Localisation updates from https://translatewiki.net.

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index ebf499d961e1027ceec88792ed4c31ca77e6b02c..86b35e00b27f70973633ae75010dd263e2adbd92 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -25,6 +25,7 @@
 # Author: Kassem7899
 # Author: Kuwaity26
 # Author: LaMagiaaa
 # Author: Kassem7899
 # Author: Kuwaity26
 # Author: LaMagiaaa

+# Author: Lolekek

 # Author: MRidhaAJ
 # Author: Majid Al-Dharrab
 # Author: McDutchie
 # Author: MRidhaAJ
 # Author: Majid Al-Dharrab
 # Author: McDutchie


@@ -2043,7 +2044,7 @@ ar:
         contributors_es_spain: إسبانيا
         contributors_za_credit_html: '%{south_africa}: يحتوي على بيانات مصدرها %{ngi_link}
           ، حقوق الطبع والنشر محفوظة للولاية.'
         contributors_es_spain: إسبانيا
         contributors_za_credit_html: '%{south_africa}: يحتوي على بيانات مصدرها %{ngi_link}
           ، حقوق الطبع والنشر محفوظة للولاية.'

-        contributors_za_south_africa: جÙ\86Ù\88ب Ø£فريقيا
+        contributors_za_south_africa: جÙ\86Ù\88ب Ø¥فريقيا

         contributors_za_ngi: 'المديرية الرئيسية: المعلومات الجغرافية المكانية الوطنية'
         contributors_gb_credit_html: |-
           %{united_kingdom}: يحتوي على Ordnance
         contributors_za_ngi: 'المديرية الرئيسية: المعلومات الجغرافية المكانية الوطنية'
         contributors_gb_credit_html: |-
           %{united_kingdom}: يحتوي على Ordnance

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 387fb1b2913b477a08fc52b9769cc8d12f99ecfc..04ede1a1482234c5728e7a3cf94708fda77c7a72 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -2250,7 +2250,6 @@ ast:
         cycle_map: Mapa ciclista
         transport_map: Mapa de tresportes
         hot: Humanitariu
         cycle_map: Mapa ciclista
         transport_map: Mapa de tresportes
         hot: Humanitariu

-        opnvkarte: ÖPNVKarte

       layers:
         header: Capes del mapa
         notes: Notes de mapa
       layers:
         header: Capes del mapa
         notes: Notes de mapa

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 6568da07a63328caed320482550ff14a05c182d5..d537dd03ec12142c3de198c1e08705740049dcf3 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -2271,7 +2271,6 @@ be:
         cycle_map: Веласіпедная карта
         transport_map: Транспартная карта
         hot: Гуманітарная карта
         cycle_map: Веласіпедная карта
         transport_map: Транспартная карта
         hot: Гуманітарная карта

-        opnvkarte: ÖPNVKarte

       layers:
         header: Слаі карты
         notes: Заўвагі на карце
       layers:
         header: Слаі карты
         notes: Заўвагі на карце

diff --git a/config/locales/br.yml b/config/locales/br.yml
index f0b3194b5b60a1b8a24ae7b4752f9dee86846fcc..bef1c760f80e5f2aae9849a06b36b970c11b64e6 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -3000,7 +3000,6 @@ br:
         cycle_map: Kelc'hiad kartenn
         transport_map: Kartenn treuzdougen
         hot: Denegour
         cycle_map: Kelc'hiad kartenn
         transport_map: Kartenn treuzdougen
         hot: Denegour

-        opnvkarte: ÖPNVKarte

       layers:
         header: Gwiskadoù kartenn
         notes: Notennoù kartenn
       layers:
         header: Gwiskadoù kartenn
         notes: Notennoù kartenn


@@ -3014,8 +3013,6 @@ br:
       osm_france: OpenStreetMap Frañs
       thunderforest_credit: Teol pourchaset gant %{thunderforest_link}
       andy_allan: Andy Allan
       osm_france: OpenStreetMap Frañs
       thunderforest_credit: Teol pourchaset gant %{thunderforest_link}
       andy_allan: Andy Allan

-      opnvkarte_credit: Teol pourchaset gant %{memomaps_link}
-      memomaps: MeMoMaps

       tracestrack_credit: Teol pourchaset gant %{tracestrack_link}
     site:
       edit_tooltip: Kemmañ ar gartenn
       tracestrack_credit: Teol pourchaset gant %{tracestrack_link}
     site:
       edit_tooltip: Kemmañ ar gartenn

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index da328fa0d069b3557b2df19e990faf80831333b5..35a1aa453fdaf24f754e45078a23c651355475a5 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -3045,7 +3045,6 @@ ca:
         transport_map: Mapa de transports
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitari
         transport_map: Mapa de transports
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitari

-        opnvkarte: ÖPNVKarte (mapa de transport públic)

       layers:
         header: Capes del mapa
         notes: Notes de mapa
       layers:
         header: Capes del mapa
         notes: Notes de mapa


@@ -3060,8 +3059,6 @@ ca:
       osm_france: OpenStreetMap França
       thunderforest_credit: Tessel·les cortesia de %{thunderforest_link}
       andy_allan: Andy Allan
       osm_france: OpenStreetMap França
       thunderforest_credit: Tessel·les cortesia de %{thunderforest_link}
       andy_allan: Andy Allan

-      opnvkarte_credit: Tessel·les cortesia de %{memomaps_link}
-      memomaps: MeMoMaps

       tracestrack_credit: Tessel·les cortesia de %{tracestrack_link}
       hotosm_credit: Estil de tessel·les per %{hotosm_link}, hostatjades per %{osm_france_link}
       hotosm_name: Equip humanitari de l'OpenStreetMap
       tracestrack_credit: Tessel·les cortesia de %{tracestrack_link}
       hotosm_credit: Estil de tessel·les per %{hotosm_link}, hostatjades per %{osm_france_link}
       hotosm_name: Equip humanitari de l'OpenStreetMap

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 32b874f7a5b42c94ccf9b9d4e30b1c258fed29a5..4e1874c12b6ed46f6aea06dc7edededc97b7e39b 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -3131,7 +3131,6 @@ cs:
         transport_map: Dopravní mapa
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitární
         transport_map: Dopravní mapa
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitární

-        opnvkarte: ÖPNVKarte

       layers:
         header: Mapové vrstvy
         notes: Poznámky k mapě
       layers:
         header: Mapové vrstvy
         notes: Poznámky k mapě


@@ -3146,8 +3145,6 @@ cs:
       osm_france: OpenStreetMap Francie
       thunderforest_credit: Dlaždice laskavostí %{thunderforest_link}
       andy_allan: Andyho Allana
       osm_france: OpenStreetMap Francie
       thunderforest_credit: Dlaždice laskavostí %{thunderforest_link}
       andy_allan: Andyho Allana

-      opnvkarte_credit: Dlaždice s laskavým svolením %{memomaps_link}
-      memomaps: MeMoMaps

       tracestrack_credit: Dlaždice laskavostí %{tracestrack_link}
       hotosm_credit: Styl dlaždic od %{hotosm_link} hostuje %{osm_france_link}
       hotosm_name: Humanitárního týmu OpenStreetMap
       tracestrack_credit: Dlaždice laskavostí %{tracestrack_link}
       hotosm_credit: Styl dlaždic od %{hotosm_link} hostuje %{osm_france_link}
       hotosm_name: Humanitárního týmu OpenStreetMap

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 7f12593697471d791e5493152449d5104703d682..a6171c98c20afc6fbb83f04379487a7f06f95645 100644 (file)
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -44,6 +44,10 @@ cy:
       messages:
         invalid_email_address: nid yw'n ymddangos ei fod yn gyfeiriad e-bost dilys
         email_address_not_routable: nid yw'n gyrchadwy
       messages:
         invalid_email_address: nid yw'n ymddangos ei fod yn gyfeiriad e-bost dilys
         email_address_not_routable: nid yw'n gyrchadwy

+        display_name_is_user_n: ni all fod yn user_n oni bai mai n yw eich rhif defnyddiwr
+      models:
+        user_mute:
+          is_already_muted: wedi anwybyddu yn barod

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


@@ -63,8 +67,8 @@ cy:
       old_relation_member: Aelod o Hen Berthynas
       old_relation_tag: Tag Hen Berthynas
       old_way: Hen Lwybr
       old_relation_member: Aelod o Hen Berthynas
       old_relation_tag: Tag Hen Berthynas
       old_way: Hen Lwybr

-      old_way_node: Nod Hen Ffordd
-      old_way_tag: Tag Hen Ffordd
+      old_way_node: Hen Nod Llwybr
+      old_way_tag: Tag Hen Lwybr

       relation: Perthynas
       relation_member: Aelod Perthynol
       relation_tag: Tag Perthynas
       relation: Perthynas
       relation_member: Aelod Perthynol
       relation_tag: Tag Perthynas


@@ -271,6 +275,8 @@ cy:
         reopened_at_by_html: Wedi ailgychwyn %{when} gan %{user}
       rss:
         title: Nodiadau OpenStreetMap
         reopened_at_by_html: Wedi ailgychwyn %{when} gan %{user}
       rss:
         title: Nodiadau OpenStreetMap

+        description_area: Rhestr o nodiadau, adroddwyd, gyda sylwadau, neu wedi cau
+          yn eich ardal [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]

         description_item: Ffrwd RSS ar gyfer nodyn %{id}
         opened: Nodyn newydd (ger %{place})
         commented: Sylw newydd (ger %{place})
         description_item: Ffrwd RSS ar gyfer nodyn %{id}
         opened: Nodyn newydd (ger %{place})
         commented: Sylw newydd (ger %{place})


@@ -295,6 +301,7 @@ cy:
           yn cael eu cadw.
         retain_changeset_discussions: Bydd eich trafodaethau grwpiau newid, os ydynt
           yn bodoli, yn cael eu cadw.
           yn cael eu cadw.
         retain_changeset_discussions: Bydd eich trafodaethau grwpiau newid, os ydynt
           yn bodoli, yn cael eu cadw.

+        retain_email: Bydd eich cyfeiriad e-bost yn cael ei gadw.

         confirm_delete: Ydych chi'n siŵr?
         cancel: Canslo
   accounts:
         confirm_delete: Ydych chi'n siŵr?
         cancel: Canslo
   accounts:


@@ -397,8 +404,12 @@ cy:
         many: '%{count} nod'
         other: '%{count} nod'
       also_part_of_html:
         many: '%{count} nod'
         other: '%{count} nod'
       also_part_of_html:

-        one: rhan o'r ffordd %{related_ways}
-        other: rhan o'r ffyrdd %{related_ways}
+        zero: rhan o lwybr %{related_ways}
+        one: rhan o lwybr %{related_ways}
+        two: rhan o lwybr %{related_ways}
+        few: rhan o lwybr %{related_ways}
+        many: rhan o lwybr %{related_ways}
+        other: rhan o lwybr %{related_ways}

     relation:
       title_html: 'Perthynas: %{name}'
       history_title_html: 'Hanes y Perthynas: %{name}'
     relation:
       title_html: 'Perthynas: %{name}'
       history_title_html: 'Hanes y Perthynas: %{name}'


@@ -521,7 +532,7 @@ cy:
       my friends: Fy ffrindiau
       no friends: Nid ydych wedi ychwanegu unrhyw ffrindiau eto.
       nearby users: Defnyddwyr eraill gerllaw
       my friends: Fy ffrindiau
       no friends: Nid ydych wedi ychwanegu unrhyw ffrindiau eto.
       nearby users: Defnyddwyr eraill gerllaw

-      no nearby users: Nid oes defnyddwyr gerllaw sy'n datgelu eu bod yn mapio eto.
+      no nearby users: Nid oes defnyddwyr gerllaw sy'n dweud eu bod yn mapio eto.

       friends_changesets: Grwpiau newid eich ffrindiau
       friends_diaries: cofnodion dyddiaduron ffrindiau
       nearby_changesets: grwpiau newid defnyddwyr gerllaw
       friends_changesets: Grwpiau newid eich ffrindiau
       friends_diaries: cofnodion dyddiaduron ffrindiau
       nearby_changesets: grwpiau newid defnyddwyr gerllaw


@@ -610,6 +621,10 @@ cy:
       newer_comments: Sylwadau Diweddarach
       older_comments: Sylwadau Hŷn
   doorkeeper:
       newer_comments: Sylwadau Diweddarach
       older_comments: Sylwadau Hŷn
   doorkeeper:

+    flash:
+      applications:
+        create:
+          notice: Cofrestrwyd yr Ap.

     openid_connect:
       errors:
         messages:
     openid_connect:
       errors:
         messages:


@@ -908,7 +923,7 @@ cy:
           motorway_link: Ffordd Traffordd
           passing_place: Lle Pasio
           path: Llwybr
           motorway_link: Ffordd Traffordd
           passing_place: Lle Pasio
           path: Llwybr

-          pedestrian: Llwybr Cerddwyr
+          pedestrian: Stryd Gerddwyr

           platform: Platfform
           primary: Priffordd
           primary_link: Priffordd
           platform: Platfform
           primary: Priffordd
           primary_link: Priffordd


@@ -952,6 +967,7 @@ cy:
           citywalls: Waliau Ddinas
           fort: Caer
           heritage: Safle Dreftadaeth
           citywalls: Waliau Ddinas
           fort: Caer
           heritage: Safle Dreftadaeth

+          hollow_way: Ceuffordd

           house: Tŷ
           manor: Maenor
           memorial: Cofeb
           house: Tŷ
           manor: Maenor
           memorial: Cofeb


@@ -963,8 +979,9 @@ cy:
           stone: Carreg
           tomb: Beddrod
           tower: Tŵr
           stone: Carreg
           tomb: Beddrod
           tower: Tŵr

-          wayside_cross: Croes Min Ffordd
-          wayside_shrine: Cysegrfa Min Ffordd
+          wayside_chapel: Capel Min y Ffordd
+          wayside_cross: Croes Min y Ffordd
+          wayside_shrine: Cysegrfa Min y Ffordd

           wreck: Llongddrylliad
           "yes": Safle Hanesyddol
         junction:
           wreck: Llongddrylliad
           "yes": Safle Hanesyddol
         junction:


@@ -1029,6 +1046,7 @@ cy:
           water_park: Parc Dŵr
           "yes": Hamdden
         man_made:
           water_park: Parc Dŵr
           "yes": Hamdden
         man_made:

+          adit: Adit

           advertising: Hysbysebu
           antenna: Antena
           beacon: Goleufa
           advertising: Hysbysebu
           antenna: Antena
           beacon: Goleufa


@@ -1098,6 +1116,7 @@ cy:
           moor: Gwaun
           mud: Mwd
           peak: Copa
           moor: Gwaun
           mud: Mwd
           peak: Copa

+          peninsula: Penrhyn

           point: Pwynt
           reef: Riff
           ridge: Cefn
           point: Pwynt
           reef: Riff
           ridge: Cefn


@@ -1502,7 +1521,7 @@ cy:
     gpx_failure:
       hi: Helo %{to_user},
       failed_to_import: 'methwyd â mewnforio. Dyma''r gwall:'
     gpx_failure:
       hi: Helo %{to_user},
       failed_to_import: 'methwyd â mewnforio. Dyma''r gwall:'

-      subject: Methwyd mewnforio GPX [OpenStreetMap]
+      subject: '[OpenStreetMap] Methiant Mewnforio GPX'

     gpx_success:
       hi: Helo %{to_user},
       subject: '[OpenStreetMap] Llwyddiant Mewnforio GPX'
     gpx_success:
       hi: Helo %{to_user},
       subject: '[OpenStreetMap] Llwyddiant Mewnforio GPX'


@@ -1526,9 +1545,13 @@ cy:
         subject_own: '[OpenStreetMap] Gwnaeth %{commenter} sylw ar un o''ch nodiadau'
         subject_other: '[OpenStreetMap] Gwnaeth %{commenter} sylw ar nodyn y mae gennych
           ddiddordeb ynddo'
         subject_own: '[OpenStreetMap] Gwnaeth %{commenter} sylw ar un o''ch nodiadau'
         subject_other: '[OpenStreetMap] Gwnaeth %{commenter} sylw ar nodyn y mae gennych
           ddiddordeb ynddo'

+      closed:
+        subject_own: '[OpenStreetMap] Datrysodd %{commenter} un o''ch nodiadau'
+        subject_other: '[OpenStreetMap] Datrysodd %{commenter} nodyn y mae gennych
+          ddiddordeb yndo'

       reopened:
       reopened:

-        subject_own: '[OpenStreetMap] Ailgychwynodd %{commenter} un o''ch nodiadau'
-        subject_other: '[OpenStreetMap] Ailgychwynodd %{commenter} nodyn y mae gennych
+        subject_own: '[OpenStreetMap] Ailysgogodd %{commenter} un o''ch nodiadau'
+        subject_other: '[OpenStreetMap] Ailysgogodd %{commenter} nodyn y mae gennych

           ddiddordeb ynddo'
     changeset_comment_notification:
       hi: Helo %{to_user},
           ddiddordeb ynddo'
     changeset_comment_notification:
       hi: Helo %{to_user},


@@ -1536,6 +1559,8 @@ cy:
       commented:
         subject_own: '[OpenStreetMap] Gwnaeth %{commenter} sylw ar un o''ch grwpiau
           newid'
       commented:
         subject_own: '[OpenStreetMap] Gwnaeth %{commenter} sylw ar un o''ch grwpiau
           newid'

+        subject_other: '[OpenStreetMap] Gwnaeth %{commenter} sylw ar grŵp newydd y
+          mae gennych ddiddordeb ynddo'

         partial_changeset_with_comment: gyda sylw '%{changeset_comment}'
         partial_changeset_with_comment_html: gyda sylw '%{changeset_comment}'
         partial_changeset_without_comment: dim sylw
         partial_changeset_with_comment: gyda sylw '%{changeset_comment}'
         partial_changeset_with_comment_html: gyda sylw '%{changeset_comment}'
         partial_changeset_without_comment: dim sylw


@@ -1570,7 +1595,9 @@ cy:
         few: '%{count} hen neges'
         many: '%{count} hen neges'
         other: '%{count} hen neges'
         few: '%{count} hen neges'
         many: '%{count} hen neges'
         other: '%{count} hen neges'

-      people_mapping_nearby: person yn mapio gerllaw
+      no_messages_yet_html: Nid oes gennych unrhyw negeseuon eto. Beth am gysylltu
+        â'r %{people_mapping_nearby_link}?
+      people_mapping_nearby: pobl yn mapio gerllaw

     messages_table:
       from: Gan
       to: I
     messages_table:
       from: Gan
       to: I


@@ -1601,7 +1628,11 @@ cy:
       messages:
         one: Mae gennych %{count} neges wedi ei anfon
         other: Mae gennych %{count} neges wedi eu hanfon
       messages:
         one: Mae gennych %{count} neges wedi ei anfon
         other: Mae gennych %{count} neges wedi eu hanfon

+      no_sent_messages_html: Nid oes gennych unrhyw negeseuon wedi'u hanfon eto. Beth
+        am gysylltu â'r %{people_mapping_nearby_link}?

       people_mapping_nearby: pobl yn mapio gerllaw
       people_mapping_nearby: pobl yn mapio gerllaw

+    muted:
+      title: Negeseuon ag Anwybyddwyd

     show:
       title: Darllen neges
       reply_button: Ateb
     show:
       title: Darllen neges
       reply_button: Ateb


@@ -1613,6 +1644,7 @@ cy:
     heading:
       my_inbox: Fy Mewnflwch
       my_outbox: Fy Mlwch Allan
     heading:
       my_inbox: Fy Mewnflwch
       my_outbox: Fy Mlwch Allan

+      muted_messages: Negeseuon ag anwybyddwyd

     mark:
       as_read: Nodwyd fod y neges wedi ei ddarllen
       as_unread: Nodwyd nad yw'r neges wedi ei ddarllen
     mark:
       as_read: Nodwyd fod y neges wedi ei ddarllen
       as_unread: Nodwyd nad yw'r neges wedi ei ddarllen


@@ -1622,9 +1654,11 @@ cy:
     new:
       title: Ailosod cyfrinair
       heading: Wedi anghofio'ch cyfrinair?
     new:
       title: Ailosod cyfrinair
       heading: Wedi anghofio'ch cyfrinair?

-      email address: 'Cyfeiriad e-bost:'
+      email address: Cyfeiriad E-bost

       new password button: Ailosod cyfrinair
     create:
       new password button: Ailosod cyfrinair
     create:

