Localisation updates from https://translatewiki.net.

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 92c2f1a245f96f47e4892e993ba3e6b4b6c9e55d..205b01f1a696fe00bd293f22cae53e5135bc7d6e 100644 (file)
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -43,11 +43,11 @@ cy:
     errors:
       messages:
         invalid_email_address: nid yw'n ymddangos ei fod yn gyfeiriad ebost dilys
     errors:
       messages:
         invalid_email_address: nid yw'n ymddangos ei fod yn gyfeiriad ebost dilys

-        email_address_not_routable: nid yw'n cyrchadwy
+        email_address_not_routable: nid yw'n gyrchadwy

     models:
       acl: Rhestr Rheoli Mynediad
       changeset: Grŵp newid
     models:
       acl: Rhestr Rheoli Mynediad
       changeset: Grŵp newid

-      changeset_tag: Tag Grŵp newidiadau
+      changeset_tag: Tag Grŵp newid

       country: Gwlad
       diary_comment: Nodyn Dyddiadur
       diary_entry: Cofnod Dyddiadur
       country: Gwlad
       diary_comment: Nodyn Dyddiadur
       diary_entry: Cofnod Dyddiadur


@@ -82,7 +82,15 @@ cy:
     attributes:
       client_application:
         name: Enw (gofynnol)
     attributes:
       client_application:
         name: Enw (gofynnol)

-        allow_write_api: olygu'r map
+        url: URL y Prif Ap (Gofynnol)
+        callback_url: URL galw'n ôl
+        support_url: URL Cefnogaeth
+        allow_read_prefs: darllen eu dewisiadau defnyddiwr
+        allow_write_prefs: addasu eu dewisiadau defnyddiwr
+        allow_write_diary: creu cofnodion dyddiadur, sylwadau a gwneud ffrindiau
+        allow_write_api: golygu'r map
+        allow_read_gpx: darllen eu dargopiadau GPS
+        allow_write_gpx: uwchlwytho dargopiadau GPS

         allow_write_notes: addasu nodiadau
       diary_comment:
         body: Corff
         allow_write_notes: addasu nodiadau
       diary_comment:
         body: Corff


@@ -95,6 +103,8 @@ cy:
         language_code: Iaith
       doorkeeper/application:
         name: Enw
         language_code: Iaith
       doorkeeper/application:
         name: Enw

+        redirect_uri: Ailgyfeirio URIs
+        confidential: Ap cyfrinachol?

         scopes: Caniatâd
       friend:
         user: Defnyddiwr
         scopes: Caniatâd
       friend:
         user: Defnyddiwr


@@ -121,9 +131,12 @@ cy:
         description: Disgrifiad
       report:
         category: Dewiswch reswm dros eich adroddiad
         description: Disgrifiad
       report:
         category: Dewiswch reswm dros eich adroddiad

+        details: Rhowch mwy o fanylion am y broblem (gofynnol).

       user:
       user:

+        auth_provider: Darparwr Ap
+        auth_uid: UID Dilysu

         email: E-bost
         email: E-bost

-        email_confirmation: Cadarnhau E-bost
+        email_confirmation: Cadarnhad e-bost

         new_email: Cyfeiriad e-bost newydd
         active: Gweithredol
         display_name: Enw defnyddiwr
         new_email: Cyfeiriad e-bost newydd
         active: Gweithredol
         display_name: Enw defnyddiwr


@@ -298,6 +311,8 @@ cy:
         cyhoeddus all olygu data map.
       find_out_why: dyma pam
       make_edits_public_button: Gwneud fy holl olygiadau yn gyhoeddus
         cyhoeddus all olygu data map.
       find_out_why: dyma pam
       make_edits_public_button: Gwneud fy holl olygiadau yn gyhoeddus

+    update:
+      success: Diweddarwyd gwybodaeth defnyddiwr yn llwyddiannus.

     destroy:
       success: Cyfrif wedi'i ddileu.
   browse:
     destroy:
       success: Cyfrif wedi'i ddileu.
   browse:


@@ -310,7 +325,7 @@ cy:
     deleted_ago_by_html: Wedi dileu %{time_ago} gan %{user}
     edited_ago_by_html: Golgwyd %{time_ago} gan %{user}
     version: Fersiwn
     deleted_ago_by_html: Wedi dileu %{time_ago} gan %{user}
     edited_ago_by_html: Golgwyd %{time_ago} gan %{user}
     version: Fersiwn

-    in_changeset: Grŵp Newid
+    in_changeset: Grŵp newid

     anonymous: dienw
     no_comment: (dim sylw)
     part_of: Rhan o
     anonymous: dienw
     no_comment: (dim sylw)
     part_of: Rhan o


@@ -328,6 +343,8 @@ cy:
       relation: Perthynas %{count}
       relation_paginated: Perthynas (%{x}-%{y} o %{count})
       comment: Sylwadau (%{count})
       relation: Perthynas %{count}
       relation_paginated: Perthynas (%{x}-%{y} o %{count})
       comment: Sylwadau (%{count})

+      hidden_comment_by_html: Sylw cudd gan %{user} %{time_ago}
+      comment_by_html: Sylw gan %{user} %{time_ago}

       changesetxml: XML grŵp newid
       osmchangexml: XML osmChange
       feed:
       changesetxml: XML grŵp newid
       osmchangexml: XML osmChange
       feed:


@@ -344,6 +361,13 @@ cy:
       title_html: 'Llwybr: %{name}'
       history_title_html: 'Hanes Llwybr: %{name}'
       nodes: Nodau
       title_html: 'Llwybr: %{name}'
       history_title_html: 'Hanes Llwybr: %{name}'
       nodes: Nodau

+      nodes_count:
+        zero: '%{count} nod'
+        one: '%{count} nod'
+        two: '%{count} nod'
+        few: '%{count} nod'
+        many: '%{count} nod'
+        other: '%{count} nod'

       also_part_of_html:
         one: rhan o'r ffordd %{related_ways}
         other: rhan o'r ffyrdd %{related_ways}
       also_part_of_html:
         one: rhan o'r ffordd %{related_ways}
         other: rhan o'r ffyrdd %{related_ways}


@@ -351,6 +375,13 @@ cy:
       title_html: 'Perthynas: %{name}'
       history_title_html: 'Hanes y Perthynas: %{name}'
       members: Aelodau
       title_html: 'Perthynas: %{name}'
       history_title_html: 'Hanes y Perthynas: %{name}'
       members: Aelodau

+      members_count:
+        zero: '%{count} aelod'
+        one: '%{count} aelod'
+        two: '%{count} aelod'
+        few: '%{count} aelod'
+        many: '%{count} aelod'
+        other: '%{count} aelod'

     relation_member:
       entry_role_html: '%{type} %{name} fel %{role}'
       type:
     relation_member:
       entry_role_html: '%{type} %{name} fel %{role}'
       type:


@@ -400,6 +431,7 @@ cy:
       wikipedia_link: Erthygl %{page} ar Wicipedia
       wikimedia_commons_link: Eitem %{page} ar Gomin Wicimedia
       telephone_link: Galw %{phone_number}
       wikipedia_link: Erthygl %{page} ar Wicipedia
       wikimedia_commons_link: Eitem %{page} ar Gomin Wicimedia
       telephone_link: Galw %{phone_number}

+      colour_preview: Rhagolwg lliw %{colour_value}

       email_link: E-bost %{email}
     query:
       title: Nodweddion Ymholiad
       email_link: E-bost %{email}
     query:
       title: Nodweddion Ymholiad


@@ -501,6 +533,7 @@ cy:
         arni'n anghywir.
     diary_entry:
       posted_by_html: Postiwyd gan %{link_user} ar %{created} yn %{language_link}
         arni'n anghywir.
     diary_entry:
       posted_by_html: Postiwyd gan %{link_user} ar %{created} yn %{language_link}

+      updated_at_html: Diweddarwyd ddiwethaf ar %{updated}.

       comment_link: Sylw ar y cofnod hwn
       reply_link: Anfon neges at yr awdur
       comment_count:
       comment_link: Sylw ar y cofnod hwn
       reply_link: Anfon neges at yr awdur
       comment_count:


@@ -538,6 +571,9 @@ cy:
         title: Cofnodion dyddiadur OpenStreetMap
         description: Cofnodion dyddiadur diweddar gan ddefnyddwyr OpenStreetMap
     comments:
         title: Cofnodion dyddiadur OpenStreetMap
         description: Cofnodion dyddiadur diweddar gan ddefnyddwyr OpenStreetMap
     comments:

+      heading: Sylwadau Dyddiadur %{user}
+      subheading_html: Sylwadau Dyddiadur wedi'u hychwanegu gan %{user}
+      no_comments: Dim sylwadau dyddiadur

       post: Post
       when: Pryd
       comment: Sylw
       post: Post
       when: Pryd
       comment: Sylw


@@ -577,6 +613,7 @@ cy:
           drag_lift: Cadair lusg
           gondola: Lifft Gondola
           magic_carpet: Lifft Carped Hud
           drag_lift: Cadair lusg
           gondola: Lifft Gondola
           magic_carpet: Lifft Carped Hud

+          platter: Lifft Plater

           pylon: Peilon
           station: Gorsaf Awyr
           t-bar: Lifft T-Bar
           pylon: Peilon
           station: Gorsaf Awyr
           t-bar: Lifft T-Bar


@@ -678,6 +715,7 @@ cy:
           ranger_station: Gorsaf Ceidwad
           recycling: Pwynt Ailgylchu
           restaurant: Bwyty
           ranger_station: Gorsaf Ceidwad
           recycling: Pwynt Ailgylchu
           restaurant: Bwyty

+          sanitary_dump_station: Gorsaf Dympio Glanweithdra

           school: Ysgol
           shelter: Cysgod
           shower: Cawod
           school: Ysgol
           shelter: Cysgod
           shower: Cawod


@@ -690,14 +728,21 @@ cy:
           theatre: Theatr
           toilets: Toiledau
           townhall: Neuadd y Dref
           theatre: Theatr
           toilets: Toiledau
           townhall: Neuadd y Dref

+          training: Cyfleuster Hyfforddi

           university: Prifysgol
           university: Prifysgol

+          vehicle_inspection: Archwilio Cerbydau

           vending_machine: Peiriant Gwerthu
           veterinary: Milfeddygfa
           village_hall: Neuadd Bentref
           waste_basket: Bin Sbwriel
           waste_disposal: Gwaredu Sbwriel
           vending_machine: Peiriant Gwerthu
           veterinary: Milfeddygfa
           village_hall: Neuadd Bentref
           waste_basket: Bin Sbwriel
           waste_disposal: Gwaredu Sbwriel

+          waste_dump_site: Safle Dympio Gwastraff
+          watering_place: Lle Dyfrhau

           water_point: Cyflenwad Dŵr
           water_point: Cyflenwad Dŵr

+          weighbridge: Pont Bwyso
+          "yes": Amwynder

         boundary:
         boundary:

+          aboriginal_lands: Tiroedd Brodorol

           administrative: Ffin Gweinyddol
           census: Ffin Cyfrifiad
           national_park: Parc Cenedlaethol
           administrative: Ffin Gweinyddol
           census: Ffin Cyfrifiad
           national_park: Parc Cenedlaethol


@@ -706,6 +751,7 @@ cy:
           "yes": Ffin
         bridge:
           aqueduct: Dyfrbont
           "yes": Ffin
         bridge:
           aqueduct: Dyfrbont

+          boardwalk: Rhodfa Estyll

           suspension: Pont Grog
           swing: Pont Droelli
           viaduct: Pont Trenau
           suspension: Pont Grog
           swing: Pont Droelli
           viaduct: Pont Trenau


@@ -721,6 +767,8 @@ cy:
           civic: Adeilad Dinesig
           college: Adeilad Coleg
           commercial: Adeilad Masnachol
           civic: Adeilad Dinesig
           college: Adeilad Coleg
           commercial: Adeilad Masnachol

+          construction: Adeilad yn cael ei Adeiladu
+          dormitory: Dorm

           farm: Ffermdy
           garage: Garej
           garages: Garejis
           farm: Ffermdy
           garage: Garej
           garages: Garejis


@@ -1030,6 +1078,7 @@ cy:
           lawyer: Cyfreithiwr
           newspaper: Swyddfa Bapur Newydd
           ngo: Swyddfa NGO
           lawyer: Cyfreithiwr
           newspaper: Swyddfa Bapur Newydd
           ngo: Swyddfa NGO

+          notary: Notari

           religion: Swyddfa Grefyddol
           research: Swyddfa Ymchwil
           tax_advisor: Cynghorydd Treth
           religion: Swyddfa Grefyddol
           research: Swyddfa Ymchwil
           tax_advisor: Cynghorydd Treth


@@ -1094,9 +1143,12 @@ cy:
           alcohol: Siop Drwyddedig
           antiques: Hynafolion
           art: Siop Gelf
           alcohol: Siop Drwyddedig
           antiques: Hynafolion
           art: Siop Gelf

+          baby_goods: Nwyddau Babanod

           bag: Siop Bagiau
           bakery: Becws
           bag: Siop Bagiau
           bakery: Becws

+          bathroom_furnishing: Dodrefn Ystafell Ymolchi

           beauty: Siop Harddwch
           beauty: Siop Harddwch

+          bed: Cynhyrchion Dillad Gwely

           beverages: Siop Ddiodau
           bicycle: Siop Feiciau
           bookmaker: Llyfrwerthwr
           beverages: Siop Ddiodau
           bicycle: Siop Feiciau
           bookmaker: Llyfrwerthwr


@@ -1118,6 +1170,9 @@ cy:
           convenience: Siop Bob-peth
           copyshop: Siop Argraffu
           cosmetics: Siop Golur
           convenience: Siop Bob-peth
           copyshop: Siop Argraffu
           cosmetics: Siop Golur

+          craft: Storfa Cynnyrch Crefft
+          curtain: Siop Lenni
+          dairy: Siop Laeth

           deli: Deli
           department_store: Siop Adrannol
           discount: Siop Ddisgownt
           deli: Deli
           department_store: Siop Adrannol
           discount: Siop Ddisgownt


@@ -1127,6 +1182,7 @@ cy:
           electronics: Siop Electroneg
           erotic: Siop Erotig
           estate_agent: Gwerthwr Tai
           electronics: Siop Electroneg
           erotic: Siop Erotig
           estate_agent: Gwerthwr Tai

+          fabric: Siop Ddeunydd

           farm: Siop Fferm
           fashion: Siop Ffasiwn
           florist: Siop Flodau
           farm: Siop Fferm
           fashion: Siop Ffasiwn
           florist: Siop Flodau


@@ -1162,7 +1218,9 @@ cy:
           paint: Siop Baent
           pet: Siop Anifeiliaid Anwes
           photo: Siop Luniau
           paint: Siop Baent
           pet: Siop Anifeiliaid Anwes
           photo: Siop Luniau

+          seafood: Bwyd Môr

           second_hand: Siop ail-law
           second_hand: Siop ail-law

+          sewing: Siop Gwnïo

           shoes: Siop Esgidiau
           sports: Siop Chwaraeon
           stationery: Siop Offer Swyddfa
           shoes: Siop Esgidiau
           sports: Siop Chwaraeon
           stationery: Siop Offer Swyddfa


@@ -1245,7 +1303,9 @@ cy:
       title: Materion
       select_status: Dewis statws
       select_type: Dewis math
       title: Materion
       select_status: Dewis statws
       select_type: Dewis math

+      not_updated: Heb ei Ddiweddaru

       search: Chwilio
       search: Chwilio

+      search_guidance: 'Chwilio Gwallau:'

       user_not_found: Nid yw'r defnyddiwr yn bodoli
       issues_not_found: Ni chanfuwyd unrhyw faterion o'r fath
       status: Statws
       user_not_found: Nid yw'r defnyddiwr yn bodoli
       issues_not_found: Ni chanfuwyd unrhyw faterion o'r fath
       status: Statws


@@ -1266,6 +1326,7 @@ cy:
         open: Agor
         resolved: Datruswyd
     show:
         open: Agor
         resolved: Datruswyd
     show:

+      title: '%{status} Gwall #%{issue_id}'

       no_reports: Dim adroddiadau
       report_created_at: Adroddwyd gyntaf am %{datetime}
       last_resolved_at: Datryswyd ddiwethaf am %{datetime}
       no_reports: Dim adroddiadau
       report_created_at: Adroddwyd gyntaf am %{datetime}
       last_resolved_at: Datryswyd ddiwethaf am %{datetime}


@@ -1274,21 +1335,41 @@ cy:
       reopen: Ailagor
       read_reports: Darllen Adroddiadau
       new_reports: Adroddiadau Newydd
       reopen: Ailagor
       read_reports: Darllen Adroddiadau
       new_reports: Adroddiadau Newydd

+    reports:
+      reported_by_html: Adroddwyd fel %{category} gan %{user} ar %{updated_at}

     helper:
       reportable_title:
     helper:
       reportable_title:

+        diary_comment: '%{entry_title}, sylw #%{comment_id}'

         note: 'Nodyn #%{note_id}'
   reports:
     new:
       title_html: Adrodd %{link}
         note: 'Nodyn #%{note_id}'
   reports:
     new:
       title_html: Adrodd %{link}

+      missing_params: Ni ellir creu adroddiad newydd

       categories:
         diary_entry:
       categories:
         diary_entry:

+          spam_label: Mae'r cofnod dyddiadur hwn yn / yn cynnwys sbam
+          offensive_label: Mae'r cofnod dyddiadur hwn yn anweddus / sarhaus
+          threat_label: Mae'r cofnod dyddiadur hwn yn cynnwys bygythiad

           other_label: Arall
         diary_comment:
           other_label: Arall
         diary_comment:

+          spam_label: Mae'r sylw dyddiadur hwn yn/yn cynnwys sbam
+          offensive_label: Mae'r sylw dyddiadur hwn yn anweddus/sarhaus
+          threat_label: Mae'r sylw dyddiadur hwn yn cynnwys bygythiad

           other_label: Arall
         user:
           other_label: Arall
         user:

+          spam_label: Mae'r proffil defnyddiwr hwn yn / yn cynnwys sbam
+          offensive_label: Mae'r proffil defnyddiwr hwn yn anweddus / sarhaus
+          threat_label: Mae'r proffil defnyddiwr hwn yn cynnwys bygythiad
+          vandal_label: Mae'r defnyddiwr hwn yn fandal

           other_label: Arall
         note:
           other_label: Arall
         note:

+          spam_label: Mae'r nodyn hwn yn sbam
+          personal_label: Mae'r nodyn hwn yn cynnwys data personol
+          abusive_label: Mae'r nodyn hwn yn sarhaus

           other_label: Arall
           other_label: Arall

+    create:
+      successful_report: Anfonwyd eich adroddiad yn llwyddiannus
+      provide_details: Rhowch y manylion gofynnol os gwelwch yn dda

   layouts:
     logo:
       alt_text: Logo OpenStreetMap
   layouts:
     logo:
       alt_text: Logo OpenStreetMap


@@ -1350,14 +1431,17 @@ cy:
     gpx_success:
       hi: Helo %{to_user},
     signup_confirm:
     gpx_success:
       hi: Helo %{to_user},
     signup_confirm:

+      subject: '[OpenStreetMap] Croeso i OpenStreetMap'

       greeting: Shwmae!
       created: Mae rhywun (chi gobeithio!) newydd greu cyfrif yn %{site_url}.
     email_confirm:
       greeting: Shwmae!
       created: Mae rhywun (chi gobeithio!) newydd greu cyfrif yn %{site_url}.
     email_confirm:

+      subject: '[OpenStreetMap] Cadarnhewch eich cyfeiriad e-bost'

       greeting: Helo,
       hopefully_you: Hoffai rhywun (chi, gobeithio) newid eu cyfeiriad e-bost ar %{server_url}
         i %{new_address}.
       click_the_link: Os mai chi yw hwn, cliciwch ar y ddolen isod i gadarnhau'r newid.
     lost_password:
       greeting: Helo,
       hopefully_you: Hoffai rhywun (chi, gobeithio) newid eu cyfeiriad e-bost ar %{server_url}
         i %{new_address}.
       click_the_link: Os mai chi yw hwn, cliciwch ar y ddolen isod i gadarnhau'r newid.
     lost_password:

+      subject: '[OpenStreetMap] Cais ailosod cyfrinair'

       greeting: Helo,
     note_comment_notification:
       anonymous: Defnyddiwr dienw
       greeting: Helo,
     note_comment_notification:
       anonymous: Defnyddiwr dienw


@@ -1374,6 +1458,8 @@ cy:
       heading: Gwiriwch eich e-byst!
       button: Cadarnhau
       click_here: cliciwch yma
       heading: Gwiriwch eich e-byst!
       button: Cadarnhau
       click_here: cliciwch yma

+    confirm_resend:
+      failure: Heb ganfod y defnyddiwr %{name}.

     confirm_email:
       heading: Cadarnhau newid cyfeiriad e-bost
       button: Cadarnhau
     confirm_email:
       heading: Cadarnhau newid cyfeiriad e-bost
       button: Cadarnhau


@@ -1385,6 +1471,20 @@ cy:
       my_inbox: Fy Mewnflwch
       my_outbox: Fy Mlwch Allan
       messages: Mae gennych %{new_messages} a %{old_messages}
       my_inbox: Fy Mewnflwch
       my_outbox: Fy Mlwch Allan
       messages: Mae gennych %{new_messages} a %{old_messages}

+      new_messages:
+        zero: '%{count} neges newydd'
+        one: '%{count} neges newydd'
+        two: '%{count} new messages'
+        few: '%{count} neges newydd'
+        many: '%{count} neges newydd'
+        other: '%{count} neges newydd'
+      old_messages:
+        zero: '%{count} hen neges'
+        one: '%{count} hen neges'
+        two: '%{count} hen neges'
+        few: '%{count} hen neges'
+        many: '%{count} hen neges'
+        other: '%{count} hen neges'

       from: Gan
       subject: Pwnc
       date: Dyddiad
       from: Gan
       subject: Pwnc
       date: Dyddiad


@@ -1454,6 +1554,8 @@ cy:
       cancel: Canslo
     update:
       failure: Ni ellir diweddaru'r dewisiadau.
       cancel: Canslo
     update:
       failure: Ni ellir diweddaru'r dewisiadau.

+    update_success_flash:
+      message: Diweddarwyd eich dewisiadau.

   profiles:
     edit:
       title: Golygu proffil
   profiles:
     edit:
       title: Golygu proffil


@@ -1525,6 +1627,8 @@ cy:
       headings: Penawdau
       heading: Pennawd
       subheading: Is-bennawd
       headings: Penawdau
       heading: Pennawd
       subheading: Is-bennawd

+      first: Eitem gyntaf
+      second: Ail eitem

       link: Dolen
       text: Testun
       image: Delwedd
       link: Dolen
       text: Testun
       image: Delwedd


@@ -1538,12 +1642,14 @@ cy:
       next: Nesaf
       heading_html: '%{copyright}Cyfranwyr %{br} OpenStreetMap'
       local_knowledge_title: Gwybodaeth Leol
       next: Nesaf
       heading_html: '%{copyright}Cyfranwyr %{br} OpenStreetMap'
       local_knowledge_title: Gwybodaeth Leol

+      community_driven_title: Gwaith y Gymuned

       community_driven_osm_blog: Blog OpenStreetMap
       community_driven_user_diaries: dyddiaduron defnyddwyr
       community_driven_community_blogs: blogiau cymunedol
       community_driven_osm_foundation: OSM Foundation
       open_data_title: Data Agored
       open_data_open_data: data agored
       community_driven_osm_blog: Blog OpenStreetMap
       community_driven_user_diaries: dyddiaduron defnyddwyr
       community_driven_community_blogs: blogiau cymunedol
       community_driven_osm_foundation: OSM Foundation
       open_data_title: Data Agored
       open_data_open_data: data agored

+      open_data_copyright_license: Tudalen Hawlfraint a Thrwydded

       legal_title: Cyfreithiol
       legal_1_1_openstreetmap_foundation: OpenStreetMap Foundation
       legal_1_1_terms_of_use: Telerau Gwasanaeth
       legal_title: Cyfreithiol
       legal_1_1_openstreetmap_foundation: OpenStreetMap Foundation
       legal_1_1_terms_of_use: Telerau Gwasanaeth


@@ -1564,12 +1670,34 @@ cy:
       legal_babble:
         title_html: Hawlfraint a Thrwydded
         introduction_1_open_data: data agored
       legal_babble:
         title_html: Hawlfraint a Thrwydded
         introduction_1_open_data: data agored

+        introduction_1_osm_foundation: OpenStreetMap Foundation
+        introduction_2_html: |-
+          Rydych yn rhydd i gopïo, dosbarthu, trosglwyddo ac addasu ein data, cyn belled â'ch bod yn cydnabod OpenStreetMap a'i
+          gyfranwyr. Os ydych chi'n newid neu'n adeiladu ar ein data, dim ond o dan yr un drwydded y cewch chi ddosbarthu eich canlyniad. Mae'r %{legal_code_link} llawn yn esbonio eich hawliau a'ch cyfrifoldebau.

         introduction_2_legal_code: cod cyfreithiol
         introduction_2_legal_code: cod cyfreithiol

+        introduction_3_html: Mae ein dogfennaeth wedi'i thrwyddedu o dan drwydded
+          %{creative_commons_link} (CC BY-SA 2.0).
+        introduction_3_creative_commons: Creative Commons Attribution-ShareAlike 2.0

         credit_title_html: Sut i gydnabod OpenStreetMap
         credit_title_html: Sut i gydnabod OpenStreetMap

+        credit_1_html: 'Pan fyddwch yn defnyddio data OpenStreetMap, mae rhaid i chi
+          wneud y ddau beth canlynol:'
+        credit_2_1: Rhoi cydnabyddiaeth i OpenStreetMap trwy arddangos ein hysbysiad
+          hawlfraint.
+        credit_2_2: Gwnewch yn glir bod y data ar gael o dan y Drwydded Cronfa Ddata
+          Agored.
+        credit_3_html: |-
+          Ar gyfer yr hysbysiad hawlfraint, mae gennym ofynion gwahanol o ran sut y dylid ei arddangos, yn dibynnu ar sut rydych yn defnyddio ein data. Er enghraifft, mae rheolau
+          gwahanol yn berthnasol ar sut i ddangos yr hysbysiad hawlfraint yn dibynnu a ydych wedi creu map pori, map printiedig neu ddelwedd statig. Ceir manylion llawn am y gofynion yn y %{attribution_guidelines_link}.
+        credit_3_attribution_guidelines: Canllawiau Priodoli

         credit_4_1_this_copyright_page: y dudalen hawlfraint hon
         attribution_example:
         credit_4_1_this_copyright_page: y dudalen hawlfraint hon
         attribution_example:

+          alt: Enghraifft o sut i briodoli OpenStreetMap ar dudalen we

           title: Enghraifft o gydnabyddiaeth
         more_title_html: Darganfod rhagor
           title: Enghraifft o gydnabyddiaeth
         more_title_html: Darganfod rhagor

+        more_1_1_osmf_licence_page: Tudalen Trwydded OSMF
+        more_2_1_api_usage_policy: Polisi Defnydd API
+        more_2_1_tile_usage_policy: Polisi Defnydd Teils
+        more_2_1_nominatim_usage_policy: Polisi Defnydd Nominatim

         contributors_title_html: Ein cyfranwyr
         contributors_at_austria: Awstria
         contributors_at_stadt_wien: Stadt Wien
         contributors_title_html: Ein cyfranwyr
         contributors_at_austria: Awstria
         contributors_at_stadt_wien: Stadt Wien


@@ -1584,19 +1712,24 @@ cy:
         contributors_fr_france: Ffrainc
         contributors_nl_netherlands: Iseldiroedd
         contributors_nz_new_zealand: Seland Newydd
         contributors_fr_france: Ffrainc
         contributors_nl_netherlands: Iseldiroedd
         contributors_nz_new_zealand: Seland Newydd

+        contributors_nz_linz_data_service: Gwasanaeth Data LINZ

         contributors_nz_cc_by: CC BY 4.0
         contributors_rs_serbia: Serbia
         contributors_si_slovenia: Slofenia
         contributors_nz_cc_by: CC BY 4.0
         contributors_rs_serbia: Serbia
         contributors_si_slovenia: Slofenia

+        contributors_si_mkgp: Gweinyddiaeth Amaethyddiaeth, Coedwigaeth a Bwyd

         contributors_es_spain: Sbaen
         contributors_es_ign: IGN
         contributors_es_cc_by: CC BY 4.0
         contributors_za_south_africa: De Affrica
         contributors_es_spain: Sbaen
         contributors_es_ign: IGN
         contributors_es_cc_by: CC BY 4.0
         contributors_za_south_africa: De Affrica

+        contributors_gb_credit_html: '%{united_kingdom}: Yn cynnwys data Arolwg Ordnans
+          © Hawlfraint y Goron a chronfa ddata 2010-2023.'

         contributors_gb_united_kingdom: Deyrnas Unedig
         contributors_2_contributors_page: Tudalen gyfranwyr
         infringement_title_html: Torri hawlfraint
         trademarks_title: Nodau Masnach
         trademarks_1_1_trademark_policy: Polisi Nod Masnach
     index:
         contributors_gb_united_kingdom: Deyrnas Unedig
         contributors_2_contributors_page: Tudalen gyfranwyr
         infringement_title_html: Torri hawlfraint
         trademarks_title: Nodau Masnach
         trademarks_1_1_trademark_policy: Polisi Nod Masnach
     index:

+      js_2: Mae OpenStreetMap yn defnyddio JavaScript ar gyfer ei fap llithrig.

       permalink: Dolen barhaol
       shortlink: Dolen fer
       createnote: Ychwanegu nodyn
       permalink: Dolen barhaol
       shortlink: Dolen fer
       createnote: Ychwanegu nodyn


@@ -1619,6 +1752,8 @@ cy:
         advice: 'Os yw''r allforio''n methu, ystyriwch un o''r canlynol:'
         planet:
           title: Planet OSM
         advice: 'Os yw''r allforio''n methu, ystyriwch un o''r canlynol:'
         planet:
           title: Planet OSM

+        overpass:
+          title: Overpass API

         other:
           title: Ffynonellau eraill
           description: Ffynonellau ychwanegol a nodir ar wici OpenStreetMap
         other:
           title: Ffynonellau eraill
           description: Ffynonellau ychwanegol a nodir ar wici OpenStreetMap


@@ -1662,6 +1797,7 @@ cy:
         title: switch2osm
       wiki:
         title: Wici OpenStreetMap
         title: switch2osm
       wiki:
         title: Wici OpenStreetMap

+        description: Archwiliwch y wici am ddogfennau manwl OpenStreetMap.

     any_questions:
       title: Unrhyw gwestiynau?
     sidebar:
     any_questions:
       title: Unrhyw gwestiynau?
     sidebar:


@@ -1748,10 +1884,30 @@ cy:
           toilets: Toiledau
     welcome:
       title: Croeso!
           toilets: Toiledau
     welcome:
       title: Croeso!

+      introduction: Croeso i OpenStreetMap, map y byd rhydd ac agored. Nawr eich bod
+        wedi cofrestru, rydych chi'n barod i ddechrau mapio. Dyma ganllaw gyflym gyda'r
+        hyn pwysicaf i wybod cyn ichi ddechrau arni.

       whats_on_the_map:
         title: Beth sydd ar y Map
       whats_on_the_map:
         title: Beth sydd ar y Map

+        on_the_map_html: Mae OpenStreetMap yn addas i fapio pethau sy'n %{real_and_current}
+          - mae'n cynnwys miliynau o adeiladau, strydoedd, a manylion eraill am lefydd.
+          Gallwch chi fapio unrhyw beth sydd o ddiddordeb ichi.
+        real_and_current: bodoli'n go iawn ac yn gyfoes
+        off_the_map_html: '%{doesnt} cynnwys barn defnyddwyr fel sgoriau, nodweddion
+          hanesyddol neu dybiedig, a data o ffynonellau o dan hawlfraint. Oni bai
+          bod gennych chi ganiatâd arbennig, peidiwch â chopio o fapiau ar-lein neu
+          ar bapur.'
+        doesnt: Nad yw'n

       basic_terms:
         title: Termau syml mapio
       basic_terms:
         title: Termau syml mapio

+        paragraph_1: Mae gan OpenStreetMap rywfaint o dafodiaith ei hun. Dyma ychydig
+          o eiriau allweddol a fydd yn ddefnyddiol ichi.
+        an_editor_html: Mae %{editor} yn rhaglen neu wefan y gallwch chi ei defnyddio
+          i olygu'r map.
+        a_node_html: Mae %{node} yn bwynt ar y map, fel bwyty neu goeden.
+        a_way_html: Mae %{way} yn llinell neu ardal fel ffordd, nant, llyn neu adeilad.
+        a_tag_html: Mae %{tag} yn cynnwys data am nod neu ffordd, fel enw bwyty neu
+          derfyn cyflymder ffordd.

         editor: golygydd
         node: nod
         way: llwybr
         editor: golygydd
         node: nod
         way: llwybr


@@ -1778,6 +1934,7 @@ cy:
     trace_optionals:
       tags: Tagiau
     show:
     trace_optionals:
       tags: Tagiau
     show:

+      pending: I DDOD

       filename: 'Enw ffeil:'
       download: lawrlwytho
       uploaded: 'Uwchlwythwyd:'
       filename: 'Enw ffeil:'
       download: lawrlwytho
       uploaded: 'Uwchlwythwyd:'


@@ -1791,6 +1948,7 @@ cy:
       none: Dim
       visibility: 'Gwelededd:'
     trace:
       none: Dim
       visibility: 'Gwelededd:'
     trace:

+      pending: I DDOD

       count_points:
         zero: '%{count} pwynt'
         one: '%{count} pwynt'
       count_points:
         zero: '%{count} pwynt'
         one: '%{count} pwynt'


@@ -1836,6 +1994,7 @@ cy:
     revoke:
       flash: Rydych wedi diddymu'r tocyn ar gyfer %{application}.
     scopes:
     revoke:
       flash: Rydych wedi diddymu'r tocyn ar gyfer %{application}.
     scopes:

+      write_api: Golygu'r map

       write_notes: Addasu nodiadau
   oauth_clients:
     new:
       write_notes: Addasu nodiadau
   oauth_clients:
     new:


@@ -1863,6 +2022,7 @@ cy:
       delete: Dileu
       client_id: ID Cleient
       client_secret: Cyfrinach Cleient
       delete: Dileu
       client_id: ID Cleient
       client_secret: Cyfrinach Cleient

+      permissions: Caniatadau

   oauth2_authorizations:
     new:
       authorize: Awdurdodi
   oauth2_authorizations:
     new:
       authorize: Awdurdodi


@@ -1871,6 +2031,8 @@ cy:
     new:
       title: Cofrestru
       support: cymorth
     new:
       title: Cofrestru
       support: cymorth

+      about:
+        header: Rhydd ac agored

       display name description: Eich enw defnyddiwr cyhoeddus. Gallwch newid hyn yn
         nes ymlaen yn eich dewisiadau.
       continue: Cofrestru
       display name description: Eich enw defnyddiwr cyhoeddus. Gallwch newid hyn yn
         nes ymlaen yn eich dewisiadau.
       continue: Cofrestru


@@ -1879,16 +2041,21 @@ cy:
     terms:
       title: Telerau
       heading: Telerau
     terms:
       title: Telerau
       heading: Telerau

+      heading_ct: Telerau Cyfranwyr

       consider_pd_why: beth yw hwn?
       consider_pd_why: beth yw hwn?

+      informal_translations: cyfieithiadau anffurfiol

       continue: Parhau
       decline: Gwrthod
       legale_names:
         france: Ffrainc
         italy: Yr Eidal
         rest_of_world: Gweddill y byd
       continue: Parhau
       decline: Gwrthod
       legale_names:
         france: Ffrainc
         italy: Yr Eidal
         rest_of_world: Gweddill y byd