+      notice email on way: Sori eich bod wedi ei golli :-( ond mae e-bost ar y ffordd
+        er mwyn ichi ei ailosod yn fuan.

       notice email cannot find: Methwyd dod o hyd i'r cyfeiriad ebost yno.
     edit:
       title: Ailosod cyfrinair
       notice email cannot find: Methwyd dod o hyd i'r cyfeiriad ebost yno.
     edit:
       title: Ailosod cyfrinair


@@ -1673,9 +1707,9 @@ cy:
     new:
       title: Mewngofnodi
       heading: Mewngofnodi
     new:
       title: Mewngofnodi
       heading: Mewngofnodi

-      email or username: 'Cyfeiriad e-bost neu enw defnyddiwr:'
-      password: 'Cyfrinair:'
-      openid_html: '%{logo} OpenID:'
+      email or username: Cyfeiriad E-Bost neu Enw Defnyddiwr
+      password: Cyfrinair
+      openid_html: '%{logo} OpenID'

       remember: Cofiwch fi
       lost password link: Wedi anghofio eich cyfrinair?
       login_button: Mewngofnodi
       remember: Cofiwch fi
       lost password link: Wedi anghofio eich cyfrinair?
       login_button: Mewngofnodi


@@ -1716,9 +1750,12 @@ cy:
       support: cymorth
   shared:
     markdown_help:
       support: cymorth
   shared:
     markdown_help:

+      heading_html: Wedi'i ddosrannu gyda %{kramdown_link}

       headings: Penawdau
       heading: Pennawd
       subheading: Is-bennawd
       headings: Penawdau
       heading: Pennawd
       subheading: Is-bennawd

+      unordered: Rhestr heb ei threfnu
+      ordered: Rhestr wedi'i threfnu

       first: Eitem gyntaf
       second: Ail eitem
       link: Dolen
       first: Eitem gyntaf
       second: Ail eitem
       link: Dolen


@@ -1918,6 +1955,7 @@ cy:
           primary: Priffordd
           secondary: Ffordd eilaidd
           unclassified: Ffordd annosbarthedig
           primary: Priffordd
           secondary: Ffordd eilaidd
           unclassified: Ffordd annosbarthedig

+          pedestrian: Llwybr cerddwyr

           track: Trac
           bridleway: Llwybr ceffylau
           cycleway: Llwybr beiciau
           track: Trac
           bridleway: Llwybr ceffylau
           cycleway: Llwybr beiciau


@@ -1962,6 +2000,7 @@ cy:
           scrubland: Prysgoed
           lake: Llyn
           reservoir: Cronfa Ddŵr
           scrubland: Prysgoed
           lake: Llyn
           reservoir: Cronfa Ddŵr

+          intermittent_water: Dŵr ysbeidiol

           glacier: Rhewlif
           reef: Riff
           wetland: Gwlyptir
           glacier: Rhewlif
           reef: Riff
           wetland: Gwlyptir


@@ -1971,6 +2010,7 @@ cy:
           allotments: Rhandiroedd
           pitch: Cae chwaraeon
           centre: Canolfan chwaraeon
           allotments: Rhandiroedd
           pitch: Cae chwaraeon
           centre: Canolfan chwaraeon

+          beach: Traeth

           reserve: Gwarchodfa natur
           military: Ardal filwrol
           school: Ysgol
           reserve: Gwarchodfa natur
           military: Ardal filwrol
           school: Ysgol


@@ -2013,8 +2053,8 @@ cy:
         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.
         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
+        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 lwybr, fel enw bwyty neu

           derfyn cyflymder ffordd.
         editor: golygydd
         node: nod
           derfyn cyflymder ffordd.
         editor: golygydd
         node: nod


@@ -2025,6 +2065,7 @@ cy:
         imports: Mewnforion
         automated_edits: Golygiadau Awtomatig
       start_mapping: Dechrau Mapio
         imports: Mewnforion
         automated_edits: Golygiadau Awtomatig
       start_mapping: Dechrau Mapio

+      continue_authorization: Parhau Awdurdodi

       add_a_note:
         title: Dim amser i olygu? Ychwanegwch nodyn!
         the_map: map
       add_a_note:
         title: Dim amser i olygu? Ychwanegwch nodyn!
         the_map: map


@@ -2126,7 +2167,7 @@ cy:
     settings_menu:
       account_settings: Gosodiadau Cyfrif
       oauth1_settings: Gosodiadau OAuth 1
     settings_menu:
       account_settings: Gosodiadau Cyfrif
       oauth1_settings: Gosodiadau OAuth 1

-      oauth2_applications: Ceisiadau OAuth 2
+      oauth2_applications: Apiau OAuth 2

       oauth2_authorizations: Awdurdodiadau OAuth 2
   oauth:
     authorize:
       oauth2_authorizations: Awdurdodiadau OAuth 2
   oauth:
     authorize:


@@ -2149,7 +2190,7 @@ cy:
       denied: Rydych wedi gwrthod mynediad i'ch cyfrif gan y rhaglen %{app_name}.
       invalid: Nid yw'r tocyn awdurdodiad yn ddilys.
     revoke:
       denied: Rydych wedi gwrthod mynediad i'ch cyfrif gan y rhaglen %{app_name}.
       invalid: Nid yw'r tocyn awdurdodiad yn ddilys.
     revoke:

-      flash: Rydych wedi diddymu'r tocyn ar gyfer %{application}.
+      flash: Rydych chi wedi dirymu'r tocyn ar gyfer %{application}.

     scopes:
       openid: Mewngofnodi ag OpenStreetMap
       read_prefs: Darllen dewisiadau defnyddwyr
     scopes:
       openid: Mewngofnodi ag OpenStreetMap
       read_prefs: Darllen dewisiadau defnyddwyr


@@ -2163,9 +2204,9 @@ cy:
       skip_authorization: Cymeradwyo cais yn awtomatig
   oauth_clients:
     new:
       skip_authorization: Cymeradwyo cais yn awtomatig
   oauth_clients:
     new:

-      title: Cofrestru rhaglen newydd
+      title: Cofrestru ap newydd

     edit:
     edit:

-      title: Golygu'ch rhaglen
+      title: Golygu eich ap

     show:
       title: Manylion OAuth ar gyfer %{app_name}
       key: 'Allwedd Defnyddiwr:'
     show:
       title: Manylion OAuth ar gyfer %{app_name}
       key: 'Allwedd Defnyddiwr:'


@@ -2203,14 +2244,20 @@ cy:
       client_id: ID Cleient
       client_secret: Cyfrinach Cleient
       permissions: Caniatadau
       client_id: ID Cleient
       client_secret: Cyfrinach Cleient
       permissions: Caniatadau

+      redirect_uris: Ailgyfeirio URIs

   oauth2_authorizations:
     new:
       authorize: Awdurdodi
       deny: Gwrthod
   oauth2_authorizations:
     new:
       authorize: Awdurdodi
       deny: Gwrthod

+    show:
+      title: Cod awdurdodi

   oauth2_authorized_applications:
     index:
   oauth2_authorized_applications:
     index:

+      title: Fy Apiau Awdurdodedig

       application: Ap
       permissions: Caniatadau
       application: Ap
       permissions: Caniatadau

+    application:
+      revoke: Dirymu Mynediad

   users:
     new:
       title: Cofrestru
   users:
     new:
       title: Cofrestru


@@ -2291,6 +2338,7 @@ cy:
           importer: Tynnu statws mewnforiwr
       block_history: Blociau Gweithredol
       moderator_history: Blociau a roddwyd
           importer: Tynnu statws mewnforiwr
       block_history: Blociau Gweithredol
       moderator_history: Blociau a roddwyd

+      revoke_all_blocks: Dirymu pob bloc

       comments: Sylwadau
       create_block: Rhwystro'r Defnyddiwr hwn
       activate_user: Gwneud y cyfri'n fyw
       comments: Sylwadau
       create_block: Rhwystro'r Defnyddiwr hwn
       activate_user: Gwneud y cyfri'n fyw


@@ -2340,6 +2388,8 @@ cy:
       empty: Dim blociau eto.
     revoke:
       revoke: Dad-flocio!
       empty: Dim blociau eto.
     revoke:
       revoke: Dad-flocio!

+    revoke_all:
+      revoke: Dad-flocio!

     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.


@@ -2505,7 +2555,6 @@ cy:
         transport_map: Map Trafnidiaeth
         tracestracktop_topo: Tracestrack Topo
         hot: Dyngarol
         transport_map: Map Trafnidiaeth
         tracestracktop_topo: Tracestrack Topo
         hot: Dyngarol

-        opnvkarte: ÖPNVKarte

       layers:
         header: Haenau Map
         notes: Nodiadau Map
       layers:
         header: Haenau Map
         notes: Nodiadau Map


@@ -2520,8 +2569,6 @@ cy:
       osm_france: OpenStreetMap Ffrainc
       thunderforest_credit: Teils trwy garedigrwydd %{thunderforest_link}
       andy_allan: Andy Allan
       osm_france: OpenStreetMap Ffrainc
       thunderforest_credit: Teils trwy garedigrwydd %{thunderforest_link}
       andy_allan: Andy Allan

-      opnvkarte_credit: Teils trwy garedigrwydd %{memomaps_link}
-      memomaps: MeMoMaps

       tracestrack_credit: Teils trwy garedigrwydd %{tracestrack_link}
       hotosm_credit: Arddull teils gan %{hotosm_link} a gynhelir gan %{osm_france_link}
       hotosm_name: Tîm Dyngarol OpenStreetMap
       tracestrack_credit: Teils trwy garedigrwydd %{tracestrack_link}
       hotosm_credit: Arddull teils gan %{hotosm_link} a gynhelir gan %{osm_france_link}
       hotosm_name: Tîm Dyngarol OpenStreetMap


@@ -2570,6 +2617,8 @@ cy:
         stay_roundabout_without_exit: Aros ar gylchfan - %{name}
         start_without_exit: Dechreuwch ar %{name}
         destination_without_exit: Wedi cyrraedd cyrchfan
         stay_roundabout_without_exit: Aros ar gylchfan - %{name}
         start_without_exit: Dechreuwch ar %{name}
         destination_without_exit: Wedi cyrraedd cyrchfan

+        against_oneway_without_exit: Mynd yn erbyn unffordd ar %{name}
+        end_oneway_without_exit: Diwedd unffordd ar %{name}

         exit_roundabout: Gadael y gylchfan i %{name}
         unnamed: ffordd heb enw
         courtesy: Cyfarwyddiadau trwy garedigrwydd %{link}
         exit_roundabout: Gadael y gylchfan i %{name}
         unnamed: ffordd heb enw
         courtesy: Cyfarwyddiadau trwy garedigrwydd %{link}

diff --git a/config/locales/da.yml b/config/locales/da.yml
index a46e357a823e871eda5995bcb7ddc74fded03142..4c787bd50e46b578d5cf22cdd67b908bd62b380d 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -3148,7 +3148,6 @@ da:
         transport_map: Transportkort
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitær
         transport_map: Transportkort
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitær

-        opnvkarte: Offentlig transport

       layers:
         header: Kortlag
         notes: Kortbemærkninger
       layers:
         header: Kortlag
         notes: Kortbemærkninger


@@ -3163,8 +3162,6 @@ da:
       osm_france: OpenStreetMap Frankrig
       thunderforest_credit: Kortfliser stillet til rådighed af %{thunderforest_link}
       andy_allan: Andy Allan
       osm_france: OpenStreetMap Frankrig
       thunderforest_credit: Kortfliser stillet til rådighed af %{thunderforest_link}
       andy_allan: Andy Allan

-      opnvkarte_credit: Kortfliser stillet til rådighed af %{memomaps_link}
-      memomaps: MeMoMaps

       tracestrack_credit: Kortfliser stillet til rådighed af %{tracestrack_link}
       hotosm_credit: Kortflise-stil af %{hotosm_link} hostet af %{osm_france_link}
       hotosm_name: Humanitarian OpenStreetMap Team
       tracestrack_credit: Kortfliser stillet til rådighed af %{tracestrack_link}
       hotosm_credit: Kortflise-stil af %{hotosm_link} hostet af %{osm_france_link}
       hotosm_name: Humanitarian OpenStreetMap Team

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 4f7df13b71da621adec51cbbeb90748b7ff2ab84..16ca737d732e23060508f1080fd8334b72370cf3 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1740,7 +1740,7 @@ de:
       loaded:
         one: mit %{trace_points} von einem möglichen Punkt erfolgreich geladen.
         other: mit %{trace_points} von %{count} möglichen Punkten erfolgreich geladen.
       loaded:
         one: mit %{trace_points} von einem möglichen Punkt erfolgreich geladen.
         other: mit %{trace_points} von %{count} möglichen Punkten erfolgreich geladen.

-      all_your_traces_html: Alle deiner erfolgreich hochgeladenen GPX-Traces findest
+      all_your_traces_html: Alle deine erfolgreich hochgeladenen GPX-Traces findest

         du unter %{url}.
       subject: '[OpenStreetMap] GPX-Import erfolgreich'
     signup_confirm:
         du unter %{url}.
       subject: '[OpenStreetMap] GPX-Import erfolgreich'
     signup_confirm:


@@ -1967,7 +1967,7 @@ de:
         möglicherweise vertippt oder du bist einem ungültigem Link gefolgt.
     update:
       flash changed: Dein Passwort wurde geändert.
         möglicherweise vertippt oder du bist einem ungültigem Link gefolgt.
     update:
       flash changed: Dein Passwort wurde geändert.

-      flash token bad: Das Token konnte nicht gefundenw werden, überprüfe bitte die
+      flash token bad: Das Token konnte nicht gefunden werden, überprüfe bitte die

         URL.
   preferences:
     show:
         URL.
   preferences:
     show:


@@ -2546,7 +2546,7 @@ de:
         real_and_current: real und aktuell
         off_the_map_html: Was es %{doesnt} enthält, sind Meinungsdaten wie Bewertungen,
           historische oder hypothetische Merkmale und Daten aus urheberrechtlich geschützten
         real_and_current: real und aktuell
         off_the_map_html: Was es %{doesnt} enthält, sind Meinungsdaten wie Bewertungen,
           historische oder hypothetische Merkmale und Daten aus urheberrechtlich geschützten

-          Quellen. Kopiere nicht von Online- oder Papierkarten, es sei denn, du haben
+          Quellen. Kopiere nicht von Online- oder Papierkarten, es sei denn, du hast

           eine Sondergenehmigung.
         doesnt: nicht
       basic_terms:
           eine Sondergenehmigung.
         doesnt: nicht
       basic_terms:


@@ -3238,7 +3238,7 @@ de:
       reactivate: Reaktivieren
       comment_and_resolve: Kommentieren & Erledigen
       comment: Kommentieren
       reactivate: Reaktivieren
       comment_and_resolve: Kommentieren & Erledigen
       comment: Kommentieren

-      log_in_to_comment: Melden dich an, um diesen Hinweis zu kommentieren
+      log_in_to_comment: Melde dich an, um diesen Hinweis zu kommentieren

       report_link_html: Wenn diese Notiz sensible Informationen enthält, die entfernt
         werden müssen, kannst du %{link}.
       other_problems_resolve: Für alle anderen Probleme mit dem Hinweis, erledige
       report_link_html: Wenn diese Notiz sensible Informationen enthält, die entfernt
         werden müssen, kannst du %{link}.
       other_problems_resolve: Für alle anderen Probleme mit dem Hinweis, erledige


@@ -3303,7 +3303,6 @@ de:
         transport_map: Verkehrskarte
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitär
         transport_map: Verkehrskarte
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitär

-        opnvkarte: ÖPNVKarte

       layers:
         header: Kartenebenen
         notes: Hinweise/Fehlermeldungen
       layers:
         header: Kartenebenen
         notes: Hinweise/Fehlermeldungen


@@ -3318,8 +3317,6 @@ de:
       osm_france: OpenStreetMap Frankreich
       thunderforest_credit: Kacheln mit freundlicher Genehmigung von %{thunderforest_link}
       andy_allan: Andy Allan
       osm_france: OpenStreetMap Frankreich
       thunderforest_credit: Kacheln mit freundlicher Genehmigung von %{thunderforest_link}
       andy_allan: Andy Allan

-      opnvkarte_credit: Kacheln mit freundlicher Genehmigung von %{memomaps_link}
-      memomaps: MeMoMaps

       tracestrack_credit: Kacheln mit freundlicher Genehmigung von %{tracestrack_link}
       hotosm_credit: Kachelstil von %{hotosm_link}, gehostet von %{osm_france_link}
       hotosm_name: Humanitäres OpenStreetMap Team
       tracestrack_credit: Kacheln mit freundlicher Genehmigung von %{tracestrack_link}
       hotosm_credit: Kachelstil von %{hotosm_link}, gehostet von %{osm_france_link}
       hotosm_name: Humanitäres OpenStreetMap Team

diff --git a/config/locales/el.yml b/config/locales/el.yml
index eceb4cc1b5f04fdac27bbd7696e88a4d2da5d970..f52dab6f2d3faeabbcf5a62f0a46ebf8e1202ccd 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -3189,7 +3189,6 @@ el:
         transport_map: Συγκοινωνία
         tracestracktop_topo: Tracetrack Topo
         hot: Ανθρωπιστικός
         transport_map: Συγκοινωνία
         tracestracktop_topo: Tracetrack Topo
         hot: Ανθρωπιστικός

-        opnvkarte: ÖPNVKarte συγκοινωνίες

       layers:
         header: Στρώματα
         notes: Σημειώσεις χάρτη
       layers:
         header: Στρώματα
         notes: Σημειώσεις χάρτη


@@ -3204,8 +3203,6 @@ el:
       osm_france: OpenStreetMap Γαλλίας
       thunderforest_credit: Πλακίδια ευγενική προσφορά του %{thunderforest_link}
       andy_allan: Andy Allan
       osm_france: OpenStreetMap Γαλλίας
       thunderforest_credit: Πλακίδια ευγενική προσφορά του %{thunderforest_link}
       andy_allan: Andy Allan

-      opnvkarte_credit: Πλακίδια ευγενική προσφορά του %{memomaps_link}
-      memomaps: MeMoMaps

       tracestrack_credit: Πλακίδια ευγενική προσφορά του %{tracestrack_link}
       hotosm_credit: Στυλ πλακιδίων από %{hotosm_link} φιλοξενημένο από %{osm_france_link}
       hotosm_name: Humanitarian OpenStreetMap Team
       tracestrack_credit: Πλακίδια ευγενική προσφορά του %{tracestrack_link}
       hotosm_credit: Στυλ πλακιδίων από %{hotosm_link} φιλοξενημένο από %{osm_france_link}
       hotosm_name: Humanitarian OpenStreetMap Team

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 22025511c0484811a09ebd4eb44ccc670349d8d9..f41621aa9c5af6d2edd07d2fdc23e6283b0f19ea 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -3110,7 +3110,6 @@ eo:
         transport_map: Transporta mapo
         tracestracktop_topo: Topografia mapo
         hot: Hom-helpa mapo
         transport_map: Transporta mapo
         tracestracktop_topo: Topografia mapo
         hot: Hom-helpa mapo

-        opnvkarte: ÖPNVKarte

       layers:
         header: Tavoloj de mapo
         notes: Map-rimarkoj
       layers:
         header: Tavoloj de mapo
         notes: Map-rimarkoj


@@ -3125,8 +3124,6 @@ eo:
       osm_france: OpenStreetMap France
       thunderforest_credit: Kaheloj danke al %{thunderforest_link}
       andy_allan: Andy ALLAN
       osm_france: OpenStreetMap France
       thunderforest_credit: Kaheloj danke al %{thunderforest_link}
       andy_allan: Andy ALLAN

-      opnvkarte_credit: Kaheloj danke al %{memomaps_link}
-      memomaps: MeMoMaps

       tracestrack_credit: Kaheloj danke al %{tracestrack_link}
       hotosm_credit: 'Stilo de kaheloj: %{hotosm_link}, retgastigo: %{osm_france_link}'
       hotosm_name: HOTOSM
       tracestrack_credit: Kaheloj danke al %{tracestrack_link}
       hotosm_credit: 'Stilo de kaheloj: %{hotosm_link}, retgastigo: %{osm_france_link}'
       hotosm_name: HOTOSM

diff --git a/config/locales/es.yml b/config/locales/es.yml
index ee6e3a3a244a5e62ba1417fb81da34c1e164a202..656a9d199adb2fc9a90a0052d69ac220527d42d0 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -3269,7 +3269,6 @@ es:
         transport_map: Mapa de transporte
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitario
         transport_map: Mapa de transporte
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitario

-        opnvkarte: ÖPNVKarte

       layers:
         header: Capas del mapa
         notes: Notas del mapa
       layers:
         header: Capas del mapa
         notes: Notas del mapa


@@ -3285,8 +3284,6 @@ es:
       osm_france: OpenStreetMap Francia
       thunderforest_credit: Teselas cortesía de %{thunderforest_link}
       andy_allan: Andy Allan
       osm_france: OpenStreetMap Francia
       thunderforest_credit: Teselas cortesía de %{thunderforest_link}
       andy_allan: Andy Allan

-      opnvkarte_credit: Teselas cortesía de %{memomaps_link}
-      memomaps: MeMoMaps

       tracestrack_credit: Teselas cortesía de %{tracestrack_link}
       hotosm_credit: Estilo de teselas por %{hotosm_link} alojados por %{osm_france_link}
       hotosm_name: Equipo humanitario de OpenStreetMap
       tracestrack_credit: Teselas cortesía de %{tracestrack_link}
       hotosm_credit: Estilo de teselas por %{hotosm_link} alojados por %{osm_france_link}
       hotosm_name: Equipo humanitario de OpenStreetMap

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 659a88876f33780c517e14e1f50d6ccbe5aaf783..6e2908a4deba539c9645d8c06cb84a4d1cd23a7c 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -2887,7 +2887,6 @@ eu:
         cycle_map: Bizikletentzako mapa
         transport_map: Garraioen mapa
         hot: Humanitarioa
         cycle_map: Bizikletentzako mapa
         transport_map: Garraioen mapa
         hot: Humanitarioa

-        opnvkarte: ÖPNVKarte

       layers:
         header: Maparen geruzak
         notes: Maparen oharrak
       layers:
         header: Maparen geruzak
         notes: Maparen oharrak


@@ -2900,7 +2899,6 @@ eu:
       website_and_api_terms: Webgunearen eta APIaren baldintzak
       osm_france: OpenStreetMap Frantzia
       andy_allan: Andy Allan
       website_and_api_terms: Webgunearen eta APIaren baldintzak
       osm_france: OpenStreetMap Frantzia
       andy_allan: Andy Allan

-      memomaps: MeMoMaps

       hotosm_name: OpenStreetMap Talde humanitarioa
     site:
       edit_tooltip: Editatu mapa
       hotosm_name: OpenStreetMap Talde humanitarioa
     site:
       edit_tooltip: Editatu mapa

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 6fa9f36ef7850020d9cb13f6a888d9e4618a5d6c..6c6c4ac922b6d2a0e63eb26c078f013f7769503c 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1763,7 +1763,7 @@ fa:
     new:
       title: فراموشی رمز عبور
       heading: رمز عبور خودتان را فراموش کرده‌اید؟
     new:
       title: فراموشی رمز عبور
       heading: رمز عبور خودتان را فراموش کرده‌اید؟

-      email address: 'نشانی رایانامه:'
+      email address: نشانی رایانامه

       new password button: بازنشانی رمز عبور
       help_text: رایانامه‌ای که با آن نام‌نویسی کرده‌اید را وارد کنید. ما پیوندی به
         آن می‌فرستیم تا بتوانید به وسیلهٔ آن گذرواژه‌تان را بازنشانی کنید.
       new password button: بازنشانی رمز عبور
       help_text: رایانامه‌ای که با آن نام‌نویسی کرده‌اید را وارد کنید. ما پیوندی به
         آن می‌فرستیم تا بتوانید به وسیلهٔ آن گذرواژه‌تان را بازنشانی کنید.


@@ -1820,8 +1820,8 @@ fa:
     new:
       title: ورود
       heading: ورود
     new:
       title: ورود
       heading: ورود

-      email or username: 'نشانی رایانامه یا نام کاربری:'
-      password: 'رمز عبور:'
+      email or username: نشانی رایانامه یا نام کاربری
+      password: رمز عبور

       openid_html: '%{logo} OpenID:'
       remember: مرا به خاطر بسپار
       lost password link: رمز عبورتان را فراموش کرده‌اید؟
       openid_html: '%{logo} OpenID:'
       remember: مرا به خاطر بسپار
       lost password link: رمز عبورتان را فراموش کرده‌اید؟

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index b362cdfe5b44b01c9d110ef4edfefb26f03f3012..6af0bca939091c1f284ea44840f902ac86819aa4 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1775,7 +1775,7 @@ fi:
     new:
       title: Unohtunut salasana
       heading: Unohditko salasanasi?
     new:
       title: Unohtunut salasana
       heading: Unohditko salasanasi?

-      email address: 'Sähköpostiosoite:'
+      email address: Sähköpostiosoite

       new password button: Lähetä salasanan palautusohjeet
       help_text: Kirjoita alapuolelle kirjautumissähköpostiosoitteesi. Osoitteeseen
         lähetetään salasanan palautusohjeet.
       new password button: Lähetä salasanan palautusohjeet
       help_text: Kirjoita alapuolelle kirjautumissähköpostiosoitteesi. Osoitteeseen
         lähetetään salasanan palautusohjeet.


@@ -1833,9 +1833,9 @@ fi:
     new:
       title: Kirjautumissivu
       heading: Kirjaudu
     new:
       title: Kirjautumissivu
       heading: Kirjaudu

-      email or username: 'Sähköpostiosoite tai käyttäjätunnus:'
-      password: 'Salasana:'
-      openid_html: '%{logo} OpenID:'
+      email or username: Sähköpostiosoite tai käyttäjätunnus
+      password: Salasana
+      openid_html: '%{logo} OpenID'

       remember: Pidä minut sisäänkirjautuneena
       lost password link: Unohditko salasanasi?
       login_button: Kirjaudu sisään
       remember: Pidä minut sisäänkirjautuneena
       lost password link: Unohditko salasanasi?
       login_button: Kirjaudu sisään


@@ -2180,21 +2180,32 @@ fi:
           primary: Kantatie
           secondary: Seututie
           unclassified: Luokittelematon tie
           primary: Kantatie
           secondary: Seututie
           unclassified: Luokittelematon tie

+          pedestrian: Jalkakäytävä

           track: Metsätie
           bridleway: Ratsastustie
           cycleway: Pyörätie
           cycleway_national: Kansallinen pyörätie
           cycleway_regional: Alueellinen pyörätie
           cycleway_local: Paikallinen pyörätie
           track: Metsätie
           bridleway: Ratsastustie
           cycleway: Pyörätie
           cycleway_national: Kansallinen pyörätie
           cycleway_regional: Alueellinen pyörätie
           cycleway_local: Paikallinen pyörätie

+          cycleway_mtb: Maastopyöräreitti

           footway: Jalkakäytävä
           rail: Junarata
           footway: Jalkakäytävä
           rail: Junarata

+          train: Juna

           subway: Metro
           subway: Metro

+          ferry: Lautta
+          light_rail: Pikaraitiotie
+          tram: Raitiovaunu
+          trolleybus: Johdinauto
+          bus: Bussi

           cable_car: Köysirata
           cable_car: Köysirata

-          chair_lift: tuolihissi
+          chair_lift: Tuolihissi

           runway: Lentokentän kiitotie
           runway: Lentokentän kiitotie

-          taxiway: rullaustie
+          taxiway: Rullaustie

           apron: Lentokentän asemataso
           admin: Hallinnollinen raja
           apron: Lentokentän asemataso
           admin: Hallinnollinen raja

+          capital: Pääkaupunki
+          city: Kaupunki
+          vineyard: Viinitarha

           forest: Talousmetsä
           wood: Metsä
           golf: Golfkenttä
           forest: Talousmetsä
           wood: Metsä
           golf: Golfkenttä


@@ -2206,7 +2217,7 @@ fi:
           commercial: Toimistoalue
           heathland: Kanervikko
           lake: Järvi
           commercial: Toimistoalue
           heathland: Kanervikko
           lake: Järvi

-          reservoir: tekojärvi
+          reservoir: Tekojärvi

           farm: Maatila
           brownfield: Purettujen rakennusten alue
           cemetery: Hautausmaa
           farm: Maatila
           brownfield: Purettujen rakennusten alue
           cemetery: Hautausmaa


@@ -2216,18 +2227,21 @@ fi:
           reserve: Luonnonsuojelualue
           military: Sotilasalue
           school: Koulu
           reserve: Luonnonsuojelualue
           military: Sotilasalue
           school: Koulu

-          university: yliopisto
+          university: Yliopisto
+          hospital: Sairaala

           building: Merkittävä rakennus
           station: Rautatieasema
           summit: Vuorenhuippu
           building: Merkittävä rakennus
           station: Rautatieasema
           summit: Vuorenhuippu

-          peak: huippu
+          peak: Huippu

           tunnel: Katkoviivallinen kehys = tunneli
           bridge: Musta kehys = silta
           private: Yksityinen
           destination: Ei läpikulkua
           construction: Rakenteilla olevia teitä
           tunnel: Katkoviivallinen kehys = tunneli
           bridge: Musta kehys = silta
           private: Yksityinen
           destination: Ei läpikulkua
           construction: Rakenteilla olevia teitä

+          bus_stop: Bussipysäkki

           bicycle_shop: Pyöräkauppa
           bicycle_parking: Pyöräparkki
           bicycle_shop: Pyöräkauppa
           bicycle_parking: Pyöräparkki

+          bicycle_parking_small: Pieni pyöräparkki

           toilets: Vessat
     welcome:
       title: Tervetuloa!
           toilets: Vessat
     welcome:
       title: Tervetuloa!


@@ -2774,6 +2788,16 @@ fi:
       showing_page: Sivu %{page}
       next: Seuraava »
       previous: « Edellinen
       showing_page: Sivu %{page}
       next: Seuraava »
       previous: « Edellinen

+  user_mutes:
+    index:
+      table:
+        tbody:
+          send_message: Lähetä viesti
+    create:
+      notice: Mykistit käyttäjän %{name}.
+      error: Käyttäjää %{name} ei voitu mykistää. %{full_message}.
+    destroy:
+      notice: Poistit mykistyksen käyttäjältä %{name}.

   notes:
     index:
       title: Käyttäjän %{user} kommentoimat ja luomat huomautukset
   notes:
     index:
       title: Käyttäjän %{user} kommentoimat ja luomat huomautukset


@@ -2865,7 +2889,6 @@ fi:
         cycle_map: Pyöräilykartta
         transport_map: Joukkoliikenne
         hot: Humanitaarinen
         cycle_map: Pyöräilykartta
         transport_map: Joukkoliikenne
         hot: Humanitaarinen

-        opnvkarte: ÖPNVKarte

       layers:
         header: Karttanäkymä
         notes: Karttailmoitukset
       layers:
         header: Karttanäkymä
         notes: Karttailmoitukset


@@ -2879,7 +2902,6 @@ fi:
       cyclosm_credit: 'Laattojen tyyli: %{osm_france_link} ylläpitämä %{cyclosm_link}'
       osm_france: OpenStreetMap Francen
       thunderforest_credit: Laattojen tekijä %{thunderforest_link}
       cyclosm_credit: 'Laattojen tyyli: %{osm_france_link} ylläpitämä %{cyclosm_link}'
       osm_france: OpenStreetMap Francen
       thunderforest_credit: Laattojen tekijä %{thunderforest_link}

-      opnvkarte_credit: Laattojen tekijä %{memomaps_link}

       hotosm_credit: 'Laattojen tyyli: %{osm_france_link} ylläpitämä %{hotosm_link}'
     site:
       edit_tooltip: Muokkaa karttaa
       hotosm_credit: 'Laattojen tyyli: %{osm_france_link} ylläpitämä %{hotosm_link}'
     site:
       edit_tooltip: Muokkaa karttaa

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index eef299dc3460806379c95386258800b10bc4f34e..5034cb13d09c094e6248ba28fa89f53a1d5878f8 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -3291,7 +3291,6 @@ fr:
         transport_map: Carte de transport
         tracestracktop_topo: Topo de Tracestack
         hot: Humanitaire
         transport_map: Carte de transport
         tracestracktop_topo: Topo de Tracestack
         hot: Humanitaire

-        opnvkarte: ÖPNVKarte

       layers:
         header: Couches de carte
         notes: Notes de carte
       layers:
         header: Couches de carte
         notes: Notes de carte


@@ -3306,8 +3305,6 @@ fr:
       osm_france: OpenStreetMap France
       thunderforest_credit: Carreaux fournis aimablement par %{thunderforest_link}
       andy_allan: Andy Allan
       osm_france: OpenStreetMap France
       thunderforest_credit: Carreaux fournis aimablement par %{thunderforest_link}
       andy_allan: Andy Allan

-      opnvkarte_credit: Carreaux fournis aimablement par %{memomaps_link}
-      memomaps: MeMoMaps

       tracestrack_credit: Carreaux fournis aimablement par %{tracestrack_link}
       hotosm_credit: Style de carreaux par %{hotosm_link} hébergé par %{osm_france_link}
       hotosm_name: L’Équipe OpenStreetMap Humanitaire
       tracestrack_credit: Carreaux fournis aimablement par %{tracestrack_link}
       hotosm_credit: Style de carreaux par %{hotosm_link} hébergé par %{osm_france_link}
       hotosm_name: L’Équipe OpenStreetMap Humanitaire

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index d30991d992e4e94e3af4535127d732655a76bd27..f4035fff1af1ebdebb86d7d95aeb7c48dc33772a 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -1810,8 +1810,6 @@ fur:
       osm_france: OpenStreetMap France
       thunderforest_credit: Tassei par gentîl concession di %{thunderforest_link}
       andy_allan: Andy Allan
       osm_france: OpenStreetMap France
       thunderforest_credit: Tassei par gentîl concession di %{thunderforest_link}
       andy_allan: Andy Allan

-      opnvkarte_credit: Tassei par gentîl concession di %{memomaps_link}
-      memomaps: MeMoMaps

       tracestrack_credit: Tassei par gentîl concession di %{tracestrack_link}
       hotosm_credit: Stîl dai tassei di %{hotosm_link} ospitât di %{osm_france_link}
       hotosm_name: La clape umanitare di OpenStreetMap
       tracestrack_credit: Tassei par gentîl concession di %{tracestrack_link}
       hotosm_credit: Stîl dai tassei di %{hotosm_link} ospitât di %{osm_france_link}
       hotosm_name: La clape umanitare di OpenStreetMap

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index f270dd74206488f6ee798abd0eb054e47751c989..0b3d226e54efda80dad7ae64f3fa48fa92c8884f 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -2665,7 +2665,6 @@ fy:
         cycle_map: Fytskaart
         transport_map: Ferfierskaart
         hot: Humanitêr
         cycle_map: Fytskaart
         transport_map: Ferfierskaart
         hot: Humanitêr

-        opnvkarte: Ferfiermiddels

       layers:
         header: Kaartlagen
         notes: Kaartnotysjes
       layers:
         header: Kaartlagen
         notes: Kaartnotysjes

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 3411ce22487307583ba20dea762ea43d25fc2d2f..9d53bbfdd70556a9cd6019af6447e0823dcb06c2 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -58,6 +58,8 @@ gl:
       messages:
         invalid_email_address: non semella ser un enderezo de correo electrónico válido
         email_address_not_routable: non é atinxíbel
       messages:
         invalid_email_address: non semella ser un enderezo de correo electrónico válido
         email_address_not_routable: non é atinxíbel

+        display_name_is_user_n: non pode ser user_n agás que n sexa o teu identificador
+          de usuario

       models:
         user_mute:
           is_already_muted: xa está silenciado
       models:
         user_mute:
           is_already_muted: xa está silenciado


@@ -1851,7 +1853,7 @@ gl:
     new:
       title: Contrasinal perdido
       heading: Esqueciches o contrasinal?
     new:
       title: Contrasinal perdido
       heading: Esqueciches o contrasinal?

-      email address: 'Enderezo de correo electrónico:'
+      email address: Enderezo de correo electrónico

       new password button: Restablecer o contrasinal
       help_text: Escribe o enderezo de correo electrónico que empregaches para te
         rexistrares. Enviarémosche unha ligazón que poderás empregar para restablecer
       new password button: Restablecer o contrasinal
       help_text: Escribe o enderezo de correo electrónico que empregaches para te
         rexistrares. Enviarémosche unha ligazón que poderás empregar para restablecer


@@ -1914,8 +1916,8 @@ gl:
     new:
       title: Rexistrarse
       heading: Rexistro
     new:
       title: Rexistrarse
       heading: Rexistro

-      email or username: 'Enderezo de correo electrónico ou nome de usuario:'
-      password: 'Contrasinal:'
+      email or username: Enderezo de correo electrónico ou nome de usuario
+      password: Contrasinal

       openid_html: '%{logo} OpenID:'
       remember: Lembrádeme
       lost password link: Perdiches o teu contrasinal?
       openid_html: '%{logo} OpenID:'
       remember: Lembrádeme
       lost password link: Perdiches o teu contrasinal?


@@ -3176,7 +3178,6 @@ gl:
         transport_map: Transporte
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitario
         transport_map: Transporte
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitario

-        opnvkarte: ÖPNVKarte (Transporte)

       layers:
         header: Capas do mapa
         notes: Notas do mapa
       layers:
         header: Capas do mapa
         notes: Notas do mapa


@@ -3191,8 +3192,6 @@ gl:
       osm_france: OpenStreetMap Francia
       thunderforest_credit: Mosaicos cortesía de %{thunderforest_link}
       andy_allan: Andy Allan
       osm_france: OpenStreetMap Francia
       thunderforest_credit: Mosaicos cortesía de %{thunderforest_link}
       andy_allan: Andy Allan

-      opnvkarte_credit: Mosaicos cortesía de %{memomaps_link}
-      memomaps: MeMoMaps

       tracestrack_credit: Mosaicos cortesía de %{tracestrack_link}
       hotosm_credit: Estilo de mosaicos do %{hotosm_link} aloxado por %{osm_france_link}
       hotosm_name: equipo humanitario do OpenStreetMap
       tracestrack_credit: Mosaicos cortesía de %{tracestrack_link}
       hotosm_credit: Estilo de mosaicos do %{hotosm_link} aloxado por %{osm_france_link}
       hotosm_name: equipo humanitario do OpenStreetMap

diff --git a/config/locales/he.yml b/config/locales/he.yml
index ab32d78fdcf461166eb75743316f74998b8b4624..0bb2dc9efd872057aea905b0ea07ccaf758ab5bd 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -3154,7 +3154,6 @@ he:
         transport_map: מפת תחבורה
         tracestracktop_topo: טופוגרפיה של Tracestrack
         hot: הומניטרי
         transport_map: מפת תחבורה
         tracestracktop_topo: טופוגרפיה של Tracestrack
         hot: הומניטרי

-        opnvkarte: ÖPNVKarte

       layers:
         header: שכבות במפה
         notes: הערות במפה
       layers:
         header: שכבות במפה
         notes: הערות במפה


@@ -3169,8 +3168,6 @@ he:
       osm_france: OpenStreetMap צרפת
       thunderforest_credit: אריחים באדיבות %{thunderforest_link}
       andy_allan: אנדי אלן
       osm_france: OpenStreetMap צרפת
       thunderforest_credit: אריחים באדיבות %{thunderforest_link}
       andy_allan: אנדי אלן

-      opnvkarte_credit: אריחים באדיבות %{memomaps_link}
-      memomaps: ממומאפס

       tracestrack_credit: האריחים באדיבות %{tracestrack_link}
       hotosm_credit: סגנון אריחים מאת %{hotosm_link} מתארח אצל %{osm_france_link}
       hotosm_name: צוות OpenStreetMap הומניטרי
       tracestrack_credit: האריחים באדיבות %{tracestrack_link}
       hotosm_credit: סגנון אריחים מאת %{hotosm_link} מתארח אצל %{osm_france_link}
       hotosm_name: צוות OpenStreetMap הומניטרי

diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 3d457f3ce88559bc08ffee9f8dc8c8f22da0c995..bd68389fae806ba62d8314e6e1f5adc04c8694fe 100644 (file)
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -944,6 +944,9 @@ hi:
       home location: घर का स्थान
       show: दिखाएँ
       delete: हटाएँ
       home location: घर का स्थान
       show: दिखाएँ
       delete: हटाएँ

+  sessions:
+    new:
+      password: पासवर्ड

   site:
     about:
       legal_1_1_terms_of_use: उपयोग की शर्तें
   site:
     about:
       legal_1_1_terms_of_use: उपयोग की शर्तें

diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 14887dc76e8eadb8f0fda5e5d68fde03a909e853..af2921f85220aba58a373f4b9bc07b17ac5f3fb9 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -2621,7 +2621,6 @@ hsb:
         cycle_map: Kolesowa karta
         transport_map: Wobchadna karta
         hot: Sobuskutkowacy humanitarneje pomocy
         cycle_map: Kolesowa karta
         transport_map: Wobchadna karta
         hot: Sobuskutkowacy humanitarneje pomocy

-        opnvkarte: ÖPNVKarte

       layers:
         header: Kartowe runiny
         notes: Pokazki
       layers:
         header: Kartowe runiny
         notes: Pokazki

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 1aa9661f5a0d1212eb2ededd90df398111b2ee86..36ab594aff98dedf4400e728c5e4f6e97cf462c3 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -3001,7 +3001,6 @@ hu:
         cycle_map: Kerékpártérkép
         transport_map: Tömegközlekedés
         hot: Humanitárius
         cycle_map: Kerékpártérkép
         transport_map: Tömegközlekedés
         hot: Humanitárius

-        opnvkarte: ÖPNVKarte (tömegközlekedés)

       layers:
         header: Térképnézetek
         notes: Térképjegyzetek
       layers:
         header: Térképnézetek
         notes: Térképjegyzetek

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 3493cc9b11c9d5ca2353e56b33b459712566d1ab..7b675604e00461e8ab041fdaaa40f8ae5b1d98a6 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -45,6 +45,10 @@ ia:
       messages:
         invalid_email_address: non pare esser un adresse de e-mail valide
         email_address_not_routable: non es attingibile
       messages:
         invalid_email_address: non pare esser un adresse de e-mail valide
         email_address_not_routable: non es attingibile

+        display_name_is_user_n: non pote esser user_n si n non es tu ID de usator
+      models:
+        user_mute:
+          is_already_muted: es ja silentiate

     models:
       acl: Lista de controlo de accesso
       changeset: Gruppo de modificationes
     models:
       acl: Lista de controlo de accesso
       changeset: Gruppo de modificationes


@@ -441,6 +445,15 @@ ia:
       introduction: Clicca sur le carta pro cercar objectos a proximitate.
       nearby: Objectos proxime
       enclosing: Objectos inglobante
       introduction: Clicca sur le carta pro cercar objectos a proximitate.
       nearby: Objectos proxime
       enclosing: Objectos inglobante

+  old_nodes:
+    not_found:
+      sorry: Guai, le version %{version} del nodo №%{id} non pote esser trovate.
+  old_ways:
+    not_found:
+      sorry: Guai, le version %{version} del via №%{id} non pote esser trovate.
+  old_relations:
+    not_found:
+      sorry: Guai, le version %{version} del relation №%{id} non pote esser trovate.

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


@@ -1635,6 +1648,8 @@ ia:
           puncto.
         other: ha essite cargate con successo con %{trace_points} ex un maximo de
           %{count} punctos.
           puncto.
         other: ha essite cargate con successo con %{trace_points} ex un maximo de
           %{count} punctos.

+      all_your_traces_html: Tote le tracias GPX que tu ha incargate con successo pote
+        esser trovate a %{url}.

       subject: '[OpenStreetMap] Importation GPX succedite'
     signup_confirm:
       subject: '[OpenStreetMap] Benvenite a OpenStreetMap'
       subject: '[OpenStreetMap] Importation GPX succedite'
     signup_confirm:
       subject: '[OpenStreetMap] Benvenite a OpenStreetMap'


@@ -1773,11 +1788,13 @@ ia:
       to: A
       subject: Subjecto
       date: Data
       to: A
       subject: Subjecto
       date: Data

+      actions: Actiones

     message_summary:
       unread_button: Marcar como non legite
       read_button: Marcar como legite
       reply_button: Responder
       destroy_button: Deler
     message_summary:
       unread_button: Marcar como non legite
       read_button: Marcar como legite
       reply_button: Responder
       destroy_button: Deler

+      unmute_button: Displaciar al cassa de entrata

     new:
       title: Inviar message
       send_message_to_html: Inviar un nove message a %{name}
     new:
       title: Inviar message
       send_message_to_html: Inviar un nove message a %{name}


@@ -1792,12 +1809,18 @@ ia:
       body: Non existe un message con iste ID.
     outbox:
       title: Cassa de exito
       body: Non existe un message con iste ID.
     outbox:
       title: Cassa de exito

+      actions: Actiones

       messages:
         one: Tu ha %{count} message inviate
         other: Tu ha %{count} messages inviate
       no_sent_messages_html: Tu non ha ancora inviate alcun message. Proque non contactar
         alcun %{people_mapping_nearby_link}?
       people_mapping_nearby: cartographos vicin
       messages:
         one: Tu ha %{count} message inviate
         other: Tu ha %{count} messages inviate
       no_sent_messages_html: Tu non ha ancora inviate alcun message. Proque non contactar
         alcun %{people_mapping_nearby_link}?
       people_mapping_nearby: cartographos vicin

+    muted:
+      title: Messages silentiate
+      messages:
+        one: '%{count message silentiate'
+        other: Tu ha %{count} messages silentiate

     reply:
       wrong_user: Tu es authenticate como "%{user}", ma le message al qual tu vole
         responder non ha essite inviate a iste usator. Per favor aperi un session
     reply:
       wrong_user: Tu es authenticate como "%{user}", ma le message al qual tu vole
         responder non ha essite inviate a iste usator. Per favor aperi un session


@@ -1816,16 +1839,20 @@ ia:
     heading:
       my_inbox: Mi cassa de entrata
       my_outbox: Mi cassa de exito
     heading:
       my_inbox: Mi cassa de entrata
       my_outbox: Mi cassa de exito

+      muted_messages: Messages silentiate

     mark:
       as_read: Message marcate como legite
       as_unread: Message marcate como non legite
     mark:
       as_read: Message marcate como legite
       as_unread: Message marcate como non legite

+    unmute:
+      notice: Le message ha essite displaciate al cassa de entrata
+      error: Le message non poteva esser displaciate al cassa de entrata.

     destroy:
       destroyed: Message delite
   passwords:
     new:
       title: Contrasigno perdite
       heading: Contrasigno oblidate?
     destroy:
       destroyed: Message delite
   passwords:
     new:
       title: Contrasigno perdite
       heading: Contrasigno oblidate?

-      email address: 'Adresse de e-mail:'
+      email address: Adresse de e-mail

       new password button: Reinitialisar contrasigno
       help_text: Entra le adresse de e-mail que tu usava pro inscriber te, e nos te
         inviara un ligamine que tu pote usar pro reinitialisar tu contrasigno.
       new password button: Reinitialisar contrasigno
       help_text: Entra le adresse de e-mail que tu usava pro inscriber te, e nos te
         inviara un ligamine que tu pote usar pro reinitialisar tu contrasigno.


@@ -1885,9 +1912,9 @@ ia:
     new:
       title: Aperir session
       heading: Aperir session
     new:
       title: Aperir session
       heading: Aperir session

-      email or username: 'Adresse de e-mail o nomine de usator:'
-      password: 'Contrasigno:'
-      openid_html: 'OpenID de %{logo}:'
+      email or username: Adresse de e-mail o nomine de usator
+      password: Contrasigno
+      openid_html: OpenID de %{logo}

       remember: Memorar me
       lost password link: Contrasigno perdite?
       login_button: Aperir session
       remember: Memorar me
       lost password link: Contrasigno perdite?
       login_button: Aperir session


@@ -1945,6 +1972,7 @@ ia:
       image: Imagine
       alt: Texto alternative
       url: URL
       image: Imagine
       alt: Texto alternative
       url: URL

+      codeblock: Bloco de codice

     richtext_field:
       edit: Modificar
       preview: Previsualisar
     richtext_field:
       edit: Modificar
       preview: Previsualisar


@@ -2307,12 +2335,14 @@ ia:
           primary: Via primari
           secondary: Via secundari
           unclassified: Via non classificate
           primary: Via primari
           secondary: Via secundari
           unclassified: Via non classificate

+          pedestrian: Via pro pedones

           track: Pista
           bridleway: Sentiero pro cavallos
           cycleway: Via cyclabile
           cycleway_national: Pista cyclabile national
           cycleway_regional: Pista cyclabile regional
           cycleway_local: Pista cyclabile local
           track: Pista
           bridleway: Sentiero pro cavallos
           cycleway: Via cyclabile
           cycleway_national: Pista cyclabile national
           cycleway_regional: Pista cyclabile regional
           cycleway_local: Pista cyclabile local

+          cycleway_mtb: Percurso de bicycletta de montania

           footway: Sentiero pro pedones
           rail: Ferrovia
           train: Traino
           footway: Sentiero pro pedones
           rail: Ferrovia
           train: Traino


@@ -2328,6 +2358,8 @@ ia:
           taxiway: Via de circulation pro aviones
           apron: Platteforma pro aviones
           admin: Limite administrative
           taxiway: Via de circulation pro aviones
           apron: Platteforma pro aviones
           admin: Limite administrative

+          capital: Capital
+          city: Citate

           orchard: Verdiero
           vineyard: Vinia
           forest: Foreste
           orchard: Verdiero
           vineyard: Vinia
           forest: Foreste


@@ -2359,6 +2391,7 @@ ia:
           allotments: Jardines familial
           pitch: Campo de sport
           centre: Centro de sport
           allotments: Jardines familial
           pitch: Campo de sport
           centre: Centro de sport

+          beach: Plagia

           reserve: Reserva natural
           military: Area militar
           school: Schola
           reserve: Reserva natural
           military: Area militar
           school: Schola


@@ -2376,7 +2409,9 @@ ia:
           bus_stop: Halto de autobus
           stop: Halto
           bicycle_shop: Magazin de bicyclettas
           bus_stop: Halto de autobus
           stop: Halto
           bicycle_shop: Magazin de bicyclettas

+          bicycle_rental: Location de bicyclettas

           bicycle_parking: Parcamento de bicyclettas
           bicycle_parking: Parcamento de bicyclettas

+          bicycle_parking_small: Micre spatio de parcamento pro bicyclettas

           toilets: Toilettes
     welcome:
       title: Benvenite!
           toilets: Toilettes
     welcome:
       title: Benvenite!


@@ -2579,6 +2614,7 @@ ia:
       oauth1_settings: Configuration OAuth 1
       oauth2_applications: Applicationes OAuth 2
       oauth2_authorizations: Autorisationes OAuth 2
       oauth1_settings: Configuration OAuth 1
       oauth2_applications: Applicationes OAuth 2
       oauth2_authorizations: Autorisationes OAuth 2

+      muted_users: Usatores silentiate

   oauth:
     authorize:
       title: Autorisar accesso a tu conto
   oauth:
     authorize:
       title: Autorisar accesso a tu conto


@@ -2615,6 +2651,7 @@ ia:
       read_gpx: Leger tracias GPS private
       write_gpx: Incargar tracias GPS
       write_notes: Modificar notas
       read_gpx: Leger tracias GPS private
       write_gpx: Incargar tracias GPS
       write_notes: Modificar notas

+      write_redactions: Censurar datos del carta

       read_email: Leger le adresse de e-mail del usator
       skip_authorization: Approbar automaticamente le application
   oauth_clients:
       read_email: Leger le adresse de e-mail del usator
       skip_authorization: Approbar automaticamente le application
   oauth_clients:


@@ -2788,6 +2825,8 @@ ia:
       my_dashboard: Mi pannello
       blocks on me: Blocadas concernente me
       blocks by me: Blocadas facite per me
       my_dashboard: Mi pannello
       blocks on me: Blocadas concernente me
       blocks by me: Blocadas facite per me

+      create_mute: Silentiar iste usator
+      destroy_mute: Non silentiar iste usator

       edit_profile: Modificar profilo
       send message: Inviar message
       diary: Diario
       edit_profile: Modificar profilo
       send message: Inviar message
       diary: Diario


@@ -2819,6 +2858,7 @@ ia:
           importer: Revocar le accesso de importator
       block_history: Blocadas active
       moderator_history: Blocadas imponite
           importer: Revocar le accesso de importator
       block_history: Blocadas active
       moderator_history: Blocadas imponite

+      revoke_all_blocks: Revocar tote le blocadas

       comments: Commentos
       create_block: Blocar iste usator
       activate_user: Activar iste usator
       comments: Commentos
       create_block: Blocar iste usator
       activate_user: Activar iste usator


@@ -2926,6 +2966,16 @@ ia:
       confirm: Es tu secur de voler revocar iste blocada?
       revoke: Revocar!
       flash: Iste blocada ha essite revocate.
       confirm: Es tu secur de voler revocar iste blocada?
       revoke: Revocar!
       flash: Iste blocada ha essite revocate.

+    revoke_all:
+      title: Revocation de tote le blocadas de %{block_on}
+      heading_html: Revocation de tote le blocadas de %{block_on}
+      empty: '%{name} non ha blocadas active.'
+      confirm: Es tu secur de voler revocar %{active_blocks}?
+      active_blocks:
+        one: '%{count} blocada active'
+        other: '%{count} blocadas active'
+      revoke: Revocar!
+      flash: Tote le blocadas active ha essite revocate.

     helper:
       time_future_html: Expira in %{time}.
       until_login: Active usque le usator aperi session.
     helper:
       time_future_html: Expira in %{time}.
       until_login: Active usque le usator aperi session.


@@ -2984,6 +3034,31 @@ ia:
       showing_page: Pagina %{page}
       next: Sequente »
       previous: « Precedente
       showing_page: Pagina %{page}
       next: Sequente »
       previous: « Precedente

+  user_mutes:
+    index:
+      title: Usatores silentiate
+      my_muted_users: Mi usatores silentiate
+      you_have_muted_n_users:
+        one: Tu ha silentiate %{count} usator
+        other: Tu ha silentiate %{count} usatores
+      user_mute_explainer: Le messages de usatores silentiate es displaciate a un
+        cassa de entrata separate e tu non recipera notificationes de e-mail.
+      user_mute_admins_and_moderators: Tu pote silentiar administratores e moderatores,
+        ma lor messages non essera silentiate.
+      table:
+        thead:
+          muted_user: Usator silentiate
+          actions: Actiones
+        tbody:
+          unmute: Non silentiar
+          send_message: Inviar message
+    create:
+      notice: Tu ha silentiate %{name}.
+      error: '%{name} non poteva esser silentiate. %{full_message}.'
+    destroy:
+      notice: Tu non plus silentia %{name}.
+      error: Non esseva possibile disfacer le silentiamento del usator. Per favor
+        essaya lo de novo.

   notes:
     index:
       title: Notas submittite o commentate per %{user}
   notes:
     index:
       title: Notas submittite o commentate per %{user}


@@ -3021,6 +3096,7 @@ ia:
       reactivate: Reactivar
       comment_and_resolve: Commentar e resolver
       comment: Commento
       reactivate: Reactivar
       comment_and_resolve: Commentar e resolver
       comment: Commento

+      log_in_to_comment: Aperi session pro commentar iste nota

       report_link_html: Si iste nota contine information sensibile que debe esser
         removite, tu pote %{link}.
       other_problems_resolve: Pro tote altere problema con le nota, per favor resolve
       report_link_html: Si iste nota contine information sensibile que debe esser
         removite, tu pote %{link}.
       other_problems_resolve: Pro tote altere problema con le nota, per favor resolve


@@ -3083,7 +3159,6 @@ ia:
         transport_map: Carta de transporto
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitario
         transport_map: Carta de transporto
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitario

-        opnvkarte: ÖPNVKarte

       layers:
         header: Stratos de carta
         notes: Notas de carta
       layers:
         header: Stratos de carta
         notes: Notas de carta


@@ -3098,8 +3173,6 @@ ia:
       osm_france: OpenStreetMap Francia
       thunderforest_credit: Tegulas fornite per %{thunderforest_link}
       andy_allan: Andy Allan
       osm_france: OpenStreetMap Francia
       thunderforest_credit: Tegulas fornite per %{thunderforest_link}
       andy_allan: Andy Allan

-      opnvkarte_credit: Tegulas fornite per %{memomaps_link}
-      memomaps: MeMoMaps

       tracestrack_credit: Tegulas fornite per %{tracestrack_link}
       hotosm_credit: Stilo de tegulas per %{hotosm_link} albergate per %{osm_france_link}
       hotosm_name: le Equipa Humanitari de OpenStreetMap
       tracestrack_credit: Tegulas fornite per %{tracestrack_link}
       hotosm_credit: Stilo de tegulas per %{hotosm_link} albergate per %{osm_france_link}
       hotosm_name: le Equipa Humanitari de OpenStreetMap

diff --git a/config/locales/id.yml b/config/locales/id.yml
index b1be472c65c0bacc5ebe4ca399baf97e0f340db4..bb45ebfccbcfc8c62a82779b9fd153ac83b9452b 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -78,6 +78,11 @@ id:
       messages:
         invalid_email_address: nampaknya bukan alamat surel yang sah
         email_address_not_routable: tidak dapat dirutekan
       messages:
         invalid_email_address: nampaknya bukan alamat surel yang sah
         email_address_not_routable: tidak dapat dirutekan

+        display_name_is_user_n: tidak bisa menjadi user_n kecuali n adalah id pengguna
+          Anda
+      models:
+        user_mute:
+          is_already_muted: sudah dibisukan

     models:
       acl: Daftar Kontrol Akses
       changeset: Set Perubahan
     models:
       acl: Daftar Kontrol Akses
       changeset: Set Perubahan


@@ -199,41 +204,29 @@ id:
   datetime:
     distance_in_words_ago:
       about_x_hours:
   datetime:
     distance_in_words_ago:
       about_x_hours:

-        one: sekitar 1 jam yang lalu

         other: sekitar %{count} jam yang lalu
       about_x_months:
         other: sekitar %{count} jam yang lalu
       about_x_months:

-        one: sekitar 1 bulan yang lalu

         other: sekitar %{count} bulan yang lalu
       about_x_years:
         other: sekitar %{count} bulan yang lalu
       about_x_years:

-        one: sekitar 1 tahun yang lalu

         other: sekitar %{count} tahun yang lalu
       almost_x_years:
         other: sekitar %{count} tahun yang lalu
       almost_x_years:

-        one: hampir 1 tahun yang lalu

         other: hampir %{count} tahun yang lalu
       half_a_minute: setengah menit yang lalu
       less_than_x_seconds:
         other: hampir %{count} tahun yang lalu
       half_a_minute: setengah menit yang lalu
       less_than_x_seconds:

-        one: tak sampai 1 detik yang lalu

         other: tak sampai %{count} detik yang lalu
       less_than_x_minutes:
         other: tak sampai %{count} detik yang lalu
       less_than_x_minutes:

-        one: tak sampai 1 menit yang lalu

         other: tak sampai %{count} menit yang lalu
       over_x_years:
         other: tak sampai %{count} menit yang lalu
       over_x_years:

-        one: lebih dari 1 tahun yang lalu

         other: lebih dari %{count} tahun yang lalu
       x_seconds:
         other: lebih dari %{count} tahun yang lalu
       x_seconds:

-        one: 1 detik yang lalu

         other: '%{count} detik yang lalu'
       x_minutes:
         other: '%{count} detik yang lalu'
       x_minutes:

-        one: 1 menit yang lalu

         other: '%{count} menit yang lalu'
       x_days:
         other: '%{count} menit yang lalu'
       x_days:

-        one: 1 hari yang lalu

         other: '%{count} hari yang lalu'
       x_months:
         other: '%{count} hari yang lalu'
       x_months:

-        one: 1 bulan yang lalu

         other: '%{count} bulan yang lalu'
       x_years:
         other: '%{count} bulan yang lalu'
       x_years:

-        one: 1 tahun yang lalu

         other: '%{count} tahun yang lalu'
   editor:
     default: Standar (saat ini %{name})
         other: '%{count} tahun yang lalu'
   editor:
     default: Standar (saat ini %{name})


@@ -249,6 +242,7 @@ id:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

+      microsoft: Microsoft

       github: GitHub
       wikipedia: Wikipedia
   api:
       github: GitHub
       wikipedia: Wikipedia
   api:


@@ -264,6 +258,7 @@ id:
         reopened_at_by_html: Diaktifkan kembali %{when} yang lalu oleh %{user}
       rss:
         title: Catatan OpenStreetMap
         reopened_at_by_html: Diaktifkan kembali %{when} yang lalu oleh %{user}
       rss:
         title: Catatan OpenStreetMap

+        description_all: Daftar catatan yang dilaporkan, dikomentari, atau ditutup

         description_area: Daftar catatan, laporan, komentar atau ditutup di daerah
           Anda [( %{min_lat}|%{min_lon})--( %{max_lat}|%{max_lon})]
         description_item: Sebuah rss feed untuk catatan %{id}
         description_area: Daftar catatan, laporan, komentar atau ditutup di daerah
           Anda [( %{min_lat}|%{min_lon})--( %{max_lat}|%{max_lon})]
         description_item: Sebuah rss feed untuk catatan %{id}


@@ -297,6 +292,8 @@ id:
           disembunyikan dari publik.
         retain_changeset_discussions: Diskusi perubahan Anda tidak akan dihapus.
         retain_email: Alamat surel Anda akan dipertahankan.
           disembunyikan dari publik.
         retain_changeset_discussions: Diskusi perubahan Anda tidak akan dihapus.
         retain_email: Alamat surel Anda akan dipertahankan.

+        recent_editing_html: Karena Anda baru saja mengedit, akun Anda saat ini tidak
+          dapat dihapus. Penghapusan dapat dilakukan pada %{time}.

         confirm_delete: Apakah Anda yakin?
         cancel: Batal
   accounts:
         confirm_delete: Apakah Anda yakin?
         cancel: Batal
   accounts:


@@ -360,10 +357,8 @@ id:
     no_comment: (tidak ada komentar)
     part_of: Bagian dari
     part_of_relations:
     no_comment: (tidak ada komentar)
     part_of: Bagian dari
     part_of_relations:

-      one: 1 relasi

       other: '%{count} relasi'
     part_of_ways:
       other: '%{count} relasi'
     part_of_ways:

-      one: 1 arah

       other: '%{count} arah'
     download_xml: Unduh XML
     view_history: Versi terdahulu
       other: '%{count} arah'
     download_xml: Unduh XML
     view_history: Versi terdahulu


@@ -407,7 +402,6 @@ id:
       history_title_html: 'Riwayat Hubungan: %{name}'
       members: Anggota
       members_count:
       history_title_html: 'Riwayat Hubungan: %{name}'
       members: Anggota
       members_count:

-        one: 1 anggota

         other: '%{count} anggota'
     relation_member:
       entry_role_html: '%{type} %{name} sebagai %{role}'
         other: '%{count} anggota'
     relation_member:
       entry_role_html: '%{type} %{name} sebagai %{role}'


@@ -465,6 +459,15 @@ id:
       introduction: Klik di peta untuk mencari fitur terdekat.
       nearby: Fitur terdekat
       enclosing: Fitur sekitar
       introduction: Klik di peta untuk mencari fitur terdekat.
       nearby: Fitur terdekat
       enclosing: Fitur sekitar

+  old_nodes:
+    not_found:
+      sorry: 'Maaf, titik #%{id} versi %{version} tidak dapat ditemukan.'
+  old_ways:
+    not_found:
+      sorry: 'Maaf, rute #%{id} versi %{version} tidak dapat ditemukan.'
+  old_relations:
+    not_found:
+      sorry: 'Maaf, relasi #%{id} versi %{version} tidak dapat ditemukan.'

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


@@ -570,9 +573,8 @@ id:
       comment_link: Komentar di entri ini
       reply_link: Kirim pesan ke penulis
       comment_count:
       comment_link: Komentar di entri ini
       reply_link: Kirim pesan ke penulis
       comment_count:

-        one: '%{count} komentar'
-        zero: Tidak ada komentar

         other: '%{count} komentar'
         other: '%{count} komentar'

+      no_comments: Tidak ada komentar

       edit_link: Edit entri ini
       hide_link: Sembunyikan entri ini
       unhide_link: Tampilkan kembali entri ini
       edit_link: Edit entri ini
       hide_link: Sembunyikan entri ini
       unhide_link: Tampilkan kembali entri ini


@@ -610,10 +612,36 @@ id:
       newer_comments: Komentar Baru
       older_comments: Komentar Lama
   doorkeeper:
       newer_comments: Komentar Baru
       older_comments: Komentar Lama
   doorkeeper:

+    errors:
+      messages:
+        account_selection_required: Server otorisasi memerlukan pemilihan akun pengguna
+          akhir
+        consent_required: Server otorisasi memerlukan persetujuan pengguna akhir
+        interaction_required: Server otorisasi memerlukan interaksi pengguna akhir
+        login_required: Server otorisasi memerlukan otentikasi pengguna akhir

     flash:
       applications:
         create:
           notice: Aplikasi Didaftarkan.
     flash:
       applications:
         create:
           notice: Aplikasi Didaftarkan.

+    openid_connect:
+      errors:
+        messages:
+          auth_time_from_resource_owner_not_configured: Gagal karena tidak ada konfigurasi
+            Doorkeeper::OpenidConnect.configure.auth_time_from_resource_owner.
+          reauthenticate_resource_owner_not_configured: Gagal karena tidak ada konfigurasi
+            Doorkeeper::OpenidConnect.configure.reauthenticate_resource_owner.
+          resource_owner_from_access_token_not_configured: Gagal karena tidak ada
+            konfigurasi Doorkeeper::OpenidConnect.configure.resource_owner_from_access_token.
+          select_account_for_resource_owner_not_configured: Gagal karena tidak ada
+            konfigurasi  Doorkeeper::OpenidConnect.configure.select_account_for_resource_owner.
+          subject_not_configured: Pembuatan Token ID gagal karena tidak ada konfigurasi
+            Doorkeeper::OpenidConnect.configure.subject.
+    scopes:
+      address: Lihat alamat fisik Anda
+      email: Lihat alamat email Anda
+      openid: Otentikasi akun Anda
+      phone: Lihat nomor telepon Anda
+      profile: Lihat informasi profil Anda

   errors:
     contact:
       contact_url_title: Penjelasan berbagai kanal kontak
   errors:
     contact:
       contact_url_title: Penjelasan berbagai kanal kontak


@@ -1448,7 +1476,6 @@ id:
       last_updated_time_ago_user_html: '%{time_ago} oleh %{user}'
       link_to_reports: Lihat Laporan
       reports_count:
       last_updated_time_ago_user_html: '%{time_ago} oleh %{user}'
       link_to_reports: Lihat Laporan
       reports_count:

-        one: 1 Laporan

         other: '%{count} Laporan'
       reported_item: Butir dilaporkan
       states:
         other: '%{count} Laporan'
       reported_item: Butir dilaporkan
       states:


@@ -1458,9 +1485,8 @@ id:
     show:
       title: '%{status} Isu #%{issue_id}'
       reports:
     show:
       title: '%{status} Isu #%{issue_id}'
       reports:

-        zero: Tak ada
-        one: satu

         other: '%{count} laporan'
         other: '%{count} laporan'

+      no_reports: Tidak ada laporan

       report_created_at_html: Pertama dilaporkan pada %{datetime}
       last_resolved_at_html: Terakhir diselesaikan pada %{datetime}
       last_updated_at_html: Terakhir diubah pada %{datetime} oleh %{displayname}
       report_created_at_html: Pertama dilaporkan pada %{datetime}
       last_resolved_at_html: Terakhir diselesaikan pada %{datetime}
       last_updated_at_html: Terakhir diubah pada %{datetime} oleh %{displayname}


@@ -1481,6 +1507,7 @@ id:
       reopened: Status isu telah diset ke 'Terbuka'
     comments:
       comment_from_html: Komentar dari %{user_link} pada %{comment_created_at}
       reopened: Status isu telah diset ke 'Terbuka'
     comments:
       comment_from_html: Komentar dari %{user_link} pada %{comment_created_at}

+      reassign_param: Tugaskan Kembali Masalah?

     reports:
       reported_by_html: Dilaporkan sebagai %{category} oleh %{user} pada %{updated_at}
     helper:
     reports:
       reported_by_html: Dilaporkan sebagai %{category} oleh %{user} pada %{updated_at}
     helper:


@@ -1490,6 +1517,8 @@ id:
   issue_comments:
     create:
       comment_created: Komentar Anda telah berhasil dibuat
   issue_comments:
     create:
       comment_created: Komentar Anda telah berhasil dibuat

+      issue_reassigned: Komentar Anda telah dibuat dan masalahnya telah ditugaskan
+        kembali

   reports:
     new:
       title_html: Laporkan %{link}
   reports:
     new:
       title_html: Laporkan %{link}


@@ -1618,6 +1647,10 @@ id:
       subject: '[OpenStreetMap] gagal impor GPX'
     gpx_success:
       hi: Halo %{to_user},
       subject: '[OpenStreetMap] gagal impor GPX'
     gpx_success:
       hi: Halo %{to_user},

+      loaded:
+        other: berhasil dimuat dengan %{trace_points} dari %{count} titik yang mungkin.
+      all_your_traces_html: Semua jejak GPX Anda yang berhasil diunggah dapat ditemukan
+        di %{url}.

       subject: '[OpenStreetMap] impor GPX sukses'
     signup_confirm:
       subject: '[OpenStreetMap] Selamat datang di OpenStreetMap'
       subject: '[OpenStreetMap] impor GPX sukses'
     signup_confirm:
       subject: '[OpenStreetMap] Selamat datang di OpenStreetMap'


@@ -1759,11 +1792,13 @@ id:
       to: Kepada
       subject: Subyek
       date: Tanggal
       to: Kepada
       subject: Subyek
       date: Tanggal

+      actions: Tindakan

     message_summary:
       unread_button: Tandai belum dibaca
       read_button: Tandai sudah dibaca
       reply_button: Balas
       destroy_button: Hapus
     message_summary:
       unread_button: Tandai belum dibaca
       read_button: Tandai sudah dibaca
       reply_button: Balas
       destroy_button: Hapus

+      unmute_button: Pindahkan ke Kotak Masuk

     new:
       title: Kirim Pesan
       send_message_to_html: Kirim pesan baru ke %{name}
     new:
       title: Kirim Pesan
       send_message_to_html: Kirim pesan baru ke %{name}


@@ -1778,12 +1813,17 @@ id:
       body: Maaf tidak ada pesan dengan id tersebut.
     outbox:
       title: Kotak keluar
       body: Maaf tidak ada pesan dengan id tersebut.
     outbox:
       title: Kotak keluar

+      actions: Tindakan

       messages:
         one: Anda memiliki %{count} pesan terkirim
         other: Anda memiliki %{count} pesan terkirim
       no_sent_messages_html: Anda belum memiliki pesan. Mengapa tidak  berhubungan
         dengan beberapa %{people_mapping_nearby_link}?
       people_mapping_nearby: orang-orang disekitar Anda yang melakukan pemetaan
       messages:
         one: Anda memiliki %{count} pesan terkirim
         other: Anda memiliki %{count} pesan terkirim
       no_sent_messages_html: Anda belum memiliki pesan. Mengapa tidak  berhubungan
         dengan beberapa %{people_mapping_nearby_link}?
       people_mapping_nearby: orang-orang disekitar Anda yang melakukan pemetaan

+    muted:
+      title: Pesan yang Dibisukan
+      messages:
+        other: '%{count} pesan yang dibisukan'

     reply:
       wrong_user: Anda login sebagai '%{user}' tapi pesan yang Anda balas tidak terkirim
         ke pengguna. Silahkan login sebagai pengguna yang benar untuk membalas.
     reply:
       wrong_user: Anda login sebagai '%{user}' tapi pesan yang Anda balas tidak terkirim
         ke pengguna. Silahkan login sebagai pengguna yang benar untuk membalas.


@@ -1801,16 +1841,20 @@ id:
     heading:
       my_inbox: Kotak Masuk Saya
       my_outbox: Kotak Keluar Saya
     heading:
       my_inbox: Kotak Masuk Saya
       my_outbox: Kotak Keluar Saya

+      muted_messages: Pesan yang dibisukan

     mark:
       as_read: Pesan ditandai sebagai telah dibaca
       as_unread: Pesan ditandai sebagai belum dibaca
     mark:
       as_read: Pesan ditandai sebagai telah dibaca
       as_unread: Pesan ditandai sebagai belum dibaca

+    unmute:
+      notice: Pesan berhasil dipindahkan ke Kotak Masuk
+      error: Pesan tidak berhasil dipindahkan ke Kotak Masuk

     destroy:
       destroyed: Pesan dihapus
   passwords:
     new:
       title: Kehilangan kata sandi
       heading: Lupa Kata Sandi?
     destroy:
       destroyed: Pesan dihapus
   passwords:
     new:
       title: Kehilangan kata sandi
       heading: Lupa Kata Sandi?

-      email address: 'Alamat Email:'
+      email address: Alamat Email

       new password button: Setel ulang kata sandi
       help_text: Masukkan alamat email yang Anda gunakan untuk mendaftar, kami akan
         mengirim link ke alamat tersebut yang dapat Anda gunakan untuk menyetel ulang
       new password button: Setel ulang kata sandi
       help_text: Masukkan alamat email yang Anda gunakan untuk mendaftar, kami akan
         mengirim link ke alamat tersebut yang dapat Anda gunakan untuk menyetel ulang


@@ -1826,6 +1870,8 @@ id:
       flash token bad: Tidak dapat menemukan token tersebut, cek URL nya mungkin?
     update:
       flash changed: Kata sandi Anda telah diubah.
       flash token bad: Tidak dapat menemukan token tersebut, cek URL nya mungkin?
     update:
       flash changed: Kata sandi Anda telah diubah.

+      flash token bad: Tidak dapat menemukan token tersebut, mungkin sebaiknya URL-nya
+        diperiksa?

   preferences:
     show:
       title: Preferensi Saya
   preferences:
     show:
       title: Preferensi Saya


@@ -1861,6 +1907,9 @@ id:
       no home location: Anda telah memasukkan lokasi rumah Anda.
       update home location on click: Memperbarui lokasi rumah ketika saya klik pada
         peta?
       no home location: Anda telah memasukkan lokasi rumah Anda.
       update home location on click: Memperbarui lokasi rumah ketika saya klik pada
         peta?

+      show: Tampilkan
+      delete: Hapus
+      undelete: Batal hapus

     update:
       success: Profil telah diperbarui.
       failure: Tidak dapat memperbarui profil.
     update:
       success: Profil telah diperbarui.
       failure: Tidak dapat memperbarui profil.


@@ -1868,9 +1917,9 @@ id:
     new:
       title: Login
       heading: Login
     new:
       title: Login
       heading: Login

-      email or username: 'Alamat Email atau Nama Pengguna:'
-      password: 'Kata Sandi:'
-      openid_html: '%{logo} OpenID:'
+      email or username: Alamat Email atau Nama Pengguna
+      password: Kata Sandi
+      openid_html: '%{logo} OpenID'

       remember: Ingat saya
       lost password link: Kehilangan kata sandi Anda?
       login_button: Login
       remember: Ingat saya
       lost password link: Kehilangan kata sandi Anda?
       login_button: Login


@@ -1890,8 +1939,8 @@ id:
           title: Masuk dengan Facebook
           alt: Masuk dengan akun Facebook
         microsoft:
           title: Masuk dengan Facebook
           alt: Masuk dengan akun Facebook
         microsoft:

-          title: Masuk dengan Windows Live
-          alt: Masuk dengan akun Windows Live
+          title: Masuk dengan Microsoft
+          alt: Masuk dengan akun Microsoft

         github:
           title: Masuk dengan GitHub.
           alt: Masuk dengan Akun GitHub.
         github:
           title: Masuk dengan GitHub.
           alt: Masuk dengan Akun GitHub.


@@ -1927,6 +1976,7 @@ id:
       image: Gambar
       alt: Teks alternatif
       url: URL
       image: Gambar
       alt: Teks alternatif
       url: URL

+      codeblock: Blok kode

     richtext_field:
       edit: Sunting
       preview: Pratayang
     richtext_field:
       edit: Sunting
       preview: Pratayang


@@ -2061,6 +2111,11 @@ id:
           %{canada}: Mengandung data dari
           GeoBase®, GeoGratis (© Departemen Sumber Daya Alam Kanada), CanVec (© Departemen Sumber Daya Alam Kanada), dan StatCan (Divisi Geografi, Badan Pusat Statistik Kanada).
         contributors_ca_canada: Kanada
           %{canada}: Mengandung data dari
           GeoBase®, GeoGratis (© Departemen Sumber Daya Alam Kanada), CanVec (© Departemen Sumber Daya Alam Kanada), dan StatCan (Divisi Geografi, Badan Pusat Statistik Kanada).
         contributors_ca_canada: Kanada

+        contributors_cz_credit_html: '%{czechia}: Mengandung data dari Administrasi
+          Survei Tanah dan Kadaster Negara yang dilisensikan di bawah %{cc_licence_link}'
+        contributors_cz_czechia: Ceko
+        contributors_cz_cc_licence: Lisensi Creative Commons Attribution 4.0 International
+          (CC BY 4.0)

         contributors_fi_credit_html: '%{finland}: Mengandung data dari Pusat Data
           Topografi Survei Pertanahan Nasional Finlandia dan sumber data lain, berlisensi
           %{nlsfi_license_link}.'
         contributors_fi_credit_html: '%{finland}: Mengandung data dari Pusat Data
           Topografi Survei Pertanahan Nasional Finlandia dan sumber data lain, berlisensi
           %{nlsfi_license_link}.'


@@ -2079,6 +2134,12 @@ id:
         contributors_nz_new_zealand: Selandia Baru
         contributors_nz_linz_data_service: LINZ Data Service
         contributors_nz_cc_by: CC BY 4.0
         contributors_nz_new_zealand: Selandia Baru
         contributors_nz_linz_data_service: LINZ Data Service
         contributors_nz_cc_by: CC BY 4.0

+        contributors_rs_credit_html: |-
+          %{serbia}: Mengandung data dari %{rgz_link} dan %{open_data_portal}
+          (informasi publik Serbia), 2018.
+        contributors_rs_serbia: Serbia
+        contributors_rs_rgz: Otoritas Geodesi Serbia
+        contributors_rs_open_data_portal: Portal Data Terbuka Nasional

         contributors_si_credit_html: |-
           %{slovenia}: Mengandung data dari %{gu_link} dan %{mkgp_link}
           (penerangan umum Slovenia).
         contributors_si_credit_html: |-
           %{slovenia}: Mengandung data dari %{gu_link} dan %{mkgp_link}
           (penerangan umum Slovenia).


@@ -2266,54 +2327,83 @@ id:
           primary: Jalan Primer
           secondary: Jalan Sekunder
           unclassified: Jalan Tidak Terklasifikasi
           primary: Jalan Primer
           secondary: Jalan Sekunder
           unclassified: Jalan Tidak Terklasifikasi

+          pedestrian: Jalur pejalan kaki

           track: Trek
           bridleway: Jalan Tanah
           cycleway: Jalur Sepeda
           cycleway_national: Jalur sepeda nasional
           cycleway_regional: Jalur sepeda daerah
           cycleway_local: Jalur sepeda lokal
           track: Trek
           bridleway: Jalan Tanah
           cycleway: Jalur Sepeda
           cycleway_national: Jalur sepeda nasional
           cycleway_regional: Jalur sepeda daerah
           cycleway_local: Jalur sepeda lokal

+          cycleway_mtb: Rute sepeda gunung

           footway: Jalan Setapak
           rail: Rel Kereta
           footway: Jalan Setapak
           rail: Rel Kereta

+          train: Kereta

           subway: Kereta bawah tanah
           subway: Kereta bawah tanah

+          ferry: Feri
+          light_rail: Kereta api ringan
+          tram: Trem
+          trolleybus: Kereta dorong
+          bus: Bus

           cable_car: Kereta Kabel
           cable_car: Kereta Kabel

-          chair_lift: Kereta Gantung
+          chair_lift: Kereta gantung

           runway: Landasan bandara
           runway: Landasan bandara

-          taxiway: landas hubung
+          taxiway: Landas hubung

           apron: Tempat Parkir Pesawat
           admin: Batas administrasi
           apron: Tempat Parkir Pesawat
           admin: Batas administrasi

+          capital: Ibu kota
+          city: Kota
+          orchard: Kebun buah
+          vineyard: Kebun anggur

           forest: Hutan
           wood: Kayu
           forest: Hutan
           wood: Kayu

+          farmland: Lahan pertanian
+          grass: Rumput
+          meadow: Padang rumput
+          bare_rock: Daratan batu
+          sand: Pasir

           golf: Lapangan Golf
           park: Taman
           common: Umum
           golf: Lapangan Golf
           park: Taman
           common: Umum

+          built_up: Daerah yang dibangun

           resident: Area Permukiman
           retail: Area pertokoan
           industrial: Kawasan industri
           commercial: Area komersial
           heathland: Semak
           resident: Area Permukiman
           retail: Area pertokoan
           industrial: Kawasan industri
           commercial: Area komersial
           heathland: Semak

+          scrubland: Semak belukar

           lake: Danau
           reservoir: Wilayah Serapan (Reservoir)
           lake: Danau
           reservoir: Wilayah Serapan (Reservoir)

+          intermittent_water: Perairan yang terputus-putus
+          glacier: Gletser
+          reef: Batu karang
+          wetland: Lahan basah

           farm: Pertanian
           brownfield: Lahan kosong
           cemetery: Pemakaman
           allotments: Tanah garap
           pitch: Lapangan Olahraga
           centre: Pusat Olahraga
           farm: Pertanian
           brownfield: Lahan kosong
           cemetery: Pemakaman
           allotments: Tanah garap
           pitch: Lapangan Olahraga
           centre: Pusat Olahraga

+          beach: Pantai

           reserve: Cagar Alam
           military: Kawasan militer
           school: Sekolah
           reserve: Cagar Alam
           military: Kawasan militer
           school: Sekolah

-          university: universitas
+          university: Universitas
+          hospital: Rumah sakit

           building: Bangunan Penting
           station: Stasiun Kereta Api
           summit: Puncak
           building: Bangunan Penting
           station: Stasiun Kereta Api
           summit: Puncak

-          peak: puncak
+          peak: Puncak

           tunnel: Dashed Casing = terowongan
           bridge: Black casing = jembatan
           private: Akses pribadi
           destination: Akses tujuan
           construction: Jalan sedang diperbaiki
           tunnel: Dashed Casing = terowongan
           bridge: Black casing = jembatan
           private: Akses pribadi
           destination: Akses tujuan
           construction: Jalan sedang diperbaiki

+          bus_stop: Halte bus
+          stop: Perhentian

           bicycle_shop: Toko sepeda
           bicycle_shop: Toko sepeda

+          bicycle_rental: Penyewaan sepeda

           bicycle_parking: Tempat parkir sepeda
           bicycle_parking: Tempat parkir sepeda

+          bicycle_parking_small: Parkir sepeda kecil

           toilets: Toilet
     welcome:
       title: Selamat datang!
           toilets: Toilet
     welcome:
       title: Selamat datang!


@@ -2356,6 +2446,7 @@ id:
         imports: Impor
         automated_edits: Edit Otomatis
       start_mapping: Mulai pemetaan
         imports: Impor
         automated_edits: Edit Otomatis
       start_mapping: Mulai pemetaan

+      continue_authorization: Lanjutkan Otorisasi

       add_a_note:
         title: Keberatan menyunting? Tambahkan catatan!
         para_1: Jika Anda ingin memberi perbaikan kecil dan tidak mau mendaftar ataupun
       add_a_note:
         title: Keberatan menyunting? Tambahkan catatan!
         para_1: Jika Anda ingin memberi perbaikan kecil dan tidak mau mendaftar ataupun


@@ -2449,7 +2540,8 @@ id:
       newer: Trek-trek terbaru
     trace:
       pending: TERTUNDA
       newer: Trek-trek terbaru
     trace:
       pending: TERTUNDA

-      count_points: '%{count} titik'
+      count_points:
+        other: '%{count} titik'

       more: selebihnya
       trace_details: Lihat Perincian Jejak
       view_map: Lihat peta
       more: selebihnya
       trace_details: Lihat Perincian Jejak
       view_map: Lihat peta


@@ -2512,6 +2604,7 @@ id:
       oauth1_settings: Setelah OAuth 1
       oauth2_applications: Aplikasi OAuth 2
       oauth2_authorizations: Otorisasi OAuth 2
       oauth1_settings: Setelah OAuth 1
       oauth2_applications: Aplikasi OAuth 2
       oauth2_authorizations: Otorisasi OAuth 2

+      muted_users: Pengguna yang Dibisukan

   oauth:
     authorize:
       title: Otorisasi akses ke akun Anda
   oauth:
     authorize:
       title: Otorisasi akses ke akun Anda


@@ -2540,6 +2633,7 @@ id:
     permissions:
       missing: Anda tidak mengizinkan akses aplikasi ke fasilitas ini
     scopes:
     permissions:
       missing: Anda tidak mengizinkan akses aplikasi ke fasilitas ini
     scopes:

+      openid: Masuk menggunakan OpenStreetMap

       read_prefs: Baca preferensi pengguna
       write_prefs: Ubah preferensi pengguna
       write_diary: Buat entri buku harian, komentar dan berteman
       read_prefs: Baca preferensi pengguna
       write_prefs: Ubah preferensi pengguna
       write_diary: Buat entri buku harian, komentar dan berteman


@@ -2547,6 +2641,7 @@ id:
       read_gpx: Baca jejak GPS pribadi
       write_gpx: Unggah jejak GPS
       write_notes: Ubah catatan
       read_gpx: Baca jejak GPS pribadi
       write_gpx: Unggah jejak GPS
       write_notes: Ubah catatan

+      write_redactions: Sunting data peta

       read_email: Baca alamat surel pengguna
       skip_authorization: Setujui aplikasi secara otomatis
   oauth_clients:
       read_email: Baca alamat surel pengguna
       skip_authorization: Setujui aplikasi secara otomatis
   oauth_clients:


@@ -2719,6 +2814,8 @@ id:
       my_dashboard: Dasbor Saya
       blocks on me: Blok kepada saya
       blocks by me: Blok oleh saya
       my_dashboard: Dasbor Saya
       blocks on me: Blok kepada saya
       blocks by me: Blok oleh saya

+      create_mute: Bisukan Pengguna ini
+      destroy_mute: Batalkan pembisuan Pengguna ini

       edit_profile: Sunting Profil
       send message: Kirim Pesan
       diary: Catatan Harian
       edit_profile: Sunting Profil
       send message: Kirim Pesan
       diary: Catatan Harian


@@ -2728,6 +2825,7 @@ id:
       remove as friend: Hapus pertemanan
       add as friend: Jadikan Teman
       mapper since: 'Melakukan pemetaan sejak:'
       remove as friend: Hapus pertemanan
       add as friend: Jadikan Teman
       mapper since: 'Melakukan pemetaan sejak:'

+      uid: 'ID pengguna:'

       ct status: 'Syarat-syarat kontributor:'
       ct undecided: Belum diputuskan
       ct declined: Tolak
       ct status: 'Syarat-syarat kontributor:'
       ct undecided: Belum diputuskan
       ct declined: Tolak


@@ -2738,14 +2836,18 @@ id:
       role:
         administrator: Pengguna ini merupakan administrator
         moderator: Pengguna ini adalah moderator
       role:
         administrator: Pengguna ini merupakan administrator
         moderator: Pengguna ini adalah moderator

+        importer: Pengguna ini adalah seorang importir

         grant:
           administrator: Memberikan akses administrator
           moderator: Memberikan akses moderator
         grant:
           administrator: Memberikan akses administrator
           moderator: Memberikan akses moderator

+          importer: Berikan izin importir

         revoke:
           administrator: Mencabut akses administrator
           moderator: Mencabut akses moderator
         revoke:
           administrator: Mencabut akses administrator
           moderator: Mencabut akses moderator

+          importer: Cabut izin importir

       block_history: Blok Aktif
       moderator_history: Blok yang Diberikan
       block_history: Blok Aktif
       moderator_history: Blok yang Diberikan

+      revoke_all_blocks: Cabut semua pemblokiran

       comments: Komentar
       create_block: Blokir Pengguna Ini
       activate_user: Aktifkan Pengguna Ini
       comments: Komentar
       create_block: Blokir Pengguna Ini
       activate_user: Aktifkan Pengguna Ini


@@ -2856,6 +2958,15 @@ id:
       confirm: Apakah Anda yakin untuk membatalkan blokir ini?
       revoke: Batalkan!
       flash: Blokir ini telah dibatalkan.
       confirm: Apakah Anda yakin untuk membatalkan blokir ini?
       revoke: Batalkan!
       flash: Blokir ini telah dibatalkan.

+    revoke_all:
+      title: Mencabut semua pemblokiran pada %{block_on}
+      heading_html: Mencabut semua pemblokiran pada %{block_on}
+      empty: '%{name} tidak sedang diblokir.'
+      confirm: Apakah Anda yakin untuk membatalkan %{active_blocks}?
+      active_blocks:
+        other: '%{count} blokir yang aktif'
+      revoke: Batalkan!
+      flash: Semua blokir aktif telah dicabut.

     helper:
       time_future_html: Berakhir pada %{time}.
       until_login: Aktif sampai pengguna melakukan log in.
     helper:
       time_future_html: Berakhir pada %{time}.
       until_login: Aktif sampai pengguna melakukan log in.


@@ -2864,19 +2975,14 @@ id:
       time_past_html: Berakhir %{time} yang lalu.
       block_duration:
         hours:
       time_past_html: Berakhir %{time} yang lalu.
       block_duration:
         hours:

-          one: 1 hour
-          other: '%{count} hours'
+          other: '%{count} jam'

         days:
         days:

-          one: 1 hari

           other: '%{count} hari'
         weeks:
           other: '%{count} hari'
         weeks:

-          one: 1 pekan

           other: '%{count} pekan'
         months:
           other: '%{count} pekan'
         months:

-          one: 1 bulan

           other: '%{count} bulan'
         years:
           other: '%{count} bulan'
         years:

-          one: 1 tahun

           other: '%{count} tahun'
     blocks_on:
       title: Diblokir pada %{name}
           other: '%{count} tahun'
     blocks_on:
       title: Diblokir pada %{name}


@@ -2914,11 +3020,36 @@ id:
       showing_page: Halaman %{page}
       next: Berikutnya »
       previous: « Sebelumnya
       showing_page: Halaman %{page}
       next: Berikutnya »
       previous: « Sebelumnya

+  user_mutes:
+    index:
+      title: Pengguna yang Dibisukan
+      my_muted_users: Pengguna yang saya bisukan
+      you_have_muted_n_users:
+        other: Anda telah membisukan %{count} pengguna
+      user_mute_explainer: Pesan dari pengguna yang dibisukan akan dipindahkan ke
+        Kotak Masuk terpisah dan Anda tidak akan menerima pemberitahuan email.
+      user_mute_admins_and_moderators: Anda dapat membisukan Admin dan Moderator tetapi
+        pesan mereka tidak akan dibisukan.
+      table:
+        thead:
+          muted_user: Pengguna yang Dibisukan
+          actions: Tindakan
+        tbody:
+          unmute: Batalkan pembisuan
+          send_message: Kirim pesan
+    create:
+      notice: Anda membisukan %{name}.
+      error: '%{name} tidak dapat dibisukan. %{full_message}.'
+    destroy:
+      notice: Anda berhenti membisukan %{name}.
+      error: Pengguna tidak dapat dihentikan pembisuannya. Silakan coba lagi.

   notes:
     index:
       title: Catatan dimasukkan atau dikomentari oleh %{user}
       heading: catatan oleh %{user}
   notes:
     index:
       title: Catatan dimasukkan atau dikomentari oleh %{user}
       heading: catatan oleh %{user}

-      subheading_html: Catatan dimasukkan atau dikomentari oleh %{user}
+      subheading_html: Catatan %{submitted} atau %{commented} oleh %{user}
+      subheading_submitted: dimasukkan
+      subheading_commented: dikomentari

       no_notes: Tidak ada catatan
       id: Id
       creator: Pembuat
       no_notes: Tidak ada catatan
       id: Id
       creator: Pembuat


@@ -2948,6 +3079,7 @@ id:
       reactivate: Aktifkan kembali
       comment_and_resolve: Komentar & Selesaikan
       comment: Komentar
       reactivate: Aktifkan kembali
       comment_and_resolve: Komentar & Selesaikan
       comment: Komentar

+      log_in_to_comment: Masuk untuk mengomentari catatan ini

       report_link_html: Bila catatan ini mengandung informasi sensitif yang perlu
         dihapus, Anda bisa %{link}.
       other_problems_resolve: Kalau ada masalah lain, mohon tutup/selesaikan dengan
       report_link_html: Bila catatan ini mengandung informasi sensitif yang perlu
         dihapus, Anda bisa %{link}.
       other_problems_resolve: Kalau ada masalah lain, mohon tutup/selesaikan dengan


@@ -2999,18 +3131,16 @@ id:
       locate:
         title: Tampilkan Lokasiku
         metersPopup:
       locate:
         title: Tampilkan Lokasiku
         metersPopup:

-          one: Anda berjarak satu meter dari titik ini

           other: Anda berjarak %{count} meter dari titik ini
         feetPopup:
           other: Anda berjarak %{count} meter dari titik ini
         feetPopup:

-          one: Anda berjarak satu kaki dari titik ini

           other: Anda berjarak %{count} kaki dari titik ini
       base:
         standard: Standar
         cyclosm: CyclOSM
         cycle_map: Peta Sepeda
         transport_map: Peta Transportasi
           other: Anda berjarak %{count} kaki dari titik ini
       base:
         standard: Standar
         cyclosm: CyclOSM
         cycle_map: Peta Sepeda
         transport_map: Peta Transportasi

+        tracestracktop_topo: Tracestrack Topo

         hot: Kemanusiaan
         hot: Kemanusiaan

-        opnvkarte: ÖPNVKarte

       layers:
         header: Layer Peta
         notes: Catatan Peta
       layers:
         header: Layer Peta
         notes: Catatan Peta


@@ -3025,8 +3155,7 @@ id:
       osm_france: OpenStreetMap France
       thunderforest_credit: Kotak peta oleh %{thunderforest_link}
       andy_allan: Andy Allan
       osm_france: OpenStreetMap France
       thunderforest_credit: Kotak peta oleh %{thunderforest_link}
       andy_allan: Andy Allan

-      opnvkarte_credit: Kotak peta oleh %{memomaps_link}
-      memomaps: MeMoMaps
+      tracestrack_credit: Kotak peta oleh %{tracestrack_link}

       hotosm_credit: Desain kotak peta oleh %{hotosm_link}, diproses oleh %{osm_france_link}
       hotosm_name: Humanitarian OpenStreetMap Team
     site:
       hotosm_credit: Desain kotak peta oleh %{hotosm_link}, diproses oleh %{osm_france_link}
       hotosm_name: Humanitarian OpenStreetMap Team
     site:


@@ -3038,6 +3167,7 @@ id:
       map_data_zoom_in_tooltip: Perbesar untuk melihat data peta
       queryfeature_tooltip: Fitur kueri
       queryfeature_disabled_tooltip: Perbesar ke fitur kueri
       map_data_zoom_in_tooltip: Perbesar untuk melihat data peta
       queryfeature_tooltip: Fitur kueri
       queryfeature_disabled_tooltip: Perbesar ke fitur kueri

+      embed_html_disabled: Penyematan HTML tidak tersedia untuk lapisan peta ini

     changesets:
       show:
         comment: Komentar
     changesets:
       show:
         comment: Komentar

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 3b49cc15a47e72565b4d02f77e19964955fb2179..4c79362609cf76245a1a197d8b92a90207dd497a 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -3104,7 +3104,6 @@ is:
         cycle_map: Hjólakort
         transport_map: Umferðarkort
         hot: Hjálparstarf
         cycle_map: Hjólakort
         transport_map: Umferðarkort
         hot: Hjálparstarf

-        opnvkarte: ÖPNVKarte

       layers:
         header: Lög á korti
         notes: Minnispunktar á korti
       layers:
         header: Lög á korti
         notes: Minnispunktar á korti


@@ -3121,8 +3120,6 @@ is:
       osm_france: OpenStreetMap Frakklandi
       thunderforest_credit: Kortatíglar frá %{thunderforest_link}
       andy_allan: Andy Allan
       osm_france: OpenStreetMap Frakklandi
       thunderforest_credit: Kortatíglar frá %{thunderforest_link}
       andy_allan: Andy Allan

-      opnvkarte_credit: Kortatíglar frá %{memomaps_link}
-      memomaps: MeMoMaps

       hotosm_credit: Stíll kortatígla frá %{hotosm_link} hýst af %{osm_france_link}
       hotosm_name: Humanitarian OpenStreetMap teyminu
     site:
       hotosm_credit: Stíll kortatígla frá %{hotosm_link} hýst af %{osm_france_link}
       hotosm_name: Humanitarian OpenStreetMap teyminu
     site:

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 67f12f23ce92f208f172a18ec525c22baaca5b68..2dce0bc1d22c28b73bef589f51622d3847b6346d 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1959,7 +1959,7 @@ it:
       heading: Entra
       email or username: Indirizzo e-mail o nome utente
       password: Password
       heading: Entra
       email or username: Indirizzo e-mail o nome utente
       password: Password

-      openid_html: '%{logo} OpenID:'
+      openid_html: '%{logo} OpenID'

       remember: Ricordati di me
       lost password link: Persa la password?
       login_button: Entra
       remember: Ricordati di me
       lost password link: Persa la password?
       login_button: Entra


@@ -3206,7 +3206,6 @@ it:
         transport_map: Mappa dei trasporti
         tracestracktop_topo: Tracestrack Topo
         hot: Umanitario
         transport_map: Mappa dei trasporti
         tracestracktop_topo: Tracestrack Topo
         hot: Umanitario

-        opnvkarte: ÖPNVKarte

       layers:
         header: Livelli mappa
         notes: Note sulla mappa
       layers:
         header: Livelli mappa
         notes: Note sulla mappa


@@ -3221,8 +3220,6 @@ it:
       osm_france: OpenStreetMap France
       thunderforest_credit: Tasselli per gentile concessione di %{thunderforest_link}
       andy_allan: Andy Allan
       osm_france: OpenStreetMap France
       thunderforest_credit: Tasselli per gentile concessione di %{thunderforest_link}
       andy_allan: Andy Allan

-      opnvkarte_credit: Tasselli per gentile concessione di %{memomaps_link}
-      memomaps: MeMoMaps

       tracestrack_credit: Tasselli per gentile concessione di %{tracestrack_link}
       hotosm_credit: Stile tasselli di %{hotosm_link} ospitato da %{osm_france_link}
       hotosm_name: La squadra di OpenStreetMap Humanitarian
       tracestrack_credit: Tasselli per gentile concessione di %{tracestrack_link}
       hotosm_credit: Stile tasselli di %{hotosm_link} ospitato da %{osm_france_link}
       hotosm_name: La squadra di OpenStreetMap Humanitarian

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 5c5e9a665d2619e228f032e8339e493bd4742c94..c4a6d8af46540e2be7591f61eebf7e74883a7828 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -2623,7 +2623,6 @@ ja:
         cycle_map: サイクリングマップ
         transport_map: 交通マップ
         hot: Humanitarian
         cycle_map: サイクリングマップ
         transport_map: 交通マップ
         hot: Humanitarian

-        opnvkarte: ÖPNVKarte

       layers:
         header: 地図のレイヤー
         notes: 地図メモ
       layers:
         header: 地図のレイヤー
         notes: 地図メモ

diff --git a/config/locales/kk-cyrl.yml b/config/locales/kk-cyrl.yml
index b42373947ed913521898310ca29519a5daa17dd1..924edef603cc6b62810bb47d905f7a68bad8593a 100644 (file)
--- a/config/locales/kk-cyrl.yml
+++ b/config/locales/kk-cyrl.yml
@@ -1131,7 +1131,6 @@ kk-cyrl:
         standard: Cтандартты
         cyclosm: CyclOSM
         transport_map: Көлік картасы
         standard: Cтандартты
         cyclosm: CyclOSM
         transport_map: Көлік картасы

-        opnvkarte: ÖPNVKarte

       layers:
         header: Карта қабаттары
         title: Қабаттар
       layers:
         header: Карта қабаттары
         title: Қабаттар

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 71151740ba2257c61e68904dbb5e2434edf6fb6d..b450eaa1ec816a78475f85752551c70159b445cd 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -2818,7 +2818,6 @@ ko:
         transport_map: 교통 지도
         tracestracktop_topo: 트레이스트랙 토포
         hot: 인도주의
         transport_map: 교통 지도
         tracestracktop_topo: 트레이스트랙 토포
         hot: 인도주의

-        opnvkarte: 대중교통 지도

       layers:
         header: 지도 레이어
         notes: 지도 참고
       layers:
         header: 지도 레이어
         notes: 지도 참고


@@ -2833,8 +2832,6 @@ ko:
       osm_france: 오픈스트리트맵 프랑스
       thunderforest_credit: '%{thunderforest_link} 제공 타일'
       andy_allan: 앤디 앨런
       osm_france: 오픈스트리트맵 프랑스
       thunderforest_credit: '%{thunderforest_link} 제공 타일'
       andy_allan: 앤디 앨런

-      opnvkarte_credit: '%{memomaps_link} 제공 타일'
-      memomaps: MeMoMaps

       tracestrack_credit: '%{tracestrack_link} 제공 타일'
       hotosm_credit: '%{osm_france_link}에서 호스팅하는 %{hotosm_link}의 타일 스타일'
       hotosm_name: 인도주의 오픈스트리트맵 팀
       tracestrack_credit: '%{tracestrack_link} 제공 타일'
       hotosm_credit: '%{osm_france_link}에서 호스팅하는 %{hotosm_link}의 타일 스타일'
       hotosm_name: 인도주의 오픈스트리트맵 팀

diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 43eee1b8da203bb5a88096ec4431bfee5d74035d..9094815635c9026071b21f16f1552b53296a0da4 100644 (file)
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -2793,7 +2793,6 @@ ku-Latn:
         cycle_map: Nexşeya bisiklête
         transport_map: Nexşeya transportê
         hot: Mirovatî
         cycle_map: Nexşeya bisiklête
         transport_map: Nexşeya transportê
         hot: Mirovatî

-        opnvkarte: ÖPNVKarte

       layers:
         header: Tebeqeyên nexşeyê
         notes: Notên nexşeyê
       layers:
         header: Tebeqeyên nexşeyê
         notes: Notên nexşeyê

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 2780f657794db486954f42a36eccd5a2218f3f6d..7b4e9c05d830aa81f7bc23b3470c1ffc372dc132 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -2461,7 +2461,6 @@ lb:
         cycle_map: Vëloskaart
         transport_map: Verkéierskaart
         hot: Humanitär
         cycle_map: Vëloskaart
         transport_map: Verkéierskaart
         hot: Humanitär

-        opnvkarte: Bus-Zuch-Kaart

       layers:
         header: Kaartenniveauen
         notes: Hiweiser/Feelermeldungen
       layers:
         header: Kaartenniveauen
         notes: Hiweiser/Feelermeldungen

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index cd71732cb9b110a55ce51f9d4521e98343398fdb..4a6f8ddae1e4dd4956560cfee3d611f99f796225 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -2756,7 +2756,6 @@ lt:
         cycle_map: Dviračių žemėlapis
         transport_map: Transporto žemėlapis
         hot: Humanitarinis
         cycle_map: Dviračių žemėlapis
         transport_map: Transporto žemėlapis
         hot: Humanitarinis

-        opnvkarte: ÖPNVKarte

       layers:
         header: Žemėlapio sluoksniai
         notes: Žemėlapio pastabos
       layers:
         header: Žemėlapio sluoksniai
         notes: Žemėlapio pastabos

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index be53a8d61a9b45ef129ea8b67d5d04ee6f408308..365d1468e3d194576da4eb4f099f46d918e29fa8 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -46,6 +46,8 @@ mk:
       messages:
         invalid_email_address: не претставува важечка е-пошта
         email_address_not_routable: не е насочлива
       messages:
         invalid_email_address: не претставува важечка е-пошта
         email_address_not_routable: не е насочлива

+        display_name_is_user_n: не може да биде user_n освен ако n е вашата корисничка
+          назнака

       models:
         user_mute:
           is_already_muted: е веќе замолкнат
       models:
         user_mute:
           is_already_muted: е веќе замолкнат


@@ -441,6 +443,15 @@ mk:
       introduction: Стиснете на картата за да ги најдете елементите во близина.
       nearby: Елементи во близина
       enclosing: Обиколни елементи
       introduction: Стиснете на картата за да ги најдете елементите во близина.
       nearby: Елементи во близина
       enclosing: Обиколни елементи

+  old_nodes:
+    not_found:
+      sorry: 'За жал, не го најдов јазолот #%{id} верзија %{version}.'
+  old_ways:
+    not_found:
+      sorry: 'За жал, не го најдов патот #%{id} верзија %{version}.'
+  old_relations:
+    not_found:
+      sorry: 'За жал, не го најдов односот #%{id} верзија %{version}.'

   changesets:
     changeset_paging_nav:
       showing_page: Страница %{page}
   changesets:
     changeset_paging_nav:
       showing_page: Страница %{page}


@@ -1826,7 +1837,7 @@ mk:
     new:
       title: Загубена лозинка
       heading: Ја заборавивте лозинката?
     new:
       title: Загубена лозинка
       heading: Ја заборавивте лозинката?

-      email address: 'Е-пошта:'
+      email address: Е-пошта

       new password button: Смени лозинка
       help_text: Внесете ја е-поштенската адреса со која се зачленивте, и ќе ви пратиме
         врска каде ќе наведете нова лозинка.
       new password button: Смени лозинка
       help_text: Внесете ја е-поштенската адреса со која се зачленивте, и ќе ви пратиме
         врска каде ќе наведете нова лозинка.


@@ -1888,8 +1899,8 @@ mk:
       title: Најава
       heading: Најава
       email or username: Е-пошта или корисничко име
       title: Најава
       heading: Најава
       email or username: Е-пошта или корисничко име

-      password: 'Лозинка:'
-      openid_html: '%{logo} OpenID:'
+      password: Лозинка
+      openid_html: '%{logo} OpenID'

       remember: Запомни ме
       lost password link: Ја заборавивте лозинката?
       login_button: Најава
       remember: Запомни ме
       lost password link: Ја заборавивте лозинката?
       login_button: Најава


@@ -3132,7 +3143,6 @@ mk:
         transport_map: Сообраќајна
         tracestracktop_topo: Tracestrack Топо
         hot: Хуманитарна
         transport_map: Сообраќајна
         tracestracktop_topo: Tracestrack Топо
         hot: Хуманитарна

-        opnvkarte: ÖPNVKarte

       layers:
         header: Слоеви на картата
         notes: Белешки на картата
       layers:
         header: Слоеви на картата
         notes: Белешки на картата


@@ -3147,8 +3157,6 @@ mk:
       osm_france: OpenStreetMap Франција
       thunderforest_credit: Полињата се доставени од %{thunderforest_link}
       andy_allan: Енди Алан
       osm_france: OpenStreetMap Франција
       thunderforest_credit: Полињата се доставени од %{thunderforest_link}
       andy_allan: Енди Алан

-      opnvkarte_credit: Полињата се доставени од %{memomaps_link}
-      memomaps: MeMoMaps

       tracestrack_credit: Полињата се доставени од %{tracestrack_link}
       hotosm_credit: Стилот на полињата е од %{hotosm_link} вдомен од %{osm_france_link}
       hotosm_name: Екипа на Хуманитарната OpenStreetMap
       tracestrack_credit: Полињата се доставени од %{tracestrack_link}
       hotosm_credit: Стилот на полињата е од %{hotosm_link} вдомен од %{osm_france_link}
       hotosm_name: Екипа на Хуманитарната OpenStreetMap

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index c8fa8937d03c71d6b4c24ee731aedbc8463ce815..48b248ef7755154ef1950d7967a7a2dbd4013659 100644 (file)
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -2400,7 +2400,6 @@ nb:
         cycle_map: Sykkelkart
         transport_map: Transport-kart
         hot: Humanitært
         cycle_map: Sykkelkart
         transport_map: Transport-kart
         hot: Humanitært

-        opnvkarte: ÖPNVKarte

       layers:
         header: Kartlag
         notes: Kartmerknader
       layers:
         header: Kartlag
         notes: Kartmerknader

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index d48f6db741893e1c8ab321478c436dd74dd75d90..b7853854494b8ad3502cf720f8146717bf1fcaa6 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -3155,7 +3155,6 @@ nl:
         transport_map: Transportkaart
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitair
         transport_map: Transportkaart
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitair

-        opnvkarte: ÖPNVKarte

       layers:
         header: Kaartlagen
         notes: Kaartopmerkingen
       layers:
         header: Kaartlagen
         notes: Kaartopmerkingen


@@ -3170,8 +3169,6 @@ nl:
       osm_france: OpenStreetMap Frankrijk
       thunderforest_credit: Tegels met dank aan %{thunderforest_link}
       andy_allan: Andy Allan
       osm_france: OpenStreetMap Frankrijk
       thunderforest_credit: Tegels met dank aan %{thunderforest_link}
       andy_allan: Andy Allan

-      opnvkarte_credit: Tegels met dank aan %{memomaps_link}
-      memomaps: MeMoMaps

       tracestrack_credit: Tegels met dank aan %{tracestrack_link}
       hotosm_credit: Kaartstijl door %{hotosm_link} gehost door %{osm_france_link}
       hotosm_name: Humanitair OpenStreetMap-team
       tracestrack_credit: Tegels met dank aan %{tracestrack_link}
       hotosm_credit: Kaartstijl door %{hotosm_link} gehost door %{osm_france_link}
       hotosm_name: Humanitair OpenStreetMap-team

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 0bf4740d5ad516e419b5f29a26df5ca01d3a773b..226cb4cf753f602125fdf2f6c337fa8c091d2709 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -3068,7 +3068,6 @@ pl:
         transport_map: Transportu publicznego
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitarna
         transport_map: Transportu publicznego
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitarna

-        opnvkarte: ÖPNVKarte

       layers:
         header: Warstwy
         notes: Uwagi
       layers:
         header: Warstwy
         notes: Uwagi


@@ -3084,8 +3083,6 @@ pl:
       osm_france: OpenStreetMap France
       thunderforest_credit: Kafelki dzięki uprzejmości %{thunderforest_link}
       andy_allan: Andy'ego Allana
       osm_france: OpenStreetMap France
       thunderforest_credit: Kafelki dzięki uprzejmości %{thunderforest_link}
       andy_allan: Andy'ego Allana

-      opnvkarte_credit: Kafelki dzięki uprzejmości %{memomaps_link}
-      memomaps: MeMoMaps

       hotosm_credit: 'Styl kafelków: %{hotosm_link}. Hosting: %{osm_france_link}'
       hotosm_name: Humanitarian OpenStreetMap Team
     site:
       hotosm_credit: 'Styl kafelków: %{hotosm_link}. Hosting: %{osm_france_link}'
       hotosm_name: Humanitarian OpenStreetMap Team
     site:

diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml
index f7bef6bc17189be26e11346657051e8e104c57ce..137add5b9cc221b2c4ba47131225752b8865c1cb 100644 (file)
--- a/config/locales/pnb.yml
+++ b/config/locales/pnb.yml
@@ -2074,7 +2074,6 @@ pnb:
         cycle_map: سائیکل نقشہ
         transport_map: ٹرینسپورٹ
         hot: لوک سیوی
         cycle_map: سائیکل نقشہ
         transport_map: ٹرینسپورٹ
         hot: لوک سیوی

-        opnvkarte: ٹرینسپورٹ (اوپن کارٹ)

       layers:
         header: نقشے دیاں تہیاں
         notes: نقشے دے نوٹ
       layers:
         header: نقشے دیاں تہیاں
         notes: نقشے دے نوٹ

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index ab6f28520de66c348d32304b352f10e34e74c6ce..684bbfdd3bbc66f4073b58e8e7a56ae442f5c5cd 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -3185,7 +3185,6 @@ pt-PT:
         transport_map: Transportes Públicos
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitário
         transport_map: Transportes Públicos
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitário

-        opnvkarte: ÖPNVKarte

       layers:
         header: Camadas do mapa
         notes: Notas no mapa
       layers:
         header: Camadas do mapa
         notes: Notas no mapa


@@ -3200,8 +3199,6 @@ pt-PT:
       osm_france: OpenStreetMap França
       thunderforest_credit: Mosaicos cortesia de %{thunderforest_link}
       andy_allan: Andy Allan
       osm_france: OpenStreetMap França
       thunderforest_credit: Mosaicos cortesia de %{thunderforest_link}
       andy_allan: Andy Allan

-      opnvkarte_credit: Mosaicos cortesia de %{memomaps_link}
-      memomaps: MeMoMaps

       tracestrack_credit: Mosaicos cortesia de %{tracestrack_link}
       hotosm_credit: Estilo de mosaicos por %{hotosm_link} hospedado por %{osm_france_link}
       hotosm_name: Equipa Humanitária do OpenStreetMap
       tracestrack_credit: Mosaicos cortesia de %{tracestrack_link}
       hotosm_credit: Estilo de mosaicos por %{hotosm_link} hospedado por %{osm_france_link}
       hotosm_name: Equipa Humanitária do OpenStreetMap

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index c8a6e147e27fda9a02eb16c5bbfbff2c23e63162..4d2c010a0cd51c658640b8e413111639368ee4db 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -100,6 +100,11 @@ pt:
       messages:
         invalid_email_address: não parece ser um endereço de e-mail válido
         email_address_not_routable: não é roteável
       messages:
         invalid_email_address: não parece ser um endereço de e-mail válido
         email_address_not_routable: não é roteável

+        display_name_is_user_n: não pode ser user_n a não ser que n seja o seu ID
+          de usuário
+      models:
+        user_mute:
+          is_already_muted: já está silenciado

     models:
       acl: Lista de controle de acesso
       changeset: Conjunto de alterações
     models:
       acl: Lista de controle de acesso
       changeset: Conjunto de alterações


@@ -124,7 +129,7 @@ pt:
       relation: Relação
       relation_member: Membro da relação
       relation_tag: Etiqueta de relação
       relation: Relação
       relation_member: Membro da relação
       relation_tag: Etiqueta de relação

-      report: Reportar
+      report: Denúncia

       session: Sessão
       trace: Trilha
       tracepoint: Ponto de trilha
       session: Sessão
       trace: Trilha
       tracepoint: Ponto de trilha


@@ -186,7 +191,7 @@ pt:
         title: Título
         description: Descrição
       report:
         title: Título
         description: Descrição
       report:

-        category: Seleciona um motivo para o seu relatório
+        category: Selecione um motivo para a sua denúncia

         details: Por favor, forneça mais alguns detalhes sobre o problema (obrigatório).
       user:
         auth_provider: Provedor de autenticação
         details: Por favor, forneça mais alguns detalhes sobre o problema (obrigatório).
       user:
         auth_provider: Provedor de autenticação


@@ -222,42 +227,42 @@ pt:
   datetime:
     distance_in_words_ago:
       about_x_hours:
   datetime:
     distance_in_words_ago:
       about_x_hours:

-        one: cerca de %{count} hora atrás
-        other: cerca de %{count} horas atrás
+        one: há cerca de %{count} hora
+        other: há cerca de %{count} horas

       about_x_months:
       about_x_months:

-        one: cerca de %{count} mês atrás
-        other: cerca de %{count} meses atrás
+        one: há cerca de %{count} mês
+        other: há cerca de %{count} meses

       about_x_years:
       about_x_years:

-        one: cerca de %{count} ano atrás
-        other: cerca de %{count} anos atrás
+        one: há cerca de %{count} ano
+        other: há cerca de %{count} anos

       almost_x_years:
       almost_x_years:

-        one: quase %{count} ano atrás
-        other: quase %{count} anos atrás
-      half_a_minute: meio minuto atrás
+        one: há quase %{count} ano
+        other: há quase %{count} anos
+      half_a_minute: há meio minuto

       less_than_x_seconds:
       less_than_x_seconds:

-        one: menos de %{count} segundo atrás
-        other: menos de %{count} segundos atrás
+        one: há menos de %{count} segundo
+        other: há menos de %{count} segundos

       less_than_x_minutes:
       less_than_x_minutes:

-        one: menos de %{count} minuto atras
-        other: menos de %{count} minutos atrás
+        one: há menos de %{count} minuto
+        other: há menos de %{count} minutos

       over_x_years:
       over_x_years:

-        one: mais de %{count} ano atrás
-        other: mais de %{count} anos atrás
+        one: há mais de %{count} ano
+        other: há mais de %{count} anos

       x_seconds:
       x_seconds:

-        one: '%{count} segundo atrás'
-        other: '%{count} segundos atrás'
+        one: há %{count} segundo
+        other: há %{count} segundos

       x_minutes:
       x_minutes:

-        one: '%{count} minuto atrás'
-        other: '%{count} minutos atrás'
+        one: há %{count} minuto
+        other: há %{count} minutos

       x_days:
       x_days:

-        one: '%{count} dia atrás'
-        other: '%{count} dias atrás'
+        one: ontem
+        other: há %{count} dias

       x_months:
       x_months:

-        one: '%{count} mês atrás'
-        other: '%{count} meses atrás'
+        one: há %{count} mês
+        other: há %{count} meses

       x_years:
       x_years:

-        one: '%{count} ano atrás'
-        other: '%{count} anos atrás'
+        one: há %{count} ano
+        other: há %{count} anos

   editor:
     default: Padrão (atualmente %{name})
     id:
   editor:
     default: Padrão (atualmente %{name})
     id:


@@ -288,9 +293,9 @@ pt:
         reopened_at_by_html: Reativado %{when} por %{user}
       rss:
         title: Notas do OpenStreetMap
         reopened_at_by_html: Reativado %{when} por %{user}
       rss:
         title: Notas do OpenStreetMap

-        description_all: Uma lista de notas relatadas, comentadas ou fechadas
-        description_area: Uma lista de notas relatadas, comentadas ou encerradas na
-          sua área [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
+        description_all: Uma lista de notas denunciadas, comentadas ou fechadas
+        description_area: Uma lista de notas reportadas, comentadas ou resolvidas
+          na sua área [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]

         description_item: Um feed RSS para a nota %{id}
         opened: nova nota (perto de %{place})
         commented: novo comentário (perto de %{place})
         description_item: Um feed RSS para a nota %{id}
         opened: nova nota (perto de %{place})
         commented: novo comentário (perto de %{place})


@@ -324,6 +329,8 @@ pt:
         retain_changeset_discussions: Suas discussões em conjuntos de edições, se
           existirem, serão retidas.
         retain_email: Seu endereço de e-mail será retido.
         retain_changeset_discussions: Suas discussões em conjuntos de edições, se
           existirem, serão retidas.
         retain_email: Seu endereço de e-mail será retido.

+        recent_editing_html: Como você editou recentemente, sua conta não pode ser
+          excluída no momento. A exclusão será possível em %{time}.

         confirm_delete: Tem certeza?
         cancel: Cancelar
   accounts:
         confirm_delete: Tem certeza?
         cancel: Cancelar
   accounts:


@@ -376,9 +383,9 @@ pt:
     created: Criado
     closed: Fechado
     created_ago_html: Criado há %{time_ago}
     created: Criado
     closed: Fechado
     created_ago_html: Criado há %{time_ago}

-    closed_ago_html: Fechado há %{time_ago}
+    closed_ago_html: Fechado %{time_ago}

     created_ago_by_html: Criado há %{time_ago} por %{user}
     created_ago_by_html: Criado há %{time_ago} por %{user}

-    closed_ago_by_html: Fechado há %{time_ago} por %{user}
+    closed_ago_by_html: Fechado %{time_ago} por %{user}

     deleted_ago_by_html: Excluído há %{time_ago} por %{user}
     edited_ago_by_html: Editado há %{time_ago} por %{user}
     version: Versão
     deleted_ago_by_html: Excluído há %{time_ago} por %{user}
     edited_ago_by_html: Editado há %{time_ago} por %{user}
     version: Versão


@@ -1494,21 +1501,21 @@ pt:
       select_status: Selecionar status
       select_type: Selecione o tipo
       select_last_updated_by: Selecione a última atualização por
       select_status: Selecionar status
       select_type: Selecione o tipo
       select_last_updated_by: Selecione a última atualização por

-      reported_user: Reportar usuário
+      reported_user: Usuário denunciado

       not_updated: Não atualizado
       search: Pesquisar
       search_guidance: 'Pesquisar problemas:'
       user_not_found: Usuário não existe
       issues_not_found: Nenhum problema foi encontrado
       status: Status
       not_updated: Não atualizado
       search: Pesquisar
       search_guidance: 'Pesquisar problemas:'
       user_not_found: Usuário não existe
       issues_not_found: Nenhum problema foi encontrado
       status: Status

-      reports: Relatórios
+      reports: Denúncias

       last_updated: Última Atualização
       last_updated_time_ago_user_html: Há %{time_ago} por %{user}
       last_updated: Última Atualização
       last_updated_time_ago_user_html: Há %{time_ago} por %{user}

-      link_to_reports: Ver Denúncias
+      link_to_reports: Ver denúncias

       reports_count:
       reports_count:

-        one: '%{count} Relatório'
-        other: '%{count} Relatórios'
-      reported_item: Item Reportado
+        one: '%{count} denúncia'
+        other: '%{count} denúncias'
+      reported_item: Elemento denunciado

       states:
         ignored: Ignorado
         open: Aberto
       states:
         ignored: Ignorado
         open: Aberto


@@ -1516,18 +1523,18 @@ pt:
     show:
       title: '%{status} Problema #%{issue_id}'
       reports:
     show:
       title: '%{status} Problema #%{issue_id}'
       reports:

-        one: '%{count} relatório'
-        other: '%{count} relatórios'
-      no_reports: Sem relatórios
-      report_created_at_html: Primeiro relatado em %{datetime}
+        one: '%{count} denúncia'
+        other: '%{count} denúncias'
+      no_reports: Sem denúncias
+      report_created_at_html: Denunciado pela primeira vez em %{datetime}

       last_resolved_at_html: Resolvido pela última vez em %{datetime}
       last_updated_at_html: Última atualização em %{datetime} por %{displayname}
       resolve: Resolvido
       ignore: Ignorar
       reopen: Reabrir
       last_resolved_at_html: Resolvido pela última vez em %{datetime}
       last_updated_at_html: Última atualização em %{datetime} por %{displayname}
       resolve: Resolvido
       ignore: Ignorar
       reopen: Reabrir

-      reports_of_this_issue: Denunciar este problema
-      read_reports: Ler Denúncia
-      new_reports: Novas Denúncias
+      reports_of_this_issue: Denúncias deste problema
+      read_reports: Ler denúncias
+      new_reports: Novas denúncias

       other_issues_against_this_user: Outros problemas contra este usuário
       no_other_issues: Nenhum outro problema contra este usuário.
       comments_on_this_issue: Comentários sobre este problema
       other_issues_against_this_user: Outros problemas contra este usuário
       no_other_issues: Nenhum outro problema contra este usuário.
       comments_on_this_issue: Comentários sobre este problema


@@ -1541,7 +1548,7 @@ pt:
       comment_from_html: Comentário de %{user_link} em %{comment_created_at}
       reassign_param: Reatribuir problema?
     reports:
       comment_from_html: Comentário de %{user_link} em %{comment_created_at}
       reassign_param: Reatribuir problema?
     reports:

-      reported_by_html: Reportado como %{category} por %{user} em %{updated_at}
+      reported_by_html: Denunciado como %{category} por %{user} em %{updated_at}

     helper:
       reportable_title:
         diary_comment: '%{entry_title}, comentário #%{comment_id}'
     helper:
       reportable_title:
         diary_comment: '%{entry_title}, comentário #%{comment_id}'


@@ -1552,8 +1559,8 @@ pt:
       issue_reassigned: O seu comentário foi criado e o problema foi reatribuído
   reports:
     new:
       issue_reassigned: O seu comentário foi criado e o problema foi reatribuído
   reports:
     new:

-      title_html: Denuncia %{link}
-      missing_params: Não é possível criar um novo relatório
+      title_html: Denunciar %{link}
+      missing_params: Não foi possível criar uma nova denúncia

       disclaimer:
         intro: 'Antes de enviar sua denúncia para os moderadores do site, certifique-se
           de que:'
       disclaimer:
         intro: 'Antes de enviar sua denúncia para os moderadores do site, certifique-se
           de que:'


@@ -1584,7 +1591,7 @@ pt:
           abusive_label: Esta nota é abusiva
           other_label: Outro
     create:
           abusive_label: Esta nota é abusiva
           other_label: Outro
     create:

-      successful_report: Sua denúncia foi registrada com sucesso
+      successful_report: A sua denúncia foi registrada com sucesso

       provide_details: Por favor, forneça os detalhes necessários
   layouts:
     logo:
       provide_details: Por favor, forneça os detalhes necessários
   layouts:
     logo:


@@ -1818,11 +1825,13 @@ pt:
       to: Para
       subject: Assunto
       date: Data
       to: Para
       subject: Assunto
       date: Data

+      actions: Ações

     message_summary:
       unread_button: Marcar como não lida
       read_button: Marcar como lida
       reply_button: Responder
       destroy_button: Apagar
     message_summary:
       unread_button: Marcar como não lida
       read_button: Marcar como lida
       reply_button: Responder
       destroy_button: Apagar

+      unmute_button: Mover para caixa de entrada

     new:
       title: Enviar mensagem
       send_message_to_html: Enviar uma nova mensagem para %{name}
     new:
       title: Enviar mensagem
       send_message_to_html: Enviar uma nova mensagem para %{name}


@@ -1837,12 +1846,18 @@ pt:
       body: Não existe uma mensagem com este id.
     outbox:
       title: Caixa de Saída
       body: Não existe uma mensagem com este id.
     outbox:
       title: Caixa de Saída

+      actions: Ações

       messages:
         one: Você tem %{count} mensagem enviada
         other: Você tem %{count} mensagens enviadas
       no_sent_messages_html: Você ainda não enviou nenhuma mensagem. Por que não entrar
         em contato com %{people_mapping_nearby_link}?
       people_mapping_nearby: alguém mapeando por perto
       messages:
         one: Você tem %{count} mensagem enviada
         other: Você tem %{count} mensagens enviadas
       no_sent_messages_html: Você ainda não enviou nenhuma mensagem. Por que não entrar
         em contato com %{people_mapping_nearby_link}?
       people_mapping_nearby: alguém mapeando por perto

+    muted:
+      title: Mensagens silenciadas
+      messages:
+        one: '%{count} mensagem silenciada'
+        other: Você tem %{count} mensagens silenciadas

     reply:
       wrong_user: Você está conectado como `%{user}' mas a mensagem que você quer
         responder não foi enviada para este usuário. Faça o login com o usuário correto
     reply:
       wrong_user: Você está conectado como `%{user}' mas a mensagem que você quer
         responder não foi enviada para este usuário. Faça o login com o usuário correto


@@ -1861,16 +1876,20 @@ pt:
     heading:
       my_inbox: Minha Caixa de Entrada
       my_outbox: Minha caixa de saída
     heading:
       my_inbox: Minha Caixa de Entrada
       my_outbox: Minha caixa de saída

+      muted_messages: Mensagens silenciadas

     mark:
       as_read: Mensagem marcada como lida
       as_unread: Mensagem marcada como não lida
     mark:
       as_read: Mensagem marcada como lida
       as_unread: Mensagem marcada como não lida

+    unmute:
+      notice: A mensagem foi movida para a caixa de entrada
+      error: A mensagem não pôde ser movida para a caixa de entrada.

     destroy:
       destroyed: Mensagem apagada
   passwords:
     new:
       title: Senha esquecida
       heading: Esqueceu sua senha?
     destroy:
       destroyed: Mensagem apagada
   passwords:
     new:
       title: Senha esquecida
       heading: Esqueceu sua senha?

-      email address: 'Endereço de E-mail:'
+      email address: Endereço de e-mail

       new password button: Redefinir senha
       help_text: Digite o endereço de e-mail que você usou para se conectar e enviaremos
         um link que você poderá usar para redefinir a sua senha.
       new password button: Redefinir senha
       help_text: Digite o endereço de e-mail que você usou para se conectar e enviaremos
         um link que você poderá usar para redefinir a sua senha.


@@ -1885,6 +1904,7 @@ pt:
       flash token bad: O código não confere, verifique a URL.
     update:
       flash changed: Sua senha foi alterada.
       flash token bad: O código não confere, verifique a URL.
     update:
       flash changed: Sua senha foi alterada.

+      flash token bad: O token não foi encontrado. Talvez deveria conferir o URL?

   preferences:
     show:
       title: Minhas preferências
   preferences:
     show:
       title: Minhas preferências


@@ -1929,9 +1949,9 @@ pt:
     new:
       title: Entrar
       heading: Entrar
     new:
       title: Entrar
       heading: Entrar

-      email or username: 'E-mail ou nome de usuário:'
-      password: 'Senha:'
-      openid_html: '%{logo} OpenID:'
+      email or username: E-mail ou nome de usuário
+      password: Senha
+      openid_html: '%{logo} OpenID'

       remember: Lembrar neste computador
       lost password link: Esqueceu sua senha?
       login_button: Entrar
       remember: Lembrar neste computador
       lost password link: Esqueceu sua senha?
       login_button: Entrar


@@ -1989,6 +2009,7 @@ pt:
       image: Imagem
       alt: Texto alternativo
       url: URL
       image: Imagem
       alt: Texto alternativo
       url: URL

+      codeblock: Bloco de código

     richtext_field:
       edit: Editar
       preview: Pré-visualizar
     richtext_field:
       edit: Editar
       preview: Pré-visualizar


@@ -2351,41 +2372,63 @@ pt:
           primary: Via primária
           secondary: Via secundária
           unclassified: Via não classificada
           primary: Via primária
           secondary: Via secundária
           unclassified: Via não classificada

+          pedestrian: Calçadão

           track: Estrada rústica
           bridleway: Hipovia
           cycleway: Ciclovia
           cycleway_national: Ciclovia nacional
           cycleway_regional: Ciclovia regional
           cycleway_local: Ciclovia local
           track: Estrada rústica
           bridleway: Hipovia
           cycleway: Ciclovia
           cycleway_national: Ciclovia nacional
           cycleway_regional: Ciclovia regional
           cycleway_local: Ciclovia local

+          cycleway_mtb: Rota de bicicleta de montanha

           footway: Caminho de pedestre
           rail: Ferrovia
           footway: Caminho de pedestre
           rail: Ferrovia

+          train: Trem

           subway: Metrô
           subway: Metrô

+          ferry: Balsa
+          light_rail: VLT
+          tram: Bonde
+          trolleybus: Trólebus
+          bus: Ônibus

           cable_car: Bonde aéreo
           chair_lift: Teleférico
           runway: Pista de Pouso
           cable_car: Bonde aéreo
           chair_lift: Teleférico
           runway: Pista de Pouso

-          taxiway: pista de taxiamento
+          taxiway: Pista de taxiamento

           apron: Pátio de aeródromo
           admin: Limite administrativo
           apron: Pátio de aeródromo
           admin: Limite administrativo

+          capital: Capital
+          city: Cidade
+          orchard: Pomar

           vineyard: Vinha
           forest: Floresta manejada
           wood: Bosque nativo
           vineyard: Vinha
           forest: Floresta manejada
           wood: Bosque nativo

+          farmland: Terreno agrícola
+          grass: Grama

           meadow: Prado
           meadow: Prado

+          bare_rock: Rocha exposta
+          sand: Areia

           golf: Campo de golfe
           park: Parque
           common: Baldio comunitário
           golf: Campo de golfe
           park: Parque
           common: Baldio comunitário

+          built_up: Zona edificada

           resident: Área residencial
           retail: Área de varejo
           industrial: Área industrial
           commercial: Área de negócios
           heathland: Urzal
           resident: Área residencial
           retail: Área de varejo
           industrial: Área industrial
           commercial: Área de negócios
           heathland: Urzal

+          scrubland: Matagal

           lake: Lago
           reservoir: Reservatório
           lake: Lago
           reservoir: Reservatório

+          intermittent_water: Corpo de água intermitente
+          glacier: Geleira
+          reef: Recife
+          wetland: Pântano

           farm: Lavoura
           brownfield: Terreno abandonado
           cemetery: Cemitério secular
           allotments: Horta urbana
           pitch: Quadra esportiva
           centre: Centro/clube esportivo
           farm: Lavoura
           brownfield: Terreno abandonado
           cemetery: Cemitério secular
           allotments: Horta urbana
           pitch: Quadra esportiva
           centre: Centro/clube esportivo

+          beach: Praia

           reserve: Reserva ambiental
           military: Área militar
           school: Escola/Universidade
           reserve: Reserva ambiental
           military: Área militar
           school: Escola/Universidade


@@ -2400,8 +2443,12 @@ pt:
           private: Acesso restrito
           destination: Acesso local apenas
           construction: Vias em construção
           private: Acesso restrito
           destination: Acesso local apenas
           construction: Vias em construção

+          bus_stop: Ponto de ônibus
+          stop: Parada

           bicycle_shop: Loja de bicicletas
           bicycle_shop: Loja de bicicletas

+          bicycle_rental: Aluguel de bicicletas

           bicycle_parking: Bicicletário
           bicycle_parking: Bicicletário

+          bicycle_parking_small: Estacionamento pequeno para bicicletas

           toilets: Banheiros
     welcome:
       title: Bem-vindo(a)!
           toilets: Banheiros
     welcome:
       title: Bem-vindo(a)!


@@ -2444,6 +2491,7 @@ pt:
         imports: Importações
         automated_edits: Edições automáticas
       start_mapping: Começando a Mapear
         imports: Importações
         automated_edits: Edições automáticas
       start_mapping: Começando a Mapear

+      continue_authorization: Continuar autorização

       add_a_note:
         title: Sem tempo para editar? Inclua uma nota!
         para_1: Se você só quer que algo pequeno seja arrumado, e não tem tempo para
       add_a_note:
         title: Sem tempo para editar? Inclua uma nota!
         para_1: Se você só quer que algo pequeno seja arrumado, e não tem tempo para


@@ -2603,6 +2651,7 @@ pt:
       oauth1_settings: Configurações do OAuth 1
       oauth2_applications: Aplicações OAuth 2
       oauth2_authorizations: Autorizações do OAuth 2
       oauth1_settings: Configurações do OAuth 1
       oauth2_applications: Aplicações OAuth 2
       oauth2_authorizations: Autorizações do OAuth 2

+      muted_users: Usuários silenciados

   oauth:
     authorize:
       title: Autorizar acesso à sua conta
   oauth:
     authorize:
       title: Autorizar acesso à sua conta


@@ -2814,6 +2863,8 @@ pt:
       my_dashboard: Meu painel
       blocks on me: Bloqueios sobre mim
       blocks by me: Bloqueios por mim
       my_dashboard: Meu painel
       blocks on me: Bloqueios sobre mim
       blocks by me: Bloqueios por mim

+      create_mute: Silenciar este usuário
+      destroy_mute: Deixar de silenciar este usuário

       edit_profile: Editar perfil
       send message: Enviar mensagem
       diary: Diário
       edit_profile: Editar perfil
       send message: Enviar mensagem
       diary: Diário


@@ -2845,6 +2896,7 @@ pt:
           importer: Revogar o acesso de importador
       block_history: Bloqueios ativos
       moderator_history: Bloqueios aplicados
           importer: Revogar o acesso de importador
       block_history: Bloqueios ativos
       moderator_history: Bloqueios aplicados

+      revoke_all_blocks: Revogar todos os bloqueios

       comments: Comentários
       create_block: Bloquear este usuário
       activate_user: Ativar este usuário
       comments: Comentários
       create_block: Bloquear este usuário
       activate_user: Ativar este usuário


@@ -2945,7 +2997,7 @@ pt:
       success: Bloqueio atualizado.
     index:
       title: Bloqueios do usuário
       success: Bloqueio atualizado.
     index:
       title: Bloqueios do usuário

-      heading: Lista de bloqueios do usuário.
+      heading: Lista de bloqueios de usuário

       empty: Nenhum bloqueio foi aplicado ainda.
     revoke:
       title: Retirando bloqueio de %{block_on}
       empty: Nenhum bloqueio foi aplicado ainda.
     revoke:
       title: Retirando bloqueio de %{block_on}


@@ -2955,6 +3007,11 @@ pt:
       confirm: Deseja realmente retirar esse bloqueio?
       revoke: Cancelar!
       flash: Esse bloqueio foi retirado.
       confirm: Deseja realmente retirar esse bloqueio?
       revoke: Cancelar!
       flash: Esse bloqueio foi retirado.

+    revoke_all:
+      title: Revogando todos os bloqueios em %{block_on}
+      heading_html: Revogando todos os bloqueios em %{block_on}
+      empty: '%{name} não tem bloqueios ativos.'
+      confirm: Você tem certeza de que quer revogar %{active_blocks}?

     helper:
       time_future_html: Termina em %{time}.
       until_login: Ativo até que o usuário se conecte.
     helper:
       time_future_html: Termina em %{time}.
       until_login: Ativo até que o usuário se conecte.


@@ -3048,6 +3105,7 @@ pt:
       reactivate: Reativar
       comment_and_resolve: Comentar e resolver
       comment: Comentar
       reactivate: Reativar
       comment_and_resolve: Comentar e resolver
       comment: Comentar

+      log_in_to_comment: Entre na sua conta para comentar esta nota

       report_link_html: Se esta nota contiver informação sensível que tenha de ser
         removida, podes %{link}.
       other_problems_resolve: Para qualquer outro problema com a nota, resolve-a pessoalmente
       report_link_html: Se esta nota contiver informação sensível que tenha de ser
         removida, podes %{link}.
       other_problems_resolve: Para qualquer outro problema com a nota, resolve-a pessoalmente


@@ -3110,7 +3168,6 @@ pt:
         transport_map: Transporte Público
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitário
         transport_map: Transporte Público
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitário

-        opnvkarte: ÖPNVKarte

       layers:
         header: Camadas do mapa
         notes: Notas de mapa
       layers:
         header: Camadas do mapa
         notes: Notas de mapa


@@ -3125,8 +3182,6 @@ pt:
       osm_france: OpenStreetMap França
       thunderforest_credit: Mosaico cortesia de %{thunderforest_link}
       andy_allan: Andy Allan
       osm_france: OpenStreetMap França
       thunderforest_credit: Mosaico cortesia de %{thunderforest_link}
       andy_allan: Andy Allan

-      opnvkarte_credit: Mosaico cortesia de %{memomaps_link}
-      memomaps: MeMoMaps

       tracestrack_credit: Mosaico cortesia de %{tracestrack_link}
       hotosm_credit: Estilo de mosaico por %{hotosm_link} hospedado por %{osm_france_link}
       hotosm_name: Humanitarian OpenStreetMap Team
       tracestrack_credit: Mosaico cortesia de %{tracestrack_link}
       hotosm_credit: Estilo de mosaico por %{hotosm_link} hospedado por %{osm_france_link}
       hotosm_name: Humanitarian OpenStreetMap Team


@@ -3139,6 +3194,8 @@ pt:
       map_data_zoom_in_tooltip: Aproxime para ver dados do mapa
       queryfeature_tooltip: Consultar elementos
       queryfeature_disabled_tooltip: Aproxime para consultar elementos
       map_data_zoom_in_tooltip: Aproxime para ver dados do mapa
       queryfeature_tooltip: Consultar elementos
       queryfeature_disabled_tooltip: Aproxime para consultar elementos

+      embed_html_disabled: A incorporação de HTML não está disponível para esta camada
+        do mapa

     changesets:
       show:
         comment: Comentar
     changesets:
       show:
         comment: Comentar

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 624560049b15b3f08c2aab152a6e2aa090a05a82..e15fba92ebeefd24467641b57b398729bba504e5 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -3144,7 +3144,6 @@ ro:
         transport_map: Hartă de transport
         tracestracktop_topo: Tracestrack Topo
         hot: Umanitară
         transport_map: Hartă de transport
         tracestracktop_topo: Tracestrack Topo
         hot: Umanitară

-        opnvkarte: ÖPNVKarte

       layers:
         header: Straturile hărții
         notes: Notație hartă
       layers:
         header: Straturile hărții
         notes: Notație hartă


@@ -3159,8 +3158,6 @@ ro:
       osm_france: OpenStreetMap Franța
       thunderforest_credit: Plăci prin amabilitatea lui %{thunderforest_link}
       andy_allan: Andy Allan
       osm_france: OpenStreetMap Franța
       thunderforest_credit: Plăci prin amabilitatea lui %{thunderforest_link}
       andy_allan: Andy Allan

-      opnvkarte_credit: Tile-uri prin amabilitatea lui %{memomaps_link}
-      memomaps: MeMoMaps

       tracestrack_credit: Tile-uri prin amabilitatea lui %{tracestrack_link}
       hotosm_credit: Stilul tile-urilor creat de %{hotosm_link} găzduit de %{osm_france_link}
       hotosm_name: Echipa Umanitară OpenStreetMap
       tracestrack_credit: Tile-uri prin amabilitatea lui %{tracestrack_link}
       hotosm_credit: Stilul tile-urilor creat de %{hotosm_link} găzduit de %{osm_france_link}
       hotosm_name: Echipa Umanitară OpenStreetMap

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 61686301f8a64e0380a1a1cf8740fc7687af4784..fd8d61d8ab9da2f2aa7ad71929e0993cf652998a 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -3073,7 +3073,6 @@ ru:
         cycle_map: Велосипедная карта
         transport_map: Карта транспорта
         hot: Гуманитарная
         cycle_map: Велосипедная карта
         transport_map: Карта транспорта
         hot: Гуманитарная

-        opnvkarte: ÖPNVKarte

       layers:
         header: Слои карты
         notes: Заметки
       layers:
         header: Слои карты
         notes: Заметки


@@ -3087,7 +3086,6 @@ ru:
       osm_france: OpenStreetMap Франция
       thunderforest_credit: Тайлы предоставлены %{thunderforest_link}
       andy_allan: Энди Аллан
       osm_france: OpenStreetMap Франция
       thunderforest_credit: Тайлы предоставлены %{thunderforest_link}
       andy_allan: Энди Аллан

-      opnvkarte_credit: Тайлы предоставлены %{memomaps_link}

       hotosm_credit: Стиль тайлов от %{hotosm_link} размещен на %{osm_france_link}
     site:
       edit_tooltip: Править карту
       hotosm_credit: Стиль тайлов от %{hotosm_link} размещен на %{osm_france_link}
     site:
       edit_tooltip: Править карту

diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 4021e2df1e398eb47f4f570c4896935f272117cc..1dae73587029813edd27c65448af62c81d8e3147 100644 (file)
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -3110,7 +3110,6 @@ sc:
         transport_map: Mapa de sos trasportos
         tracestracktop_topo: Tracestrack Topo
         hot: Umanitàriu
         transport_map: Mapa de sos trasportos
         tracestracktop_topo: Tracestrack Topo
         hot: Umanitàriu

-        opnvkarte: ÖPNVKarte

       layers:
         header: Istratos de sa mapa
         notes: Notas de sa mapa
       layers:
         header: Istratos de sa mapa
         notes: Notas de sa mapa


@@ -3126,8 +3125,6 @@ sc:
       osm_france: OpenStreetMap Frantza
       thunderforest_credit: Tasseddos frunidos pro cortesia dae %{thunderforest_link}
       andy_allan: Andy Allan
       osm_france: OpenStreetMap Frantza
       thunderforest_credit: Tasseddos frunidos pro cortesia dae %{thunderforest_link}
       andy_allan: Andy Allan

-      opnvkarte_credit: Tasseddos frunidos pro cortesia dae %{memomaps_link}
-      memomaps: MeMoMaps

       tracestrack_credit: Tasseddos frunidos pro cortesia dae %{tracestrack_link}
       hotosm_credit: Istile de sos tasseddos de %{hotosm_link} acasagiadu dae %{osm_france_link}
       hotosm_name: Iscuadra umanitària de OpenStreetMap
       tracestrack_credit: Tasseddos frunidos pro cortesia dae %{tracestrack_link}
       hotosm_credit: Istile de sos tasseddos de %{hotosm_link} acasagiadu dae %{osm_france_link}
       hotosm_name: Iscuadra umanitària de OpenStreetMap

diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index fb77107fcfb71ab4441592de9226d8af286e71b7..628687296d1309d9de40c783a9377a99d0147e2c 100644 (file)
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -2035,7 +2035,6 @@ scn:
         cycle_map: Cartina pî bicicletti
         transport_map: Mappa dî trasporti
         hot: Umanitaria
         cycle_map: Cartina pî bicicletti
         transport_map: Mappa dî trasporti
         hot: Umanitaria

-        opnvkarte: ÖPNVKarte

       layers:
         header: Strati dâ cartina
         notes: Noti dâ cartina
       layers:
         header: Strati dâ cartina
         notes: Noti dâ cartina

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 196ab794df4e1d8bc3e113d9c15efdf96db3cc84..ddf3cdb762eeddd0fa7806b63fec6f596c4f4b90 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -2733,7 +2733,6 @@ sk:
         cycle_map: Cyklomapa
         transport_map: Dopravná mapa
         hot: Humanitárna
         cycle_map: Cyklomapa
         transport_map: Dopravná mapa
         hot: Humanitárna

-        opnvkarte: ÖPNVKarte

       layers:
         header: Mapové vrstvy
         notes: Poznámky k mape
       layers:
         header: Mapové vrstvy
         notes: Poznámky k mape


@@ -2748,8 +2747,6 @@ sk:
       osm_france: OpenStreetMap Francúzsko
       thunderforest_credit: Dlaždice s dovolením od %{thunderforest_link}
       andy_allan: Andyho Allana
       osm_france: OpenStreetMap Francúzsko
       thunderforest_credit: Dlaždice s dovolením od %{thunderforest_link}
       andy_allan: Andyho Allana

-      opnvkarte_credit: Dlaždice s dovolením od %{memomaps_link}
-      memomaps: MeMoMaps

       hotosm_credit: Štýl dlaždíc od %{hotosm_link} poskytuje %{osm_france_link}
       hotosm_name: Humanitárneho tímu OpenStreetMap
     site:
       hotosm_credit: Štýl dlaždíc od %{hotosm_link} poskytuje %{osm_france_link}
       hotosm_name: Humanitárneho tímu OpenStreetMap
     site:

diff --git a/config/locales/skr-arab.yml b/config/locales/skr-arab.yml
index c0425c64f6bf7aac4fb475703fa0b57f362e416e..29f59ec9b680c0118e55fa40ab9bd196d90ad86d 100644 (file)
--- a/config/locales/skr-arab.yml
+++ b/config/locales/skr-arab.yml
@@ -1100,6 +1100,7 @@ skr-arab:
     new:
       title: لاگ ان
       heading: لاگ ان
     new:
       title: لاگ ان
       heading: لاگ ان

+      email or username: ای میل پتہ یا ورتݨ ناں

       password: پاس ورڈ
       openid_html: '%{logo} اوپن آئی ڈی:'
       remember: میکوں یاد رکھو
       password: پاس ورڈ
       openid_html: '%{logo} اوپن آئی ڈی:'
       remember: میکوں یاد رکھو


@@ -1231,6 +1232,7 @@ skr-arab:
           reservoir: ذخائر
           glacier: گلیشیئر
           farm: کھیت
           reservoir: ذخائر
           glacier: گلیشیئر
           farm: کھیت

+          beach: ساحل

           school: سکول
           university: یونی ورسٹی
           hospital: ہسپتال
           school: سکول
           university: یونی ورسٹی
           hospital: ہسپتال

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index aa1395ed4cb292977dac335be7471092be5eee31..523bd80dc1132bc5c9585ac6db0f63ddce6ff975 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -3227,7 +3227,6 @@ sl:
         transport_map: Prometna karta
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitarno
         transport_map: Prometna karta
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitarno

-        opnvkarte: ÖPNVKarte

       layers:
         header: Sloji zemljevida
         notes: Opombe na zemljevidu
       layers:
         header: Sloji zemljevida
         notes: Opombe na zemljevidu


@@ -3242,8 +3241,6 @@ sl:
       osm_france: OpenStreetMap France
       thunderforest_credit: Ploščice z dovoljenjem %{thunderforest_link}
       andy_allan: Andy Allan
       osm_france: OpenStreetMap France
       thunderforest_credit: Ploščice z dovoljenjem %{thunderforest_link}
       andy_allan: Andy Allan

-      opnvkarte_credit: Ploščice z dovoljenjem %{memomaps_link}
-      memomaps: MeMoMaps

       tracestrack_credit: Ploščice z dovoljenjem %{tracestrack_link}
       hotosm_credit: Slog ploščic %{hotosm_link}, gosti jih %{osm_france_link}
       hotosm_name: Humanitarna ekipa OpenStreetMap
       tracestrack_credit: Ploščice z dovoljenjem %{tracestrack_link}
       hotosm_credit: Slog ploščic %{hotosm_link}, gosti jih %{osm_france_link}
       hotosm_name: Humanitarna ekipa OpenStreetMap

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index e05969ff01d2082fb48a5691b6089363467e1d77..141fa13d9acf1ecf7ea6f83f00d7f761ad34c4eb 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -176,7 +176,55 @@ sr:
         new_email: (никада се не приказује јавно)
   datetime:
     distance_in_words_ago:
         new_email: (никада се не приказује јавно)
   datetime:
     distance_in_words_ago:

+      about_x_hours:
+        one: пре око %{count} сата
+        few: пре око %{count} сата
+        other: пре око %{count} сати
+      about_x_months:
+        one: пре око %{count} месец
+        few: пре око %{count} месеца
+        other: пре око %{count} месеци
+      about_x_years:
+        one: пре око %{count} године
+        few: пре око %{count} године
+        other: пре око %{count} година
+      almost_x_years:
+        one: пре скоро %{count} године
+        few: пре скоро %{count} године
+        other: пре скоро %{count} година

       half_a_minute: пре пола минута
       half_a_minute: пре пола минута

+      less_than_x_seconds:
+        one: пре мање од %{count} секунде
+        few: пре мање од %{count} секунде
+        other: пре мање од %{count} секунди
+      less_than_x_minutes:
+        one: пре мање од %{count} минута
+        few: пре мање од %{count} минута
+        other: пре мање од %{count} минута
+      over_x_years:
+        one: пре више од %{count} године
+        few: пре више од %{count} године
+        other: пре више од %{count} година
+      x_seconds:
+        one: пре %{count} секунде
+        few: пре %{count} секунде
+        other: пре %{count} секунди
+      x_minutes:
+        one: пре %{count} минут
+        few: пре %{count} минута
+        other: пре %{count} минута
+      x_days:
+        one: пре %{count} дан
+        few: пре %{count} дана
+        other: пре %{count} дана
+      x_months:
+        one: пре %{count} месец
+        few: пре %{count} месеца
+        other: пре %{count} месеци
+      x_years:
+        one: пре %{count} године
+        few: пре %{count} године
+        other: пре %{count} година

   printable_name:
     with_version: '%{id}, вер. %{version}'
   editor:
   printable_name:
     with_version: '%{id}, вер. %{version}'
   editor:


@@ -284,6 +332,8 @@ sr:
       relation: Односи (%{count})
       relation_paginated: Односи (%{x}-%{y} од %{count})
       comment: Коментари (%{count})
       relation: Односи (%{count})
       relation_paginated: Односи (%{x}-%{y} од %{count})
       comment: Коментари (%{count})

+      hidden_comment_by_html: Сакривени коментар корисника %{user} %{time_ago}
+      comment_by_html: '%{user} коментарисао(ла) пре %{time_ago}'

       changesetxml: XML скуп промена
       osmchangexml: osmChange XML
       feed:
       changesetxml: XML скуп промена
       osmchangexml: osmChange XML
       feed:


@@ -1360,7 +1410,7 @@ sr:
         subject_other: '[OpenStreetMap] %{commenter} је коментарисао о чејнџсету за
           који сте заинтересовани'
         your_changeset: '%{commenter} је оставио коментар на једном од Ваших чејнџсетова
         subject_other: '[OpenStreetMap] %{commenter} је коментарисао о чејнџсету за
           који сте заинтересовани'
         your_changeset: '%{commenter} је оставио коментар на једном од Ваших чејнџсетова

-          у %{time}'
+          %{time}'

         commented_changeset: '%{commenter} је у %{time} оставио коментар на чејнџсету
           мапе који надгледате и који је направио %{changeset_author}'
         partial_changeset_with_comment: са коментаром „%{changeset_comment}”
         commented_changeset: '%{commenter} је у %{time} оставио коментар на чејнџсету
           мапе који надгледате и који је направио %{changeset_author}'
         partial_changeset_with_comment: са коментаром „%{changeset_comment}”


@@ -1396,6 +1446,7 @@ sr:
       messages: Имате %{new_messages} и %{old_messages}
       new_messages:
         one: '%{count} нова порука'
       messages: Имате %{new_messages} и %{old_messages}
       new_messages:
         one: '%{count} нова порука'

+        few: '%{count} нове поруке'

         other: '%{count} нових порука'
       old_messages:
         one: '%{count} стара порука'
         other: '%{count} нових порука'
       old_messages:
         one: '%{count} стара порука'


@@ -1510,7 +1561,7 @@ sr:
       heading: Пријава
       email or username: Имејл адреса или корисничко име
       password: Лозинка
       heading: Пријава
       email or username: Имејл адреса или корисничко име
       password: Лозинка

-      openid_html: '%{logo} OpenID:'
+      openid_html: '%{logo} OpenID'

       remember: Запамти ме
       lost password link: Заборавили сте лозинку?
       login_button: Пријави ме
       remember: Запамти ме
       lost password link: Заборавили сте лозинку?
       login_button: Пријави ме


@@ -1753,6 +1804,8 @@ sr:
           rail: Железничка пруга
           train: Воз
           subway: Подземна железница
           rail: Железничка пруга
           train: Воз
           subway: Подземна железница

+          ferry: Трајект
+          tram: Трамвај

           trolleybus: Тролејбус
           bus: Аутобус
           cable_car: Жичара
           trolleybus: Тролејбус
           bus: Аутобус
           cable_car: Жичара


@@ -1766,7 +1819,9 @@ sr:
           vineyard: Виноград
           forest: Шума
           wood: Шума
           vineyard: Виноград
           forest: Шума
           wood: Шума

+          grass: Трава

           meadow: Ливада
           meadow: Ливада

+          sand: Песак

           golf: Голф терен
           park: Парк
           common: Пољана
           golf: Голф терен
           park: Парк
           common: Пољана


@@ -1777,6 +1832,7 @@ sr:
           heathland: Пустош
           lake: Језеро
           reservoir: Резервоар
           heathland: Пустош
           lake: Језеро
           reservoir: Резервоар

+          glacier: Глечер

           farm: Фарма
           brownfield: Грађевинско земљиште
           cemetery: Гробље
           farm: Фарма
           brownfield: Грађевинско земљиште
           cemetery: Гробље


@@ -1816,6 +1872,7 @@ sr:
         title: Основни картографски термини
         paragraph_1: ОпенСтритМап има свој жаргон. Ево пар кључних речи које могу
           да буду корисне.
         title: Основни картографски термини
         paragraph_1: ОпенСтритМап има свој жаргон. Ево пар кључних речи које могу
           да буду корисне.

+        tag: ознака

       rules:
         title: Правила!
         automated_edits: Аутоматизоване измене
       rules:
         title: Правила!
         automated_edits: Аутоматизоване измене

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 5b75229c49e7a0c011f98102a624405c95128bd6..86ed4714debe1e916b7e862ec7e616a34d1c036a 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -92,6 +92,7 @@ sv:
       messages:
         invalid_email_address: verkar inte vara en giltig e-postadress.
         email_address_not_routable: kan inte ruttas
       messages:
         invalid_email_address: verkar inte vara en giltig e-postadress.
         email_address_not_routable: kan inte ruttas

+        display_name_is_user_n: kan inte vara user_n om inte n är ditt användar-id

     models:
       acl: Tillgångskontrollista (ACL)
       changeset: Ändringsuppsättning
     models:
       acl: Tillgångskontrollista (ACL)
       changeset: Ändringsuppsättning


@@ -112,7 +113,7 @@ sv:
       old_relation_tag: Gammal relationstagg
       old_way: Gammal sträcka
       old_way_node: Gammal sträcknod
       old_relation_tag: Gammal relationstagg
       old_way: Gammal sträcka
       old_way_node: Gammal sträcknod

-      old_way_tag: Gammal sträcketagg
+      old_way_tag: Gammal sträcktagg

       relation: Relation
       relation_member: Relationsmedlem
       relation_tag: Relationstagg
       relation: Relation
       relation_member: Relationsmedlem
       relation_tag: Relationstagg


@@ -314,6 +315,8 @@ sv:
         retain_changeset_discussions: Dina diskussioner på ändringsuppsätningar, om
           du gjort några, kommer bevaras.
         retain_email: Din e-postadress kommer bevaras.
         retain_changeset_discussions: Dina diskussioner på ändringsuppsätningar, om
           du gjort några, kommer bevaras.
         retain_email: Din e-postadress kommer bevaras.

+        recent_editing_html: Eftersom du nyligen har redigerat kan ditt konto för
+          närvarande inte raderas. Radering kommer att vara tillåtet om %{time}.

         confirm_delete: Är du säker?
         cancel: Avbryt
   accounts:
         confirm_delete: Är du säker?
         cancel: Avbryt
   accounts:


@@ -483,6 +486,12 @@ sv:
       introduction: Klicka på kartan för att hitta funktioner i närheten.
       nearby: Finns i närheten
       enclosing: Omgivande kartobjekt
       introduction: Klicka på kartan för att hitta funktioner i närheten.
       nearby: Finns i närheten
       enclosing: Omgivande kartobjekt

+  old_nodes:
+    not_found:
+      sorry: 'Tyvärr, nod #%{id} version %{version} kunde inte hittas.'
+  old_ways:
+    not_found:
+      sorry: 'Tyvärr, sträckan #%{id} version %{version} kunde inte hittas.'

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


@@ -894,7 +903,7 @@ sv:
           "yes": Byggnad
         club:
           scout: Scoutklubbhus
           "yes": Byggnad
         club:
           scout: Scoutklubbhus

-          sport: Sportklubb
+          sport: Idrottsförening

           "yes": Klubb
         craft:
           beekeeper: Biodlare
           "yes": Klubb
         craft:
           beekeeper: Biodlare


@@ -1088,7 +1097,7 @@ sv:
           resort: Resort
           sauna: Bastu
           slipway: Stapelbädd
           resort: Resort
           sauna: Bastu
           slipway: Stapelbädd

-          sports_centre: Sporthall
+          sports_centre: Idrottsanläggning

           stadium: Stadium
           swimming_pool: Simbassäng
           track: Löparbana
           stadium: Stadium
           swimming_pool: Simbassäng
           track: Löparbana


@@ -1852,7 +1861,7 @@ sv:
     new:
       title: Förlorat lösenord
       heading: Glömt lösenord?
     new:
       title: Förlorat lösenord
       heading: Glömt lösenord?

-      email address: 'E-postadress:'
+      email address: E-postadress

       new password button: Återställ lösenord
       help_text: Ange e-postadressen du använde för att registrera dig så skickar
         vi en länk till den som du kan använda för att återställa ditt lösenord.
       new password button: Återställ lösenord
       help_text: Ange e-postadressen du använde för att registrera dig så skickar
         vi en länk till den som du kan använda för att återställa ditt lösenord.


@@ -1909,9 +1918,9 @@ sv:
     new:
       title: Logga in
       heading: Logga in
     new:
       title: Logga in
       heading: Logga in

-      email or username: 'E-postadress eller användarnamn:'
-      password: 'Lösenord:'
-      openid_html: '%{logo} OpenID:'
+      email or username: E-postadress eller Användarnamn
+      password: Lösenord
+      openid_html: '%{logo} OpenID'

       remember: Kom ihåg mig
       lost password link: Glömt ditt lösenord?
       login_button: Logga in
       remember: Kom ihåg mig
       lost password link: Glömt ditt lösenord?
       login_button: Logga in


@@ -2101,6 +2110,12 @@ sv:
         contributors_at_cc_by_at_with_amendments: CC BY AT med tillägg
         contributors_au_australia: Australien
         contributors_au_geoscape_australia: Geoscape Australien
         contributors_at_cc_by_at_with_amendments: CC BY AT med tillägg
         contributors_au_australia: Australien
         contributors_au_geoscape_australia: Geoscape Australien

+        contributors_ca_credit_html: |-
+          %{canada}: Innehåller data från
+          GeoBase®, GeoGratis (© Department of Natural
+          Resources Canada), CanVec (© Department of Natural
+          Resources Canada), och StatCan (Geography Division,
+          Statistics Canada).

         contributors_ca_canada: Kanada
         contributors_cz_czechia: Tjeckien
         contributors_fi_finland: Finland
         contributors_ca_canada: Kanada
         contributors_cz_czechia: Tjeckien
         contributors_fi_finland: Finland


@@ -2134,6 +2149,8 @@ sv:
         contributors_za_credit_html: '%{south_africa}: Innehåller data från %{ngi_link},
           statens upphovsrätt förbehålls.'
         contributors_za_south_africa: Sydafrika
         contributors_za_credit_html: '%{south_africa}: Innehåller data från %{ngi_link},
           statens upphovsrätt förbehålls.'
         contributors_za_south_africa: Sydafrika

+        contributors_gb_credit_html: '%{united_kingdom}: Innehåller Ordnance Survey
+          data © Crown copyright and database right 2010-2023.'

         contributors_gb_united_kingdom: Storbritannien
         contributors_2_html: |-
           För ytterligare information om dessa och andra källor som har använts
         contributors_gb_united_kingdom: Storbritannien
         contributors_2_html: |-
           För ytterligare information om dessa och andra källor som har använts


@@ -2304,26 +2321,41 @@ sv:
           primary: Primär väg (riksväg)
           secondary: Sekundär väg (större länsväg)
           unclassified: Oklassificerad väg
           primary: Primär väg (riksväg)
           secondary: Sekundär väg (större länsväg)
           unclassified: Oklassificerad väg

+          pedestrian: Gågata

           track: Traktorväg
           bridleway: Ridstig
           cycleway: Cykelväg
           cycleway_national: Nationell cykelväg
           cycleway_regional: Regional cykelväg
           cycleway_local: Lokal cykelväg
           track: Traktorväg
           bridleway: Ridstig
           cycleway: Cykelväg
           cycleway_national: Nationell cykelväg
           cycleway_regional: Regional cykelväg
           cycleway_local: Lokal cykelväg

+          cycleway_mtb: Mountainbike-led

           footway: Gångväg
           rail: Järnväg
           footway: Gångväg
           rail: Järnväg

+          train: Tåg

           subway: Tunnelbana
           subway: Tunnelbana

+          ferry: Färja
+          bus: Buss

           cable_car: Linbana
           chair_lift: stollift
           runway: Landningsbana
           taxiway: taxibana
           apron: Flygplatsplatta
           admin: Administrativ gräns
           cable_car: Linbana
           chair_lift: stollift
           runway: Landningsbana
           taxiway: taxibana
           apron: Flygplatsplatta
           admin: Administrativ gräns

+          capital: Huvudstad
+          city: Stad
+          orchard: Fruktträdgård
+          vineyard: Vingård

           forest: Kulturskog
           wood: Naturskog
           forest: Kulturskog
           wood: Naturskog

+          farmland: Jordbruksmark
+          grass: Gräs
+          meadow: Äng
+          bare_rock: Klippa
+          sand: Sand

           golf: Golfbana
           park: Park
           common: Allmänning
           golf: Golfbana
           park: Park
           common: Allmänning

+          built_up: Bebyggt område

           resident: Bostadsområde
           retail: Område för Detaljhandel
           industrial: Industriellt område
           resident: Bostadsområde
           retail: Område för Detaljhandel
           industrial: Industriellt område


@@ -2331,27 +2363,36 @@ sv:
           heathland: Hed
           lake: Sjö
           reservoir: vattenmagasin
           heathland: Hed
           lake: Sjö
           reservoir: vattenmagasin

+          glacier: Glaciär
+          reef: Rev
+          wetland: Våtmark

           farm: Bondgård
           brownfield: Förfallen industritomt
           cemetery: Begravningsplats
           allotments: Koloniträdgårdar
           farm: Bondgård
           brownfield: Förfallen industritomt
           cemetery: Begravningsplats
           allotments: Koloniträdgårdar

-          pitch: Bollplan
+          pitch: Idrottsplan

           centre: Idrottsanläggning
           centre: Idrottsanläggning

+          beach: Strand

           reserve: Naturreservat
           military: Militärområde
           school: Skola
           reserve: Naturreservat
           military: Militärområde
           school: Skola

-          university: universitet
+          university: Universitet
+          hospital: Sjukhus

           building: Viktig byggnad
           station: Järnvägsstation
           summit: Höjd
           building: Viktig byggnad
           station: Järnvägsstation
           summit: Höjd

-          peak: topp
+          peak: Topp

           tunnel: Streckade kanter = tunnel
           bridge: Svarta kanter = bro
           private: Privat tillgång
           destination: Förbjuden genomfart
           construction: Vägar under konstruktion
           tunnel: Streckade kanter = tunnel
           bridge: Svarta kanter = bro
           private: Privat tillgång
           destination: Förbjuden genomfart
           construction: Vägar under konstruktion

+          bus_stop: Busshållplats
+          stop: Hållplats

           bicycle_shop: Cykelaffär
           bicycle_shop: Cykelaffär

+          bicycle_rental: Cykeluthyrning

           bicycle_parking: Cykelparkering
           bicycle_parking: Cykelparkering

+          bicycle_parking_small: Liten cykelparkering

           toilets: Toaletter
     welcome:
       title: Välkommen!
           toilets: Toaletter
     welcome:
       title: Välkommen!


@@ -2396,6 +2437,7 @@ sv:
         imports: Importer
         automated_edits: Automatiserade redigeringar
       start_mapping: Börja kartlägga
         imports: Importer
         automated_edits: Automatiserade redigeringar
       start_mapping: Börja kartlägga

+      continue_authorization: Fortsätt auktorisering

       add_a_note:
         title: Ingen tid att redigera? Lägg till en kommentar!
         para_1: Om du bara vill ha ett litet problem fixat och inte har tid att registrera
       add_a_note:
         title: Ingen tid att redigera? Lägg till en kommentar!
         para_1: Om du bara vill ha ett litet problem fixat och inte har tid att registrera


@@ -2963,6 +3005,13 @@ sv:
       showing_page: Sida %{page}
       next: Nästa »
       previous: « Föregående
       showing_page: Sida %{page}
       next: Nästa »
       previous: « Föregående

+  user_mutes:
+    index:
+      table:
+        thead:
+          actions: Åtgärder
+        tbody:
+          send_message: Skicka meddelande

   notes:
     index:
       title: Anteckningar skapade eller kommenterade av %{user}
   notes:
     index:
       title: Anteckningar skapade eller kommenterade av %{user}


@@ -2999,6 +3048,7 @@ sv:
       reactivate: Återaktivera
       comment_and_resolve: Kommentera och Avklara
       comment: Kommentera
       reactivate: Återaktivera
       comment_and_resolve: Kommentera och Avklara
       comment: Kommentera

+      log_in_to_comment: Logga in för att kommentera denna anteckning

       report_link_html: Om denna anteckning innehåller känslig information som måste
         tas bort kan du %{link}.
       other_problems_resolve: För alla andra problem med anteckningen, lös det själv
       report_link_html: Om denna anteckning innehåller känslig information som måste
         tas bort kan du %{link}.
       other_problems_resolve: För alla andra problem med anteckningen, lös det själv


@@ -3060,7 +3110,6 @@ sv:
         cycle_map: Cykelkarta
         transport_map: Transportkarta
         hot: Humanitärt
         cycle_map: Cykelkarta
         transport_map: Transportkarta
         hot: Humanitärt

-        opnvkarte: ÖPNVKarte

       layers:
         header: Kartskikt
         notes: Kartanteckningar
       layers:
         header: Kartskikt
         notes: Kartanteckningar


@@ -3073,7 +3122,6 @@ sv:
       website_and_api_terms: Webbplats och API-villkor
       osm_france: OpenStreetMap Frankrike
       andy_allan: Andy Allan
       website_and_api_terms: Webbplats och API-villkor
       osm_france: OpenStreetMap Frankrike
       andy_allan: Andy Allan

-      memomaps: MeMoMaps

       hotosm_name: Humanitärt OpenStreetMap-team
     site:
       edit_tooltip: Redigera kartan
       hotosm_name: Humanitärt OpenStreetMap-team
     site:
       edit_tooltip: Redigera kartan

diff --git a/config/locales/te.yml b/config/locales/te.yml
index 30b60738fe41acc6e05ab52877ef5ead54be8ac6..75751500c4c7d480d3ebe4ac6c5315c29100bd1c 100644 (file)
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -2469,7 +2469,6 @@ te:
         cycle_map: సైకిలు మ్యాపు
         transport_map: రవాణా పటం
         hot: మానవత్వ
         cycle_map: సైకిలు మ్యాపు
         transport_map: రవాణా పటం
         hot: మానవత్వ

-        opnvkarte: ÖPNVKarte

       layers:
         header: మ్యాపు పొరలు
         notes: పటపు గమనికలు
       layers:
         header: మ్యాపు పొరలు
         notes: పటపు గమనికలు

diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 076c59953175d8c9cfbee67b1907951312589ce7..31e307cc62e903defb1c8fc4930ae80526e97b0c 100644 (file)
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -2199,7 +2199,6 @@ tl:
         cyclosm: CyclOSM
         cycle_map: Mapa ng Pagbibisikleta
         transport_map: Mapa ng Transportasyon
         cyclosm: CyclOSM
         cycle_map: Mapa ng Pagbibisikleta
         transport_map: Mapa ng Transportasyon

-        opnvkarte: ÖPNVKarte (mapa ng pampublikong sasakyan)

       layers:
         data: Dato ng Mapa
         gps: Pangmadlang mga Bakas ng GPS
       layers:
         data: Dato ng Mapa
         gps: Pangmadlang mga Bakas ng GPS

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index e9962889145a466d881bb7a6751c37600be1e720..f44a229729617f9e506d4f333b431ab04a9a99de 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -488,6 +488,15 @@ tr:
       introduction: Yakındaki özellikleri bulmak için haritaya tıklayın.
       nearby: Yakındaki özellikler
       enclosing: Kapsayan özellikler
       introduction: Yakındaki özellikleri bulmak için haritaya tıklayın.
       nearby: Yakındaki özellikler
       enclosing: Kapsayan özellikler

+  old_nodes:
+    not_found:
+      sorry: 'Üzgünüz, #%{id} düğümünün %{version} sürümü bulunamadı.'
+  old_ways:
+    not_found:
+      sorry: 'Üzgünüz, #%{id} yolunun %{version} sürümü bulunamadı.'
+  old_relations:
+    not_found:
+      sorry: 'Üzgünüz, #%{id} ilişkisinin %{version} sürümü bulunamadı.'

   changesets:
     changeset_paging_nav:
       showing_page: '%{page}. sayfa'
   changesets:
     changeset_paging_nav:
       showing_page: '%{page}. sayfa'


@@ -1945,7 +1954,7 @@ tr:
       heading: Oturum Aç
       email or username: E-posta Adresi veya Kullanıcı Adı
       password: Parola
       heading: Oturum Aç
       email or username: E-posta Adresi veya Kullanıcı Adı
       password: Parola

-      openid_html: '%{logo} OpenID:'
+      openid_html: '%{logo} OpenID'

       remember: Beni hatırla
       lost password link: Parolanı mı unuttun?
       login_button: Oturum Aç
       remember: Beni hatırla
       lost password link: Parolanı mı unuttun?
       login_button: Oturum Aç


@@ -3197,7 +3206,6 @@ tr:
         transport_map: Ulaşım Haritası
         tracestracktop_topo: Tracestrack Topo
         hot: İnsancıl
         transport_map: Ulaşım Haritası
         tracestracktop_topo: Tracestrack Topo
         hot: İnsancıl

-        opnvkarte: ÖPNVKarte

       layers:
         header: Harita Katmanları
         notes: Harita Notları
       layers:
         header: Harita Katmanları
         notes: Harita Notları


@@ -3213,8 +3221,6 @@ tr:
       osm_france: OpenStreetMap Fransa
       thunderforest_credit: Döşemeler, %{thunderforest_link} katkılarıyla
       andy_allan: Andy Allan
       osm_france: OpenStreetMap Fransa
       thunderforest_credit: Döşemeler, %{thunderforest_link} katkılarıyla
       andy_allan: Andy Allan

-      opnvkarte_credit: Döşemeler, %{memomaps_link} katkılarıyla
-      memomaps: MeMo Haritaları

       tracestrack_credit: Döşemeler, %{tracestrack_link} katkılarıyla
       hotosm_credit: '%{osm_france_link} tarafından barındırılan %{hotosm_link} döşeme
         tarzı'
       tracestrack_credit: Döşemeler, %{tracestrack_link} katkılarıyla
       hotosm_credit: '%{osm_france_link} tarafından barındırılan %{hotosm_link} döşeme
         tarzı'

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 7235c55b54960df2040f9a33ba61a25e8551b9f3..9c2ad43d89022c5b1688e4c19f2a34e0f422f1f5 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -3241,7 +3241,6 @@ uk:
         transport_map: Мапа Транспорту
         tracestracktop_topo: Tracestrack Топо
         hot: Humanitarian‎
         transport_map: Мапа Транспорту
         tracestracktop_topo: Tracestrack Топо
         hot: Humanitarian‎

-        opnvkarte: ÖPNVKarte

       layers:
         header: Шари мапи
         notes: Нотатки
       layers:
         header: Шари мапи
         notes: Нотатки


@@ -3256,8 +3255,6 @@ uk:
       osm_france: OpenStreetMap France
       thunderforest_credit: Тайли %{thunderforest_link}
       andy_allan: Енді Аллан
       osm_france: OpenStreetMap France
       thunderforest_credit: Тайли %{thunderforest_link}
       andy_allan: Енді Аллан

-      opnvkarte_credit: Тайли %{memomaps_link}
-      memomaps: MeMoMaps

       tracestrack_credit: Тайли надаються %{tracestrack_link}
       hotosm_credit: Тайли %{hotosm_link} з %{osm_france_link}
       hotosm_name: Humanitarian OpenStreetMap Team
       tracestrack_credit: Тайли надаються %{tracestrack_link}
       hotosm_credit: Тайли %{hotosm_link} з %{osm_france_link}
       hotosm_name: Humanitarian OpenStreetMap Team

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index fa070fb63c7a779e547fa5f91fb46705385b99b9..0f41aaf5e28afb30ed425c7ff98e3fee0d510a8b 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -2680,7 +2680,6 @@ vi:
         cycle_map: Bản đồ Xe đạp
         transport_map: Bản đồ Giao thông
         hot: Nhân đạo Chủ nghĩa
         cycle_map: Bản đồ Xe đạp
         transport_map: Bản đồ Giao thông
         hot: Nhân đạo Chủ nghĩa

-        opnvkarte: ÖPNVKarte

       layers:
         header: Lớp Bản đồ
         notes: Ghi chú Bản đồ
       layers:
         header: Lớp Bản đồ
         notes: Ghi chú Bản đồ

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 4f612066cbc051ffbb1a39496c2881ad6c430a96..562cc3fe26c640165e430bcc4973484118f9cdb1 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1863,7 +1863,7 @@ zh-CN:
       heading: 登录
       email or username: 电子邮件地址或用户名
       password: 密码
       heading: 登录
       email or username: 电子邮件地址或用户名
       password: 密码

-      openid_html: '%{logo}OpenID：'
+      openid_html: '%{logo} OpenID'

       remember: 记住我
       lost password link: 忘记密码？
       login_button: 登录
       remember: 记住我
       lost password link: 忘记密码？
       login_button: 登录


@@ -2937,7 +2937,6 @@ zh-CN:
         transport_map: 交通运输地图
         tracestracktop_topo: 地形地貌地图
         hot: 人道救援地图
         transport_map: 交通运输地图
         tracestracktop_topo: 地形地貌地图
         hot: 人道救援地图

-        opnvkarte: 公共交通地图

       layers:
         header: 地图图层
         notes: 地图注记
       layers:
         header: 地图图层
         notes: 地图注记


@@ -2952,8 +2951,6 @@ zh-CN:
       osm_france: OpenStreetMap 法国
       thunderforest_credit: '%{thunderforest_link}提供的图块'
       andy_allan: Andy Allan
       osm_france: OpenStreetMap 法国
       thunderforest_credit: '%{thunderforest_link}提供的图块'
       andy_allan: Andy Allan

-      opnvkarte_credit: '%{memomaps_link}提供的图块'
-      memomaps: MeMoMaps

       tracestrack_credit: '%{tracestrack_link}提供的图块'
       tracestrack: 踪迹地图
       hotosm_credit: 由%{osm_france_link}托管的%{hotosm_link}图块风格
       tracestrack_credit: '%{tracestrack_link}提供的图块'
       tracestrack: 踪迹地图
       hotosm_credit: 由%{osm_france_link}托管的%{hotosm_link}图块风格

diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 9388b967c22a72447993738ef39cc05d207c651a..2c5518802683fb6d4db6b507d49feae309779e37 100644 (file)
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1242,7 +1242,6 @@ zh-HK:
         cycle_map: 單車地圖
         transport_map: 交通地圖
         hot: 人道地圖
         cycle_map: 單車地圖
         transport_map: 交通地圖
         hot: 人道地圖

-        opnvkarte: ÖPNVKarte

       layers:
         header: 地圖圖層
         notes: 地圖註記
       layers:
         header: 地圖圖層
         notes: 地圖註記

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 1e0ced92b6dc6efaca5006d65a9161a9c9db3952..f1efc5729c2313686f9847bc126f07bcde8b4378 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -87,6 +87,7 @@ zh-TW:
       messages:
         invalid_email_address: 似乎不是有效的電子郵件信箱地址。
         email_address_not_routable: 不可繞送
       messages:
         invalid_email_address: 似乎不是有效的電子郵件信箱地址。
         email_address_not_routable: 不可繞送

+        display_name_is_user_n: 不能是「user_n」除非「n」是您的使用者 ID

       models:
         user_mute:
           is_already_muted: 已忽視
       models:
         user_mute:
           is_already_muted: 已忽視


@@ -459,6 +460,15 @@ zh-TW:
       introduction: 點選地圖以尋找附近的圖徵
       nearby: 附近圖徵
       enclosing: 區域內圖徵
       introduction: 點選地圖以尋找附近的圖徵
       nearby: 附近圖徵
       enclosing: 區域內圖徵

+  old_nodes:
+    not_found:
+      sorry: '很抱歉，無法找到版本 %{version} 的節點 #%{id}。'
+  old_ways:
+    not_found:
+      sorry: 很抱歉，找不到版本 %{version} 的路徑 %{id}。
+  old_relations:
+    not_found:
+      sorry: '很抱歉，找不到版本 %{version} 的關聯 #%{id}。'

   changesets:
     changeset_paging_nav:
       showing_page: 第 %{page} 頁
   changesets:
     changeset_paging_nav:
       showing_page: 第 %{page} 頁


@@ -1777,7 +1787,7 @@ zh-TW:
     new:
       title: 遺失密碼
       heading: 忘記密碼？
     new:
       title: 遺失密碼
       heading: 忘記密碼？

-      email address: 電子郵件地址：
+      email address: 電子郵件地址

       new password button: 重設密碼
       help_text: 輸入您的電子郵件地址來註冊，我們會將連結送至該地址，而您可以用它來重設密碼。
     create:
       new password button: 重設密碼
       help_text: 輸入您的電子郵件地址來註冊，我們會將連結送至該地址，而您可以用它來重設密碼。
     create:


@@ -1834,9 +1844,9 @@ zh-TW:
     new:
       title: 登入
       heading: 登入
     new:
       title: 登入
       heading: 登入

-      email or username: 電子郵件地址或使用者名稱：
-      password: 密碼：
-      openid_html: '%{logo} OpenID：'
+      email or username: 電子郵件地址或使用者名稱
+      password: 密碼
+      openid_html: '%{logo} OpenID'

       remember: 記住我
       lost password link: 忘記您的密碼？
       login_button: 登入
       remember: 記住我
       lost password link: 忘記您的密碼？
       login_button: 登入


@@ -2916,7 +2926,6 @@ zh-TW:
         transport_map: 交通運輸地圖
         tracestracktop_topo: 蹤跡地圖地形
         hot: 人道救援
         transport_map: 交通運輸地圖
         tracestracktop_topo: 蹤跡地圖地形
         hot: 人道救援

-        opnvkarte: 公共交通地圖

       layers:
         header: 地圖圖層
         notes: 地圖註記
       layers:
         header: 地圖圖層
         notes: 地圖註記


@@ -2931,8 +2940,6 @@ zh-TW:
       osm_france: OpenStreetMap 法國
       thunderforest_credit: '%{thunderforest_link} 提供的圖磚'
       andy_allan: Andy Allan
       osm_france: OpenStreetMap 法國
       thunderforest_credit: '%{thunderforest_link} 提供的圖磚'
       andy_allan: Andy Allan

-      opnvkarte_credit: '%{memomaps_link} 提供的圖磚'
-      memomaps: MeMoMaps

       tracestrack_credit: '%{tracestrack_link} 提供的圖磚'
       tracestrack: 蹤跡地圖
       hotosm_credit: 由 %{osm_france_link} 代管的 %{hotosm_link} 所提供圖磚樣式
       tracestrack_credit: '%{tracestrack_link} 提供的圖磚'
       tracestrack: 蹤跡地圖
       hotosm_credit: 由 %{osm_france_link} 代管的 %{hotosm_link} 所提供圖磚樣式