+    terms_declined_flash:
+      terms_declined_link: y dudalen wici hon

     no_such_user:
       title: Dim defnyddiwr o'r fath
       heading: Nid yw'r defnyddiwr %{user} yn bodoli.
     no_such_user:
       title: Dim defnyddiwr o'r fath
       heading: Nid yw'r defnyddiwr %{user} yn bodoli.

+      deleted: wedi'i ddileu

     show:
       my diary: Fy Nyddiadur
       my edits: Fy Ngolygiadau
     show:
       my diary: Fy Nyddiadur
       my edits: Fy Ngolygiadau


@@ -1898,6 +2065,8 @@ cy:
       my profile: Fy Mhroffil
       my settings: Fy Ngosodiadau
       my comments: Fy Sylwadau
       my profile: Fy Mhroffil
       my settings: Fy Ngosodiadau
       my comments: Fy Sylwadau

+      my_preferences: Fy Newisiadau
+      my_dashboard: Fy Nashfwrdd

       blocks on me: Blociau arnaf i
       blocks by me: Blociau gennyf i
       edit_profile: Golygu Proffil
       blocks on me: Blociau arnaf i
       blocks by me: Blociau gennyf i
       edit_profile: Golygu Proffil


@@ -1909,6 +2078,7 @@ cy:
       remove as friend: Dad-ffrindio
       add as friend: Ychwanegu ffrind
       mapper since: 'Yn mapio ers:'
       remove as friend: Dad-ffrindio
       add as friend: Ychwanegu ffrind
       mapper since: 'Yn mapio ers:'

+      uid: 'ID Defnyddiwr:'

       ct status: 'Telerau cyfrannwr:'
       ct undecided: Heb Benderfynu
       ct declined: Wedi Gwrthod
       ct status: 'Telerau cyfrannwr:'
       ct undecided: Heb Benderfynu
       ct declined: Wedi Gwrthod


@@ -1938,17 +2108,67 @@ cy:
       heading: Defnyddwyr
     suspended:
       support: cymorth
       heading: Defnyddwyr
     suspended:
       support: cymorth

+    auth_failure:
+      no_authorization_code: Dim cod awdurdodi

   user_role:
     grant:
       confirm: Cadarnhau
     revoke:
       confirm: Cadarnhau
   user_blocks:
   user_role:
     grant:
       confirm: Cadarnhau
     revoke:
       confirm: Cadarnhau
   user_blocks:

+    not_found:
+      back: Nôl i'r mynegai
+    new:
+      title: Wrthi'n creu bloc ar %{name}
+      heading_html: Wrthi'n creu bloc ar %{name}
+    edit:
+      title: Wrthi'n golygu bloc ar %{name}
+      heading_html: Wrthi'n golygu bloc ar %{name}

     helper:
       time_future_html: Yn dod i ben mewn %{time}.
       time_past_html: Wedi dod i ben %{time} yn ôl.
     helper:
       time_future_html: Yn dod i ben mewn %{time}.
       time_past_html: Wedi dod i ben %{time} yn ôl.

+      block_duration:
+        hours:
+          zero: '%{count} awr'
+          one: '%{count} awr'
+          two: '%{count} awr'
+          few: '%{count} awr'
+          many: '%{count} awr'
+          other: '%{count} hours'
+        days:
+          zero: '%{count} diwrnod'
+          one: '%{count} diwrnod'
+          two: '%{count} ddiwrnod'
+          few: '%{count} diwrnod'
+          many: '%{count} diwrnod'
+          other: '%{count} diwrnod'
+        weeks:
+          zero: '%{count} wythnos'
+          one: '%{count} wythnos'
+          two: '%{count} wythnos'
+          few: '%{count} wythnos'
+          many: '%{count} wythnos'
+          other: '%{count} wythnos'
+        months:
+          zero: '%{count} mis'
+          one: '%{count} mis'
+          two: '%{count} fis'
+          few: '%{count} mis'
+          many: '%{count} mis'
+          other: '%{count} mis'
+        years:
+          zero: '%{count} blynedd'
+          one: '%{count} blynedd'
+          two: '%{count} flynedd'
+          few: '%{count} blynedd'
+          many: '%{count} blynedd'
+          other: '%{count} blynedd'

     blocks_on:
       title: Blociau ar %{name}
     blocks_on:
       title: Blociau ar %{name}

+      heading_html: Rhestr Blociau ar %{name}
+    blocks_by:
+      title: Blociau gan %{name}
+      heading_html: Rhestr Blociau gan %{name}

     show:
       created: 'Crëwyd:'
       duration: 'Cyfnod:'
     show:
       created: 'Crëwyd:'
       duration: 'Cyfnod:'


@@ -1960,13 +2180,18 @@ cy:
       show: Dangos
       edit: Golygu
     blocks:
       show: Dangos
       edit: Golygu
     blocks:

+      creator_name: Crëwr
+      reason: Rheswm dros flocio

       status: Statws
       showing_page: Tudalen %{page}
       next: Nesaf »
       previous: « Blaenorol
   notes:
     index:
       status: Statws
       showing_page: Tudalen %{page}
       next: Nesaf »
       previous: « Blaenorol
   notes:
     index:

+      heading: Nodiadau %{user}
+      no_notes: Dim nodiadau

       id: Id
       id: Id

+      creator: Crëwr

       description: Disgrifiad
       created_at: Crëwyd am
       last_changed: Newidiwyd ddiwethaf
       description: Disgrifiad
       created_at: Crëwyd am
       last_changed: Newidiwyd ddiwethaf


@@ -1980,7 +2205,12 @@ cy:
       event_opened_by_anonymous_html: Crëwyd gan berson ddienw %{time_ago}
       event_commented_by_html: Sylw gan %{user} %{time_ago}
       event_commented_by_anonymous_html: Sylw gan berson ddienw %{time_ago}
       event_opened_by_anonymous_html: Crëwyd gan berson ddienw %{time_ago}
       event_commented_by_html: Sylw gan %{user} %{time_ago}
       event_commented_by_anonymous_html: Sylw gan berson ddienw %{time_ago}

+      event_closed_by_html: Datryswyd gan %{user} %{time_ago}
+      event_closed_by_anonymous_html: Datryswyd gan berson ddienw %{time_ago}
+      event_hidden_by_html: Cuddiwyd gan %{user} %{time_ago}

       report: riportio'r nodyn hwn
       report: riportio'r nodyn hwn

+      anonymous_warning: Mae'r nodyn hwn yn cynnwys sylwadau gan ddefnyddwyr dienw
+        y dylid eu gwirio'n annibynnol.

       hide: Cuddio
       resolve: Datrys
       reactivate: Ail-ysgogi
       hide: Cuddio
       resolve: Datrys
       reactivate: Ail-ysgogi


@@ -2004,6 +2234,7 @@ cy:
       scale: 'Graddfa:'
       download: Lawrlwytho
       short_url: URL Byr
       scale: 'Graddfa:'
       download: Lawrlwytho
       short_url: URL Byr

+      include_marker: Cynnwys marciwr

     key:
       title: Allwedd Map
       tooltip: Allwedd Map
     key:
       title: Allwedd Map
       tooltip: Allwedd Map


@@ -2023,6 +2254,8 @@ cy:
         notes: Sylwadau Map
         data: Data Map
         title: Haenau
         notes: Sylwadau Map
         data: Data Map
         title: Haenau

+      make_a_donation: Rhoi arian
+      website_and_api_terms: Telerau'r gwefan ac API

     site:
       edit_tooltip: Golygu'r map
       edit_disabled_tooltip: Chwyddwch mewn i olygu'r map
     site:
       edit_tooltip: Golygu'r map
       edit_disabled_tooltip: Chwyddwch mewn i olygu'r map


@@ -2051,6 +2284,11 @@ cy:
       distance_m: '%{distance}m'
       distance_km: '%{distance}km'
       instructions:
       distance_m: '%{distance}m'
       distance_km: '%{distance}km'
       instructions:

+        continue_without_exit: Parhau ar %{name}
+        slight_right_without_exit: Ychydig i'r dde i %{name}
+        offramp_right: Cymerwch y ramp ar y dde
+        offramp_right_with_exit: Cymerwch allanfa %{exit} ar y dde
+        offramp_right_with_exit_name: Cymerwch allanfa %{exit} ar y dde i %{name}

         exit_counts:
           first: 1af
           second: 2il
         exit_counts:
           first: 1af
           second: 2il

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 4d112cdf4ae8e892ac3ffd46b7b9bf44b95f8e4e..c6593afc2a1ed7c20d044a0629f5f9fd4855439b 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -251,6 +251,7 @@ eo:
         reopened_at_by_html: Remalfermita %{when} de %{user}
       rss:
         title: OpenStreetMap-rimarkoj
         reopened_at_by_html: Remalfermita %{when} de %{user}
       rss:
         title: OpenStreetMap-rimarkoj

+        description_all: Listo de raportitaj, komentitaj aŭ fermitaj rimarkoj

         description_area: Listo de rimarkoj raportitaj, komentitaj aŭ fermitaj en
           via najbaraĵo [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
         description_item: RSS-fluo por rimarko %{id}
         description_area: Listo de rimarkoj raportitaj, komentitaj aŭ fermitaj en
           via najbaraĵo [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
         description_item: RSS-fluo por rimarko %{id}

diff --git a/config/locales/es.yml b/config/locales/es.yml
index f06b00d2221585020ae8d2c77ca2c77c2e743459..9ad18cdac53ee0aa69812cc0ed35eb835e71779c 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -172,11 +172,11 @@ es:
         url: URL de la aplicación principal (obligatorio)
         callback_url: URL de devolución de llamada
         support_url: URL de asistencia
         url: URL de la aplicación principal (obligatorio)
         callback_url: URL de devolución de llamada
         support_url: URL de asistencia

-        allow_read_prefs: leer tus preferencias de usuario
-        allow_write_prefs: modificar tus preferencias de usuario
+        allow_read_prefs: leer sus preferencias de usuario
+        allow_write_prefs: modificar sus preferencias de usuario

         allow_write_diary: crear entradas de diario, comentarios y hacer amigos
         allow_write_api: modificar el mapa
         allow_write_diary: crear entradas de diario, comentarios y hacer amigos
         allow_write_api: modificar el mapa

-        allow_read_gpx: leer tus trazas de GPS privadas
+        allow_read_gpx: leer sus trazas de GPS privadas

         allow_write_gpx: cargar trazas de GPS
         allow_write_notes: modificar notas
       diary_comment:
         allow_write_gpx: cargar trazas de GPS
         allow_write_notes: modificar notas
       diary_comment:


@@ -217,7 +217,7 @@ es:
         title: Título
         description: Descripción
       report:
         title: Título
         description: Descripción
       report:

-        category: Seleccione el motivo de tu denuncia
+        category: Selecciona el motivo de tu denuncia

         details: Es necesario proporcionar más detalles sobre el problema (requerido).
       user:
         auth_provider: Proveedor de autentificación
         details: Es necesario proporcionar más detalles sobre el problema (requerido).
       user:
         auth_provider: Proveedor de autentificación


@@ -685,8 +685,8 @@ es:
     contact:
       contact_url: https://wiki.openstreetmap.org/wiki/ES:Canales_de_contacto
       contact_url_title: Varios canales de contacto explicados
     contact:
       contact_url: https://wiki.openstreetmap.org/wiki/ES:Canales_de_contacto
       contact_url_title: Varios canales de contacto explicados

-      contact: contacto
-      contact_the_community_html: Siéntete libre de %{contact_link} a la comunidad
+      contact: contactar
+      contact_the_community_html: Siéntete libre de %{contact_link} con la comunidad

         de OpenStreetMap si has encontrado un enlace roto o un error. Toma nota de
         la URL exacta de tu solicitud.
     forbidden:
         de OpenStreetMap si has encontrado un enlace roto o un error. Toma nota de
         la URL exacta de tu solicitud.
     forbidden:


@@ -1424,7 +1424,7 @@ es:
           tattoo: Estudio de tatuajes
           tea: Tienda de té
           ticket: Tienda de Tickets
           tattoo: Estudio de tatuajes
           tea: Tienda de té
           ticket: Tienda de Tickets

-          tobacco: Tabaquería
+          tobacco: Tabaquería. Estanco

           toys: Juguetería
           travel_agency: Agencia de viajes
           tyres: Tienda de neumáticos
           toys: Juguetería
           travel_agency: Agencia de viajes
           tyres: Tienda de neumáticos


@@ -1460,7 +1460,7 @@ es:
           zoo: Zoológico
         tunnel:
           building_passage: Pasaje de edificio
           zoo: Zoológico
         tunnel:
           building_passage: Pasaje de edificio

-          culvert: Drenaje
+          culvert: Alcantarilla

           "yes": Túnel
         waterway:
           artificial: Vía fluvial artificial
           "yes": Túnel
         waterway:
           artificial: Vía fluvial artificial


@@ -1569,8 +1569,8 @@ es:
         intro: 'Antes de enviar tu denuncia a los moderadores del sitio, asegúrate
           de que:'
         not_just_mistake: Está seguro de que el problema no es sólo un error
         intro: 'Antes de enviar tu denuncia a los moderadores del sitio, asegúrate
           de que:'
         not_just_mistake: Está seguro de que el problema no es sólo un error

-        unable_to_fix: No puedes corregir el problema tu mismo o con la ayuda de otros
-          miembros de la comunidad.
+        unable_to_fix: No puedes corregir el problema tú mismo o con la ayuda de otros
+          miembros de la comunidad

         resolve_with_user: Ya has intentado resolver el problema con el usuario en
           cuestión.
       categories:
         resolve_with_user: Ya has intentado resolver el problema con el usuario en
           cuestión.
       categories:


@@ -1674,7 +1674,7 @@ es:
       hi: Hola %{to_user},
       subject: '[OpenStreetMap] %{user} te ha añadido como amigo'
       had_added_you: '%{user} te ha añadido como amigo en OpenStreetMap'
       hi: Hola %{to_user},
       subject: '[OpenStreetMap] %{user} te ha añadido como amigo'
       had_added_you: '%{user} te ha añadido como amigo en OpenStreetMap'

-      see_their_profile: Puedes ver tu perfil en %{userurl}.
+      see_their_profile: Puedes ver su perfil en %{userurl}.

       see_their_profile_html: Puedes ver su perfil en %{userurl}.
       befriend_them: También puedes añadirlo como amigo en %{befriendurl}.
       befriend_them_html: También puedes añadirlo como amigo en %{befriendurl}.
       see_their_profile_html: Puedes ver su perfil en %{userurl}.
       befriend_them: También puedes añadirlo como amigo en %{befriendurl}.
       befriend_them_html: También puedes añadirlo como amigo en %{befriendurl}.


@@ -1716,8 +1716,8 @@ es:
       greeting: Hola,
       hopefully_you: Alguien (posiblemente tu) ha solicitado que se restablezca la
         contraseña de la cuenta en openstreetmap.org de esta dirección de correo electrónico.
       greeting: Hola,
       hopefully_you: Alguien (posiblemente tu) ha solicitado que se restablezca la
         contraseña de la cuenta en openstreetmap.org de esta dirección de correo electrónico.

-      click_the_link: Si eres tú, haga clic en el enlace a continuación para restablecer
-        tu contraseña.
+      click_the_link: Si este eres tú, por favor, haz clic en el enlace siguiente
+        para restablecer tu contraseña.

     note_comment_notification:
       anonymous: Un usuario anónimo
       greeting: Hola,
     note_comment_notification:
       anonymous: Un usuario anónimo
       greeting: Hola,


@@ -1742,7 +1742,7 @@ es:
         commented_note: '%{commenter} ha resuelto una nota de mapa que has comentado.
           La nota está cerca de %{place}.'
         commented_note_html: '%{commenter} ha resuelto una nota del mapa en la que
         commented_note: '%{commenter} ha resuelto una nota de mapa que has comentado.
           La nota está cerca de %{place}.'
         commented_note_html: '%{commenter} ha resuelto una nota del mapa en la que

-          tu ha comentado. La nota está cerca de %{place}.'
+          tú has comentado. La nota está cerca de %{place}.'

       reopened:
         subject_own: '[OpenStreetMap] %{commenter} ha reactivado una de tus notas'
         subject_other: '[OpenStreetMap] %{commenter} ha reactivado una nota que te
       reopened:
         subject_own: '[OpenStreetMap] %{commenter} ha reactivado una de tus notas'
         subject_other: '[OpenStreetMap] %{commenter} ha reactivado una nota que te


@@ -1782,7 +1782,7 @@ es:
       unsubscribe: Para cancelar la suscripción a las actualizaciones de este conjunto
         de cambios, visita %{url} y haz clic en "Cancelar suscripción".
       unsubscribe_html: Para darte de baja de las actualizaciones de este conjunto
       unsubscribe: Para cancelar la suscripción a las actualizaciones de este conjunto
         de cambios, visita %{url} y haz clic en "Cancelar suscripción".
       unsubscribe_html: Para darte de baja de las actualizaciones de este conjunto

-        de cambios, visita %{url} y haz clic en "Cancelas subscripción".
+        de cambios, visita %{url} y haz clic en "Cancelar suscripción".

   confirmations:
     confirm:
       heading: ¡Revisa tu correo electrónico!
   confirmations:
     confirm:
       heading: ¡Revisa tu correo electrónico!


@@ -1886,10 +1886,12 @@ es:
       heading: ¿Contraseña olvidada?
       email address: 'Dirección de correo electrónico:'
       new password button: Restablecer contraseña
       heading: ¿Contraseña olvidada?
       email address: 'Dirección de correo electrónico:'
       new password button: Restablecer contraseña

-      help_text: Escribe el correo electrónico con el que se registró. Te enviaremos
-        un enlace a esa dirección, que podrás utilizar para restablecer su contraseña.
+      help_text: Escribe la dirección de correo electrónico con la que te registraste,
+        te enviaremos un enlace a esa dirección que podrás utilizar para restablecer
+        tu contraseña.

       notice email on way: Sentimos que la hayas perdido :-( pero ya va de camino
       notice email on way: Sentimos que la hayas perdido :-( pero ya va de camino

-        un correo electrónico que te servirá para restablecer su contraseña enseguida.
+        un mensaje de correo electrónico que te servirá para restablecer tu contraseña
+        enseguida.

       notice email cannot find: Lo sentimos, no se pudo encontrar esa dirección de
         correo electrónico.
     reset_password:
       notice email cannot find: Lo sentimos, no se pudo encontrar esa dirección de
         correo electrónico.
     reset_password:


@@ -1948,12 +1950,12 @@ es:
       password: 'Contraseña:'
       openid_html: '%{logo} OpenID:'
       remember: Recordarme
       password: 'Contraseña:'
       openid_html: '%{logo} OpenID:'
       remember: Recordarme

-      lost password link: ¿Has perdido su contraseña?
+      lost password link: ¿Has perdido tu contraseña?

       login_button: Iniciar sesión
       register now: Registrarse ahora
       with external: 'O bien, utiliza un servicio de terceros para acceder:'
       no account: ¿No estás registrado?
       login_button: Iniciar sesión
       register now: Registrarse ahora
       with external: 'O bien, utiliza un servicio de terceros para acceder:'
       no account: ¿No estás registrado?

-      auth failure: Lo sentimos. No puede iniciar sesión con esos datos.
+      auth failure: Lo sentimos. No se pudo iniciar sesión con esos datos.

       openid_logo_alt: Inicia sesión con una OpenID
       auth_providers:
         openid:
       openid_logo_alt: Inicia sesión con una OpenID
       auth_providers:
         openid:


@@ -2090,7 +2092,7 @@ es:
           2.0
         introduction_3_creative_commons_url: https://creativecommons.org/licenses/by-sa/2.0/deed.es
         credit_title_html: Cómo dar reconocimiento a OpenStreetMap
           2.0
         introduction_3_creative_commons_url: https://creativecommons.org/licenses/by-sa/2.0/deed.es
         credit_title_html: Cómo dar reconocimiento a OpenStreetMap

-        credit_1_html: 'Cuando utilice datos de OpenStreetMap, deberás hacer las dos
+        credit_1_html: 'Cuando utilice datos de OpenStreetMap, deberá hacer las dos

           cosas siguientes:'
         credit_2_1: Proporciona crédito a OpenStreetMap mostrando nuestro aviso de
           derechos de autor.
           cosas siguientes:'
         credit_2_1: Proporciona crédito a OpenStreetMap mostrando nuestro aviso de
           derechos de autor.


@@ -2288,11 +2290,11 @@ es:
       how_to_help:
         title: Cómo ayudar
         join_the_community:
       how_to_help:
         title: Cómo ayudar
         join_the_community:

-          title: Unete a la comunidad
+          title: Únete a la comunidad

           explanation_html: Si has notado un problema con nuestros datos del mapa,
           explanation_html: Si has notado un problema con nuestros datos del mapa,

-            por ejemplo, falta un camino o su dirección, la mejor manera de proceder
+            por ejemplo, falta un camino o tu dirección, la mejor manera de proceder

             es unirse a la comunidad OpenStreetMap y agregar o corregir los datos
             es unirse a la comunidad OpenStreetMap y agregar o corregir los datos

-            tu mismo.
+            tú mismo.

         add_a_note:
           instructions_1_html: |-
             Simplemente haz clic en %{note_icon} o en el mismo icono en la visualización del mapa.
         add_a_note:
           instructions_1_html: |-
             Simplemente haz clic en %{note_icon} o en el mismo icono en la visualización del mapa.


@@ -2361,7 +2363,7 @@ es:
         preguntas sobre él, así como debatir y documentar de forma conjunta sobre temas de mapeo.
         %{help_link}. ¿Con una organización que hace planes para OpenStreetMap? %{welcome_mat_link}.
       get_help_here: Obtén ayuda aquí
         preguntas sobre él, así como debatir y documentar de forma conjunta sobre temas de mapeo.
         %{help_link}. ¿Con una organización que hace planes para OpenStreetMap? %{welcome_mat_link}.
       get_help_here: Obtén ayuda aquí

-      welcome_mat: Echa un vistazo a la estera de bienvenida
+      welcome_mat: Echa un vistazo a la alfombra de bienvenida

     sidebar:
       search_results: Resultados de la búsqueda
       close: Cerrar
     sidebar:
       search_results: Resultados de la búsqueda
       close: Cerrar


@@ -2405,7 +2407,7 @@ es:
           apron:
           - Rampa aeroportuaria
           - terminal
           apron:
           - Rampa aeroportuaria
           - terminal

-          admin: Límite administrativos
+          admin: Límite administrativo

           forest: Bosque
           wood: Bosque
           golf: Campo de golf
           forest: Bosque
           wood: Bosque
           golf: Campo de golf


@@ -2425,7 +2427,7 @@ es:
           farm: Granja
           brownfield: Sitio baldío
           cemetery: Cementerio
           farm: Granja
           brownfield: Sitio baldío
           cemetery: Cementerio

-          allotments: Parcelas
+          allotments: Huertos de ocio

           pitch: Campo de juego
           centre: Centro deportivo
           reserve: Reserva natural
           pitch: Campo de juego
           centre: Centro deportivo
           reserve: Reserva natural


@@ -2450,7 +2452,7 @@ es:
       title: ¡Bienvenido!
       introduction: Te damos la bienvenida a OpenStreetMap, el mapa libre y editable
         del mundo. Ahora que te has registrado, has hecho lo necesario para empezar
       title: ¡Bienvenido!
       introduction: Te damos la bienvenida a OpenStreetMap, el mapa libre y editable
         del mundo. Ahora que te has registrado, has hecho lo necesario para empezar

-        a mapear. He aquí una guía rápida con las cosas más importantes que necesita
+        a mapear. He aquí una guía rápida con las cosas más importantes que necesitas

         saber.
       whats_on_the_map:
         title: Qué hay en el mapa
         saber.
       whats_on_the_map:
         title: Qué hay en el mapa


@@ -2682,10 +2684,10 @@ es:
       missing: No has permitido que la aplicación acceda a esta instalación.
     scopes:
       read_prefs: Leer preferiencias de usuario
       missing: No has permitido que la aplicación acceda a esta instalación.
     scopes:
       read_prefs: Leer preferiencias de usuario

-      write_prefs: modificar tus preferencias de usuario.
-      write_diary: Crea entradas diarias, comentarios y haz amigos
+      write_prefs: Modificar las preferencias de usuario
+      write_diary: Crear entradas del diario, comentarios y hacer amigos

       write_api: modificar el mapa.
       write_api: modificar el mapa.

-      read_gpx: Leer tus trazas de GPS privadas
+      read_gpx: Leer trazas de GPS privadas

       write_gpx: Subir trazas de GPS
       write_notes: Modifica notas
       read_email: Leer dirección de correo electrónico del usuario
       write_gpx: Subir trazas de GPS
       write_notes: Modifica notas
       read_email: Leer dirección de correo electrónico del usuario


@@ -2872,6 +2874,7 @@ es:
       remove as friend: Eliminar como amigo
       add as friend: Añadir como amigo
       mapper since: 'Mapeando desde:'
       remove as friend: Eliminar como amigo
       add as friend: Añadir como amigo
       mapper since: 'Mapeando desde:'

+      uid: 'Identificación de usuario:'

       ct status: 'Términos de Colaborador:'
       ct undecided: Indeciso
       ct declined: Rechazado
       ct status: 'Términos de Colaborador:'
       ct undecided: Indeciso
       ct declined: Rechazado


@@ -2958,7 +2961,7 @@ es:
     revoke:
       title: Confirmar revocación de rol
       heading: Confirmar revocación de rol
     revoke:
       title: Confirmar revocación de rol
       heading: Confirmar revocación de rol

-      are_you_sure: ¿Está seguro de que deseas revocar el rol `%{role}' del usuario
+      are_you_sure: ¿Está seguro de que desea revocar el rol `%{role}' del usuario

         `%{name}'?
       confirm: Confirmar
       fail: No se pudo revocar el rol `%{role}' del usuario `%{name}'. Comprueba que
         `%{name}'?
       confirm: Confirmar
       fail: No se pudo revocar el rol `%{role}' del usuario `%{name}'. Comprueba que


@@ -3002,7 +3005,7 @@ es:
       heading_html: Revocando el bloqueo sobre %{block_on} por %{block_by}
       time_future: Este bloqueo finalizará en %{time}.
       past: Este bloqueo terminó %{time} y no puede ser revocado ahora.
       heading_html: Revocando el bloqueo sobre %{block_on} por %{block_by}
       time_future: Este bloqueo finalizará en %{time}.
       past: Este bloqueo terminó %{time} y no puede ser revocado ahora.

-      confirm: ¿Estás seguro de que desea revocar este bloqueo?
+      confirm: ¿Está seguro de que desea revocar este bloqueo?

       revoke: ¡Revocar!
       flash: Este bloqueo ha sido revocado.
     helper:
       revoke: ¡Revocar!
       flash: Este bloqueo ha sido revocado.
     helper:


@@ -3220,7 +3223,7 @@ es:
         no_route: No se pudo encontrar una ruta entre esos dos lugares.
         no_place: No se pudo localizar «%{place}».
       instructions:
         no_route: No se pudo encontrar una ruta entre esos dos lugares.
         no_place: No se pudo localizar «%{place}».
       instructions:

-        continue_without_exit: Continuar en %{name}
+        continue_without_exit: Continúa por %{name}

         slight_right_without_exit: Gira un poco a la derecha hacia %{name}
         offramp_right: Toma la rampa de la derecha
         offramp_right_with_exit: Toma la salida %{exit} a la derecha
         slight_right_without_exit: Gira un poco a la derecha hacia %{name}
         offramp_right: Toma la rampa de la derecha
         offramp_right_with_exit: Toma la salida %{exit} a la derecha


@@ -3279,7 +3282,7 @@ es:
         destination_without_exit: Llegaste a tu destino
         against_oneway_without_exit: Ir en contra del sentido único en %{name}
         end_oneway_without_exit: Final de sentido único en %{name}
         destination_without_exit: Llegaste a tu destino
         against_oneway_without_exit: Ir en contra del sentido único en %{name}
         end_oneway_without_exit: Final de sentido único en %{name}

-        roundabout_with_exit: En la rotonda, toma la salida %{exit} hacia %{name}
+        roundabout_with_exit: En la rotonda, toma la %{exit} salida hacia %{name}

         roundabout_with_exit_ordinal: En la rotonda, toma la salida %{exit} hacia
           %{name}
         exit_roundabout: Sal de la rotonda hacia %{name}
         roundabout_with_exit_ordinal: En la rotonda, toma la salida %{exit} hacia
           %{name}
         exit_roundabout: Sal de la rotonda hacia %{name}

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 8f4549d5d0944cca2186b82dc2c63c79ad825392..553f83479e77a62148b339d2708335fa9f9a19ab 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -2927,6 +2927,7 @@ fr:
       remove as friend: Supprimer en tant qu’ami
       add as friend: Ajouter en tant qu’ami
       mapper since: 'Cartographe depuis :'
       remove as friend: Supprimer en tant qu’ami
       add as friend: Ajouter en tant qu’ami
       mapper since: 'Cartographe depuis :'

+      uid: 'Identifiant utilisateur :'

       ct status: 'Conditions de contribution :'
       ct undecided: Indécis
       ct declined: Refusées
       ct status: 'Conditions de contribution :'
       ct undecided: Indécis
       ct declined: Refusées

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index f80ed10fafc0b2d6b1112fd52a9fc3b966175564..ff0b9635cb77c3f6bc0ceec9bc5254f2bd651ea3 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -2784,6 +2784,7 @@ gl:
       remove as friend: Eliminar coma amizade
       add as friend: Engadir coma amizade
       mapper since: 'Cartógrafo dende:'
       remove as friend: Eliminar coma amizade
       add as friend: Engadir coma amizade
       mapper since: 'Cartógrafo dende:'

+      uid: 'Identificador de usuario:'

       ct status: 'Termos do colaborador:'
       ct undecided: Indeciso
       ct declined: Rexeitou
       ct status: 'Termos do colaborador:'
       ct undecided: Indeciso
       ct declined: Rexeitou

diff --git a/config/locales/he.yml b/config/locales/he.yml
index e95195d899ba1f8813d298bb0eabc62f91a3e9f8..664f90fcbac110ae5dac3b5adc5caa1f724da68f 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -2765,6 +2765,7 @@ he:
       remove as friend: הסרה מרשימת חברים
       add as friend: הוספה כחבר
       mapper since: 'ממפה מאז:'
       remove as friend: הסרה מרשימת חברים
       add as friend: הוספה כחבר
       mapper since: 'ממפה מאז:'

+      uid: 'מזהה משתמש:'

       ct status: 'תנאי תרומה:'
       ct undecided: עוד אין החלטה
       ct declined: נדחו
       ct status: 'תנאי תרומה:'
       ct undecided: עוד אין החלטה
       ct declined: נדחו

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index a33a87b3527d99b5cec559d102ac59f2f6166512..ab854d1e536c6c680895d13645691f3a2b60867e 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -2763,6 +2763,7 @@ ia:
       remove as friend: Remover amico
       add as friend: Adder amico
       mapper since: 'Cartographo depost:'
       remove as friend: Remover amico
       add as friend: Adder amico
       mapper since: 'Cartographo depost:'

+      uid: 'ID de usator:'

       ct status: 'Conditiones de contributor:'
       ct undecided: Indecise
       ct declined: Declinate
       ct status: 'Conditiones de contributor:'
       ct undecided: Indecise
       ct declined: Declinate

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 449fa5ebcba95f77d16d43a4e9839cf7d5d9de8e..bd9cb3c7dc073960d8b415400ff69706f53fea49 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -2820,6 +2820,7 @@ it:
       remove as friend: Rimuovi amico
       add as friend: Aggiungi amico
       mapper since: 'Mappatore dal:'
       remove as friend: Rimuovi amico
       add as friend: Aggiungi amico
       mapper since: 'Mappatore dal:'

+      uid: 'ID utente:'

       ct status: 'Termini di collaborazione:'
       ct undecided: Indeciso
       ct declined: Non accetto
       ct status: 'Termini di collaborazione:'
       ct undecided: Indeciso
       ct declined: Non accetto

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index b4e458453466ea1cf3804868ee34adc7d4fd940f..9828a724543ffb0c23bd25bb0f458e1931b96b57 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -2749,6 +2749,7 @@ mk:
       remove as friend: Отстрани од пријатели
       add as friend: Додај во пријатели
       mapper since: 'Картограф од:'
       remove as friend: Отстрани од пријатели
       add as friend: Додај во пријатели
       mapper since: 'Картограф од:'

+      uid: 'Корисничка назнака:'

       ct status: 'Услови за учество:'
       ct undecided: Неодлучено
       ct declined: Одбиен
       ct status: 'Услови за учество:'
       ct undecided: Неодлучено
       ct declined: Одбиен

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index aa9395bee3689bfb8a2680ee8e1a6a3df56118af..02843f1ed06f10ae9fceb039637074c44f4d1a1e 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -288,6 +288,8 @@ nl:
         reopened_at_by_html: '%{when} opnieuw geactiveerd door %{user}'
       rss:
         title: OpenStreetMap-opmerkingen
         reopened_at_by_html: '%{when} opnieuw geactiveerd door %{user}'
       rss:
         title: OpenStreetMap-opmerkingen

+        description_all: Een lijst met gerapporteerde, becommentarieerde of gesloten
+          opmerkingen

         description_area: Een lijst met opmerkingen en reacties in uw gebied [(%{min_lat}|%{min_lon})
           -- (%{max_lat}|%{max_lon})]
         description_item: Een RSS-feed voor opmerking %{id}
         description_area: Een lijst met opmerkingen en reacties in uw gebied [(%{min_lat}|%{min_lon})
           -- (%{max_lat}|%{max_lon})]
         description_item: Een RSS-feed voor opmerking %{id}


@@ -2833,6 +2835,7 @@ nl:
       remove as friend: Vriend verwijderen
       add as friend: Vriend toevoegen
       mapper since: 'Mapper sinds:'
       remove as friend: Vriend verwijderen
       add as friend: Vriend toevoegen
       mapper since: 'Mapper sinds:'

+      uid: 'Gebruikers-ID:'

       ct status: 'Voorwaarden voor bijdragen:'
       ct undecided: Onbeslist
       ct declined: Afgewezen
       ct status: 'Voorwaarden voor bijdragen:'
       ct undecided: Onbeslist
       ct declined: Afgewezen

diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index b6c0ba2c8a199cad84c898beab18c6cd9c1f4a1c..0037c2d3c89a42815635650f70adba63968d858d 100644 (file)
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -11,6 +11,7 @@
 # Author: Gunnernett
 # Author: Harald Khan
 # Author: Macofe
 # Author: Gunnernett
 # Author: Harald Khan
 # Author: Macofe

+# Author: Maddy from Celeste

 # Author: McDutchie
 # Author: Nemo bis
 # Author: Nghtwlkr
 # Author: McDutchie
 # Author: Nemo bis
 # Author: Nghtwlkr


@@ -26,9 +27,11 @@ nn:
     formats:
       friendly: '%e %B %Y kl. %H:%M'
   helpers:
     formats:
       friendly: '%e %B %Y kl. %H:%M'
   helpers:

+    file:
+      prompt: Vel fil

     submit:
       diary_comment:
     submit:
       diary_comment:

-        create: Lagre
+        create: Kommenter

       diary_entry:
         create: Publiser
         update: Oppdater
       diary_entry:
         create: Publiser
         update: Oppdater


@@ -39,6 +42,9 @@ nn:
       client_application:
         create: Registrer
         update: Oppdater
       client_application:
         create: Registrer
         update: Oppdater

+      oauth2_application:
+        create: Registrer
+        update: Oppdater

       redaction:
         create: Lag maskering
         update: Lagre markering
       redaction:
         create: Lag maskering
         update: Lagre markering


@@ -127,26 +133,32 @@ nn:
         description: Skildring
       user:
         email: E-post
         description: Skildring
       user:
         email: E-post

-        new_email: 'Ny e-postadresse:'
+        email_confirmation: Stadfesting av e-post
+        new_email: Ny e-postadresse

         active: Aktive
         display_name: Visningsnamn
         active: Aktive
         display_name: Visningsnamn

-        description: Skildring
-        home_lat: 'Breiddegrad:'
-        home_lon: 'Lengdegrad:'
-        languages: Språk
+        description: Skildring profilen
+        home_lat: Breiddegrad
+        home_lon: Lengdegrad
+        languages: Føretrekte språk
+        preferred_editor: Føretrekt redigeringsprogram

         pass_crypt: Passord
         pass_crypt_confirmation: Stadfest passord
     help:
       trace:
         tagstring: kommaseparert
       user_block:
         pass_crypt: Passord
         pass_crypt_confirmation: Stadfest passord
     help:
       trace:
         tagstring: kommaseparert
       user_block:

+        reason: Årsaka for at brukaren vert blokkert. Ver venleg og ver so sindig
+          og fornuftig som mogleg, gje so mykje opplysingar om situasjonen som du
+          kan med tanke på at meldinga vil vera synleg for ålmenta. Hugs på at ikkje
+          alle brukarar har kjennskap til sjargongen, so prøv å bruka ålmenne omgrep.

         needs_view: Må brukaren logge inn før denne blokkeringa vert fjerna?
       user:
         new_email: ' (vis aldri offentleg)'
   datetime:
     distance_in_words_ago:
       about_x_hours:
         needs_view: Må brukaren logge inn før denne blokkeringa vert fjerna?
       user:
         new_email: ' (vis aldri offentleg)'
   datetime:
     distance_in_words_ago:
       about_x_hours:

-        one: omkring 1 time sidan
+        one: omkring %{count} time sidan

         other: omkring %{count} timar sidan
       about_x_months:
         one: omkring 1 månad sidan
         other: omkring %{count} timar sidan
       about_x_months:
         one: omkring 1 månad sidan


@@ -157,6 +169,7 @@ nn:
       almost_x_years:
         one: nesten 1 år sidan
         other: nesten %{count} år sidan
       almost_x_years:
         one: nesten 1 år sidan
         other: nesten %{count} år sidan

+      half_a_minute: for eit halvminutt sidan

       less_than_x_seconds:
         one: mindre enn 1 sekund sidan
         other: mindre enn %{count} sekund sidan
       less_than_x_seconds:
         one: mindre enn 1 sekund sidan
         other: mindre enn %{count} sekund sidan


@@ -188,16 +201,18 @@ nn:
       description: Lokalt installert program (JOSM eller Merkaartor)
   auth:
     providers:
       description: Lokalt installert program (JOSM eller Merkaartor)
   auth:
     providers:

+      none: Ingen

       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

+      microsoft: Microsoft

       github: GitHub
       wikipedia: Wikipedia
   api:
     notes:
       comment:
       github: GitHub
       wikipedia: Wikipedia
   api:
     notes:
       comment:

-        opened_at_html: Oppretta for %{when} sidan
-        opened_at_by_html: Oppretta for %{when} sidan av %{user}
+        opened_at_html: Oppretta %{when}
+        opened_at_by_html: Oppretta %{when} av %{user}

         commented_at_html: Oppdatert %{when}
         commented_at_by_html: Oppdatert %{when} av %{user}
         closed_at_html: Løyst %{when}
         commented_at_html: Oppdatert %{when}
         commented_at_by_html: Oppdatert %{when} av %{user}
         closed_at_html: Løyst %{when}


@@ -210,11 +225,37 @@ nn:
       entry:
         comment: Kommentar
         full: Fullstendig merknad
       entry:
         comment: Kommentar
         full: Fullstendig merknad

+  account:
+    deletions:
+      show:
+        title: Slett kontoen min
+        warning: Åtvaring! Sletting av konto er endeleg, og kan ikkje gjerast om.
+        delete_account: Slett konto
+        delete_introduction: 'Du kan sletta kontoen din hjå OpenStreetMap med knappen
+          under. Merk fylgjande:'
+        delete_profile: Profilinformasjonen din, medrekna profilbilde, skildring og
+          heimestad vil fjernast.
+        delete_display_name: Det viste namnet ditt vil fjernast, og kan brukast av
+          andre kontoar.
+        retain_caveats: Somme opplysingar vil verte tatt vare på, til og med etter
+          at kontoen din er sletta.
+        retain_edits: Eventuelle redigeringer av kartdatabasen vil behaldast.
+        retain_traces: Spor du har lasta opp vil behaldast.
+        retain_diary_entries: Innlegg og kommentarar frå deg i brukardagboken vil
+          verte tekne vare på, men skylte frå ålmenta.
+        retain_notes: Merknadane og kommentarane dine vil verte tekne vare på, men
+          skylt frå ålmenta.
+        retain_changeset_discussions: Tilskota dine til diskusjonar om endringssett
+          vil behaldast.
+        retain_email: E-postadressa di vil behaldast.
+        confirm_delete: Er du sikker?
+        cancel: Bryt av

   accounts:
     edit:
       title: Rediger konto
       my settings: Innstellingane mine
   accounts:
     edit:
       title: Rediger konto
       my settings: Innstellingane mine

-      current email address: 'Noverande e-postadresse:'
+      current email address: Noverande e-postadresse
+      external auth: Ekstern autentisering

       openid:
         link text: kva er dette?
       public editing:
       openid:
         link text: kva er dette?
       public editing:


@@ -225,7 +266,7 @@ nn:
           er anonyme.
         disabled link text: kvifor can eg ikkje redigere?
       contributor terms:
           er anonyme.
         disabled link text: kvifor can eg ikkje redigere?
       contributor terms:

-        heading: 'Bidragsytervilkår:'
+        heading: Vilkår for bidragsytarar

         agreed: Du har godkjent dei nye bidragsytervilkåra
         not yet agreed: Du har endå ikkje godkjent dei nye bidragsytervilkåra.
         review link text: Vennligst følg denne lenkja når det passar deg, for å sjå
         agreed: Du har godkjent dei nye bidragsytervilkåra
         not yet agreed: Du har endå ikkje godkjent dei nye bidragsytervilkåra.
         review link text: Vennligst følg denne lenkja når det passar deg, for å sjå


@@ -234,20 +275,46 @@ nn:
           offentleg eigedom (Public Domain).
         link text: kva er dette?
       save changes button: Lagre endringar
           offentleg eigedom (Public Domain).
         link text: kva er dette?
       save changes button: Lagre endringar

+      delete_account: Slett konto...

     go_public:
     go_public:

-      heading: 'Offentleg redigering:'
+      heading: Offentleg redigering
+      currently_not_public: Nett no er redigeringane dine anonyme, og folk kan ikkje
+        senda deg meldingar eller sjå kor du er. For å visa kva du har redigert og
+        la folk kontakta deg gjennom nettstaden, klikk på knappen nedanfor.
+      only_public_can_edit: Sidan overgangen til 0.6-API-et, kan berre offentlege
+        brukarar redigera kartdata.
+      find_out_why: finn ut kvifor
+      email_not_revealed: E-postadressa di vil ikkje verte synleg for ålmenta når
+        kontoen din vert offentleg.
+      not_reversible: Denne handlinga kan ikkje omgjerast, og alle nye brukarar er
+        no offentlege frå byrjinga.

       make_edits_public_button: Gjer alle redigeringane mine offentleg
     update:
       success_confirm_needed: Brukerinformasjon oppdatert. Sjekk eposten din for å
         stadfeste din epostadresse.
       success: Brukerinformasjon oppdatert.
       make_edits_public_button: Gjer alle redigeringane mine offentleg
     update:
       success_confirm_needed: Brukerinformasjon oppdatert. Sjekk eposten din for å
         stadfeste din epostadresse.
       success: Brukerinformasjon oppdatert.

+    destroy:
+      success: Kontoen er sletta.

   browse:
     created: Oppretta
     closed: Attlaten
   browse:
     created: Oppretta
     closed: Attlaten

+    created_ago_html: Oppretta %{time_ago}
+    closed_ago_html: Lukka %{time_ago}
+    created_ago_by_html: Oppretta %{time_ago} av %{user}
+    closed_ago_by_html: Lukka %{time_ago} av %{user}
+    deleted_ago_by_html: Sletta %{time_ago} av %{user}
+    edited_ago_by_html: Redigert %{time_ago} av %{user}

     version: 'Versjon:'
     version: 'Versjon:'

+    in_changeset: Endringssett

     anonymous: anonym
     no_comment: (ingen kommentar)
     part_of: Del av
     anonymous: anonym
     no_comment: (ingen kommentar)
     part_of: Del av

+    part_of_relations:
+      one: '%{count} samhøve'
+      other: '%{count} samhøve'
+    part_of_ways:
+      one: 1 line
+      other: '%{count} liner'

     download_xml: Last ned XML
     view_history: Vis historikk
     view_details: Vis detaljar
     download_xml: Last ned XML
     view_history: Vis historikk
     view_details: Vis detaljar


@@ -259,7 +326,11 @@ nn:
       node_paginated: Punkt (%{x}-%{y} av %{count})
       way: Strekningar (%{count})
       way_paginated: Strekningar (%{x}-%{y} av %{count})
       node_paginated: Punkt (%{x}-%{y} av %{count})
       way: Strekningar (%{count})
       way_paginated: Strekningar (%{x}-%{y} av %{count})

+      relation: Samhøve (%{count})
+      relation_paginated: Samhøve (%{x}–%{y} av %{count})

       comment: Kommentarar (%{count})
       comment: Kommentarar (%{count})

+      hidden_comment_by_html: Skylt kommentar frå %{user} %{time_ago}
+      comment_by_html: Kommentar frå %{user} %{time_ago}

       changesetxml: XML for endringssett
       osmchangexml: osmChange XML
       feed:
       changesetxml: XML for endringssett
       osmchangexml: osmChange XML
       feed:


@@ -267,6 +338,8 @@ nn:
         title_comment: 'Endringssett: %{id} - %{comment}'
       join_discussion: Logg inn for å vere med i diskusjonen
       discussion: Ordskifte
         title_comment: 'Endringssett: %{id} - %{comment}'
       join_discussion: Logg inn for å vere med i diskusjonen
       discussion: Ordskifte

+      still_open: Endringssettet er framleis ope – det vert opna for diskusjon når
+        endringssettet vert lukka.

     node:
       title_html: 'Punkt: %{name}'
       history_title_html: 'Punkthistorikk: %{name}'
     node:
       title_html: 'Punkt: %{name}'
       history_title_html: 'Punkthistorikk: %{name}'


@@ -274,11 +347,19 @@ nn:
       title_html: 'Strekning: %{name}'
       history_title_html: 'Strekningshistorikk: %{name}'
       nodes: Punkt
       title_html: 'Strekning: %{name}'
       history_title_html: 'Strekningshistorikk: %{name}'
       nodes: Punkt

+      nodes_count:
+        one: '%{count} punkt'
+        other: '%{count} punkt'

       also_part_of_html:
         one: delstrekning %{related_ways}
         other: delstrekningar %{related_ways}
     relation:
       also_part_of_html:
         one: delstrekning %{related_ways}
         other: delstrekningar %{related_ways}
     relation:

+      title_html: 'Samhøve: %{name}'
+      history_title_html: 'Samhøvehistorikk: %{name}'

       members: Medlemmar
       members: Medlemmar

+      members_count:
+        one: '%{count} medlem'
+        other: '%{count} medlemar'

     relation_member:
       entry_role_html: '%{type} %{name} som %{role}'
       type:
     relation_member:
       entry_role_html: '%{type} %{name} som %{role}'
       type:


@@ -289,6 +370,7 @@ nn:
       entry_html: Relasjon %{relation_name}
       entry_role_html: Relasjon %{relation_name} (som %{relation_role})
     not_found:
       entry_html: Relasjon %{relation_name}
       entry_role_html: Relasjon %{relation_name} (som %{relation_role})
     not_found:

+      title: Ikkje funne

       sorry: Beklagar, klarte ikkje å finne %{type}-en med ID %{id}.
       type:
         node: node
       sorry: Beklagar, klarte ikkje å finne %{type}-en med ID %{id}.
       type:
         node: node


@@ -297,6 +379,7 @@ nn:
         changeset: endringssett
         note: merknad
     timeout:
         changeset: endringssett
         note: merknad
     timeout:

+      title: Tida gjekk ut

       sorry: Beklagar, data for %{type} med id %{id} tok for lang tid å hente.
       type:
         node: punkt
       sorry: Beklagar, data for %{type} med id %{id} tok for lang tid å hente.
       type:
         node: punkt


@@ -313,6 +396,8 @@ nn:
         way: vegen
         relation: relasjonen
     start_rjs:
         way: vegen
         relation: relasjonen
     start_rjs:

+      feature_warning: Hentar %{num_features} kartobjekt, noe som kan gjera at nettlesaren
+        vert treg eller stoppar heilt. Er du sikker på at du vil visa desse datuma?

       load_data: Last inn data
       loading: Lastar...
     tag_details:
       load_data: Last inn data
       loading: Lastar...
     tag_details:


@@ -322,10 +407,14 @@ nn:
         tag: Wiki-beskrivelsessiden for %{key}=%{value}-elementet
       wikidata_link: Elementet %{page} på Wikidata
       wikipedia_link: Artikkelen %{page} på Wikipedia
         tag: Wiki-beskrivelsessiden for %{key}=%{value}-elementet
       wikidata_link: Elementet %{page} på Wikidata
       wikipedia_link: Artikkelen %{page} på Wikipedia

+      wikimedia_commons_link: Sida %{page} på Wikimedia Commons

       telephone_link: Ring %{phone_number}
       telephone_link: Ring %{phone_number}

+      colour_preview: Førehandsvising av farga %{colour_value}

     query:
       title: Førespurnadsfunksjonar
     query:
       title: Førespurnadsfunksjonar

+      introduction: Klikk på kartet for å visa objekt i nærleiken.

       nearby: Nærliggjande funksjonar
       nearby: Nærliggjande funksjonar

+      enclosing: Omgjevande objekt

   changesets:
     changeset_paging_nav:
       showing_page: Side %{page}
   changesets:
     changeset_paging_nav:
       showing_page: Side %{page}


@@ -344,6 +433,7 @@ nn:
     index:
       title: Endringssett
       title_user: Endringssett av %{user}
     index:
       title: Endringssett
       title_user: Endringssett av %{user}

+      title_user_link_html: Endringssett av %{user_link}

       title_friend: Endringssett av venene dine
       title_nearby: Endringssett av brukarar i nærleiken
       empty: Fann ingen endringssett.
       title_friend: Endringssett av venene dine
       title_nearby: Endringssett av brukarar i nærleiken
       empty: Fann ingen endringssett.


@@ -354,10 +444,18 @@ nn:
       no_more_user: Ingen fleire endringssett av denne brukaren.
       load_more: Last inn meir
     timeout:
       no_more_user: Ingen fleire endringssett av denne brukaren.
       load_more: Last inn meir
     timeout:

-      sorry: Lista over endringssett tok for lang tid å hente.
+      sorry: Lista over endringssett du ba om tok for lang tid å hente.

   changeset_comments:
     comment:
   changeset_comments:
     comment:

-      commented_at_by_html: Oppdatert for %{when} sidan av %{user}
+      comment: 'Ny kommentar til endringssett #%{changeset_id} av %{author}'
+      commented_at_by_html: Oppdatert %{when} av %{user}
+    comments:
+      comment: 'Ny kommentar til endringssett #%{changeset_id} av %{author}'
+    index:
+      title_all: Endringssettdiskusjon hjå OpenStreetMap
+      title_particular: Diskusjon om endringssett %{changeset_id} hjå OpenStreetMap
+    timeout:
+      sorry: Lista over kommentarar til endringssett tok for lang tid å henta.

   dashboards:
     contact:
       km away: '%{count}km unna'
   dashboards:
     contact:
       km away: '%{count}km unna'


@@ -367,6 +465,10 @@ nn:
       nearby mapper: Brukarar i nærleiken
       friend: Ven
     show:
       nearby mapper: Brukarar i nærleiken
       friend: Ven
     show:

+      title: Kontrollpanelet mitt
+      no_home_location_html: '%{edit_profile_link} og set heimestaden din for å sjå
+        brukarar i nærleiken.'
+      edit_your_profile: Endra profilen din

       my friends: Mine vener
       no friends: Du har ikkje lagt til nokon venner enno.
       nearby users: Andre brukarar i nærleiken
       my friends: Mine vener
       no friends: Du har ikkje lagt til nokon venner enno.
       nearby users: Andre brukarar i nærleiken


@@ -380,66 +482,75 @@ nn:
     new:
       title: Ny dagbokoppføring
     form:
     new:
       title: Ny dagbokoppføring
     form:

-      location: 'Posisjon:'
-      use_map_link: bruk kart
+      location: Stad
+      use_map_link: Bruk kart

     index:
     index:

-      title: Brukarane sine dagbøker
-      title_friends: Dagbøkene til venene dine
-      title_nearby: Dagbøkene til naboar
+      title: Brukardagbøker
+      title_friends: Dagbøkene til venane dine
+      title_nearby: Dagbøkene til brukarar i nærleiken

       user_title: '%{user} si dagbok'
       in_language_title: Dagbokoppføringar på %{language}
       new: Ny dagbokoppføring
       new_title: Skriv ei ny oppføring i dagboka di
       user_title: '%{user} si dagbok'
       in_language_title: Dagbokoppføringar på %{language}
       new: Ny dagbokoppføring
       new_title: Skriv ei ny oppføring i dagboka di

+      my_diary: Dagboka mi

       no_entries: Ingen oppføringar i dagboka
       recent_entries: Nye oppføringer i dagboka
       older_entries: Eldre oppføringar
       newer_entries: Nyare oppføringar
     edit:
       no_entries: Ingen oppføringar i dagboka
       recent_entries: Nye oppføringer i dagboka
       older_entries: Eldre oppføringar
       newer_entries: Nyare oppføringar
     edit:

-      title: Rediger oppføring i dagboka
-      marker_text: Lokasjon for dagbokoppføring
+      title: Rediger dagbokoppføring
+      marker_text: Stad for dagbokoppføring

     show:
     show:

-      title: '%{user} sin dagbok | %{title}'
+      title: '%{user} si dagbok | %{title}'

       user_title: '%{user} si dagbok'
       leave_a_comment: Legg igjen ein kommentar
       login_to_leave_a_comment_html: '%{login_link} for å legge igjen ein kommentar'
       login: Logg inn
     no_such_entry:
       title: Inga slik dagbokoppføring
       user_title: '%{user} si dagbok'
       leave_a_comment: Legg igjen ein kommentar
       login_to_leave_a_comment_html: '%{login_link} for å legge igjen ein kommentar'
       login: Logg inn
     no_such_entry:
       title: Inga slik dagbokoppføring

-      heading: Inga oppføring med %{id}
-      body: Det er ingen dagbokinnlegg eller kommentar med ID %{id}. Sjekk om du har
-        skrive feil eller om lenkja er riktig.
+      heading: 'Inga oppføring med ID: %{id}'
+      body: Det finst inkje dagbokinnlegg eller kommentar med ID %{id}. Sjekk om du
+        har skrive feil eller om lenkja er feil.

     diary_entry:
       posted_by_html: Skrive av %{link_user} %{created} på %{language_link}
     diary_entry:
       posted_by_html: Skrive av %{link_user} %{created} på %{language_link}

+      updated_at_html: Sist oppdatert %{updated}.

       comment_link: Kommenter denne oppføringa
       comment_link: Kommenter denne oppføringa

-      reply_link: Svar på denne oppføringa
+      reply_link: Send ei melding til forfattaren

       comment_count:
         one: '%{count} kommentar'
       comment_count:
         one: '%{count} kommentar'

-        zero: Ingen kommentarar

         other: '%{count} kommentarar'
         other: '%{count} kommentarar'

+      no_comments: Ingen kommentarar

       edit_link: Rediger denne oppføringa
       hide_link: Skjul denne oppføringa
       edit_link: Rediger denne oppføringa
       hide_link: Skjul denne oppføringa

+      unhide_link: Slutta å skjule denne oppføringa

       confirm: Stadfest
       confirm: Stadfest

+      report: Melda denne oppføringa

     diary_comment:
       comment_from_html: Kommentar frå %{link_user}, %{comment_created_at}
       hide_link: Skjul denne kommentaren
     diary_comment:
       comment_from_html: Kommentar frå %{link_user}, %{comment_created_at}
       hide_link: Skjul denne kommentaren

+      unhide_link: Slutta å skjula denne kommentaren

       confirm: Stadfest
       report: Rapporter denne kommentaren
     location:
       confirm: Stadfest
       report: Rapporter denne kommentaren
     location:

-      location: 'Posisjon:'
+      location: 'Stad:'

       view: Vis
       view: Vis

-      edit: Rediger
+      edit: Endra

     feed:
       user:
     feed:
       user:

-        title: Oppføringar i OpenStreetMap-dagboka for %{user}
+        title: Oppføringar i OpenStreetMap-dagboka frå %{user}

         description: Nye oppføringar i OpenStreetMap-dagboka til %{user}
       language:
         title: Oppføringar i OpenStreetMap-dagbøker på %{language_name}
         description: Nye oppføringar i dagbøkene til OpenStreetMap-brukarar på %{language_name}
       all:
         title: Oppføringar OpenStreetMap-dagboka
         description: Nye oppføringar i OpenStreetMap-dagboka til %{user}
       language:
         title: Oppføringar i OpenStreetMap-dagbøker på %{language_name}
         description: Nye oppføringar i dagbøkene til OpenStreetMap-brukarar på %{language_name}
       all:
         title: Oppføringar OpenStreetMap-dagboka

-        description: Nye oppføringar i dagbøkene til OpenStreetMap-brukarar
+        description: Nylege oppføringar i dagbøkene til OpenStreetMap-brukarar

     comments:
     comments:

-      post: Post
+      title: Kommentarar i dagboka frå %{user}
+      heading: '%{user} sine kommentarar til dagboksoppføringar'
+      subheading_html: Kommentarar i dagboka frå %{user}
+      no_comments: Ingen kommentarar i dagboka
+      post: Oppføring

       when: Når
       comment: Kommentar
       newer_comments: Nyare kommentarar
       when: Når
       comment: Kommentar
       newer_comments: Nyare kommentarar


@@ -457,6 +568,9 @@ nn:
       success: '%{name} vart fjerna frå venene dine'
       not_a_friend: '%{name} er ikkje ein av venene dine.'
   geocoder:
       success: '%{name} vart fjerna frå venene dine'
       not_a_friend: '%{name} er ikkje ein av venene dine.'
   geocoder:

+    search:
+      title:
+        latlon: Intern

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:


@@ -464,16 +578,29 @@ nn:
           chair_lift: Stolheis
           drag_lift: Skitrekk
           gondola: Gondolheis
           chair_lift: Stolheis
           drag_lift: Skitrekk
           gondola: Gondolheis

+          magic_carpet: skiband
+          platter: Tallerkenheis
+          pylon: Mast

           station: Fjellheisstasjon
           station: Fjellheisstasjon

+          t-bar: Ankerheis
+          "yes": Taubane

         aeroway:
           aerodrome: Flyplass
         aeroway:
           aerodrome: Flyplass

+          airstrip: Landingsstripe

           apron: Flyrampe
           gate: Gate
           apron: Flyrampe
           gate: Gate

+          hangar: Hangar

           helipad: Helikopterplass
           helipad: Helikopterplass

+          holding_position: Venteposisjon
+          navigationaid: Luftnavigasjonshjelp
+          parking_position: Parkeringsposisjon

           runway: Rullebane
           runway: Rullebane

+          taxilane: Taxifelt

           taxiway: Taksebane
           taxiway: Taksebane

-          terminal: Terminal
+          terminal: Flyplassterminal
+          windsock: Vindpose

         amenity:
         amenity:

+          animal_boarding: Dyrepensjonat

           animal_shelter: Dyrehospits
           arts_centre: Kunstsenter
           atm: Minibank
           animal_shelter: Dyrehospits
           arts_centre: Kunstsenter
           atm: Minibank


@@ -483,7 +610,9 @@ nn:
           bench: Benk
           bicycle_parking: Sykkelparkering
           bicycle_rental: Sykkelutleige
           bench: Benk
           bicycle_parking: Sykkelparkering
           bicycle_rental: Sykkelutleige

+          bicycle_repair_station: Sjølvbetent sykkelreparasjonsstad

           biergarten: Uteservering
           biergarten: Uteservering

+          blood_bank: Blodbank

           boat_rental: Båtutleige
           brothel: Bordell
           bureau_de_change: Vekslingskontor
           boat_rental: Båtutleige
           brothel: Bordell
           bureau_de_change: Vekslingskontor


@@ -500,6 +629,7 @@ nn:
           clock: Klokke
           college: Høgskule
           community_centre: Samfunnshus
           clock: Klokke
           college: Høgskule
           community_centre: Samfunnshus

+          conference_centre: Konferansesenter

           courthouse: Rettsbygning
           crematorium: Krematorium
           dentist: Tannlege
           courthouse: Rettsbygning
           crematorium: Krematorium
           dentist: Tannlege


@@ -507,26 +637,37 @@ nn:
           drinking_water: Drikkevatn
           driving_school: Køyreskule
           embassy: Ambassade
           drinking_water: Drikkevatn
           driving_school: Køyreskule
           embassy: Ambassade

+          events_venue: Samlingslokale

           fast_food: Hurtigmat
           ferry_terminal: Ferjeterminal
           fire_station: Brannstasjon
           food_court: Serveringsstadar
           fountain: Fontene
           fast_food: Hurtigmat
           ferry_terminal: Ferjeterminal
           fire_station: Brannstasjon
           food_court: Serveringsstadar
           fountain: Fontene

-          fuel: Drivstoff
+          fuel: Bensinstation

           gambling: Gambling
           grave_yard: Gravlund
           gambling: Gambling
           grave_yard: Gravlund

+          grit_bin: Strøsandkasse

           hospital: Sjukehus
           hunting_stand: Jaktbod
           ice_cream: Iskrem
           hospital: Sjukehus
           hunting_stand: Jaktbod
           ice_cream: Iskrem

+          internet_cafe: Internettkafe

           kindergarten: Barnehage
           kindergarten: Barnehage

+          language_school: Språkskule

           library: Bibliotek
           library: Bibliotek

+          loading_dock: Lastekai
+          love_hotel: Kjærleikshotell

           marketplace: Marknadsplass
           marketplace: Marknadsplass

+          mobile_money_agent: Mobil pengeagent

           monastery: Kloster
           monastery: Kloster

+          money_transfer: Valutaoverføring

           motorcycle_parking: Motorsykkelparkering
           motorcycle_parking: Motorsykkelparkering

+          music_school: Musikkskule

           nightclub: Nattklubb
           nursing_home: Pleieheim
           parking: Parkeringsplass
           parking_entrance: Innkøyring til parkeringsgarasje
           nightclub: Nattklubb
           nursing_home: Pleieheim
           parking: Parkeringsplass
           parking_entrance: Innkøyring til parkeringsgarasje

+          parking_space: Parkeingsplass
+          payment_terminal: Betalingsterminal

           pharmacy: Apotek
           place_of_worship: Religiøst hus
           police: Politi
           pharmacy: Apotek
           place_of_worship: Religiøst hus
           police: Politi


@@ -534,9 +675,13 @@ nn:
           post_office: Postkontor
           prison: Fengsel
           pub: Pub
           post_office: Postkontor
           prison: Fengsel
           pub: Pub

+          public_bath: Badehus
+          public_bookcase: Offentleg bokkasse

           public_building: Offentleg bygning
           public_building: Offentleg bygning

+          ranger_station: Skogvaktarpost

           recycling: Resirkuleringspunkt
           restaurant: Restaurant
           recycling: Resirkuleringspunkt
           restaurant: Restaurant

+          sanitary_dump_station: Toalettømmingsstasjon

           school: Skule
           shelter: Tilfluktsrom
           shower: Dusj
           school: Skule
           shelter: Tilfluktsrom
           shower: Dusj


@@ -549,76 +694,142 @@ nn:
           theatre: Teater
           toilets: Toalett
           townhall: Rådhus
           theatre: Teater
           toilets: Toalett
           townhall: Rådhus

+          training: Treningsanlegg

           university: Universitet
           university: Universitet

+          vehicle_inspection: Køyretøykontroll

           vending_machine: Vareautomat
           veterinary: Veterinærklinikk
           village_hall: Forsamlingshus
           waste_basket: Søppelkasse
           waste_disposal: Avfallshandtering
           vending_machine: Vareautomat
           veterinary: Veterinærklinikk
           village_hall: Forsamlingshus
           waste_basket: Søppelkasse
           waste_disposal: Avfallshandtering

+          waste_dump_site: Avfallsdeponi
+          watering_place: Vatntrau
+          water_point: Vatnpunkt
+          weighbridge: Køyretøyvekt
+          "yes": Fasilitet

         boundary:
         boundary:

+          aboriginal_lands: Urfolksområde

           administrative: Administrativ grense
           census: Folketeljingsgrense
           national_park: Nationalpark
           administrative: Administrativ grense
           census: Folketeljingsgrense
           national_park: Nationalpark

+          political: Valdistriktsgrense

           protected_area: Verna område
           protected_area: Verna område

+          "yes": Grense

         bridge:
           aqueduct: Akvadukt
         bridge:
           aqueduct: Akvadukt

+          boardwalk: Strandpromenade

           suspension: Hengebru
           swing: Svingbru
           viaduct: Viadukt
           "yes": Bru
         building:
           suspension: Hengebru
           swing: Svingbru
           viaduct: Viadukt
           "yes": Bru
         building:

-          apartments: Bustadblokk
+          apartment: Leilegheit
+          apartments: Leilegheiter
+          barn: Låve
+          bungalow: Bungalow
+          cabin: Hytte

           chapel: Kapell
           chapel: Kapell

-          church: Kyrkje
+          church: Kyrkjebygg
+          civic: Offentleg bygnad
+          college: Universitetsbygnad

           commercial: Kommersiell bygning
           commercial: Kommersiell bygning

+          construction: Bygning under bygging
+          detached: Frittståande hus

           dormitory: Sovesal
           dormitory: Sovesal

-          farm: Gårdsbygg
+          duplex: Tomannshus
+          farm: Gardshus
+          farm_auxiliary: Ytterleg gardsbygg

           garage: Garasje
           garage: Garasje

+          garages: Garasjar
+          greenhouse: Drivhus
+          hangar: Hangar

           hospital: Sykehusbygg
           hospital: Sykehusbygg

-          hotel: Hotell
+          hotel: Hotellbygg

           house: Hus
           house: Hus

+          houseboat: Husbåt
+          hut: Hytte

           industrial: Industribygg
           industrial: Industribygg

+          kindergarten: Barnehagebygnad

           office: Kontorbygg
           public: Offentleg bygg
           residential: Boligbygg
           retail: Detaljsalgbygg
           office: Kontorbygg
           public: Offentleg bygg
           residential: Boligbygg
           retail: Detaljsalgbygg

+          ruins: Bygnadsruin

           school: Skulebygg
           school: Skulebygg

-          terrace: Terrasse
-          train_station: Jernbanestasjon
+          semidetached_house: Rekkjehus
+          service: Tenestebygg
+          shed: Skur
+          stable: Stall
+          static_caravan: Husvogn
+          temple: Tempelbygg
+          terrace: Terrassebygning
+          train_station: Stasjonsbygg

           university: Universitetsbygg
           university: Universitetsbygg

+          warehouse: Lagerhall

           "yes": Bygning
           "yes": Bygning

+        club:
+          scout: Speidarklubbhus
+          sport: Idrettslag
+          "yes": Samskipnad

         craft:
         craft:

+          beekeeper: Bierøktar
+          blacksmith: Smed

           brewery: Bryggeri
           carpenter: Tømrar
           brewery: Bryggeri
           carpenter: Tømrar

+          caterer: Catering
+          confectionery: Godtebutikk
+          dressmaker: Syar

           electrician: Elektrikar
           electrician: Elektrikar

+          electronics_repair: Elektronikkreparatør

           gardener: Gartnar
           gardener: Gartnar

+          glaziery: Glasmeister
+          handicraft: Kunsthandverkar
+          hvac: Klimakontrollverksemd
+          metal_construction: Metallverkstad

           painter: Målar
           photographer: Fotograf
           plumber: Røyrleggjar
           painter: Målar
           photographer: Fotograf
           plumber: Røyrleggjar

+          roofer: Taktekkjar
+          sawmill: Sagbruk

           shoemaker: Skomakar
           shoemaker: Skomakar

+          stonemason: Steinhoggar

           tailor: Skreddar
           tailor: Skreddar

+          window_construction: Vindaugsnikkar
+          winery: Vingard

           "yes": Handverkbutikk
         emergency:
           "yes": Handverkbutikk
         emergency:

+          access_point: Tilgjengepunkt

           ambulance_station: Ambulansestasjon
           ambulance_station: Ambulansestasjon

+          assembly_point: Samlingsplass

           defibrillator: Hjartestartar
           defibrillator: Hjartestartar

+          fire_extinguisher: Brannsløkkjar
+          fire_water_pond: Branndam

           landing_site: Nødlandingsplass
           landing_site: Nødlandingsplass

+          life_ring: Livbøye

           phone: Nødtelefon
           phone: Nødtelefon

+          siren: Varselsiren
+          suction_point: Naudsugepunkt for brannslange
+          water_tank: Naudvasstank for brannslange

         highway:
           abandoned: Forlaten motorveg
           bridleway: Rideveg
           bus_guideway: Leidde bussfelt
           bus_stop: Busstopp
           construction: Motorveg under konstruksjon
         highway:
           abandoned: Forlaten motorveg
           bridleway: Rideveg
           bus_guideway: Leidde bussfelt
           bus_stop: Busstopp
           construction: Motorveg under konstruksjon

+          corridor: Korridor
+          crossing: Fotgjengarfelt

           cycleway: Sykkelsti
           elevator: Heis
           emergency_access_point: Nødtilgangspunkt
           footway: Gangsti
           ford: Vadestad
           cycleway: Sykkelsti
           elevator: Heis
           emergency_access_point: Nødtilgangspunkt
           footway: Gangsti
           ford: Vadestad

+          give_way: Vikeskilt

           living_street: Gatetun
           milestone: Milestolpe
           motorway: Motorveg
           motorway_junction: Motorvegkryss
           motorway_link: Veg til motorveg
           living_street: Gatetun
           milestone: Milestolpe
           motorway: Motorveg
           motorway_junction: Motorvegkryss
           motorway_link: Veg til motorveg

+          passing_place: Møteplass

           path: Sti
           pedestrian: Gangveg
           platform: Perrong
           path: Sti
           pedestrian: Gangveg
           platform: Perrong


@@ -635,50 +846,67 @@ nn:
           services: Motorveitjenester
           speed_camera: Fotoboks
           steps: Trapper
           services: Motorveitjenester
           speed_camera: Fotoboks
           steps: Trapper

+          stop: Stoppskilt

           street_lamp: Gatelykt
           tertiary: Tertiær veg
           tertiary_link: Kommunal veg
           track: Sti
           street_lamp: Gatelykt
           tertiary: Tertiær veg
           tertiary_link: Kommunal veg
           track: Sti

+          traffic_mirror: Trafikkspeil

           traffic_signals: Trafikklys
           traffic_signals: Trafikklys

+          trailhead: Ende på sti

           trunk: Hovedveg
           trunk_link: Hovedveg
           trunk: Hovedveg
           trunk_link: Hovedveg

+          turning_circle: Snuplass
+          turning_loop: Vendesløyfe

           unclassified: Uklassifisert veg
           "yes": Veg
         historic:
           unclassified: Uklassifisert veg
           "yes": Veg
         historic:

+          aircraft: Historisk fly

           archaeological_site: Arkeologisk plass
           archaeological_site: Arkeologisk plass

+          bomb_crater: Historisk bombekrater

           battlefield: Slagmark
           boundary_stone: Grensestein
           building: Historisk bygning
           bunker: Bunker
           battlefield: Slagmark
           boundary_stone: Grensestein
           building: Historisk bygning
           bunker: Bunker

+          cannon: Historisk kanon

           castle: Slott
           castle: Slott

+          charcoal_pile: Historisk kolmile

           church: Kyrkje
           city_gate: Byport
           citywalls: Bymurar
           fort: Fort
           heritage: Verdsarvsstad
           church: Kyrkje
           city_gate: Byport
           citywalls: Bymurar
           fort: Fort
           heritage: Verdsarvsstad

+          hollow_way: Hol veg

           house: Hus
           manor: Herregard
           memorial: Minne
           house: Hus
           manor: Herregard
           memorial: Minne

+          milestone: Historisk milepæl

           mine: Gruve
           mine: Gruve

+          mine_shaft: Gruvesjakt

           monument: Monument
           monument: Monument

+          railway: Historisk jarnveg

           roman_road: Romersk veg
           ruins: Ruinar
           roman_road: Romersk veg
           ruins: Ruinar

+          rune_stone: Runestein

           stone: Stein
           tomb: Grav
           tower: Tårn
           stone: Stein
           tomb: Grav
           tower: Tårn

+          wayside_chapel: Vegkyrkje

           wayside_cross: Vegkant kross
           wayside_shrine: Vegkant alter
           wreck: Vrak
           wayside_cross: Vegkant kross
           wayside_shrine: Vegkant alter
           wreck: Vrak

+          "yes": Historisk stad

         junction:
           "yes": Kryss
         landuse:
           allotments: Kolonihagar
         junction:
           "yes": Kryss
         landuse:
           allotments: Kolonihagar

+          aquaculture: Akvakultur

           basin: Elveområde
           brownfield: Tidlegare industriområde
           cemetery: Gravplass
           commercial: Kommersielt område
           basin: Elveområde
           brownfield: Tidlegare industriområde
           cemetery: Gravplass
           commercial: Kommersielt område

-          conservation: Freda
-          construction: Kontruksjon
+          conservation: Freda område
+          construction: Byggjeplass

           farmland: Jordbruksland
           farmyard: Gardstun
           forest: Skog
           farmland: Jordbruksland
           farmyard: Gardstun
           forest: Skog


@@ -691,32 +919,43 @@ nn:
           military: Militært område
           mine: Gruve
           orchard: Frukthage
           military: Militært område
           mine: Gruve
           orchard: Frukthage

+          plant_nursery: Planteskule

           quarry: Steinbrot
           railway: Jernbane
           recreation_ground: Idrettsplass
           quarry: Steinbrot
           railway: Jernbane
           recreation_ground: Idrettsplass

+          religious: Religiøs mark

           reservoir: Reservoar
           reservoir_watershed: Nedbørfelt
           residential: Boligområde
           reservoir: Reservoar
           reservoir_watershed: Nedbørfelt
           residential: Boligområde

-          retail: Detaljsalg
+          retail: Detaljsalområde

           village_green: Landsbypark
           vineyard: Vingård
           "yes": Arealbruk
         leisure:
           village_green: Landsbypark
           vineyard: Vingård
           "yes": Arealbruk
         leisure:

+          adult_gaming_centre: Vaksenspelehall
+          amusement_arcade: Spillehall
+          bandstand: Musikkpaviljong

           beach_resort: Badestrand
           bird_hide: Fugletårn
           beach_resort: Badestrand
           bird_hide: Fugletårn

+          bleachers: Tilskodarplassar
+          bowling_alley: Bowlinghall

           common: Allmenning
           common: Allmenning

+          dance: Dansesal

           dog_park: Hundepark
           dog_park: Hundepark

+          firepit: Bålgrop

           fishing: Fiskeområde
           fitness_centre: Treningssenter
           fitness_station: Trenings studio
           garden: Hage
           golf_course: Golfbane
           fishing: Fiskeområde
           fitness_centre: Treningssenter
           fitness_station: Trenings studio
           garden: Hage
           golf_course: Golfbane

-          horse_riding: Riding
+          horse_riding: Ridesenter

           ice_rink: Skøytebane
           marina: Båthavn
           miniature_golf: Minigolf
           nature_reserve: Naturreservat
           ice_rink: Skøytebane
           marina: Båthavn
           miniature_golf: Minigolf
           nature_reserve: Naturreservat

+          outdoor_seating: Utandørs sitjeplass

           park: Park
           park: Park

+          picnic_table: Piknikbord

           pitch: Sportsarena
           playground: Leikeplass
           recreation_ground: Idrettsplass
           pitch: Sportsarena
           playground: Leikeplass
           recreation_ground: Idrettsplass


@@ -730,24 +969,75 @@ nn:
           water_park: Vannpark
           "yes": Fritid
         man_made:
           water_park: Vannpark
           "yes": Fritid
         man_made:

+          adit: Stoll
+          advertising: Reklame
+          antenna: Antenne
+          avalanche_protection: Skredvern
+          beacon: Fyr
+          beam: Bjelke
+          beehive: Bikube
+          breakwater: Molo
+          bunker_silo: Bunker
+          cairn: Varde
+          chimney: Skorstein
+          clearcut: Snauhogst
+          communications_tower: Kommunikasjonstårn
+          crane: Kran
+          cross: Kors
+          dolphin: Fortøyingspåle
+          dyke: Dike
+          embankment: Voll
+          flagpole: Flaggstong
+          gasometer: Gassklokke
+          groyne: Høfde
+          kiln: Omn

           lighthouse: Fyr
           lighthouse: Fyr

+          manhole: Kum
+          mast: Mast
+          mine: Gruve
+          mineshaft: Gruvesjakt
+          monitoring_station: Overvakingsstasjon
+          petroleum_well: Oljebrønn
+          pier: Pir

           pipeline: Røyrleidning
           pipeline: Røyrleidning

+          pumping_station: Pumpestasjon
+          reservoir_covered: Overdekt reservoar
+          silo: Silo
+          snow_cannon: Snøkanon
+          snow_fence: Snøskjerm
+          storage_tank: Lagringstank
+          street_cabinet: Gatekabinett
+          surveillance: Overvaking
+          telescope: Teleskop

           tower: Tårn
           tower: Tårn

+          utility_pole: Straummast
+          wastewater_plant: Kloakkanlegg
+          watermill: Vassmylne
+          water_tap: Vasskran
+          water_tower: Vasstårn
+          water_well: Brønn
+          water_works: Vassverk
+          windmill: Vindmylne

           works: Fabrikk
           "yes": Menneskeskapt
         military:
           airfield: Militær flyplass
           barracks: Kaserner
           bunker: Bunker
           works: Fabrikk
           "yes": Menneskeskapt
         military:
           airfield: Militær flyplass
           barracks: Kaserner
           bunker: Bunker

+          checkpoint: Kontrollpost
+          trench: Skyttargrav
+          "yes": Militær

         mountain_pass:
           "yes": Fjellovergang
         natural:
         mountain_pass:
           "yes": Fjellovergang
         natural:

+          atoll: Atoll
+          bare_rock: Klippe

           bay: Bukt
           beach: Strand
           cape: Nes
           cave_entrance: Holeinngang
           cliff: Klippe
           bay: Bukt
           beach: Strand
           cape: Nes
           cave_entrance: Holeinngang
           cliff: Klippe

-          coastline: Kystlinje
+          coastline: Kystline

           crater: Krater
           dune: Sanddyne
           fell: Fjellskrent
           crater: Krater
           dune: Sanddyne
           fell: Fjellskrent


@@ -758,12 +1048,15 @@ nn:
           grassland: Grasslette
           heath: Vidde
           hill: Ås
           grassland: Grasslette
           heath: Vidde
           hill: Ås

+          hot_spring: Varm kjelde

           island: Øy
           island: Øy

+          isthmus: Eid

           land: Land
           marsh: Sump
           moor: Myr
           mud: Gjørme
           peak: Topp
           land: Land
           marsh: Sump
           moor: Myr
           mud: Gjørme
           peak: Topp

+          peninsula: Halvøy

           point: Punkt
           reef: Rev
           ridge: Rygg
           point: Punkt
           reef: Rev
           ridge: Rygg


@@ -772,32 +1065,51 @@ nn:
           sand: Sand
           scree: Ur
           scrub: Kratt
           sand: Sand
           scree: Ur
           scrub: Kratt

+          shingle: Steinstrand

           spring: Kjelde
           stone: Stein
           strait: Stred
           tree: Tre
           spring: Kjelde
           stone: Stein
           strait: Stred
           tree: Tre

+          tree_row: Trerekkje
+          tundra: Tundra

           valley: Dal
           volcano: Vulkan
           water: Vatn
           wetland: Våtmark
           wood: Skog
           valley: Dal
           volcano: Vulkan
           water: Vatn
           wetland: Våtmark
           wood: Skog

+          "yes": Naturelement

         office:
           accountant: Revisor
           administrative: Administrasjon
         office:
           accountant: Revisor
           administrative: Administrasjon

+          advertising_agency: Reklamebyrå

           architect: Arkitekt
           architect: Arkitekt

+          association: Samband

           company: Bedrift
           company: Bedrift

+          diplomatic: Diplomatkontor
+          educational_institution: Utdanningsinstitusjon

           employment_agency: Bemanningsbedrift
           employment_agency: Bemanningsbedrift

+          energy_supplier: Kontor til energiselskap

           estate_agent: Eiendomsmeglar
           estate_agent: Eiendomsmeglar

+          financial: Finanskontor

           government: Statlig kontor
           insurance: Forsikringskontor
           government: Statlig kontor
           insurance: Forsikringskontor

+          it: IKT-kontor

           lawyer: Advokat
           lawyer: Advokat

+          logistics: Logistikkontor
+          newspaper: Avisredaksjon

           ngo: Ikkje-statlig kontor
           ngo: Ikkje-statlig kontor

+          notary: Notarus publicus
+          religion: Religiøst kontor
+          research: Forskingskontor
+          tax_advisor: Skatterådgjevar

           telecommunication: Telefonkontor
           travel_agent: Reisebyrå
           "yes": Kontor
         place:
           allotments: Kolonihagar
           telecommunication: Telefonkontor
           travel_agent: Reisebyrå
           "yes": Kontor
         place:
           allotments: Kolonihagar

+          archipelago: Arkipel

           city: By
           city: By

+          city_block: Byblokk

           country: Land
           county: Fylke
           farm: Gard
           country: Land
           county: Fylke
           farm: Gard


@@ -810,9 +1122,12 @@ nn:
           locality: Plass
           municipality: Kommune
           neighbourhood: Nabolag
           locality: Plass
           municipality: Kommune
           neighbourhood: Nabolag

+          plot: Tomt

           postcode: Postnummer
           postcode: Postnummer

+          quarter: Kvartal

           region: Område
           sea: Hav
           region: Område
           sea: Hav

+          square: Torg

           state: Delstat
           subdivision: Underavdeling
           suburb: Forstad
           state: Delstat
           subdivision: Underavdeling
           suburb: Forstad


@@ -821,6 +1136,7 @@ nn:
           "yes": Stad
         railway:
           abandoned: Forlatt jernbane
           "yes": Stad
         railway:
           abandoned: Forlatt jernbane

+          buffer_stop: Sporstoppar

           construction: Jernbane under konstruksjon
           disused: Nedlagt jernbane
           funicular: Kabelbane
           construction: Jernbane under konstruksjon
           disused: Nedlagt jernbane
           funicular: Kabelbane


@@ -834,6 +1150,7 @@ nn:
           platform: Jernbaneperrong
           preserved: Verna jernbane
           proposed: Føreslått jernbane
           platform: Jernbaneperrong
           preserved: Verna jernbane
           proposed: Føreslått jernbane

+          rail: Jarnveg

           spur: Jernbaneforgrening
           station: Jernbanestasjon
           stop: Jernbanestopp
           spur: Jernbaneforgrening
           station: Jernbanestasjon
           stop: Jernbanestopp


@@ -842,15 +1159,23 @@ nn:
           switch: Sporveksel
           tram: Sporveg
           tram_stop: Trikkestopp
           switch: Sporveksel
           tram: Sporveg
           tram_stop: Trikkestopp

+          turntable: Dreieskive

           yard: Skiftetomt
         shop:
           yard: Skiftetomt
         shop:

+          agrarian: Landbruksbutikk

           alcohol: Utanfor lisens
           antiques: Antikviteter
           alcohol: Utanfor lisens
           antiques: Antikviteter

+          appliance: Kvitvareforretning

           art: Kunstbutikk
           art: Kunstbutikk

+          baby_goods: Babybutikk
+          bag: Veskebutikk

           bakery: Bakeri
           bakery: Bakeri

+          bathroom_furnishing: Badmøbelforretning

           beauty: Skjønnheitssalong
           beauty: Skjønnheitssalong

+          bed: Sengetøyforretning

           beverages: Drikkevarebutikk
           bicycle: Sykkelbutikk
           beverages: Drikkevarebutikk
           bicycle: Sykkelbutikk

+          bookmaker: Bookmaker

           books: Bokhandel
           boutique: Luksusforretning
           butcher: Slaktar
           books: Bokhandel
           boutique: Luksusforretning
           butcher: Slaktar


@@ -859,65 +1184,109 @@ nn:
           car_repair: Bilverkstad
           carpet: Teppebutikk
           charity: Veldedighetsbutikk
           car_repair: Bilverkstad
           carpet: Teppebutikk
           charity: Veldedighetsbutikk

+          cheese: Ostbutikk

           chemist: Kjemiker
           chemist: Kjemiker

+          chocolate: Sjokolade

           clothes: Klesbutikk
           clothes: Klesbutikk

+          coffee: Kaffebutikk

           computer: Databutikk
           confectionery: Konditori
           convenience: Nærbutikk
           copyshop: Kopieringsbutikk
           cosmetics: Kosmetikkforretning
           computer: Databutikk
           confectionery: Konditori
           convenience: Nærbutikk
           copyshop: Kopieringsbutikk
           cosmetics: Kosmetikkforretning

+          craft: Hobbybutikk
+          curtain: Gardinebutikk
+          dairy: Meieributikk

           deli: Delikatessebutikk
           department_store: Varehus
           discount: Tilbudsbutikk
           deli: Delikatessebutikk
           department_store: Varehus
           discount: Tilbudsbutikk

-          doityourself: Gjer-det-sjølv
+          doityourself: Gjer-det-sjølv-butikk

           dry_cleaning: Renseri
           dry_cleaning: Renseri

+          e-cigarette: E-sigarettbutikk

           electronics: Elektronikkforretning
           electronics: Elektronikkforretning

+          erotic: Sexbutikk

           estate_agent: Eiendomsmegler
           estate_agent: Eiendomsmegler

+          fabric: Stoffbutikk

           farm: Gardsbutikk
           fashion: Motebutikk
           farm: Gardsbutikk
           fashion: Motebutikk

+          fishing: Fiskebutikk

           florist: Blomsterbutikk
           food: Matbutikk
           florist: Blomsterbutikk
           food: Matbutikk

+          frame: Rammeverkstad

           funeral_directors: Begravelsesforretning
           furniture: Møbler
           garden_centre: Hagesenter
           funeral_directors: Begravelsesforretning
           furniture: Møbler
           garden_centre: Hagesenter

+          gas: Gassbutikk

           general: Landhandel
           gift: Gåvebutikk
           greengrocer: Grønsakshandel
           grocery: Daglegvarebutikk
           hairdresser: Frisør
           hardware: Jernvarehandel
           general: Landhandel
           gift: Gåvebutikk
           greengrocer: Grønsakshandel
           grocery: Daglegvarebutikk
           hairdresser: Frisør
           hardware: Jernvarehandel

-          hifi: Hi-fi
+          health_food: Helsekostforretning
+          hearing_aids: Høyreapparat
+          herbalist: Urtehandel
+          hifi: Hi-fi-butikk
+          houseware: Kjøkkenutstyrsbutikk
+          ice_cream: Iskrembutikk
+          interior_decoration: Innreiingsbutikk

           jewelry: Gullsmed
           kiosk: Kiosk
           jewelry: Gullsmed
           kiosk: Kiosk

+          kitchen: Kjøkkenbutikk

           laundry: Vaskeri
           laundry: Vaskeri

+          locksmith: Låsesmed
+          lottery: Lotteri

           mall: Kjøpesenter
           mall: Kjøpesenter

+          massage: Massasje
+          medical_supply: Forhandlar av medisinsk utstyr

           mobile_phone: Mobiltelefonbutikk
           mobile_phone: Mobiltelefonbutikk

+          money_lender: Pengeutlånar

           motorcycle: Motorsykkelbutikk
           motorcycle: Motorsykkelbutikk

+          motorcycle_repair: Motorsykkelverkstad

           music: Musikkbutikk
           music: Musikkbutikk

+          musical_instrument: Musikkinstrument

           newsagent: Nyhetsbyrå
           newsagent: Nyhetsbyrå

+          nutrition_supplements: Kosttilskot

           optician: Optikar
           organic: Organisk matbutikk
           outdoor: Utandørs butikk
           optician: Optikar
           organic: Organisk matbutikk
           outdoor: Utandørs butikk

+          paint: Fargehandel
+          pastry: Bakeri
+          pawnbroker: Pantelånar
+          perfumery: Parfymeri

           pet: Dyrebutikk
           pet: Dyrebutikk

+          pet_grooming: Kjæledyrfrisør

           photo: Fotobutikk
           photo: Fotobutikk

+          seafood: Sjømat

           second_hand: Bruktbutikk
           second_hand: Bruktbutikk

+          sewing: Saumforretning

           shoes: Skobutikk
           sports: Sportsbutikk
           stationery: Papirbutikk
           shoes: Skobutikk
           sports: Sportsbutikk
           stationery: Papirbutikk

+          storage_rental: Lagerhotell

           supermarket: Supermarked
           tailor: Skreddar
           supermarket: Supermarked
           tailor: Skreddar

+          tattoo: Tatoveringsstudio
+          tea: Tehandel
+          ticket: Billettformidlar
+          tobacco: Tobakksbutikk

           toys: Leikebutikk
           travel_agency: Reisebyrå
           toys: Leikebutikk
           travel_agency: Reisebyrå

+          tyres: Dekkforhandlar
+          vacant: Ledig forretningslokale

           video: Videobutikk
           video: Videobutikk

-          wine: Utanfor lisens
+          video_games: Videospelbutikk
+          wholesale: Grosserar
+          wine: Vinforretning

           "yes": Butikk
         tourism:
           alpine_hut: Fjellhytte
           "yes": Butikk
         tourism:
           alpine_hut: Fjellhytte

-          apartment: Leilegheit
+          apartment: Feriehusvære

           artwork: Kunstverk
           attraction: Attraksjon
           bed_and_breakfast: Bed and breakfast
           artwork: Kunstverk
           attraction: Attraksjon
           bed_and_breakfast: Bed and breakfast

-          cabin: Hytte
+          cabin: Turisthytte
+          camp_pitch: Teltplass

           camp_site: Teltplass
           caravan_site: Campingplass
           chalet: Fjellhytte
           camp_site: Teltplass
           caravan_site: Campingplass
           chalet: Fjellhytte


@@ -931,8 +1300,10 @@ nn:
           picnic_site: Piknikplass
           theme_park: Fornøyelsespark
           viewpoint: Utsiktspunkt
           picnic_site: Piknikplass
           theme_park: Fornøyelsespark
           viewpoint: Utsiktspunkt

+          wilderness_hut: Villmarksstove

           zoo: Dyrepark
         tunnel:
           zoo: Dyrepark
         tunnel:

+          building_passage: Bygnadspassasje

           culvert: Stikkrenne
           "yes": Tunnel
         waterway:
           culvert: Stikkrenne
           "yes": Tunnel
         waterway:


@@ -956,11 +1327,15 @@ nn:
           "yes": Vassveg
       admin_levels:
         level2: Riksgrense
           "yes": Vassveg
       admin_levels:
         level2: Riksgrense

+        level3: Regiongrense

         level4: Statsgrense
         level5: Regiongrense
         level4: Statsgrense
         level5: Regiongrense

+        level6: Fylkesgrense
+        level7: Kommunegrense

         level8: Bygrense
         level9: Landsbygrense
         level10: Forstadsgrense
         level8: Bygrense
         level9: Landsbygrense
         level10: Forstadsgrense

+        level11: Grannelagsgrense

       types:
         cities: Byar
         towns: Småbyar
       types:
         cities: Byar
         towns: Småbyar


@@ -968,9 +1343,88 @@ nn:
     results:
       no_results: Ingen resultat funne
       more_results: Fleire resultat
     results:
       no_results: Ingen resultat funne
       more_results: Fleire resultat

+  issues:
+    index:
+      title: Saker
+      select_status: Vel stode
+      select_type: Vel type
+      select_last_updated_by: Vel Sist oppdatert av
+      reported_user: Meld brukar
+      not_updated: Ikkje oppdatert
+      search: Søk
+      search_guidance: 'Søk blant saker:'
+      user_not_found: Brukaren finst ikkje
+      issues_not_found: Ingen slike saker funne
+      status: Stode
+      reports: Meldingar
+      last_updated: Sist oppdatert
+      last_updated_time_ago_user_html: '%{time_ago} av %{user}'
+      link_to_reports: Sjå meldingar
+      reports_count:
+        one: '%{count} melding'
+        other: '%{count} meldingar'
+      reported_item: Meld objekt
+      states:
+        ignored: Sett bort frå
+        open: Open
+        resolved: Løyst
+    show:
+      title: '%{status} Sak #%{issue_id}'
+      reports:
+        one: '%{count} melding'
+        other: '%{count} meldingar'
+      no_reports: Ingen meldingar
+      report_created_at: Fyrst meld %{datetime}
+      last_resolved_at: Sist løyst %{datetime}
+      last_updated_at: Sis oppdatert %{datetime} av %{displayname}
+      resolve: Løys
+      ignore: Sjå bort frå
+      reopen: Opna att
+      reports_of_this_issue: Meldingar om denne saka
+      read_reports: Les meldingar
+      new_reports: Nye meldingar
+      other_issues_against_this_user: Andre saker mot denne brukaren
+      no_other_issues: Ingen andre saker mot denne brukaren.
+      comments_on_this_issue: Kommentarar om denne saka
+    resolve:
+      resolved: Stoda på saka har vorte sett til «Løyst»
+    ignore:
+      ignored: Stoda på saka har vorte sett til «Sett bort frå»
+    reopen:
+      reopened: Stoda på saka har vorte sett til «Open»
+    comments:
+      comment_from_html: Kommentar frå %{user_link}, skriven %{comment_created_at}
+      reassign_param: Omdeleger saka?
+    reports:
+      reported_by_html: Meld som %{category} av %{user}, %{updated_at}
+    helper:
+      reportable_title:
+        diary_comment: '%{entry_title}, kommentar #%{comment_id}'
+        note: 'Merknad #%{note_id}'
+  issue_comments:
+    create:
+      comment_created: Kommentaren din vart oppretta
+      issue_reassigned: Kommentaren din vart oppretta og saka vart delegert om

   reports:
     new:
   reports:
     new:

+      title_html: Meld %{link}
+      missing_params: Kan ikkje oppretta ei ny melding
+      disclaimer:
+        intro: 'Før du sender inn meldinga til moderatorane, pass på at:'
+        not_just_mistake: Du er sikker på at problemet ikkje berre er eit uhell
+        unable_to_fix: Du ikkje kan fikse problemet sjølv eller med hjelp av andre
+        resolve_with_user: Du alt har prød å løyse problemet med brukaren

       categories:
       categories:

+        diary_entry:
+          spam_label: Dette dagbokinnlegget inneheld spam
+          offensive_label: Dette dagbokinnlegget er usømeleg
+          threat_label: Dette dagbokinnlegget inneheld ein trugsel
+          other_label: Anna
+        diary_comment:
+          spam_label: Denne dagbokskommentaren er eller inneheld spam
+          offensive_label: Denne dagbokskommentaren er usømeleg
+          threat_label: Denne dagbokskommentaren inneheld ein trugsel
+          other_label: Anna

         note:
           spam_label: Denne merknaden er søppel
           abusive_label: Denne merknaden er støytande
         note:
           spam_label: Denne merknaden er søppel
           abusive_label: Denne merknaden er støytande

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index f6b6dac1cfdb1fc5d04328dc3e9bd59deb269679..c80fdce462dbb9564139fc6cdc1777906c171570 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -2824,6 +2824,7 @@ sl:
       remove as friend: Odstrani prijatelja
       add as friend: Dodaj med prijatelje
       mapper since: 'Kartograf od:'
       remove as friend: Odstrani prijatelja
       add as friend: Dodaj med prijatelje
       mapper since: 'Kartograf od:'

+      uid: 'ID uporabnika:'

       ct status: 'Pogoji sodelovanja:'
       ct undecided: Neodločen
       ct declined: Zavrnjeni
       ct status: 'Pogoji sodelovanja:'
       ct undecided: Neodločen
       ct declined: Zavrnjeni

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 02f506eb2e699a6ae6c5a7d411f7f06ffac642c1..79c85452dfd463af920642f1df309b51dc6c9c70 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -278,6 +278,7 @@ tr:
         reopened_at_by_html: '%{user} tarafından %{when} yeniden etkinleştirildi'
       rss:
         title: OpenStreetMap Notları
         reopened_at_by_html: '%{user} tarafından %{when} yeniden etkinleştirildi'
       rss:
         title: OpenStreetMap Notları

+        description_all: Bildirilen, yorum yapılan veya kapatılan notların listesi

         description_area: '[(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] bölgenizde
           raporlanan, yorumlanan veya kapatılan notların bir listesi'
         description_item: Not %{id} için bir rss beslemesi
         description_area: '[(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] bölgenizde
           raporlanan, yorumlanan veya kapatılan notların bir listesi'
         description_item: Not %{id} için bir rss beslemesi


@@ -1638,6 +1639,9 @@ tr:
       subject: '[OpenStreetMap] GPX dosyası maalesef alınamadı'
     gpx_success:
       hi: Merhaba %{to_user},
       subject: '[OpenStreetMap] GPX dosyası maalesef alınamadı'
     gpx_success:
       hi: Merhaba %{to_user},

+      loaded:
+        one: olası %{count} puan üzerinden %{trace_points} ile başarıyla yüklendi.
+        other: olası %{count} puan üzerinden %{trace_points} ile başarıyla yüklendi.

       subject: '[OpenStreetMap] GPX dosyası başarıyla alındı'
     signup_confirm:
       subject: '[OpenStreetMap]''e hoş geldin'
       subject: '[OpenStreetMap] GPX dosyası başarıyla alındı'
     signup_confirm:
       subject: '[OpenStreetMap]''e hoş geldin'


@@ -2082,18 +2086,36 @@ tr:
           Land
            Vorarlberg
         contributors_at_cc_by_at_with_amendments: değişikliklerle birlikte CC BY AT
           Land
            Vorarlberg
         contributors_at_cc_by_at_with_amendments: değişikliklerle birlikte CC BY AT

+        contributors_au_credit_html: '%{australia}: İdari Sınırlar © %{geoscape_australia_link}
+          kullanılarak birleştirilmiş veya geliştirilmiştir. Commonwealth of Australia
+          tarafından %{cc_licence_link} kapsamında lisanslanmıştır.'

         contributors_au_australia: Avustralya
         contributors_au_geoscape_australia: Geoscape Australia
         contributors_au_cc_licence: Creative Commons Atıf 4.0 Uluslararası lisansı
           (CC BY 4.0)
         contributors_au_australia: Avustralya
         contributors_au_geoscape_australia: Geoscape Australia
         contributors_au_cc_licence: Creative Commons Atıf 4.0 Uluslararası lisansı
           (CC BY 4.0)

+        contributors_ca_credit_html: '%{canada}: GeoBase®, GeoGratis (© Department
+          of Natural Resources Canada), CanVec (© Department of Natural Resources
+          Canada), and StatCan (Geography Division, Statistics Canada) verileri içerir.'

         contributors_ca_canada: Kanada
         contributors_ca_canada: Kanada

+        contributors_fi_credit_html: '%{finland}: Finlandiya Topografik Veritabanı
+          Ulusal Arazi Araştırması''ndan ve diğer veri kümelerinden veriler içerir
+          ve %{nlsfi_license_link} ile lisanslanmıştır.'

         contributors_fi_finland: Finlandiya
         contributors_fi_nlsfi_license: NLSFI Lisansı
         contributors_fi_finland: Finlandiya
         contributors_fi_nlsfi_license: NLSFI Lisansı

+        contributors_fr_credit_html: '%{france}: Direction Générale des Impôts''tan
+          alınan verileri içerir.'

         contributors_fr_france: Fransa
         contributors_fr_france: Fransa

+        contributors_nl_credit_html: '%{netherlands}: © AND verilerini içerir,
+          2007 (%{and_link})'

         contributors_nl_netherlands: Hollanda
         contributors_nl_netherlands: Hollanda

+        contributors_nz_credit_html: '%{new_zealand}: %{linz_data_service_link}''nden
+          alınan ve %{cc_by_link} kapsamında yeniden kullanım için lisanslanan verileri
+          içerir.'

         contributors_nz_new_zealand: Yeni Zelanda
         contributors_nz_linz_data_service: LINZ Veri Hizmeti
         contributors_nz_cc_by: CC BY 4.0
         contributors_nz_new_zealand: Yeni Zelanda
         contributors_nz_linz_data_service: LINZ Veri Hizmeti
         contributors_nz_cc_by: CC BY 4.0

+        contributors_rs_credit_html: '%{serbia}: %{rgz_link} ile %{open_data_portal}''ndan
+          alınan verileri içerir (Sırbistan''ın kamuya açık bilgileri), 2018.'

         contributors_rs_serbia: Sırbistan
         contributors_rs_rgz: Sırp Jeodezi Kurumu
         contributors_rs_open_data_portal: Ulusal Açık Veri Portalı
         contributors_rs_serbia: Sırbistan
         contributors_rs_rgz: Sırp Jeodezi Kurumu
         contributors_rs_open_data_portal: Ulusal Açık Veri Portalı


@@ -2103,11 +2125,22 @@ tr:
         contributors_si_slovenia: Slovenya
         contributors_si_gu: Etüt ve Harita Kurumu
         contributors_si_mkgp: Tarım, Orman ve Gıda Bakanlığı
         contributors_si_slovenia: Slovenya
         contributors_si_gu: Etüt ve Harita Kurumu
         contributors_si_mkgp: Tarım, Orman ve Gıda Bakanlığı

+        contributors_es_credit_html: '%{spain}: %{cc_by_link} kapsamında yeniden kullanım
+          için lisanslanan İspanyol National Geographic Institute (%{ign_link}) ve
+          National Cartographic System''den (%{scne_link}) alınan verileri içerir.'

         contributors_es_spain: İspanya
         contributors_es_ign: IGN
         contributors_es_cc_by: CC BY 4.0
         contributors_es_spain: İspanya
         contributors_es_ign: IGN
         contributors_es_cc_by: CC BY 4.0

+        contributors_za_credit_html: '%{south_africa}: %{ngi_link} kaynaklı verileri
+          içerir, Devlet telif hakkı saklıdır.'

         contributors_za_south_africa: Güney Afrika
         contributors_za_south_africa: Güney Afrika

+        contributors_za_ngi: 'Baş Müdürlük: Ulusal Jeo-Uzamsal Bilgi'
+        contributors_gb_credit_html: '%{united_kingdom}: Ordnance Survey verilerini
+          içerir © Crown telif hakkı ve veritabanı hakkı, 2010-2023.'

         contributors_gb_united_kingdom: Birleşik Krallık
         contributors_gb_united_kingdom: Birleşik Krallık

+        contributors_2_html: Bu ve OpenStreetMap'i geliştirmeye yardımcı olmak için
+          kullanılan diğer kaynaklar hakkında daha fazla ayrıntı için lütfen OpenStreetMap
+          Wiki'deki  %{contributors_page_link}na bakın.

         contributors_2_contributors_page: Katkıda bulunanlar sayfası
         contributors_footer_2_html: |-
           Verilerin OpenStreetMap'e dahil edilmesi, orijinal
         contributors_2_contributors_page: Katkıda bulunanlar sayfası
         contributors_footer_2_html: |-
           Verilerin OpenStreetMap'e dahil edilmesi, orijinal


@@ -2120,7 +2153,15 @@ tr:
           açık izni olmadan telif hakkıyla korunan kaynaklardan
           (ör. Google Haritalar veya basılı haritalar) hiçbir zaman
           veri eklememeleri hatırlatılır.
           açık izni olmadan telif hakkıyla korunan kaynaklardan
           (ör. Google Haritalar veya basılı haritalar) hiçbir zaman
           veri eklememeleri hatırlatılır.

+        infringement_2_1_html: Telif hakkıyla korunan materyalin OpenStreetMap veritabanına
+          veya bu siteye uygunsuz bir şekilde eklendiğine inanıyorsanız lütfen %{takedown_procedure_link}
+          sayfasına bakın veya doğrudan %{online_filing_page_link} sayfamızda dosyalayın.
+        infringement_2_1_takedown_procedure: kaldırma prosedürü
+        infringement_2_1_online_filing_page: çevrimiçi dosyalama sayfası

         trademarks_title: Ticari markalar
         trademarks_title: Ticari markalar

+        trademarks_1_1_html: OpenStreetMap, büyüteç logosu ve State of the Map; OpenStreetMap
+          Vakfı'nın tescilli ticari markalarıdır. Markaların kullanımıyla ilgili sorularınız
+          varsa lütfen %{trademark_policy_link} sayfasına bakın.

         trademarks_1_1_trademark_policy: Ticari Marka Politikası
     index:
       js_1: JavaScript desteklemeyen bir tarayıcı kullanıyorsunuz ya da JavaScript
         trademarks_1_1_trademark_policy: Ticari Marka Politikası
     index:
       js_1: JavaScript desteklemeyen bir tarayıcı kullanıyorsunuz ya da JavaScript


@@ -2736,6 +2777,7 @@ tr:
       remove as friend: Arkadaşlıktan çıkar
       add as friend: Arkadaş Olarak Ekle
       mapper since: 'Haritacılığa başlama tarihi:'
       remove as friend: Arkadaşlıktan çıkar
       add as friend: Arkadaş Olarak Ekle
       mapper since: 'Haritacılığa başlama tarihi:'

+      uid: 'Kullanıcı kimliği:'

       ct status: 'Katılımcının şartları:'
       ct undecided: Kararsız
       ct declined: Reddetti
       ct status: 'Katılımcının şartları:'
       ct undecided: Kararsız
       ct declined: Reddetti


@@ -2927,8 +2969,9 @@ tr:
     index:
       title: '%{user} tarafından gönderilen veya yorumlanan notlar'
       heading: '%{user} kullanıcıya ait notlar'
     index:
       title: '%{user} tarafından gönderilen veya yorumlanan notlar'
       heading: '%{user} kullanıcıya ait notlar'

-      subheading_html: '%{user} tarafından gönderilen veya yorumlanan notlar'
-      subheading_submitted: gönderildi
+      subheading_html: '%{user} tarafından %{submitted}} veya %{commented} notlar'
+      subheading_submitted: gönderilen
+      subheading_commented: yorumlanan

       no_notes: Not yok
       id: Kimlik
       creator: Oluşturan
       no_notes: Not yok
       id: Kimlik
       creator: Oluşturan