Localisation updates from https://translatewiki.net.

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 5dffec90870d274606ded1cc064d3b7d6eb2ee87..73eebb406c381245534a70db74fe3bced43ec0cf 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -211,7 +211,6 @@ af:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

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


@@ -1796,8 +1795,6 @@ af:
       trace_not_found: Spoor onverkrygbaar!
       visibility: 'Sigbaarheid:'
       confirm_delete: Hierdie spoor verwyder?
       trace_not_found: Spoor onverkrygbaar!
       visibility: 'Sigbaarheid:'
       confirm_delete: Hierdie spoor verwyder?

-    trace_paging_nav:
-      showing_page: Bladsy %{page}

     trace:
       pending: HANGEND
       count_points: '%{count} punte'
     trace:
       pending: HANGEND
       count_points: '%{count} punte'

diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index 835a78c246fd74d2b90294e8d94b8d8c78d0b289..58755787ce80d4dfe1f7e53c0bb3868cf655f5ae 100644 (file)
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -1002,8 +1002,6 @@ aln:
       delete_trace: Fshij kët gjurm
       trace_not_found: Gjurma nuk u gjet!
       visibility: 'Dukshmënia:'
       delete_trace: Fshij kët gjurm
       trace_not_found: Gjurma nuk u gjet!
       visibility: 'Dukshmënia:'

-    trace_paging_nav:
-      showing_page: Duke shfaqun faqen %{page}

     trace:
       pending: NË PRITJE
       count_points: '%{count} pikët'
     trace:
       pending: NË PRITJE
       count_points: '%{count} pikët'

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 587035a1e61757748ac00083378e94768970d227..508a21f7d6bf36a93702f6cb12fd669f8d3cc265 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -2320,7 +2320,6 @@ ar:
       visibility: 'الرؤية:'
       confirm_delete: احذف هذا الأثر
     trace_paging_nav:
       visibility: 'الرؤية:'
       confirm_delete: احذف هذا الأثر
     trace_paging_nav:

-      showing_page: الصفحة %{page}

       older: الآثار القديمة
       newer: الآثار الحديثة
     trace:
       older: الآثار القديمة
       newer: الآثار الحديثة
     trace:

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 78cebc2728d081beef246664a9a4c5632e75fdb2..bb821a0407deceb3b847834a8633ae8e61e3a397 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -194,7 +194,6 @@ ast:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

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


@@ -1830,7 +1829,6 @@ ast:
       visibility: 'Visibilidá:'
       confirm_delete: ¿Desaniciar esta traza?
     trace_paging_nav:
       visibility: 'Visibilidá:'
       confirm_delete: ¿Desaniciar esta traza?
     trace_paging_nav:

-      showing_page: Páxina %{page}

       older: Traces más antigües
       newer: Traces más nueves
     trace:
       older: Traces más antigües
       newer: Traces más nueves
     trace:

diff --git a/config/locales/az.yml b/config/locales/az.yml
index caeffb9506f6d4acf9994f2aa90efe05a348ef35..f339a41e18fc327632a59a651dba693eb0617e13 100644 (file)
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -142,7 +142,6 @@ az:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

       github: GitHub
       wikipedia: Vikipediya
   api:
       github: GitHub
       wikipedia: Vikipediya
   api:

diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index 8201827a5283e465fd7478bd3fd289a2e437b268..db44ea36daff67507a3c47211205fed7b19da454 100644 (file)
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -214,7 +214,6 @@ be-Tarask:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

       github: GitHub
       wikipedia: Вікіпэдыя
   api:
       github: GitHub
       wikipedia: Вікіпэдыя
   api:


@@ -1267,8 +1266,6 @@ be-Tarask:
       delete_trace: Выдаліць гэты трэк
       trace_not_found: Трэк ня знойдзены!
       visibility: 'Бачнасьць:'
       delete_trace: Выдаліць гэты трэк
       trace_not_found: Трэк ня знойдзены!
       visibility: 'Бачнасьць:'

-    trace_paging_nav:
-      showing_page: Старонка %{page}

     trace:
       pending: ЧАКАЕ
       count_points:
     trace:
       pending: ЧАКАЕ
       count_points:

diff --git a/config/locales/be.yml b/config/locales/be.yml
index e15f001bffdf1dc5e892868eb01baab29c84ed25..5112e3988107a30a6e10b90b92dcf62307279dda 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -254,7 +254,6 @@ be:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

       github: GitHub
       wikipedia: Вікіпедыя
   api:
       github: GitHub
       wikipedia: Вікіпедыя
   api:


@@ -1840,7 +1839,6 @@ be:
       visibility: 'Бачнасць:'
       confirm_delete: Выдаліць гэты след?
     trace_paging_nav:
       visibility: 'Бачнасць:'
       confirm_delete: Выдаліць гэты след?
     trace_paging_nav:

-      showing_page: Старонка %{page}

       older: Даўнейшыя сляды
       newer: Свежыя сляды
     trace:
       older: Даўнейшыя сляды
       newer: Свежыя сляды
     trace:

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 399385932abff4d0d26c6c21394d6cb413ea9f02..1e305763eda7b10f251dff416b0a1402e743b55c 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -105,11 +105,15 @@ bg:
       diary_entry:
         user: Потребител
         title: Тема
       diary_entry:
         user: Потребител
         title: Тема

+        body: Текст

         latitude: Географска ширина
         longitude: Географска дължина
         language_code: Език
       doorkeeper/application:
         name: Име
         latitude: Географска ширина
         longitude: Географска дължина
         language_code: Език
       doorkeeper/application:
         name: Име

+        redirect_uri: Пренасочващи URI
+        confidential: Поверително приложение.
+        scopes: Разрешения

       friend:
         user: Потребител
         friend: Приятел
       friend:
         user: Потребител
         friend: Приятел


@@ -137,7 +141,9 @@ bg:
         category: Посочете причина за доклада
         details: Моля, опишете проблема в подробности (задължително).
       user:
         category: Посочете причина за доклада
         details: Моля, опишете проблема в подробности (задължително).
       user:

+        auth_provider: Доставчик на автентикация

         email: Електронна поща
         email: Електронна поща

+        email_confirmation: Потвърждение по имейл

         new_email: Нова електронна поща
         active: Активен
         display_name: Видимо потребителско име
         new_email: Нова електронна поща
         active: Активен
         display_name: Видимо потребителско име


@@ -206,7 +212,7 @@ bg:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live
+      windowslive: Майкрософт

       github: GitHub
       wikipedia: Уикипедия
   api:
       github: GitHub
       wikipedia: Уикипедия
   api:


@@ -473,7 +479,6 @@ bg:
       comment_link: Коментар към публикацията
       reply_link: Изпрати послание на автора
       comment_count:
       comment_link: Коментар към публикацията
       reply_link: Изпрати послание на автора
       comment_count:

-        zero: Няма коментари

         one: 1 коментар
         other: '%{count} коментара'
       edit_link: Променяне на публикацията
         one: 1 коментар
         other: '%{count} коментара'
       edit_link: Променяне на публикацията


@@ -1436,8 +1441,8 @@ bg:
           title: Влизане с Facebook
           alt: Влизане със сметка на Facebook
         windowslive:
           title: Влизане с Facebook
           alt: Влизане със сметка на Facebook
         windowslive:

-          title: Влизане с Windows Live
-          alt: Влизане със сметка на Windows Live
+          title: Влизане с Майкрософт
+          alt: Влизане със сметка на Майкрософт

         github:
           title: Влизане с GitHub
           alt: Влизане със сметка в GitHub
         github:
           title: Влизане с GitHub
           alt: Влизане със сметка в GitHub


@@ -1710,7 +1715,6 @@ bg:
       visibility: 'Видимост:'
       confirm_delete: Изтрий това трасе?
     trace_paging_nav:
       visibility: 'Видимост:'
       confirm_delete: Изтрий това трасе?
     trace_paging_nav:

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

       older: По-стари следи
       newer: По-нови следи
     trace:
       older: По-стари следи
       newer: По-нови следи
     trace:

diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 4f883da404da6a1e0e0c41ec7ee3eb5d7450d200..513a25091a5a723fecf1d3aa6c6ac354b19b2344 100644 (file)
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -1815,8 +1815,6 @@ bn:
       delete_trace: এই অনুসরণটি মুছে ফেলুন
       trace_not_found: অনুসরণ পাওযা যায়নি।
       visibility: 'দৃষ্টিযোগ্যতা:'
       delete_trace: এই অনুসরণটি মুছে ফেলুন
       trace_not_found: অনুসরণ পাওযা যায়নি।
       visibility: 'দৃষ্টিযোগ্যতা:'

-    trace_paging_nav:
-      showing_page: '%{page} পাতা'

     trace:
       pending: অমিমাংসিত
       count_points:
     trace:
       pending: অমিমাংসিত
       count_points:

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 18aa45a8ceb9f871cd2651fa9ee4f9b56ac0ad4f..7ef4346e3ca00823ed820f824ba7ce8a40fdec95 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -256,7 +256,6 @@ br:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

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


@@ -2326,7 +2325,6 @@ br:
       visibility: 'Gwelusted :'
       confirm_delete: Diverkañ ar roudenn-mañ
     trace_paging_nav:
       visibility: 'Gwelusted :'
       confirm_delete: Diverkañ ar roudenn-mañ
     trace_paging_nav:

-      showing_page: Pajenn %{page}

       older: ↓Roudoù kozh
       newer: ↓Roudoù nevez
     trace:
       older: ↓Roudoù kozh
       newer: ↓Roudoù nevez
     trace:

diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 613f458ecb211fdd8c9127b7aeca7929c2dfe064..9390f7111fb83779ba373b52fc712513c09c7a50 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1295,7 +1295,6 @@ bs:
       trace_not_found: Trasa nije pronađena!
       visibility: 'Vidljivost:'
     trace_paging_nav:
       trace_not_found: Trasa nije pronađena!
       visibility: 'Vidljivost:'
     trace_paging_nav:

-      showing_page: Stranica %{page}

       older: Starije trase
       newer: Novije trase
     trace:
       older: Starije trase
       newer: Novije trase
     trace:

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 65a9c3149d2762300d4ea7261bc2df21d8fdc60c..84a445cbe6af7d16310b50c9090ce2569228dbba 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -257,7 +257,6 @@ ca:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

       github: GitHub
       wikipedia: Viquipèdia
   api:
       github: GitHub
       wikipedia: Viquipèdia
   api:


@@ -2416,7 +2415,6 @@ ca:
       visibility: 'Visibilitat:'
       confirm_delete: Esborrar aquesta traça?
     trace_paging_nav:
       visibility: 'Visibilitat:'
       confirm_delete: Esborrar aquesta traça?
     trace_paging_nav:

-      showing_page: Pàgina %{page}

       older: Traces més antigues
       newer: Traces més recents
     trace:
       older: Traces més antigues
       newer: Traces més recents
     trace:

diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index 4399db093ac2d0674f9ba7bcf98380175df2e107..baa0c47f21d860c6cb6e4c5677e5b6938687b481 100644 (file)
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -685,7 +685,7 @@ ce:
         other: '%{count} хаам'
       resolve: Кечйан
       ignore: Тергал ца дан
         other: '%{count} хаам'
       resolve: Кечйан
       ignore: Тергал ца дан

-      reopen: Йуха схьаелла
+      reopen: Ð\99Ñ\83Ñ\85а Ñ\81Ñ\85Ñ\8cайелла

   reports:
     new:
       title_html: Хаам %{link}
   reports:
     new:
       title_html: Хаам %{link}

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 168def4ffe19c3df88a6252f4ddeb6b74cbfda6e..57d64139670174f5933070ea9c3254400d3e1d5f 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -286,7 +286,6 @@ cs:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

       github: GitHub
       wikipedia: Wikipedie
   api:
       github: GitHub
       wikipedia: Wikipedie
   api:


@@ -2529,7 +2528,6 @@ cs:
       visibility: 'Viditelnost:'
       confirm_delete: Smazat tuto stopu?
     trace_paging_nav:
       visibility: 'Viditelnost:'
       confirm_delete: Smazat tuto stopu?
     trace_paging_nav:

-      showing_page: Stránka %{page}

       older: Starší stopy
       newer: Novější stopy
     trace:
       older: Starší stopy
       newer: Novější stopy
     trace:

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 1b8726862bcde052e08fae543bec5059eda2aa2c..be23906681a2145956302452b452600f7b2c5b4e 100644 (file)
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -23,7 +23,7 @@ cy:
       issue_comment:
         create: Ychwanegu sylw
       message:
       issue_comment:
         create: Ychwanegu sylw
       message:

-        create: Danfon
+        create: Anfon

       client_application:
         create: Cofrestru
         update: Diweddaru
       client_application:
         create: Cofrestru
         update: Diweddaru


@@ -35,22 +35,23 @@ cy:
         update: Cadw golygiadau
       trace:
         create: Uwchlwytho
         update: Cadw golygiadau
       trace:
         create: Uwchlwytho

-        update: Cadw Newidiadau
+        update: Cadw newidiadau

       user_block:
         create: Creu bloc
       user_block:
         create: Creu bloc

-        update: Uwchraddio'r bloc
+        update: Diweddaru bloc

   activerecord:
     errors:
       messages:
         invalid_email_address: nid yw'n ymddangos ei fod yn gyfeiriad ebost dilys
     models:
       acl: Rhestr Rheoli Mynediad
   activerecord:
     errors:
       messages:
         invalid_email_address: nid yw'n ymddangos ei fod yn gyfeiriad ebost dilys
     models:
       acl: Rhestr Rheoli Mynediad

-      changeset: Changeset
-      changeset_tag: Tag Changeset
+      changeset: Grŵp newidiadau
+      changeset_tag: Tag Grŵp newidiadau

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

+      issue: Mater

       language: Iaith
       message: Neges
       node: Nod
       language: Iaith
       message: Neges
       node: Nod


@@ -66,6 +67,7 @@ cy:
       relation: Perthynas
       relation_member: Aelod Perthynol
       relation_tag: Tag Perthynas
       relation: Perthynas
       relation_member: Aelod Perthynol
       relation_tag: Tag Perthynas

+      report: Adrodd

       session: Sesiwn
       trace: Dargopïo
       tracepoint: Pwynt Dargopïo
       session: Sesiwn
       trace: Dargopïo
       tracepoint: Pwynt Dargopïo


@@ -79,33 +81,37 @@ cy:
     attributes:
       client_application:
         name: Enw (Angenrheidiol)
     attributes:
       client_application:
         name: Enw (Angenrheidiol)

+        allow_write_api: olygu'r map
+        allow_write_notes: addasu nodiadau

       diary_comment:
         body: Corff
       diary_entry:
         user: Defnyddiwr
         title: Pwnc
       diary_comment:
         body: Corff
       diary_entry:
         user: Defnyddiwr
         title: Pwnc

+        body: Corff

         latitude: Lledred
         longitude: Hydred
         language_code: Iaith
       doorkeeper/application:
         name: Enw
         latitude: Lledred
         longitude: Hydred
         language_code: Iaith
       doorkeeper/application:
         name: Enw

+        scopes: Caniatâd

       friend:
         user: Defnyddiwr
         friend: Ffrind
       trace:
         user: Defnyddiwr
         visible: Gweladwy
       friend:
         user: Defnyddiwr
         friend: Ffrind
       trace:
         user: Defnyddiwr
         visible: Gweladwy

-        name: Enw'r ffeil
+        name: Enw ffeil

         size: Maint
         latitude: Lledred
         longitude: Hydred
         public: Cyhoeddus
         description: Disgrifiad
         size: Maint
         latitude: Lledred
         longitude: Hydred
         public: Cyhoeddus
         description: Disgrifiad

-        gpx_file: 'Uwchlwytho Ffeil GPX:'
-        visibility: 'Gwelededd:'
+        gpx_file: Uwchlwytho Ffeil GPX
+        visibility: Gwelededd

         tagstring: Tagiau
       message:
         tagstring: Tagiau
       message:

-        sender: Danfonwr
+        sender: Anfonwr

         title: Pwnc
         body: Corff
         recipient: Derbyniwr
         title: Pwnc
         body: Corff
         recipient: Derbyniwr


@@ -113,26 +119,34 @@ cy:
         title: Teitl
         description: Disgrifiad
       user:
         title: Teitl
         description: Disgrifiad
       user:

-        email: Ebost
-        new_email: 'Cyfeiriad Ebost Newydd:'
+        email: E-bost
+        new_email: Cyfeiriad e-bost newydd

         active: Gweithredol
         active: Gweithredol

-        display_name: Enw Arddangos
-        description: Disgrifiad
-        home_lat: 'Lledred:'
-        home_lon: 'Hydred:'
+        display_name: Enw defnyddiwr
+        description: Disgrifiad proffil
+        home_lat: Lledred
+        home_lon: Hydred

         languages: Ieithoedd
         pass_crypt: Cyfrinair
         languages: Ieithoedd
         pass_crypt: Cyfrinair

-        pass_crypt_confirmation: Cadarnhau Cyfrinair
+        pass_crypt_confirmation: Cadarnhau cyfrinair

     help:
       user:
         new_email: (byth ei ddangos yn gyhoeddus)
   datetime:
     distance_in_words_ago:
       about_x_hours:
     help:
       user:
         new_email: (byth ei ddangos yn gyhoeddus)
   datetime:
     distance_in_words_ago:
       about_x_hours:

-        one: tuag awr yn ôl
+        zero: '%{count} awr yn ôl'
+        one: tua %{count} awr yn ôl
+        two: tua %{count} awr yn ôl
+        few: tua %{count} awr yn ôl
+        many: tua %{count} awr yn ôl

         other: tua %{count} awr yn ôl
       about_x_months:
         other: tua %{count} awr yn ôl
       about_x_months:

-        one: tuag un fis yn ôl
+        zero: tua %{count} mis yn ôl
+        one: tua %{count} mis yn ôl
+        two: tua %{count} fis yn ôl
+        few: tua %{count} mis yn ôl
+        many: tua %{count} mis yn ôl

         other: tua %{count} mis yn ôl
       about_x_years:
         one: tuag un blynedd yn ôl
         other: tua %{count} mis yn ôl
       about_x_years:
         one: tuag un blynedd yn ôl


@@ -158,7 +172,6 @@ cy:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

       github: GitHub
       wikipedia: Wicipedia
   api:
       github: GitHub
       wikipedia: Wicipedia
   api:


@@ -167,7 +180,7 @@ cy:
         opened_at_html: Crëwyd %{when}
         opened_at_by_html: Crëwyd %{when} gan %{user}
         commented_at_html: Diweddarwyd %{when}
         opened_at_html: Crëwyd %{when}
         opened_at_by_html: Crëwyd %{when} gan %{user}
         commented_at_html: Diweddarwyd %{when}

-        commented_at_by_html: Diweddarwyd %{when}gan %{user}
+        commented_at_by_html: Diweddarwyd %{when} gan %{user}

       rss:
         title: Nodiadau OpenStreetMap
       entry:
       rss:
         title: Nodiadau OpenStreetMap
       entry:


@@ -176,15 +189,17 @@ cy:
   account:
     deletions:
       show:
   account:
     deletions:
       show:

-        title: Dileu Fy Nghyfrif
-        delete_account: Dileu Cyfrif
+        title: Dileu fy nghyfrif
+        delete_account: Dileu cyfrif
+        retain_changeset_discussions: Bydd eich trafodaethau grŵp newidiadau, os ydynt
+          yn bodoli, yn cael eu cadw.

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

-      title: Golygu'r cyfrif
+      title: Golygu cyfrif

       my settings: Fy ngosodiadau
       my settings: Fy ngosodiadau

-      current email address: 'Cyfeiriad Ebost Presenol:'
+      current email address: Cyfeiriad e-bost cyfredol

       openid:
         link text: beth yw hwn?
       public editing:
       openid:
         link text: beth yw hwn?
       public editing:


@@ -193,49 +208,56 @@ cy:
         enabled link text: beth yw hwn?
         disabled link text: pam na allaf olygu?
       contributor terms:
         enabled link text: beth yw hwn?
         disabled link text: pam na allaf olygu?
       contributor terms:

-        heading: 'Telerau Cyfranwyr:'
-        agreed: Rydych wedi derbyn y telerau cyfranwyr newydd.
-        not yet agreed: Nid ydych eto wedi cytuno i'r telerau cyfranwyr newydd.
-        review link text: Dilynwch y ddolen hon i adolygu a derbyn y telerau cyfranwyr
+        heading: Telerau Cyfranwyr
+        agreed: Rydych chi wedi cytuno â'r Telerau Cyfranwyr newydd.
+        not yet agreed: Nid ydych wedi cytuno â'r Telerau Cyfranwyr newydd eto.
+        review link text: Dilynwch y ddolen hon i adolygu a derbyn y Telerau Cyfranwyr

           newydd.
         link text: beth yw hwn?
           newydd.
         link text: beth yw hwn?

-      save changes button: Cadw Newidiadau
-      delete_account: Dileu Cyfrif...
+      save changes button: Cadw newidiadau
+      delete_account: Dileu cyfrif...

     go_public:
     go_public:

-      heading: 'Golygu cyhoeddus:'
+      heading: Golygu cyhoeddus
+      only_public_can_edit: Ers y newid yn fersiwn 0.6 yr API, dim ond defnyddwyr
+        cyhoeddus all olygu data map.
+      find_out_why: dyma pam

       make_edits_public_button: Gwneud fy holl olygiadau yn gyhoeddus
       make_edits_public_button: Gwneud fy holl olygiadau yn gyhoeddus

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

   browse:
     created: Crëwyd
     closed: Wedi cau
     version: Fersiwn
   browse:
     created: Crëwyd
     closed: Wedi cau
     version: Fersiwn

-    in_changeset: Set-newid
+    in_changeset: Grŵp newidiadau

     anonymous: dienw
     no_comment: (dim sylw)
     part_of: Rhan o
     download_xml: Lawrlwytho XML
     anonymous: dienw
     no_comment: (dim sylw)
     part_of: Rhan o
     download_xml: Lawrlwytho XML

-    view_history: Gweld yr Hanes
-    view_details: Gweld Manylion
+    view_history: Gweld hanes
+    view_details: Gweld manylion

     location: Lleoliadː
     changeset:
     location: Lleoliadː
     changeset:

-      title: '%{id}'
+      title: 'Grŵp newidiadau: %{id}'

       belongs_to: Awdur
       belongs_to: Awdur

-      node: Cygnau (%{count})
-      node_paginated: Cygnau (%{x}-%{y} o %{count})
+      node: Nodau (%{count})
+      node_paginated: Nodau (%{x}-%{y} o %{count})

       way: Llwybrau %{count}
       way_paginated: Llwybrau (%{x}-%{y} o %{count})
       relation: Perthynas %{count}
       relation_paginated: Perthynas (%{x}-%{y} o %{count})
       comment: Sylwadau (%{count})
       way: Llwybrau %{count}
       way_paginated: Llwybrau (%{x}-%{y} o %{count})
       relation: Perthynas %{count}
       relation_paginated: Perthynas (%{x}-%{y} o %{count})
       comment: Sylwadau (%{count})

-      changesetxml: Set-newid XML
-      osmchangexml: osmChange XML
+      changesetxml: XML grŵp newidiadau
+      osmchangexml: XML osmChange

       feed:
       feed:

-        title: Set-newid %{id}
-        title_comment: Set-newid %{id} - %{comment}
-      join_discussion: Mewngofnodwch i ymuno yn y sgwrs
+        title: Grŵp newidiadau %{id}
+        title_comment: Grŵp newidiadau %{id} - %{comment}
+      join_discussion: Mewngofnodwch i ymuno â'r sgwrs

       discussion: Sgwrs
       discussion: Sgwrs

+      still_open: Mae'r grŵp newidiadau dal ar agor - bydd trafodaeth yn cychwyn unwaith
+        y bydd y grŵp newidiadau wedi cau.

     node:
       title_html: 'Nod: %{name}'
     node:
       title_html: 'Nod: %{name}'

-      history_title_html: 'Hanes y Nod: %{name}'
+      history_title_html: 'Hanes y nod: %{name}'

     way:
       title_html: 'Llwybr: %{name}'
       history_title_html: 'Hanes Llwybr: %{name}'
     way:
       title_html: 'Llwybr: %{name}'
       history_title_html: 'Hanes Llwybr: %{name}'


@@ -262,7 +284,7 @@ cy:
         node: nod
         way: llwybr
         relation: perthynas
         node: nod
         way: llwybr
         relation: perthynas

-        changeset: set-newid
+        changeset: grŵp newidiadau

         note: nod
     timeout:
       sorry: Cymerodd yn rhy hir i adalw data math %{type} (gydag ID %{id})!
         note: nod
     timeout:
       sorry: Cymerodd yn rhy hir i adalw data math %{type} (gydag ID %{id})!


@@ -270,7 +292,7 @@ cy:
         node: nod
         way: llwybr
         relation: perthynas
         node: nod
         way: llwybr
         relation: perthynas

-        changeset: set-newid
+        changeset: grŵp newidiadau

         note: nodyn
     redacted:
       redaction: Golygiad %{id}
         note: nodyn
     redacted:
       redaction: Golygiad %{id}


@@ -283,7 +305,7 @@ cy:
     start_rjs:
       feature_warning: Wrthi'n llwytho nodweddio %{num_features}, a all arafu eich
         porwr. Wyt ti'n sicr dy fod am weld y data?
     start_rjs:
       feature_warning: Wrthi'n llwytho nodweddio %{num_features}, a all arafu eich
         porwr. Wyt ti'n sicr dy fod am weld y data?

-      load_data: Llwytho Data
+      load_data: Llwytho data

       loading: Wrthi'n llwytho...
     tag_details:
       tags: Tagiau
       loading: Wrthi'n llwytho...
     tag_details:
       tags: Tagiau


@@ -307,35 +329,39 @@ cy:
     changeset:
       anonymous: Dienw
       no_edits: (dim golygiadau)
     changeset:
       anonymous: Dienw
       no_edits: (dim golygiadau)

-      view_changeset_details: Dangos y newidiadau
+      view_changeset_details: Gweld manylion y grŵp newidiadau

     changesets:
       id: ID
     changesets:
       id: ID

-      saved_at: Cyhoeddwyd
+      saved_at: Cadwyd am

       user: Defnyddiwr
       comment: Sylw
       user: Defnyddiwr
       comment: Sylw

-      area: Maes
+      area: Ardal

     index:
     index:

-      title: Setiau-newid
-      title_user: Set-newid gan %{user}
-      title_friend: Setiau-newid eich cyfeillion
-      title_nearby: Setiau-newid defnyddwyr cyfagos
+      title: Grwpiau newidiadau
+      title_user: Grwpiau newidiadau gan %{user}
+      title_user_link_html: Grwpiau newidiadau gan %{user_link}
+      title_friend: Grwpiau newidiadau gan fy ffrindiau
+      title_nearby: Grwpiau newidiadau gan ddefnyddwyr cyfagos

       empty: Ni chanfuwyd setiau-newid.
       empty: Ni chanfuwyd setiau-newid.

-      empty_area: Dim setiau-newid yn yr ardal yma.
+      empty_area: Dim grwpiau newidiadau yn yr ardal yma.

       empty_user: Dim setiau-newid gan y defnyddiwr hwn.
       empty_user: Dim setiau-newid gan y defnyddiwr hwn.

-      no_more: Dim rhagor o setiau-newid.
+      no_more: Ni chanfuwyd unrhyw grwpiau newidiadau ychwanegol.

       no_more_area: Dim rhagor o setiau-newid yn yr ardal yma.
       no_more_area: Dim rhagor o setiau-newid yn yr ardal yma.

-      no_more_user: Dim newidiadau gan y Defnyddiwr hwn.
+      no_more_user: Ni chanfuwyd unrhyw grwpiau newidiadau ychwanegol gan y defnyddiwr
+        hwn.

       load_more: Llwytho mwy
     timeout:
       load_more: Llwytho mwy
     timeout:

-      sorry: Ymddiheurwn, cymerodd y newidiadau a wnaethoch gais i'w gweld ry hir
-        i'w cyrchu.
+      sorry: Mae'n ddrwg gennym, cymerodd y rhestr o grwpiau newidiadau y gwnaethoch
+        gais amdanynt ormod o amser i'w hadalw.

   changeset_comments:
     comment:
   changeset_comments:
     comment:

-      comment: Sylw newydd ar set-newid %{changeset_id} gan awdur %{author}
+      comment: Sylw newydd ar grwp newidiadau %{changeset_id} gan %{author}

       commented_at_by_html: Diweddarwyd %{when} yn ôl gan %{user}
       commented_at_by_html: Diweddarwyd %{when} yn ôl gan %{user}

+    comments:
+      comment: Sylw newydd ar grwp newidiadau %{changeset_id} gan %{author}

     index:
       title_all: Trafodaeth OpenStreetMa o'r setiau-newid
     index:
       title_all: Trafodaeth OpenStreetMa o'r setiau-newid

-      title_particular: 'Trafodaeth OpenStreetMap set-newid #%{changeset_id}'
+      title_particular: Trafodaeth grwp newidiadau OpenStreetMap %{changeset_id}

   dashboards:
     contact:
       km away: '%{count}km i ffwrdd'
   dashboards:
     contact:
       km away: '%{count}km i ffwrdd'


@@ -343,23 +369,23 @@ cy:
     popup:
       your location: Eich lleoliad
       nearby mapper: Mapiwr gerllaw
     popup:
       your location: Eich lleoliad
       nearby mapper: Mapiwr gerllaw

-      friend: Cyfaill
+      friend: Ffrind

     show:
       edit_your_profile: Golygu eich proffil
       my friends: Fy ffrindiau
     show:
       edit_your_profile: Golygu eich proffil
       my friends: Fy ffrindiau

-      no friends: Nid ydych wedi ychwanegu cyfaill eto.
+      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.
       nearby users: Defnyddwyr eraill gerllaw
       no nearby users: Nid oes defnyddwyr gerllaw sy'n datgelu eu bod yn mapio eto.

-      friends_changesets: setiau-newid eich cyfeillion
+      friends_changesets: Grwpiau newidiadau eich ffrindiau

       friends_diaries: cofnodion dyddiaduron cyfeillion
       friends_diaries: cofnodion dyddiaduron cyfeillion

-      nearby_changesets: setiau-newid gerllaw
+      nearby_changesets: grwp newidiadau defnyddwyr gerllaw

       nearby_diaries: cofnodion dyddiaduron defnyddwyr gerllaw
   diary_entries:
     new:
       title: Cofnod Dyddiadur Newydd
     form:
       nearby_diaries: cofnodion dyddiaduron defnyddwyr gerllaw
   diary_entries:
     new:
       title: Cofnod Dyddiadur Newydd
     form:

-      location: 'Lleoliad:'
-      use_map_link: defnyddiwch y map
+      location: Lleoliad
+      use_map_link: Defnyddio Map

     index:
       title: Dyddiaduron defnyddwyr
       title_friends: Dyddiaduron ffrindiau
     index:
       title: Dyddiaduron defnyddwyr
       title_friends: Dyddiaduron ffrindiau


@@ -402,9 +428,10 @@ cy:
       comment_from_html: Sylwadau gan %{link_user} ar %{comment_created_at}
       hide_link: Cuddio'r sylw hwn
       confirm: Cadarnhau
       comment_from_html: Sylwadau gan %{link_user} ar %{comment_created_at}
       hide_link: Cuddio'r sylw hwn
       confirm: Cadarnhau

+      report: Riportio'r sylw hwn

     location:
       location: 'Lleoliad:'
     location:
       location: 'Lleoliad:'

-      view: Dangos
+      view: Gweld

       edit: Golygu
     feed:
       user:
       edit: Golygu
     feed:
       user:


@@ -419,22 +446,22 @@ cy:
         description: Cofnodion dyddiadur diweddar gan ddefnyddwyr OpenStreetMap
     comments:
       post: Post
         description: Cofnodion dyddiadur diweddar gan ddefnyddwyr OpenStreetMap
     comments:
       post: Post

-      when: Pa bryd
+      when: Pryd

       comment: Sylw
       newer_comments: Sylwadau mwy diweddar
       older_comments: Hen Sylwadau
   friendships:
     make_friend:
       comment: Sylw
       newer_comments: Sylwadau mwy diweddar
       older_comments: Hen Sylwadau
   friendships:
     make_friend:

-      heading: Ychwanegu %{user} fel cyfaill?
-      button: Ychwanegu fel cyfaill
-      success: Mae %{name} nawr yn gyfaill i chi!
-      failed: Ymddiheuriadau, methwyd ychwanegu %{name} fel cyfaill.
-      already_a_friend: Rydych eisoes yn gyfaill i %{name}
+      heading: Ychwanegu %{user} fel ffrind?
+      button: Ychwanegu fel ffrind
+      success: Mae %{name} nawr yn ffrind i chi!
+      failed: Ymddiheuriadau, methwyd ychwanegu %{name} fel ffrind.
+      already_a_friend: Rydych chi eisoes yn ffrindiau gyda %{name}.

     remove_friend:
     remove_friend:

-      heading: Peidio bod yn gyfaill i %{user}?
-      button: Peidio bod yn gyfaill
-      success: Tynnwyd %{name} o'ch cyfeillion.
-      not_a_friend: Nid yw %{name} yn un o'ch cyfeillion.
+      heading: Peidio bod yn ffrind i %{user}?
+      button: Dad-ffrindio
+      success: Tynnwyd %{name} o'ch ffrindiau.
+      not_a_friend: Nid yw %{name} yn un o'ch ffrindiau.

   geocoder:
     search_osm_nominatim:
       prefix:
   geocoder:
     search_osm_nominatim:
       prefix:


@@ -506,7 +533,7 @@ cy:
           fuel: Gorsaf Betrol
           gambling: Gamblo
           grave_yard: Mynwent
           fuel: Gorsaf Betrol
           gambling: Gamblo
           grave_yard: Mynwent

-          grit_bin: Bin Gro Mân
+          grit_bin: Bin Graeanu

           hospital: Ysbyty
           hunting_stand: Llwyfan Hela
           ice_cream: Hufen Iâ
           hospital: Ysbyty
           hunting_stand: Llwyfan Hela
           ice_cream: Hufen Iâ


@@ -528,7 +555,7 @@ cy:
           pharmacy: Fferyllfa
           place_of_worship: Man addoli
           police: Heddlu
           pharmacy: Fferyllfa
           place_of_worship: Man addoli
           police: Heddlu

-          post_box: Blwch Llythyrau
+          post_box: Blwch Post

           post_office: Swyddfa Bost
           prison: Carchar
           pub: Tafarn
           post_office: Swyddfa Bost
           prison: Carchar
           pub: Tafarn


@@ -539,19 +566,19 @@ cy:
           shelter: Cysgod
           shower: Cawod
           social_centre: Canolfan Cymdeithasol
           shelter: Cysgod
           shower: Cawod
           social_centre: Canolfan Cymdeithasol

-          social_facility: Cyfleuster cymedithasol
+          social_facility: Cyfleuster Cymdeithasol

           studio: Stiwdio
           swimming_pool: Pwll Nofio
           taxi: Tacsi
           telephone: Ffôn Cyhoeddus
           theatre: Theatr
           studio: Stiwdio
           swimming_pool: Pwll Nofio
           taxi: Tacsi
           telephone: Ffôn Cyhoeddus
           theatre: Theatr

-          toilets: Tai bach
-          townhall: Neuadd Dref
+          toilets: Toiledau
+          townhall: Neuadd y Dref

           university: Prifysgol
           vending_machine: Peiriant Gwerthu
           veterinary: Milfeddygfa
           village_hall: Neuadd Bentref
           university: Prifysgol
           vending_machine: Peiriant Gwerthu
           veterinary: Milfeddygfa
           village_hall: Neuadd Bentref

-          waste_basket: Bin sbwriel
+          waste_basket: Bin Sbwriel

           waste_disposal: Gwaredu Sbwriel
           water_point: Cyflenwad Dŵr
         boundary:
           waste_disposal: Gwaredu Sbwriel
           water_point: Cyflenwad Dŵr
         boundary:


@@ -590,14 +617,14 @@ cy:
           painter: Peintiwr
           photographer: Ffotograffydd
           plumber: Plymar
           painter: Peintiwr
           photographer: Ffotograffydd
           plumber: Plymar

-          shoemaker: Crudd
+          shoemaker: Crydd

           tailor: Teiliwr
           tailor: Teiliwr

-          "yes": Siop Grefftau
+          "yes": Siop Grefft

         emergency:
           ambulance_station: Gorsaf Ambiwlans
           assembly_point: Man Ymgynull
           defibrillator: Diffibriliwr
         emergency:
           ambulance_station: Gorsaf Ambiwlans
           assembly_point: Man Ymgynull
           defibrillator: Diffibriliwr

-          landing_site: Man Glanio Mewn Argyfwng
+          landing_site: Man Glanio Argyfwng

           phone: Ffôn Argyfwng
           water_tank: Tanc Dŵr Argyfwng
         highway:
           phone: Ffôn Argyfwng
           water_tank: Tanc Dŵr Argyfwng
         highway:


@@ -608,11 +635,11 @@ cy:
           construction: Priffordd yn cael ei Adeiladu
           corridor: Coridor
           cycleway: Llwybr Beicio
           construction: Priffordd yn cael ei Adeiladu
           corridor: Coridor
           cycleway: Llwybr Beicio

-          elevator: Codwr
+          elevator: Lifft

           emergency_access_point: Pwynt Mynediad Argyfwng
           footway: Llwybr Cerdded
           ford: Rhyd
           emergency_access_point: Pwynt Mynediad Argyfwng
           footway: Llwybr Cerdded
           ford: Rhyd

-          give_way: Arwydd "Ildiwch!"
+          give_way: Arwydd Ildio

           living_street: Stryd Byw
           milestone: Carreg Filltir
           motorway: Traffordd
           living_street: Stryd Byw
           milestone: Carreg Filltir
           motorway: Traffordd


@@ -707,13 +734,13 @@ cy:
           "yes": Defnydd Tir
         leisure:
           beach_resort: Ardal Wyliau
           "yes": Defnydd Tir
         leisure:
           beach_resort: Ardal Wyliau

-          bird_hide: Cuddle Adar
+          bird_hide: Cuddfan Adar

           common: Tir Comin
           dog_park: Parc Cwn
           firepit: Ardal Dân
           fishing: Man Pysgota
           common: Tir Comin
           dog_park: Parc Cwn
           firepit: Ardal Dân
           fishing: Man Pysgota

-          fitness_centre: Canolfan Gadw'n Heini
-          fitness_station: Lle Cadw'n Heini
+          fitness_centre: Canolfan Hamdden
+          fitness_station: Gorsaf Hamdden

           garden: Gardd
           golf_course: Cwrs Golff
           horse_riding: Llain Marchogaeth
           garden: Gardd
           golf_course: Cwrs Golff
           horse_riding: Llain Marchogaeth


@@ -792,7 +819,7 @@ cy:
           forest: Coedwig
           geyser: Geiser
           glacier: Rhewlif
           forest: Coedwig
           geyser: Geiser
           glacier: Rhewlif

-          grassland: Caeau
+          grassland: Glaswelltir

           heath: Rhos
           hill: Bryn
           island: Ynys
           heath: Rhos
           hill: Bryn
           island: Ynys


@@ -805,7 +832,7 @@ cy:
           reef: Riff
           ridge: Cefn
           rock: Craig
           reef: Riff
           ridge: Cefn
           rock: Craig

-          saddle: Cyfrwy
+          saddle: Adwy

           sand: Tywod
           scree: Sgri
           scrub: Llwyni
           sand: Tywod
           scree: Sgri
           scrub: Llwyni


@@ -816,7 +843,7 @@ cy:
           valley: Dyffryn
           volcano: Llosgfynydd
           water: Dŵr
           valley: Dyffryn
           volcano: Llosgfynydd
           water: Dŵr

-          wetland: Gwlypdir
+          wetland: Gwlyptir

           wood: Coed
         office:
           accountant: Cyfrifydd
           wood: Coed
         office:
           accountant: Cyfrifydd


@@ -831,7 +858,7 @@ cy:
           insurance: Swyddfa Yswiriant
           it: Swyddfa TG
           lawyer: Cyfreithiwr
           insurance: Swyddfa Yswiriant
           it: Swyddfa TG
           lawyer: Cyfreithiwr

-          ngo: Swyddfa'r NGO
+          ngo: Swyddfa NGO

           telecommunication: Swyddfa Telegyfathrebu
           travel_agent: Asiantaeth Deithio
           "yes": Swyddfa
           telecommunication: Swyddfa Telegyfathrebu
           travel_agent: Asiantaeth Deithio
           "yes": Swyddfa


@@ -864,12 +891,12 @@ cy:
           "yes": Lle
         railway:
           abandoned: Hen Reilffordd
           "yes": Lle
         railway:
           abandoned: Hen Reilffordd

-          construction: Rheilffordd yn cael ei Osod
+          construction: Rheilffordd yn cael ei hadeiladu

           disused: Rheilffordd Segur
           funicular: Rheilffordd fynydd
           halt: Stop Trenau
           junction: Cyffordd Rheilffyrdd
           disused: Rheilffordd Segur
           funicular: Rheilffordd fynydd
           halt: Stop Trenau
           junction: Cyffordd Rheilffyrdd

-          level_crossing: Croesfan Wastad
+          level_crossing: Croesfan reilffordd

           light_rail: Rheilffordd Ysgafn
           miniature: Lein Fach
           monorail: Trên Un Gledren
           light_rail: Rheilffordd Ysgafn
           miniature: Lein Fach
           monorail: Trên Un Gledren


@@ -937,16 +964,17 @@ cy:
           grocery: Siop y Groser
           hairdresser: Siop Drin Gwallt
           hardware: Siop Nwyddau Metel
           grocery: Siop y Groser
           hairdresser: Siop Drin Gwallt
           hardware: Siop Nwyddau Metel

-          hifi: Sain
+          hifi: Siop Hi-Fi

           houseware: Siop Offer Tŷ
           houseware: Siop Offer Tŷ

+          ice_cream: Siop Hufen Iâ

           interior_decoration: Addurniadau'r Cartref
           jewelry: Siop Gemwaith
           interior_decoration: Addurniadau'r Cartref
           jewelry: Siop Gemwaith

-          kiosk: Siop Fechan
-          kitchen: Siop Offer Cegin
+          kiosk: Siop Giosg
+          kitchen: Siop Gegin

           laundry: Golchdy
           lottery: Loteri
           mall: Canolfan Siopa
           laundry: Golchdy
           lottery: Loteri
           mall: Canolfan Siopa

-          massage: Neges
+          massage: Tylino

           mobile_phone: Siop Ffonau Symudol
           motorcycle: Siop Beiciau Modur
           music: Siop Gerddoriaeth
           mobile_phone: Siop Ffonau Symudol
           motorcycle: Siop Beiciau Modur
           music: Siop Gerddoriaeth


@@ -957,7 +985,7 @@ cy:
           paint: Siop Baent
           pet: Siop Anifeiliaid Anwes
           photo: Siop Luniau
           paint: Siop Baent
           pet: Siop Anifeiliaid Anwes
           photo: Siop Luniau

-          second_hand: Siol Ail-law
+          second_hand: Siop ail-law

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


@@ -996,8 +1024,8 @@ cy:
           viewpoint: Gwylfa
           zoo: Sw
         tunnel:
           viewpoint: Gwylfa
           zoo: Sw
         tunnel:

-          culvert: Twnel Ddŵr
-          "yes": Twnel
+          culvert: Cwlfer
+          "yes": Twnnel

         waterway:
           artificial: Dyfrffyrdd Artiffisial
           boatyard: Iard Gychod
         waterway:
           artificial: Dyfrffyrdd Artiffisial
           boatyard: Iard Gychod


@@ -1034,20 +1062,21 @@ cy:
       more_results: Mwy o ganlyniadau
   issues:
     index:
       more_results: Mwy o ganlyniadau
   issues:
     index:

-      title: Pryderon
-      select_status: Statws a ddewisiwyd
-      select_type: Dewisiwch y Math
+      title: Materion
+      select_status: Dewis statws
+      select_type: Dewis math

       search: Chwilio
       user_not_found: Nid yw'r defnyddiwr yn bodoli
       search: Chwilio
       user_not_found: Nid yw'r defnyddiwr yn bodoli

-      issues_not_found: Nid oes y fath broblemau
+      issues_not_found: Ni chanfuwyd unrhyw faterion o'r fath

       status: Statws
       reports: Adroddiadau
       status: Statws
       reports: Adroddiadau

-      last_updated: Diweddariad Diwethaf
-      link_to_reports: Gweld yr Adroddiadau
+      last_updated: Diweddarwyd ddiwethaf
+      last_updated_time_ago_user_html: '%{time_ago} gan %{user}'
+      link_to_reports: Gweld adroddiadau

       reports_count:
         one: 1 Report
         other: '%{count} Adroddiadau'
       reports_count:
         one: 1 Report
         other: '%{count} Adroddiadau'

-      reported_item: Eitem dan sylw
+      reported_item: Eitem ag adroddwyd

       states:
         open: Agor
         resolved: Datruswyd
       states:
         open: Agor
         resolved: Datruswyd


@@ -1059,16 +1088,16 @@ cy:
   layouts:
     logo:
       alt_text: Logo OpenStreetMap
   layouts:
     logo:
       alt_text: Logo OpenStreetMap

-    home: Ewch Adref
+    home: Ewch i Leoliad Cartref

     logout: Allgofnodi
     log_in: Mewngofnodi
     sign_up: Cofrestru
     logout: Allgofnodi
     log_in: Mewngofnodi
     sign_up: Cofrestru

-    start_mapping: Dechrau Mapio
+    start_mapping: Dechrau mapio

     edit: Golygu
     history: Hanes
     export: Allforio
     data: Data
     edit: Golygu
     history: Hanes
     export: Allforio
     data: Data

-    export_data: Allforio Data
+    export_data: Allforio data

     gps_traces: Dargopiadau GPS
     gps_traces_tooltip: Rheoli Amlinellau GPS
     user_diaries: Dyddiaduron Defnyddwyr
     gps_traces: Dargopiadau GPS
     gps_traces_tooltip: Rheoli Amlinellau GPS
     user_diaries: Dyddiaduron Defnyddwyr


@@ -1080,7 +1109,7 @@ cy:
       sydd ar gael i'w ddefnyddio am ddim a dan drwydded rydd.
     intro_2_create_account: Creu cyfrif defnyddiwr
     partners_bytemark: Bytemark Hosting
       sydd ar gael i'w ddefnyddio am ddim a dan drwydded rydd.
     intro_2_create_account: Creu cyfrif defnyddiwr
     partners_bytemark: Bytemark Hosting

-    partners_partners: Partneriaid
+    partners_partners: partneriaid

     tou: Telerau Gwasanaeth
     osm_offline: Mae cronfa ddata OpenStreetMap all-lein ar hyn o bryd er mwyn gwaith
       cynnal a chadw hanfodol.
     tou: Telerau Gwasanaeth
     osm_offline: Mae cronfa ddata OpenStreetMap all-lein ar hyn o bryd er mwyn gwaith
       cynnal a chadw hanfodol.


@@ -1096,37 +1125,43 @@ cy:
     community_blogs_title: Blogiau gan aelodau cymuned OpenStreetMap
     make_a_donation:
       title: Cefnogwch OpenStreetMap gyda rhodd ariannol
     community_blogs_title: Blogiau gan aelodau cymuned OpenStreetMap
     make_a_donation:
       title: Cefnogwch OpenStreetMap gyda rhodd ariannol

-      text: Gwneud Cyfraniad
+      text: Rhoi arian

     learn_more: Dysgu Mwy
     more: Mwy
   user_mailer:
     message_notification:
       subject: '[OpenStreetMap] %{message_title}'
     learn_more: Dysgu Mwy
     more: Mwy
   user_mailer:
     message_notification:
       subject: '[OpenStreetMap] %{message_title}'

-      hi: Pa hwyl %{to_user}?
+      hi: Helo %{to_user},

     friendship_notification:
     friendship_notification:

-      hi: Henffych %{to_user}!
+      hi: Helo %{to_user},

     gpx_failure:
       failed_to_import: 'methwyd a mewnforio. Dyma''r gwall:'
       subject: Methwyd mewnforio GPX [OpenStreetMap]
     signup_confirm:
     gpx_failure:
       failed_to_import: 'methwyd a mewnforio. Dyma''r gwall:'
       subject: Methwyd mewnforio GPX [OpenStreetMap]
     signup_confirm:

-      greeting: Pa hwyl!
+      greeting: Shwmae!

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

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

     lost_password:
       greeting: Helo,
     note_comment_notification:
     lost_password:
       greeting: Helo,
     note_comment_notification:

-      anonymous: Defnyddiwr anhysbys
-      greeting: Pa hwyl?
+      anonymous: Defnyddiwr dienw
+      greeting: Helo,

     changeset_comment_notification:
       greeting: Helo,
     changeset_comment_notification:
       greeting: Helo,

+      commented:
+        partial_changeset_with_comment_html: gyda sylw '%{changeset_comment}'

   confirmations:
     confirm:
       button: Cadarnhau
     confirm_email:
   confirmations:
     confirm:
       button: Cadarnhau
     confirm_email:

+      heading: Cadarnhau newid cyfeiriad e-bost

       button: Cadarnhau
       button: Cadarnhau

-      success: Cadarnhewch eich cyfeiriad ebost newydd!
-      failure: Mae cyfeiriad ebost eisoes wedi ei gadarnhau gyda'r tocyn hwn.
+      success: Wedi cadarnhau eich newid cyfeiriad e-bost!
+      failure: Mae cyfeiriad e-bost eisoes wedi'i gadarnhau gyda'r tocyn hwn.

   messages:
     inbox:
       title: Mewnflwch
   messages:
     inbox:
       title: Mewnflwch


@@ -1137,13 +1172,13 @@ cy:
       date: Dyddiad
       people_mapping_nearby: person yn mapio gerllaw
     message_summary:
       date: Dyddiad
       people_mapping_nearby: person yn mapio gerllaw
     message_summary:

-      unread_button: Nodi fel heb ei ddarllen
-      read_button: Nodi fel wedi'i ddarllen
+      unread_button: Marcio fel heb ei ddarllen
+      read_button: Marcio fel wedi'i ddarllen

       reply_button: Ateb
       destroy_button: Dileu
     new:
       title: Anfon neges
       reply_button: Ateb
       destroy_button: Dileu
     new:
       title: Anfon neges

-      send_message_to_html: Anfon negese newydd at %{name}
+      send_message_to_html: Anfon neges newydd at %{name}

       back_to_inbox: Nôl i'r mewnflwch
     create:
       message_sent: Anfonwyd y neges
       back_to_inbox: Nôl i'r mewnflwch
     create:
       message_sent: Anfonwyd y neges


@@ -1152,7 +1187,7 @@ cy:
     no_such_message:
       title: Dim neges o'r fath
       heading: Dim neges o'r fath
     no_such_message:
       title: Dim neges o'r fath
       heading: Dim neges o'r fath

-      body: Ymddiheuriad, nid oes neges gyda'r id yno.
+      body: Sori, nid oes neges gyda'r id yno.

     outbox:
       title: Allanflwch
       my_inbox: Fy Mewnflwch
     outbox:
       title: Allanflwch
       my_inbox: Fy Mewnflwch


@@ -1166,7 +1201,7 @@ cy:
     show:
       title: Darllen neges
       reply_button: Ateb
     show:
       title: Darllen neges
       reply_button: Ateb

-      unread_button: Nodi nad yw wedi ei ddarllen
+      unread_button: Marcio fel heb ei ddarllen

       destroy_button: Dileu
       back: Yn ôl
     sent_message_summary:
       destroy_button: Dileu
       back: Yn ôl
     sent_message_summary:


@@ -1180,14 +1215,14 @@ cy:
     lost_password:
       title: Ailosod cyfrinair
       heading: Wedi anghofio'ch cyfrinair?
     lost_password:
       title: Ailosod cyfrinair
       heading: Wedi anghofio'ch cyfrinair?

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

       new password button: Ailosod cyfrinair
       notice email cannot find: Methwyd dod o hyd i'r cyfeiriad ebost yno.
     reset_password:
       title: Ailosod cyfrinair
       new password button: Ailosod cyfrinair
       notice email cannot find: Methwyd dod o hyd i'r cyfeiriad ebost yno.
     reset_password:
       title: Ailosod cyfrinair

-      heading: Ailosod Cyfinair ar gyfer %{user}
-      reset: Ailosod Cyfrinair
-      flash changed: Mae'ch cyfrinair wedi'i newid.
+      heading: Ailosod cyfrinair ar gyfer %{user}
+      reset: Ailosod cyfrinair
+      flash changed: Mae eich cyfrinair wedi'i newid.

   preferences:
     show:
       title: Dewisiadau
   preferences:
     show:
       title: Dewisiadau


@@ -1195,29 +1230,29 @@ cy:
       cancel: Canslo
   profiles:
     edit:
       cancel: Canslo
   profiles:
     edit:

-      title: Golygu Proffil
-      save: Diweddaru Proffil
+      title: Golygu proffil
+      save: Diweddaru proffil

       cancel: Canslo
       image: Delwedd
       gravatar:
         gravatar: Defnyddio Gravatar
         what_is_gravatar: Beth yw Gravatar?
       new image: Ychwanegu delwedd
       cancel: Canslo
       image: Delwedd
       gravatar:
         gravatar: Defnyddio Gravatar
         what_is_gravatar: Beth yw Gravatar?
       new image: Ychwanegu delwedd

-      keep image: Cadw'r ddelwedd bresennol
-      delete image: Tynnu'r ddelwedd bresennol
-      replace image: Newid y ddelwedd bresennol
+      keep image: Cadw'r ddelwedd gyfredol
+      delete image: Tynnu'r ddelwedd gyfredol
+      replace image: Newid y ddelwedd gyfredol

       image size hint: (delweddau sgwâr o leiaf 100x100 yw'r gorau)
       image size hint: (delweddau sgwâr o leiaf 100x100 yw'r gorau)

-      home location: 'Lleoliad Cartref:'
+      home location: Lleoliad Cartref

       no home location: Nid ydych wedi gosod eich lleoliad cartref.
   sessions:
     new:
       title: Mewngofnodi
       heading: Mewngofnodi
       no home location: Nid ydych wedi gosod eich lleoliad cartref.
   sessions:
     new:
       title: Mewngofnodi
       heading: Mewngofnodi

-      email or username: 'Cyfeiriad Ebost neu Enw Defnyddiwr:'
+      email or username: 'Cyfeiriad e-bost neu enw defnyddiwr:'

       password: 'Cyfrinair:'
       openid_html: '%{logo} OpenID:'
       password: 'Cyfrinair:'
       openid_html: '%{logo} OpenID:'

-      remember: Fy nghofio i
-      lost password link: Wedi anghofio'ch cyfrinair?
+      remember: Cofiwch fi
+      lost password link: Wedi anghofio eich cyfrinair?

       login_button: Mewngofnodi
       register now: Cofrestru nawr
       no account: Dim cyfrif gennych?
       login_button: Mewngofnodi
       register now: Cofrestru nawr
       no account: Dim cyfrif gennych?


@@ -1251,12 +1286,12 @@ cy:
       partners_title: Partneriaid
     copyright:
       foreign:
       partners_title: Partneriaid
     copyright:
       foreign:

-        title: Ynghylch y cyfieithiad hwn
-        html: Os oes gwrthgyferbyniad rhwng y cyfieithiad hwn a %{english_original_link},
-          bydd y dudalen Saesneg yn cael blaenoriaeth.
+        title: Ynglŷn â'r cyfieithiad hwn
+        html: Mewn achos o wrthdaro rhwng y dudalen hon a gyfieithwyd a %{english_original_link},
+          y dudalen Saesneg fydd yn cael blaenoriaeth

         english_link: y Saesneg gwreiddiol
       native:
         english_link: y Saesneg gwreiddiol
       native:

-        title: Ynghylch y dudalen hon
+        title: Ynglŷn â'r dudalen hon

         native_link: Cymraeg
         mapping_link: dechrau mapio
       legal_babble:
         native_link: Cymraeg
         mapping_link: dechrau mapio
       legal_babble:


@@ -1265,7 +1300,7 @@ cy:
         attribution_example:
           title: Enghraifft o gydnabyddiaeth
         more_title_html: Darganfod rhagor
         attribution_example:
           title: Enghraifft o gydnabyddiaeth
         more_title_html: Darganfod rhagor

-        contributors_title_html: Ein cyfrannwyr
+        contributors_title_html: Ein cyfranwyr

         contributors_at_cc_by: CC BY
         contributors_au_australia: Awstralia
         contributors_au_geoscape_australia: Geoscape Australia
         contributors_at_cc_by: CC BY
         contributors_au_australia: Awstralia
         contributors_au_geoscape_australia: Geoscape Australia


@@ -1283,21 +1318,21 @@ cy:
         contributors_za_south_africa: De Affrica
         contributors_gb_united_kingdom: Deyrnas Unedig
         contributors_2_contributors_page: Tudalen gyfranwyr
         contributors_za_south_africa: De Affrica
         contributors_gb_united_kingdom: Deyrnas Unedig
         contributors_2_contributors_page: Tudalen gyfranwyr

-        infringement_title_html: Torrwyd yr hawlfraint
+        infringement_title_html: Torri hawlfraint

     index:
       permalink: Dolen barhaol
     index:
       permalink: Dolen barhaol

-      shortlink: Dolen Fyr
+      shortlink: Dolen fer

       createnote: Ychwanegu nodyn
       license:
         copyright: Hawlfraint OpenStreetMap a chyfranwyr, dan drwydded agored
     edit:
       not_public: Nid ydych wedi gosod eich golygiadau i fod yn gyhoeddus.
       user_page_link: tudalen defnyddiwr
       createnote: Ychwanegu nodyn
       license:
         copyright: Hawlfraint OpenStreetMap a chyfranwyr, dan drwydded agored
     edit:
       not_public: Nid ydych wedi gosod eich golygiadau i fod yn gyhoeddus.
       user_page_link: tudalen defnyddiwr

-      anon_edits_link_text: Darganfyddwch achos hyn.
+      anon_edits_link_text: Gweld pam.

     export:
       title: Allforio
       area_to_export: Ardal i'w Hallforio
     export:
       title: Allforio
       area_to_export: Ardal i'w Hallforio

-      manually_select: Dewisiwch ardal wahanol
+      manually_select: Dewiswch ardal wahanol â llaw

       format_to_export: Fformatiwch i'w Hallforio
       osm_xml_data: Data XML OpenStreetMap
       map_image: Delwedd y Map (dangoser yr haen safonol)
       format_to_export: Fformatiwch i'w Hallforio
       osm_xml_data: Data XML OpenStreetMap
       map_image: Delwedd y Map (dangoser yr haen safonol)


@@ -1332,7 +1367,7 @@ cy:
     help:
       title: Cael Cymorth
       welcome:
     help:
       title: Cael Cymorth
       welcome:

-        url: /croeso
+        url: /welcome

         title: Croeso i OpenStreetMap
       beginners_guide:
         title: Llawlyfr Dechreuwyr
         title: Croeso i OpenStreetMap
       beginners_guide:
         title: Llawlyfr Dechreuwyr


@@ -1346,7 +1381,7 @@ cy:
       switch2osm:
         title: switch2osm
     any_questions:
       switch2osm:
         title: switch2osm
     any_questions:

-      title: Unrhyw gwestiwn?
+      title: Unrhyw gwestiynau?

     sidebar:
       search_results: Canlyniadau Chwilio
       close: Cau
     sidebar:
       search_results: Canlyniadau Chwilio
       close: Cau


@@ -1425,9 +1460,9 @@ cy:
           private: Mynediad preifat
           destination: Mynediad cyrchfan
           construction: Ffyrdd wrthi'n cael eu hadeiladu
           private: Mynediad preifat
           destination: Mynediad cyrchfan
           construction: Ffyrdd wrthi'n cael eu hadeiladu

-          bicycle_shop: Siop feics
-          bicycle_parking: Man parcio beics
-          toilets: Lle chwech
+          bicycle_shop: Siop feiciau
+          bicycle_parking: Man parcio beiciau
+          toilets: Toiledau

     welcome:
       title: Croeso!
       whats_on_the_map:
     welcome:
       title: Croeso!
       whats_on_the_map:


@@ -1457,7 +1492,7 @@ cy:
       download: lawrlwytho
       uploaded: 'Uwchlwythwyd:'
       points: 'Pwyntiau:'
       download: lawrlwytho
       uploaded: 'Uwchlwythwyd:'
       points: 'Pwyntiau:'

-      start_coordinates: 'Cyfesuryn dechrau:'
+      start_coordinates: 'Cyfesuryn cychwynnol:'

       map: map
       edit: golygu
       owner: 'Perchennog:'
       map: map
       edit: golygu
       owner: 'Perchennog:'


@@ -1465,15 +1500,17 @@ cy:
       tags: 'Tagiau:'
       none: Dim
       visibility: 'Gwelededd:'
       tags: 'Tagiau:'
       none: Dim
       visibility: 'Gwelededd:'

-    trace_paging_nav:
-      showing_page: Tudalen %{page}

     trace:
       count_points:
     trace:
       count_points:

-        one: 1 point
+        zero: '%{count} pwynt'
+        one: '%{count} pwynt'
+        two: '%{count} bwynt'
+        few: '%{count} phwynt'
+        many: '%{count} pwynt'

         other: '%{count} pwynt'
       more: mwy
       view_map: Gweld Map
         other: '%{count} pwynt'
       more: mwy
       view_map: Gweld Map

-      edit_map: Golygu'r Map
+      edit_map: Golygu Map

       public: CYHOEDDUS
       identifiable: CANFYDDADWY
       private: PREIFAT
       public: CYHOEDDUS
       identifiable: CANFYDDADWY
       private: PREIFAT


@@ -1490,7 +1527,7 @@ cy:
       allow_to: 'Caniatáu''r rhaglen cleient i:'
       allow_read_prefs: ddarllen eich gosodiadau defnyddiwr.
       allow_write_prefs: addasu eich gosodiadau defnyddiwr.
       allow_to: 'Caniatáu''r rhaglen cleient i:'
       allow_read_prefs: ddarllen eich gosodiadau defnyddiwr.
       allow_write_prefs: addasu eich gosodiadau defnyddiwr.

-      allow_write_diary: creu cofnodion dyddiadur, sylwadau a gwneud ffrindiau.
+      allow_write_diary: greu cofnodion dyddiadur, sylwadau a gwneud ffrindiau.

       allow_write_api: addasu'r map.
       allow_read_gpx: ddarllen eich dargopiadau GPS.
       allow_write_gpx: uwchlwytho dargopiadau GPS.
       allow_write_api: addasu'r map.
       allow_read_gpx: ddarllen eich dargopiadau GPS.
       allow_write_gpx: uwchlwytho dargopiadau GPS.


@@ -1516,7 +1553,7 @@ cy:
       authorize_url: 'URL Awdurdodi:'
       edit: Golygu Manylion
       delete: Dileu Cleient
       authorize_url: 'URL Awdurdodi:'
       edit: Golygu Manylion
       delete: Dileu Cleient

-      confirm: Ydych yn siŵr?
+      confirm: Ydych chi'n siŵr?

     index:
       oauth: OAuth
   oauth2_applications:
     index:
       oauth: OAuth
   oauth2_applications:


@@ -1529,6 +1566,8 @@ cy:
   users:
     new:
       title: Cofrestru
   users:
     new:
       title: Cofrestru

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

       continue: Cofrestru
       terms accepted: Diolch am dderbyn telerau newydd cyfranwyr!
     terms:
       continue: Cofrestru
       terms accepted: Diolch am dderbyn telerau newydd cyfranwyr!
     terms:


@@ -1561,9 +1600,9 @@ cy:
       edits: Golygiadau
       traces: Dargopiadau
       notes: Nodiadau Map
       edits: Golygiadau
       traces: Dargopiadau
       notes: Nodiadau Map

-      remove as friend: Peidio bod yn ffrind
-      add as friend: Ychwanegu Cyfaill
-      mapper since: 'Yn fapiwr ers:'
+      remove as friend: Dad-ffrindio
+      add as friend: Ychwanegu ffrind
+      mapper since: 'Yn mapio ers:'

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


@@ -1597,7 +1636,7 @@ cy:
       time_future_html: Yn dod i ben mewn %{time}.
       time_past_html: Wedi dod i ben %{time} yn ôl.
     show:
       time_future_html: Yn dod i ben mewn %{time}.
       time_past_html: Wedi dod i ben %{time} yn ôl.
     show:

-      status: Statws
+      status: 'Statws:'

       show: Dangos
       edit: Golygu
       confirm: Ydych chi'n siŵr?
       show: Dangos
       edit: Golygu
       confirm: Ydych chi'n siŵr?


@@ -1612,13 +1651,14 @@ cy:
   notes:
     index:
       id: Id
   notes:
     index:
       id: Id

+      last_changed: Newidiwyd ddiwethaf

     show:
       title: 'Nodyn: %{id}'
       description: Disgrifiad
       open_title: '#%{note_name} heb ei ddatrus'
       closed_title: '#%{note_name} wedi''i ddatrus'
       hidden_title: Nodyn cudd %{note_name}
     show:
       title: 'Nodyn: %{id}'
       description: Disgrifiad
       open_title: '#%{note_name} heb ei ddatrus'
       closed_title: '#%{note_name} wedi''i ddatrus'
       hidden_title: Nodyn cudd %{note_name}

-      report: Adroddwch am y nodyn hwn
+      report: riportio'r nodyn hwn

       hide: Cuddio
       resolve: Datrys
       reactivate: Ail roi ar waith
       hide: Cuddio
       resolve: Datrys
       reactivate: Ail roi ar waith


@@ -1692,4 +1732,6 @@ cy:
       description: 'Disgrifiad:'
       user: 'Crëwr:'
       confirm: Ydych chi'n siŵr?
       description: 'Disgrifiad:'
       user: 'Crëwr:'
       confirm: Ydych chi'n siŵr?

+    update:
+      flash: Newidiadau wedi'u cadw.

 ...
 ...

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 3efcb4596003c6dfcf9c9acb1951dd5fa280f3f5..502577aff03d5e24968495bd71fe894ac0b412fd 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -246,7 +246,6 @@ da:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

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


@@ -2471,7 +2470,6 @@ da:
       visibility: 'Synlighed:'
       confirm_delete: Slet dette spor?
     trace_paging_nav:
       visibility: 'Synlighed:'
       confirm_delete: Slet dette spor?
     trace_paging_nav:

-      showing_page: Side %{page}

       older: Ældre spor
       newer: Nyere spor
     trace:
       older: Ældre spor
       newer: Nyere spor
     trace:

diff --git a/config/locales/de.yml b/config/locales/de.yml
index dfc076b12dabf0ff980441a57cd49965d16517a8..0990c3d6d67e24959ee0dee5f721fa0f1107655e 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -316,7 +316,6 @@ de:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

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


@@ -1976,7 +1975,7 @@ de:
           title: Mit Facebook anmelden
           alt: Mit einem Facebook-Konto anmelden
         windowslive:
           title: Mit Facebook anmelden
           alt: Mit einem Facebook-Konto anmelden
         windowslive:

-          title: Mit Windows Live anmelden
+          title: Mit Microsoft anmelden

           alt: Mit einem Microsoft-Konto anmelden
         github:
           title: Mit GitHub anmelden
           alt: Mit einem Microsoft-Konto anmelden
         github:
           title: Mit GitHub anmelden


@@ -2102,16 +2101,25 @@ de:
         introduction_2_legal_code: Lizenztext
         introduction_3_html: Unsere Dokumentation steht unter der %{creative_commons_link}-Lizenz
           (CC BY-SA 2.0).
         introduction_2_legal_code: Lizenztext
         introduction_3_html: Unsere Dokumentation steht unter der %{creative_commons_link}-Lizenz
           (CC BY-SA 2.0).

+        introduction_3_creative_commons: Creative Commons Namensnennung – Weitergabe
+          unter gleichen Bedingungen 2.0

         credit_title_html: Wie auf die Urheberschaft von OpenStreetMap hinzuweisen
           ist
         credit_1_html: 'Wenn du OpenStreetMap-Daten verwendest, musst du die folgenden
           zwei Bedingungen erfüllen:'
         credit_title_html: Wie auf die Urheberschaft von OpenStreetMap hinzuweisen
           ist
         credit_1_html: 'Wenn du OpenStreetMap-Daten verwendest, musst du die folgenden
           zwei Bedingungen erfüllen:'

+        credit_2_1: Nennung von OpenStreetMap, indem du unseren Urheberrechts-Hinweis
+          anzeigst.
+        credit_2_2: Mache deutlich, dass die Daten unter der Open Database-Lizenz
+          verfügbar sind.

         credit_3_attribution_guidelines: Richtlinien für Namensnennungen
         attribution_example:
           alt: Beispiel, wie man auf OpenStreetMap auf einer Webseite hinweist
           title: Namensnennung-Beispiel
         more_title_html: Weitere Informationen
         more_1_1_osmf_licence_page: OSMF-Lizenzseite
         credit_3_attribution_guidelines: Richtlinien für Namensnennungen
         attribution_example:
           alt: Beispiel, wie man auf OpenStreetMap auf einer Webseite hinweist
           title: Namensnennung-Beispiel
         more_title_html: Weitere Informationen
         more_1_1_osmf_licence_page: OSMF-Lizenzseite

+        more_2_1_html: |-
+          Obwohl es sich bei OpenStreetMap um offene Daten handelt, können wir keine kostenlose Karten-API für Dritte bereitstellen.
+          Siehe unsere %{api_usage_policy_link}, %{tile_usage_policy_link} und %{nominatim_usage_policy_link}.

         more_2_1_api_usage_policy: API-Nutzungsrichtlinie
         more_2_1_tile_usage_policy: Nutzungsrichtlinie für Kacheln
         more_2_1_nominatim_usage_policy: Nominatim-Nutzungsrichtlinie
         more_2_1_api_usage_policy: API-Nutzungsrichtlinie
         more_2_1_tile_usage_policy: Nutzungsrichtlinie für Kacheln
         more_2_1_nominatim_usage_policy: Nominatim-Nutzungsrichtlinie


@@ -2124,11 +2132,24 @@ de:
         contributors_at_cc_by: CC BY
         contributors_at_land_vorarlberg: Land Vorarlberg
         contributors_at_cc_by_at_with_amendments: CC BY AT mit Ergänzungen
         contributors_at_cc_by: CC BY
         contributors_at_land_vorarlberg: Land Vorarlberg
         contributors_at_cc_by_at_with_amendments: CC BY AT mit Ergänzungen

+        contributors_au_credit_html: |-
+          %{australia}: Integriert oder entwickelt unter Verwendung administrativer Grenzen © %{geoscape_australia_link}
+          lizenziert vom Commonwealth of Australia unter %{cc_licence_link}.

         contributors_au_australia: Australien
         contributors_au_geoscape_australia: Geoscape Australien
         contributors_au_cc_licence: Creative Commons Namensnennung 4.0 Internationale
           Lizenz (CC BY 4.0)
         contributors_au_australia: Australien
         contributors_au_geoscape_australia: Geoscape Australien
         contributors_au_cc_licence: Creative Commons Namensnennung 4.0 Internationale
           Lizenz (CC BY 4.0)

+        contributors_ca_credit_html: |-
+          %{canada}: Enthält Daten von
+          GeoBase®, GeoGratis (© Department of Natural
+          Resources Canada), CanVec (© Department of Natural
+          Resources Canada) und StatCan (Geography Division,
+          Statistics). Kanada).

         contributors_ca_canada: Kanada
         contributors_ca_canada: Kanada

+        contributors_fi_credit_html: |-
+          %{finland}: Enthält Daten aus der
+          Nationalen Landvermessung der Topografischen Datenbank Finnlands
+          und anderen Datensätzen unter %{nlsfi_license_link}.

         contributors_fi_finland: Finnland
         contributors_fi_nlsfi_license: NLSFI-Lizenz
         contributors_fr_credit_html: |-
         contributors_fi_finland: Finnland
         contributors_fi_nlsfi_license: NLSFI-Lizenz
         contributors_fr_credit_html: |-


@@ -2148,7 +2169,13 @@ de:
           %{serbia}: Enthält Daten aus %{rgz_link} und %{open_data_portal}
           (öffentliche Informationen Serbiens), 2018.
         contributors_rs_serbia: Serbien
           %{serbia}: Enthält Daten aus %{rgz_link} und %{open_data_portal}
           (öffentliche Informationen Serbiens), 2018.
         contributors_rs_serbia: Serbien

+        contributors_rs_rgz: Serbische Geodätische Behörde
+        contributors_rs_open_data_portal: Nationales Open-Data-Portal
+        contributors_si_credit_html: |-
+          %{slovenia}: Enthält Daten aus %{gu_link} und %{mkgp_link}
+          (öffentliche Informationen aus Slowenien).

         contributors_si_slovenia: Slowenien
         contributors_si_slovenia: Slowenien

+        contributors_si_gu: Vermessungs- und Kartierungsbehörde

         contributors_si_mkgp: Ministerium für Land- und Forstwirtschaft und Ernährung
         contributors_es_credit_html: |-
           %{spain}: Enthält Daten vom
         contributors_si_mkgp: Ministerium für Land- und Forstwirtschaft und Ernährung
         contributors_es_credit_html: |-
           %{spain}: Enthält Daten vom


@@ -2160,6 +2187,7 @@ de:
         contributors_za_credit_html: '%{south_africa}: Enthält Daten von %{ngi_link},
           staatliches Urheberrecht vorbehalten.'
         contributors_za_south_africa: Südafrika
         contributors_za_credit_html: '%{south_africa}: Enthält Daten von %{ngi_link},
           staatliches Urheberrecht vorbehalten.'
         contributors_za_south_africa: Südafrika

+        contributors_za_ngi: 'Hauptdirektion: Nationale Geodaten'

         contributors_gb_credit_html: |-
           %{united_kingdom}: Enthält Ordnance
           Survey-Daten © Crown Copyright und Datenbankrecht
         contributors_gb_credit_html: |-
           %{united_kingdom}: Enthält Ordnance
           Survey-Daten © Crown Copyright und Datenbankrecht


@@ -2176,7 +2204,13 @@ de:
           hin, dass keinesfalls Daten aus urheberrechtlich geschützten Quellen verwendet
           werden dürfen (z. B. Google Maps oder gedruckte Kartenwerke), ohne vorher
           die ausdrückliche Erlaubnis des Rechteinhabers erhalten zu haben.
           hin, dass keinesfalls Daten aus urheberrechtlich geschützten Quellen verwendet
           werden dürfen (z. B. Google Maps oder gedruckte Kartenwerke), ohne vorher
           die ausdrückliche Erlaubnis des Rechteinhabers erhalten zu haben.

+        infringement_2_1_takedown_procedure: Takedown-Verfahren
+        infringement_2_1_online_filing_page: Online-Einreichungsseite

         trademarks_title: Warenzeichen
         trademarks_title: Warenzeichen

+        trademarks_1_1_html: |-
+          OpenStreetMap, das Lupenlogo und State of the Map sind eingetragene Marken der
+          OpenStreetMap Foundation. Wenn du Fragen zu der Verwendung der Marken hast, lies bitte unsere
+          %{trademark_policy_link}.

         trademarks_1_1_trademark_policy: Richtlinie für Warenzeichen
     index:
       js_1: Dein Browser unterstützt kein JavaScript oder du hast es deaktiviert.
         trademarks_1_1_trademark_policy: Richtlinie für Warenzeichen
     index:
       js_1: Dein Browser unterstützt kein JavaScript oder du hast es deaktiviert.


@@ -2208,6 +2242,8 @@ de:
       map_image: Karte (zeigt die Standardebene)
       embeddable_html: HTML zum Einbinden
       licence: Lizenz
       map_image: Karte (zeigt die Standardebene)
       embeddable_html: HTML zum Einbinden
       licence: Lizenz

+      licence_details_html: OpenStreetMap-Daten sind unter %{odbl_link} (ODbL) lizenziert.
+      odbl: Open Data Commons Open Database-Lizenz

       too_large:
         advice: 'Falls der obenstehende Export fehlschlägt, erwäge bitte, eine der
           unten aufgelisteten Quellen zu verwenden:'
       too_large:
         advice: 'Falls der obenstehende Export fehlschlägt, erwäge bitte, eine der
           unten aufgelisteten Quellen zu verwenden:'


@@ -2251,6 +2287,7 @@ de:
             ist der beste Weg zum Weitermachen der Beitritt zur OpenStreetMap-Gemeinschaft und das Beheben der Daten durch dich selbst.
       other_concerns:
         title: Andere Anliegen
             ist der beste Weg zum Weitermachen der Beitritt zur OpenStreetMap-Gemeinschaft und das Beheben der Daten durch dich selbst.
       other_concerns:
         title: Andere Anliegen

+        working_group: OSMF-Arbeitsgruppe

     help:
       title: Hilfe erhalten
       introduction: |-
     help:
       title: Hilfe erhalten
       introduction: |-


@@ -2295,6 +2332,8 @@ de:
       removed: Deine Standard OpenStreetMap Editor ist Potlatch. Da die Entwicklung
         des Adobe Flash Player eingestellt wurde, ist Potlatch nicht mehr für die
         Nutzung im Browser verfügbar.
       removed: Deine Standard OpenStreetMap Editor ist Potlatch. Da die Entwicklung
         des Adobe Flash Player eingestellt wurde, ist Potlatch nicht mehr für die
         Nutzung im Browser verfügbar.

+      desktop_application_html: Du kannst Potlatch von %{download_link} weiterhin
+        verwenden.

       change_preferences: Einstellungen hier ändern
     any_questions:
       title: Fragen?
       change_preferences: Einstellungen hier ändern
     any_questions:
       title: Fragen?


@@ -2487,7 +2526,6 @@ de:
       visibility: 'Sichtbarkeit:'
       confirm_delete: Diesen Track löschen?
     trace_paging_nav:
       visibility: 'Sichtbarkeit:'
       confirm_delete: Diesen Track löschen?
     trace_paging_nav:

-      showing_page: Seite %{page}

       older: Ältere Tracks
       newer: Neuere Tracks
     trace:
       older: Ältere Tracks
       newer: Neuere Tracks
     trace:


@@ -2696,6 +2734,11 @@ de:
       support: Support
       about:
         header: Frei und editierbar
       support: Support
       about:
         header: Frei und editierbar

+        paragraph_1: Im Gegensatz zu anderen Karten wird OpenStreetMap vollständig
+          von Leuten wie dir erstellt und kann von jedem kostenlos repariert, aktualisiert,
+          heruntergeladen und verwendet werden.
+        paragraph_2: Melde dich an, um mit der Mitarbeit zu beginnen. Wir senden dir
+          eine E-Mail zur Bestätigung deines Kontos.

       display name description: Dein öffentlich angezeigter Benutzername. Er kann
         später in den Einstellungen geändert werden.
       external auth: 'Drittparteiauthentifikation:'
       display name description: Dein öffentlich angezeigter Benutzername. Er kann
         später in den Einstellungen geändert werden.
       external auth: 'Drittparteiauthentifikation:'


@@ -2705,6 +2748,8 @@ de:
       continue: Registrieren
       terms accepted: Vielen Dank, dass du den neuen Bedingungen für Mitwirkende zugestimmt
         hast!
       continue: Registrieren
       terms accepted: Vielen Dank, dass du den neuen Bedingungen für Mitwirkende zugestimmt
         hast!

+      email_confirmation_help_html: Deine Adresse wird nicht öffentlich angezeigt.
+        Weitere Informationen findest du in unserer %{privacy_policy_link}.

       privacy_policy: Datenschutzrichtlinie
       privacy_policy_title: OSMF-Datenschutzrichtlinie einschließlich Abschnitt zu
         E-Mail-Adressen
       privacy_policy: Datenschutzrichtlinie
       privacy_policy_title: OSMF-Datenschutzrichtlinie einschließlich Abschnitt zu
         E-Mail-Adressen


@@ -2727,6 +2772,8 @@ de:
         Beiträge als gemeinfrei (Public Domain)
       consider_pd_why: Was bedeutet dies?
       consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain?uselang=de
         Beiträge als gemeinfrei (Public Domain)
       consider_pd_why: Was bedeutet dies?
       consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain?uselang=de

+      guidance_info_html: 'Informationen zum Verständnis dieser Begriffe: ein %{readable_summary_link}
+        und einige %{informal_translations_link}'

       readable_summary: menschenlesbare Zusammenfassung
       informal_translations: informelle Übersetzung
       continue: Weiter
       readable_summary: menschenlesbare Zusammenfassung
       informal_translations: informelle Übersetzung
       continue: Weiter


@@ -3077,9 +3124,13 @@ de:
       openstreetmap_contributors: OpenStreetMap Mitwirkende
       make_a_donation: Spenden
       website_and_api_terms: Website und API-Bedingungen
       openstreetmap_contributors: OpenStreetMap Mitwirkende
       make_a_donation: Spenden
       website_and_api_terms: Website und API-Bedingungen

+      cyclosm_credit: Kachelstil von %{cyclosm_link}, gehostet von %{osm_france_link}

       osm_france: OpenStreetMap Frankreich
       osm_france: OpenStreetMap Frankreich

+      thunderforest_credit: Kacheln mit freundlicher Genehmigung von %{thunderforest_link}

       andy_allan: Andy Allan
       andy_allan: Andy Allan

+      opnvkarte_credit: Kacheln mit freundlicher Genehmigung von %{memomaps_link}

       memomaps: MeMoMaps
       memomaps: MeMoMaps

+      hotosm_credit: Kachelstil von %{hotosm_link}, gehostet von %{osm_france_link}

       hotosm_name: Humanitäres OpenStreetMap Team
     site:
       edit_tooltip: Karte bearbeiten
       hotosm_name: Humanitäres OpenStreetMap Team
     site:
       edit_tooltip: Karte bearbeiten

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 4ed01b2973d889729a97dc3517856bd3f1dd5f81..cbfb12d700ea0d802a5402cb64896720b95c05aa 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -150,7 +150,6 @@ diq:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

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


@@ -951,8 +950,6 @@ diq:
       description: 'Şınasnayış:'
       tags: 'Etiketi:'
       none: Çıniyo
       description: 'Şınasnayış:'
       tags: 'Etiketi:'
       none: Çıniyo

-    trace_paging_nav:
-      showing_page: Pele %{page}

     trace:
       pending: PAWEDEYO
       count_points:
     trace:
       pending: PAWEDEYO
       count_points:

diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index 044224188bde7d1ffcae4cf233a5114e4c241d4c..c1e12b7c149a53abe6f81fb298a80598d01ee01b 100644 (file)
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -1377,7 +1377,6 @@ dsb:
       trace_not_found: Slěd njejo se namakał!
       visibility: 'Widobnosć:'
     trace_paging_nav:
       trace_not_found: Slěd njejo se namakał!
       visibility: 'Widobnosć:'
     trace_paging_nav:

-      showing_page: Bok %{page}

       older: Starše slědy
       newer: Nowše slědy
     trace:
       older: Starše slědy
       newer: Nowše slědy
     trace:

diff --git a/config/locales/el.yml b/config/locales/el.yml
index 63e29623928b7e5cff55ffa7cf5248589e85b180..4d9b62c5941ee5e98a771bb896ab210f44469d93 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -254,7 +254,6 @@ el:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

       github: GitHub
       wikipedia: Βικιπαίδεια
   api:
       github: GitHub
       wikipedia: Βικιπαίδεια
   api:


@@ -2395,7 +2394,6 @@ el:
       visibility: 'Ορατότητα:'
       confirm_delete: Διαγραφή αυτού του ίχνους;
     trace_paging_nav:
       visibility: 'Ορατότητα:'
       confirm_delete: Διαγραφή αυτού του ίχνους;
     trace_paging_nav:

-      showing_page: Σελίδα %{page}

       older: Παλαιότερα ίχνη
       newer: Νεότερα ίχνη
     trace:
       older: Παλαιότερα ίχνη
       newer: Νεότερα ίχνη
     trace:

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 29940265560c5afecc54423b9471492a3a38963b..b192b0528a1d67333d5bcec79e545b1b3e992df2 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -220,7 +220,6 @@ en-GB:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

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


@@ -1703,7 +1702,6 @@ en-GB:
       trace_not_found: Trace not found!
       visibility: 'Visibility:'
     trace_paging_nav:
       trace_not_found: Trace not found!
       visibility: 'Visibility:'
     trace_paging_nav:

-      showing_page: Page %{page}

       older: Older Traces
       newer: Newer Traces
     trace:
       older: Older Traces
       newer: Newer Traces
     trace:

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 6c17fcdc8b765f55bafadd2f99d3ee40b994fbeb..88bf0a112a7acdf7ca3a807608be9729dfd99bfd 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -235,7 +235,6 @@ eo:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

       github: GitHub
       wikipedia: Vikipedio
   api:
       github: GitHub
       wikipedia: Vikipedio
   api:


@@ -2447,7 +2446,6 @@ eo:
       visibility: 'Videbleco:'
       confirm_delete: Ĉu forigi tiun ĉi spuron?
     trace_paging_nav:
       visibility: 'Videbleco:'
       confirm_delete: Ĉu forigi tiun ĉi spuron?
     trace_paging_nav:

-      showing_page: Paĝo %{page}

       older: Antaŭaj spuroj
       newer: Postaj spuroj
     trace:
       older: Antaŭaj spuroj
       newer: Postaj spuroj
     trace:

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 3b7cecfbe1e752c1933ceb663656fc754ca6fd48..82403522c72a6c50dad35fe8d83ed5b61ed9fcf9 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -304,7 +304,6 @@ es:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

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


@@ -2428,7 +2427,6 @@ es:
       visibility: 'Visibilidad:'
       confirm_delete: ¿Quiere eliminar esta traza?
     trace_paging_nav:
       visibility: 'Visibilidad:'
       confirm_delete: ¿Quiere eliminar esta traza?
     trace_paging_nav:

-      showing_page: Página %{page}

       older: Trazas más antiguas
       newer: Trazas más recientes
     trace:
       older: Trazas más antiguas
       newer: Trazas más recientes
     trace:

diff --git a/config/locales/et.yml b/config/locales/et.yml
index ddb593e266c8d6c93a5056cb4a50b4e57819543e..263d70c8be397faabb577048737bf1c40a88f343 100644 (file)
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1959,7 +1959,6 @@ et:
       trace_not_found: Rada ei leitud!
       visibility: 'Nähtavus:'
     trace_paging_nav:
       trace_not_found: Rada ei leitud!
       visibility: 'Nähtavus:'
     trace_paging_nav:

-      showing_page: Leht %{page}

       older: Vanemad rajad
       newer: Uuemad rajad
     trace:
       older: Vanemad rajad
       newer: Uuemad rajad
     trace:

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index abc3e8d4d68c99e6d3b597191716cdd4e979b050..d17c5ca15c3282653a048711b3f0390b0ad922e1 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -230,7 +230,6 @@ eu:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

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


@@ -2222,7 +2221,6 @@ eu:
       visibility: 'Ikusgarritasuna:'
       confirm_delete: Aztarna hau ezabatu?
     trace_paging_nav:
       visibility: 'Ikusgarritasuna:'
       confirm_delete: Aztarna hau ezabatu?
     trace_paging_nav:

-      showing_page: '%{page}. orria'

       older: Aztarna zaharragoak
       newer: Aztarna berriagoak
     trace:
       older: Aztarna zaharragoak
       newer: Aztarna berriagoak
     trace:

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 326d8ce5ad5305fb9b328d11647fe8fc26dc33ff..68d0de60b8dc8102799697c7d400d0774f3cc159 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -2154,7 +2154,6 @@ fa:
       visibility: 'پدیداری:'
       confirm_delete: این رد حذف شود؟
     trace_paging_nav:
       visibility: 'پدیداری:'
       confirm_delete: این رد حذف شود؟
     trace_paging_nav:

-      showing_page: صفحهٔ %{page}

       older: ردهای کهنه‌تر
       newer: ردهای تازه‌تر
     trace:
       older: ردهای کهنه‌تر
       newer: ردهای تازه‌تر
     trace:

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 822b3abf4e9067941f689575abd66c2a16e31a94..dcc183107f0ec52c769c53a951f93b74d4363f35 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -264,7 +264,6 @@ fi:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

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


@@ -403,7 +402,7 @@ fi:
       history_title_html: Viivan %{name} historia
       nodes: Pisteet
       nodes_count:
       history_title_html: Viivan %{name} historia
       nodes: Pisteet
       nodes_count:

-        one: 1 piste
+        one: '%{count} piste'

         other: '%{count} pistettä'
       also_part_of_html:
         one: osana viivaa %{related_ways}
         other: '%{count} pistettä'
       also_part_of_html:
         one: osana viivaa %{related_ways}


@@ -574,9 +573,9 @@ fi:
       comment_link: Kommentoi tätä kirjoitusta
       reply_link: Lähetä viesti tekijälle
       comment_count:
       comment_link: Kommentoi tätä kirjoitusta
       reply_link: Lähetä viesti tekijälle
       comment_count:

-        one: 1 kommentti
-        zero: Ei kommentteja
+        one: '%{count} kommentti'

         other: '%{count} kommenttia'
         other: '%{count} kommenttia'

+      no_comments: Ei kommentteja

       edit_link: Muokkaa päiväkirjamerkintää
       hide_link: Piilota tämä merkintä
       unhide_link: Poista merkinnän piilottaminen
       edit_link: Muokkaa päiväkirjamerkintää
       hide_link: Piilota tämä merkintä
       unhide_link: Poista merkinnän piilottaminen


@@ -1446,9 +1445,9 @@ fi:
     show:
       title: '%{status} Tapaus #%{issue_id}'
       reports:
     show:
       title: '%{status} Tapaus #%{issue_id}'
       reports:

-        zero: Ei ilmiantoa
-        one: Yksi ilmianto
+        one: '%{count} ilmianto'

         other: '%{count} ilmiantoa'
         other: '%{count} ilmiantoa'

+      no_reports: Ei ilmiantoja

       report_created_at: Ilmoitettu ensimmäisen kerran %{datetime}
       last_resolved_at: Ratkaistu %{datetime}
       last_updated_at: Viimeisin käsittelijä %{displayname} %{datetime}
       report_created_at: Ilmoitettu ensimmäisen kerran %{datetime}
       last_resolved_at: Ratkaistu %{datetime}
       last_updated_at: Viimeisin käsittelijä %{displayname} %{datetime}


@@ -2351,7 +2350,6 @@ fi:
       visibility: 'Näkyvyys:'
       confirm_delete: Poista tämä jälki?
     trace_paging_nav:
       visibility: 'Näkyvyys:'
       confirm_delete: Poista tämä jälki?
     trace_paging_nav:

-      showing_page: Sivu %{page}

       older: Vanhat jäljet
       newer: Uudet jäljet
     trace:
       older: Vanhat jäljet
       newer: Uudet jäljet
     trace:

diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index 321ba9193563afc0217d6f1674d0c1cd4b391510..2e0e8834de001131a77daea26dbdffa1932bf281 100644 (file)
--- a/config/locales/fit.yml
+++ b/config/locales/fit.yml
@@ -850,8 +850,6 @@ fit:
       owner: 'Käyttäjä:'
       description: 'Kuvvaus:'
       edit_trace: Mookkaa jäljen tietoja
       owner: 'Käyttäjä:'
       description: 'Kuvvaus:'
       edit_trace: Mookkaa jäljen tietoja

-    trace_paging_nav:
-      showing_page: Sivu %{page}

     trace:
       edit_map: Mookkaa karttaa
       public: JULKINEN
     trace:
       edit_map: Mookkaa karttaa
       public: JULKINEN

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 41e18f9038dac7071380480a29c4ddd8937e02a3..4022ba8773bfe44913bee43c151f37c39c0d857d 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -309,7 +309,6 @@ fr:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

       github: GitHub
       wikipedia: Wikipédia
   api:
       github: GitHub
       wikipedia: Wikipédia
   api:


@@ -2621,7 +2620,6 @@ fr:
       visibility: 'Visibilité :'
       confirm_delete: Supprimer cette trace ?
     trace_paging_nav:
       visibility: 'Visibilité :'
       confirm_delete: Supprimer cette trace ?
     trace_paging_nav:

-      showing_page: Page %{page}

       older: Traces plus anciennes
       newer: Traces plus récentes
     trace:
       older: Traces plus anciennes
       newer: Traces plus récentes
     trace:

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 137b7af4c2e7836b109257b7aa4130038598a6bc..219c282f715972c872fe57c7392508b8ec4932f2 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -196,7 +196,6 @@ fur:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

       github: GitHub
       wikipedia: Vichipedie
   api:
       github: GitHub
       wikipedia: Vichipedie
   api:


@@ -1349,7 +1348,6 @@ fur:
       visibility: 'Visibilitât:'
       confirm_delete: Eliminâ chest percors?
     trace_paging_nav:
       visibility: 'Visibilitât:'
       confirm_delete: Eliminâ chest percors?
     trace_paging_nav:

-      showing_page: Pagjine %{page}

       older: Percors plui vieris
       newer: Percors plui gnûfs
     trace:
       older: Percors plui vieris
       newer: Percors plui gnûfs
     trace:

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index e61504c69e44a4b4fc4da5b8ab1450510d68355a..fc81f938d4531dfad38ca1dfe1375d0cf61668bd 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -213,7 +213,6 @@ fy:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

       github: GitHub
       wikipedia: Wikipedy
   api:
       github: GitHub
       wikipedia: Wikipedy
   api:


@@ -2164,7 +2163,6 @@ fy:
       visibility: 'Sichtberens:'
       confirm_delete: Dit trajekt fuortsmite?
     trace_paging_nav:
       visibility: 'Sichtberens:'
       confirm_delete: Dit trajekt fuortsmite?
     trace_paging_nav:

-      showing_page: Side %{page}

       older: Aldere trajekten
       newer: Nijere trajekten
     trace:
       older: Aldere trajekten
       newer: Nijere trajekten
     trace:

diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index ded06962b157b14bd27e3d68b3927957bf0c5ff5..34d7bd4d6eab44f8519cda7419c83532b12b127d 100644 (file)
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -171,7 +171,6 @@ ga:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

       github: GitHub
       wikipedia: Vicipéid
   api:
       github: GitHub
       wikipedia: Vicipéid
   api:


@@ -1653,7 +1652,6 @@ ga:
       trace_not_found: Níor aimsíodh an rian!
       visibility: 'Infheictheacht:'
     trace_paging_nav:
       trace_not_found: Níor aimsíodh an rian!
       visibility: 'Infheictheacht:'
     trace_paging_nav:

-      showing_page: Leathanach %{page}

       older: Loirg Níos Sine
       newer: Loirg Níos Úire
     trace:
       older: Loirg Níos Sine
       newer: Loirg Níos Úire
     trace:

diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index b2436d54ca654631cd6fa3fe555fefe7e8cdfe13..a2457bd6c9fe2b7a2d79b6c67a1e7d29fa0bb098 100644 (file)
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1513,7 +1513,6 @@ gd:
       trace_not_found: Cha deach an lorgadh a lorg!
       visibility: 'Faicsinneachd:'
     trace_paging_nav:
       trace_not_found: Cha deach an lorgadh a lorg!
       visibility: 'Faicsinneachd:'
     trace_paging_nav:

-      showing_page: Duilleag %{page}

       older: Lorgaidhean nas sine
       newer: Lorgaidhean nas ùire
     trace:
       older: Lorgaidhean nas sine
       newer: Lorgaidhean nas ùire
     trace:

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 1fe2ebb3952d70d0f3e294b761b6d21e9c61ce52..460003de8d2c112431ce86a572c3c1e63f6b65d8 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -20,7 +20,8 @@
 gl:
   time:
     formats:
 gl:
   time:
     formats:

-      friendly: '%e de %B do %Y ás %H:%M'
+      friendly: '%e de %B de %Y ás %H:%M'
+      blog: '%e de %B de %Y'

   helpers:
     file:
       prompt: Escoller un ficheiro
   helpers:
     file:
       prompt: Escoller un ficheiro


@@ -146,7 +147,7 @@ gl:
         auth_provider: Fornecedor de autenticación
         auth_uid: UID de autenticación
         email: Enderezo de correo electrónico
         auth_provider: Fornecedor de autenticación
         auth_uid: UID de autenticación
         email: Enderezo de correo electrónico

-        email_confirmation: Email de confirmación
+        email_confirmation: Confirmación do correo

         new_email: Novo enderezo de correo electrónico
         active: Activo
         display_name: Nome público
         new_email: Novo enderezo de correo electrónico
         active: Activo
         display_name: Nome público


@@ -228,7 +229,6 @@ gl:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

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


@@ -297,11 +297,11 @@ gl:
           son anónimas.
         disabled link text: por que non podo editar?
       contributor terms:
           son anónimas.
         disabled link text: por que non podo editar?
       contributor terms:

-        heading: Termos do contribuínte
-        agreed: Aceptaches os novos termos do contribuínte.
-        not yet agreed: Aínda non aceptaches os novos termos do contribuínte.
+        heading: Termos do colaborador
+        agreed: Aceptaches os novos termos do colaborador.
+        not yet agreed: Aínda non aceptaches os novos termos do colaborador.

         review link text: Siga esta ligazón para revisar e aceptar os novos termos
         review link text: Siga esta ligazón para revisar e aceptar os novos termos

-          do contribuínte.
+          do colaborador.

         agreed_with_pd: Tamén declarou que coida que as súas edicións pertencen ó
           dominio público.
         link text: que é isto?
         agreed_with_pd: Tamén declarou que coida que as súas edicións pertencen ó
           dominio público.
         link text: que é isto?


@@ -363,12 +363,12 @@ gl:
       comment: Comentarios (%{count})
       hidden_comment_by_html: Comentario de %{user} agochado %{time_ago}
       comment_by_html: Comentario de %{user} %{time_ago}
       comment: Comentarios (%{count})
       hidden_comment_by_html: Comentario de %{user} agochado %{time_ago}
       comment_by_html: Comentario de %{user} %{time_ago}

-      changesetxml: Conxunto de modificacións do XML
-      osmchangexml: osmChange XML
+      changesetxml: XML do conxunto de modificacións
+      osmchangexml: XML de osmChange

       feed:
         title: Conxunto de modificacións %{id}
         title_comment: Conxunto de modificacións %{id} - %{comment}
       feed:
         title: Conxunto de modificacións %{id}
         title_comment: Conxunto de modificacións %{id} - %{comment}

-      join_discussion: Iniciar a sesión para unirse á parola
+      join_discussion: Inicia a sesión para unirte á parola

       discussion: Parola
       still_open: O conxunto de modificacións segue aberto - Abrirase a parola cando
         o conxunto de modificacións estea pechado.
       discussion: Parola
       still_open: O conxunto de modificacións segue aberto - Abrirase a parola cando
         o conxunto de modificacións estea pechado.


@@ -549,7 +549,7 @@ gl:
       body: Non existe ningunha entrada no diario ou comentario co ID %{id}. Comprobe
         a ortografía ou que a ligazón que seguiu estea ben.
     diary_entry:
       body: Non existe ningunha entrada no diario ou comentario co ID %{id}. Comprobe
         a ortografía ou que a ligazón que seguiu estea ben.
     diary_entry:

-      posted_by_html: Publicado por %{link_user} no %{created} en %{language_link}.
+      posted_by_html: Publicado por %{link_user} o %{created} en %{language_link}.

       updated_at_html: Última actualización no %{updated}.
       comment_link: Comentar nesta entrada
       reply_link: Enviar unha mensaxe ó autor
       updated_at_html: Última actualización no %{updated}.
       comment_link: Comentar nesta entrada
       reply_link: Enviar unha mensaxe ó autor


@@ -619,7 +619,7 @@ gl:
         ese nome no servidor do OpenStreetMap (HTTP 404)
   friendships:
     make_friend:
         ese nome no servidor do OpenStreetMap (HTTP 404)
   friendships:
     make_friend:

-      heading: Quere engadir a %{user} coma amizade?
+      heading: Queres engadir a %{user} coma amizade?

       button: Engadir coma amizade
       success: '%{name} xa é a túa amizade!'
       failed: Houbo un erro ó engadir a %{name} coma amizade.
       button: Engadir coma amizade
       success: '%{name} xa é a túa amizade!'
       failed: Houbo un erro ó engadir a %{name} coma amizade.


@@ -1535,7 +1535,7 @@ gl:
     intro_header: Dámosche a benvida ó OpenStreetMap!
     intro_text: O OpenStreetMap é un mapa do mundo, creado por xente coma ti e de
       libre uso baixo unha licenza aberta.
     intro_header: Dámosche a benvida ó OpenStreetMap!
     intro_text: O OpenStreetMap é un mapa do mundo, creado por xente coma ti e de
       libre uso baixo unha licenza aberta.

-    intro_2_create_account: Cree unha conta de usuario
+    intro_2_create_account: Crea unha conta de usuario

     hosting_partners_html: O aloxamento está fornecido por %{ucl}, %{fastly}, %{bytemark}
       e outros %{partners}.
     partners_ucl: UCL
     hosting_partners_html: O aloxamento está fornecido por %{ucl}, %{fastly}, %{bytemark}
       e outros %{partners}.
     partners_ucl: UCL


@@ -1629,7 +1629,7 @@ gl:
       greeting: 'Ola:'
       hopefully_you: Alguén (se cadra ti) pediu o restabelecemento do contrasinal
         desta conta de correo electrónico en openstreetmap.org.
       greeting: 'Ola:'
       hopefully_you: Alguén (se cadra ti) pediu o restabelecemento do contrasinal
         desta conta de correo electrónico en openstreetmap.org.

-      click_the_link: Se este es ti, preme na seguinte ligazón para restabelecer o
+      click_the_link: Se este es ti, preme na seguinte ligazón para restablecer o

         teu contrasinal.
     note_comment_notification:
       anonymous: Un usuario anónimo
         teu contrasinal.
     note_comment_notification:
       anonymous: Un usuario anónimo


@@ -1754,7 +1754,7 @@ gl:
     new:
       title: Enviar unha mensaxe
       send_message_to_html: Enviarlle unha nova mensaxe a %{name}
     new:
       title: Enviar unha mensaxe
       send_message_to_html: Enviarlle unha nova mensaxe a %{name}

-      back_to_inbox: Voltar á caixa de entrada
+      back_to_inbox: Volver á caixa de entrada

     create:
       message_sent: Mensaxe enviada
       limit_exceeded: Estivo enviando unha morea de mensaxes recentemente. Agarde
     create:
       message_sent: Mensaxe enviada
       limit_exceeded: Estivo enviando unha morea de mensaxes recentemente. Agarde


@@ -1784,7 +1784,7 @@ gl:
       reply_button: Responder
       unread_button: Marcar como non lida
       destroy_button: Eliminar
       reply_button: Responder
       unread_button: Marcar como non lida
       destroy_button: Eliminar

-      back: Voltar
+      back: Volver

       wrong_user: Accedeches ó sistema coma "%{user}", pero a mensaxe que pregaches
         ler non a enviaches a ese usuario ou el non a enviou a ti. Accede co usuario
         correcto para ler a resposta.
       wrong_user: Accedeches ó sistema coma "%{user}", pero a mensaxe que pregaches
         ler non a enviaches a ese usuario ou el non a enviou a ti. Accede co usuario
         correcto para ler a resposta.


@@ -1798,19 +1798,19 @@ gl:
   passwords:
     lost_password:
       title: Contrasinal perdido
   passwords:
     lost_password:
       title: Contrasinal perdido

-      heading: Esqueceu o contrasinal?
+      heading: Esqueciches o contrasinal?

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

-      new password button: Restabelecer o contrasinal
-      help_text: Escribe o enderezo de correo electrónico que empregaches para se
-        rexistrar. Enviarémosche unha ligazón que poderás empregar para restabelecer
+      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

         o teu contrasinal.
       notice email on way: Por desgraza perdeuno, pero hai en camiño unha mensaxe
         de correo electrónico ca que o poderá restabelecelo axiña.
       notice email cannot find: Non se puido atopar o enderezo de correo electrónico.
     reset_password:
         o teu contrasinal.
       notice email on way: Por desgraza perdeuno, pero hai en camiño unha mensaxe
         de correo electrónico ca que o poderá restabelecelo axiña.
       notice email cannot find: Non se puido atopar o enderezo de correo electrónico.
     reset_password:

-      title: Restabelecer o contrasinal
-      heading: Restabelecer o contrasinal de %{user}
-      reset: Restabelecer o contrasinal
+      title: Restablecer o contrasinal
+      heading: Restablecer o contrasinal de %{user}
+      reset: Restablecer o contrasinal

       flash changed: Mudouse o teu contrasinal.
       flash token bad: Non se atopou o pase. Quizabes tería que comprobar o enderezo
         URL.
       flash changed: Mudouse o teu contrasinal.
       flash token bad: Non se atopou o pase. Quizabes tería que comprobar o enderezo
         URL.


@@ -1859,11 +1859,11 @@ gl:
       password: 'Contrasinal:'
       openid_html: '%{logo} OpenID:'
       remember: Lembrádeme
       password: 'Contrasinal:'
       openid_html: '%{logo} OpenID:'
       remember: Lembrádeme

-      lost password link: Perdeches o teu contrasinal?
+      lost password link: Perdiches o teu contrasinal?

       login_button: Iniciar a sesión
       login_button: Iniciar a sesión

-      register now: Rexístrese agora
+      register now: Rexístrate agora

       with external: 'Ou ben, emprega un servizo de terceiros para acceder:'
       with external: 'Ou ben, emprega un servizo de terceiros para acceder:'

-      no account: Non está rexistrado?
+      no account: Non estás rexistrado?

       auth failure: Sentímolo, non puido acceder ó sistema con eses datos.
       openid_logo_alt: Acceder ó sistema cun OpenID
       auth_providers:
       auth failure: Sentímolo, non puido acceder ó sistema con eses datos.
       openid_logo_alt: Acceder ó sistema cun OpenID
       auth_providers:


@@ -1929,7 +1929,7 @@ gl:
         de todo o mundo sobre camiños, vías, cafetarías, estacións e moitas máis cousas.
       local_knowledge_title: Coñecemento local
       local_knowledge_html: |-
         de todo o mundo sobre camiños, vías, cafetarías, estacións e moitas máis cousas.
       local_knowledge_title: Coñecemento local
       local_knowledge_html: |-

-        O OpenStreetMap fai fincapé nos coñecementos locais. Os contribuíntes axúdanse
+        O OpenStreetMap fai fincapé nos coñecementos locais. Os colaboradores axúdanse

         de imaxes aéreas, dispositivos GPS e mapas de campo rudimentarios para asegurarse de que os datos do OSM
         son correctos e están actualizados.
       community_driven_title: Dirixido pola comunidade
         de imaxes aéreas, dispositivos GPS e mapas de campo rudimentarios para asegurarse de que os datos do OSM
         son correctos e están actualizados.
       community_driven_title: Dirixido pola comunidade


@@ -1948,7 +1948,7 @@ gl:
       open_data_title: Datos libres
       open_data_1_html: |-
         Os datos do OpenStreetMap son %{open_data}: podes empregalos libremente e para calquera finalidade
       open_data_title: Datos libres
       open_data_1_html: |-
         Os datos do OpenStreetMap son %{open_data}: podes empregalos libremente e para calquera finalidade

-        sempre que recoñezas ó OpenStreetMap e mailos seus contribuíntes coma os autores dos datos. Se modificas os datos
+        sempre que recoñezas ó OpenStreetMap e mailos seus colaboradores coma os autores dos datos. Se modificas os datos

         ou os empregas dalgún xeito para outros fins, podes distribuír o resultado sempre e cando o fagas empregando
         a mesma licenza. Atoparás información máis detallada na %{copyright_license_link}.
       open_data_open_data: datos libres
         ou os empregas dalgún xeito para outros fins, podes distribuír o resultado sempre e cando o fagas empregando
         a mesma licenza. Atoparás información máis detallada na %{copyright_license_link}.
       open_data_open_data: datos libres


@@ -1973,14 +1973,14 @@ gl:
     copyright:
       foreign:
         title: Acerca desta tradución
     copyright:
       foreign:
         title: Acerca desta tradución

-        html: No caso de conflito entre esta páxina traducida e %{english_original_link},
-          a páxina ficará en inglés
+        html: En caso de conflito entre esta páxina traducida e %{english_original_link},
+          a páxina en inglés prevalecerá

         english_link: a orixinal en inglés
       native:
         title: Acerca desta páxina
         english_link: a orixinal en inglés
       native:
         title: Acerca desta páxina

-        html: Estás ollando a versión en inglés da páxina de dereitos de autor. Pode
-          voltar á %{native_link} desta páxina ou pode deixar de ler sobre os dereitos
-          de autor e %{mapping_link}.
+        html: Estás ollando a versión en inglés da páxina de dereitos de autoría.
+          Pode volver á %{native_link} desta páxina ou pode deixar de ler sobre os
+          dereitos de autoría e %{mapping_link}.

         native_link: versión en galego
         mapping_link: comezar a contribuír
       legal_babble:
         native_link: versión en galego
         mapping_link: comezar a contribuír
       legal_babble:


@@ -2038,9 +2038,9 @@ gl:
         more_2_1_api_usage_policy: política de uso da API
         more_2_1_tile_usage_policy: política de uso de mosaicos
         more_2_1_nominatim_usage_policy: política de uso de Nominatim
         more_2_1_api_usage_policy: política de uso da API
         more_2_1_tile_usage_policy: política de uso de mosaicos
         more_2_1_nominatim_usage_policy: política de uso de Nominatim

-        contributors_title_html: Os nosos contribuíntes
+        contributors_title_html: Os nosos colaboradores

         contributors_intro_html: |-
         contributors_intro_html: |-

-          Os nosos contribuíntes son milleiros de persoas. Tamén incluímos
+          Os nosos colaboradores son milleiros de persoas. Tamén incluímos

           datos baixo licenzas abertas de axencias nacionais de cartografía
           e outras fontes, entre elas:
         contributors_at_credit_html: |-
           datos baixo licenzas abertas de axencias nacionais de cartografía
           e outras fontes, entre elas:
         contributors_at_credit_html: |-


@@ -2146,7 +2146,7 @@ gl:
       shortlink: Atallo
       createnote: Engadir unha nota
       license:
       shortlink: Atallo
       createnote: Engadir unha nota
       license:

-        copyright: Dereitos de autor do OpenStreetMap e os seus contribuíntes, baixo
+        copyright: Dereitos de autoría do OpenStreetMap e os seus colaboradores, baixo

           unha licenza aberta
       remote_failed: Falla na edición; comprobe que ou ben o JOSM ou ben o Merkaartor
         estea cargado e que a opción do control remoto estea activada
           unha licenza aberta
       remote_failed: Falla na edición; comprobe que ou ben o JOSM ou ben o Merkaartor
         estea cargado e que a opción do control remoto estea activada


@@ -2190,7 +2190,7 @@ gl:
             países e cidades seleccionados
         other:
           title: Outras fontes
             países e cidades seleccionados
         other:
           title: Outras fontes

-          description: Fontes adicionais listadas na wiki do OpenStreetMap
+          description: Fontes adicionais listadas no wiki do OpenStreetMap

       options: Opcións
       format: Formato
       scale: Escala
       options: Opcións
       format: Formato
       scale: Escala


@@ -2216,7 +2216,7 @@ gl:
           instructions_1_html: |-
             Preme na %{note_icon} ou na mesma icona na visualización do mapa.
             Isto ha engadir unha marcaxe ó mapa que podes mover
           instructions_1_html: |-
             Preme na %{note_icon} ou na mesma icona na visualización do mapa.
             Isto ha engadir unha marcaxe ó mapa que podes mover

-            arrastrándoa. Engade a túa mensaxe, preme en "Gardar" e outras persoas pescudarán iso.
+            arrastrando. Engade a túa mensaxe, preme en "Gardar" e outras persoas pescudarán iso.

       other_concerns:
         title: Outras preocupacións
         concerns_html: |-
       other_concerns:
         title: Outras preocupacións
         concerns_html: |-


@@ -2411,8 +2411,8 @@ gl:
         para_1: Se soamente queres corrixir unha pequena cousa e non tes tempo de
           te rexistrares e aprenderes a editar, engadir unha nota é moi doado.
         para_2_html: |-
         para_1: Se soamente queres corrixir unha pequena cousa e non tes tempo de
           te rexistrares e aprenderes a editar, engadir unha nota é moi doado.
         para_2_html: |-

-          Vai %{map_link} ou preme na icona das notas: %{note_icon}.
-          Isto ha engadir unha marcaxe ó mapa que podes mover arrastrándoa.
+          Vai %{map_link} e preme na icona das notas: %{note_icon}.
+          Isto ha engadir unha marcaxe ó mapa que podes mover arrastrando.

           Engade a túa mensaxe, preme en "Gardar" e outras persoas pescudarán iso.
         the_map: ó mapa
     communities:
           Engade a túa mensaxe, preme en "Gardar" e outras persoas pescudarán iso.
         the_map: ó mapa
     communities:


@@ -2493,7 +2493,6 @@ gl:
       visibility: 'Visibilidade:'
       confirm_delete: Eliminar esta pista?
     trace_paging_nav:
       visibility: 'Visibilidade:'
       confirm_delete: Eliminar esta pista?
     trace_paging_nav:

-      showing_page: Páxina %{page}

       older: Pistas máis antigas
       newer: Pistas máis novas
     trace:
       older: Pistas máis antigas
       newer: Pistas máis novas
     trace:


@@ -2556,7 +2555,7 @@ gl:
       blocked: O teu acceso á API foi bloqueado. Accede ó sistema para atopar máis
         información na interface web.
       need_to_see_terms: O teu acceso á API está suspendido de xeito temporal. Accede
       blocked: O teu acceso á API foi bloqueado. Accede ó sistema para atopar máis
         información na interface web.
       need_to_see_terms: O teu acceso á API está suspendido de xeito temporal. Accede

-        ó sistema para ollar os termos do contribuínte. Non tes que aceptalos, pero
+        ó sistema para ollar os termos do colaborador. Non tes que aceptalos, pero

         debes coñecelos.
     settings_menu:
       account_settings: Axustes da conta
         debes coñecelos.
     settings_menu:
       account_settings: Axustes da conta


@@ -2712,7 +2711,7 @@ gl:
       auth no password: Coa autenticación de terceiros non se precisa un contrasinal,
         aínda que hai algunhas ferramentas e servidores que aínda a solicitan.
       continue: Rexistrarse
       auth no password: Coa autenticación de terceiros non se precisa un contrasinal,
         aínda que hai algunhas ferramentas e servidores que aínda a solicitan.
       continue: Rexistrarse

-      terms accepted: Grazas por aceptar os novos termos do contribuínte!
+      terms accepted: Grazas por aceptar os novos termos do colaborador!

       email_confirmation_help_html: O teu enderezo non se mostra publicamente; consulta
         a nosa %{privacy_policy_link} para obter máis información.
       privacy_policy: política de protección de datos
       email_confirmation_help_html: O teu enderezo non se mostra publicamente; consulta
         a nosa %{privacy_policy_link} para obter máis información.
       privacy_policy: política de protección de datos


@@ -2727,7 +2726,7 @@ gl:
         "Continuar".
       contributor_terms_explain: Este acordo regula as condicións para as túas contribucións
         actuais e futuras.
         "Continuar".
       contributor_terms_explain: Este acordo regula as condicións para as túas contribucións
         actuais e futuras.

-      read_ct: Lin e acepto os termos do contribuínte anteriores
+      read_ct: Lin e acepto os termos do colaborador anteriores

       tou_explain_html: Estes %{tou_link} rexen o uso da páxina/sitio web e outras
         infraestruturas fornecidas pola OSMF.  Preme na ligazón, le e acepta o texto.
       read_tou: Lin e acepto os Termos de uso
       tou_explain_html: Estes %{tou_link} rexen o uso da páxina/sitio web e outras
         infraestruturas fornecidas pola OSMF.  Preme na ligazón, le e acepta o texto.
       read_tou: Lin e acepto os Termos de uso


@@ -2741,8 +2740,8 @@ gl:
       informal_translations: traducións informais
       continue: Continuar
       decline: Rexeitar
       informal_translations: traducións informais
       continue: Continuar
       decline: Rexeitar

-      you need to accept or decline: Lea e, deseguido, acepte ou rexeite os novos
-        Termos do contribuínte para proseguer.
+      you need to accept or decline: Le e, deseguido, acepta ou rexeita os novos termos
+        do colaborador para continuar.

       legale_select: 'Escolle o teu país de residencia:'
       legale_names:
         france: Francia
       legale_select: 'Escolle o teu país de residencia:'
       legale_names:
         france: Francia


@@ -2780,7 +2779,7 @@ gl:
       remove as friend: Eliminar coma amizade
       add as friend: Engadir coma amizade
       mapper since: 'Cartógrafo dende:'
       remove as friend: Eliminar coma amizade
       add as friend: Engadir coma amizade
       mapper since: 'Cartógrafo dende:'

-      ct status: 'Termos do contribuínte:'
+      ct status: 'Termos do colaborador:'

       ct undecided: Indeciso
       ct declined: Rexeitou
       latest edit: 'Última edición (%{ago}):'
       ct undecided: Indeciso
       ct declined: Rexeitou
       latest edit: 'Última edición (%{ago}):'


@@ -2806,7 +2805,7 @@ gl:
       unconfirm_user: Desconfirmar este usuario
       unsuspend_user: Anular a suspensión deste usuario
       hide_user: Agochar este usuario
       unconfirm_user: Desconfirmar este usuario
       unsuspend_user: Anular a suspensión deste usuario
       hide_user: Agochar este usuario

-      unhide_user: Descobrir este usuario
+      unhide_user: Descubrir este usuario

       delete_user: Eliminar este usuario
       confirm: Confirmar
       report: Denunciar este usuario
       delete_user: Eliminar este usuario
       confirm: Confirmar
       report: Denunciar este usuario


@@ -2873,7 +2872,7 @@ gl:
       non_moderator_revoke: Cómpre ser moderador para revogar un bloqueo.
     not_found:
       sorry: Non se puido atopar o bloqueo de usuario número %{id}.
       non_moderator_revoke: Cómpre ser moderador para revogar un bloqueo.
     not_found:
       sorry: Non se puido atopar o bloqueo de usuario número %{id}.

-      back: Voltar ó índice
+      back: Volver ó índice

     new:
       title: Creando un bloqueo a %{name}
       heading_html: Creando un bloqueo a %{name}
     new:
       title: Creando un bloqueo a %{name}
       heading_html: Creando un bloqueo a %{name}


@@ -3009,17 +3008,17 @@ gl:
       disappear_date_html: Esta nota resolta desaparecerá do mapa en %{disappear_in}.
     new:
       title: Nova nota
       disappear_date_html: Esta nota resolta desaparecerá do mapa en %{disappear_in}.
     new:
       title: Nova nota

-      intro: Atopou un erro ou descobriu que falla algún dato? Informe ós outros cartógrafos
+      intro: Atopou un erro ou descubriu que falla algún dato? Informe ós outros cartógrafos

         para que poidamos solucionalo. Mova o marcador á posición correcta e escriba
         unha nota expoñendo o problema.
         para que poidamos solucionalo. Mova o marcador á posición correcta e escriba
         unha nota expoñendo o problema.

-      advice: A túa nota será pública e poderás empregarse para actualizar o mapa,
-        por conseguinte, non insira información persoal, nin datos de mapas protexidos
+      advice: A túa nota será pública e poderá empregarse para actualizar o mapa;
+        por conseguinte, non insiras información persoal, nin datos de mapas protexidos

         por dereitos de autoría ou listaxes de directorios.
       add: Engadir a nota
   javascripts:
     close: Pechar
     share:
         por dereitos de autoría ou listaxes de directorios.
       add: Engadir a nota
   javascripts:
     close: Pechar
     share:

-      title: Compartillar
+      title: Compartir

       cancel: Desbotar
       image: Imaxe
       link: Ligazón ou HTML
       cancel: Desbotar
       image: Imaxe
       link: Ligazón ou HTML


@@ -3079,8 +3078,8 @@ gl:
       andy_allan: Andy Allan
       opnvkarte_credit: Mosaicos cortesía de %{memomaps_link}
       memomaps: MeMoMaps
       andy_allan: Andy Allan
       opnvkarte_credit: Mosaicos cortesía de %{memomaps_link}
       memomaps: MeMoMaps

-      hotosm_credit: Estilo de mosaicos de %{hotosm_link} aloxado por %{osm_france_link}
-      hotosm_name: Equipo humanitario do OpenStreetMap
+      hotosm_credit: Estilo de mosaicos do %{hotosm_link} aloxado por %{osm_france_link}
+      hotosm_name: equipo humanitario do OpenStreetMap

     site:
       edit_tooltip: Editar o mapa
       edit_disabled_tooltip: Achegue para editar o mapa
     site:
       edit_tooltip: Editar o mapa
       edit_disabled_tooltip: Achegue para editar o mapa

diff --git a/config/locales/he.yml b/config/locales/he.yml
index f24e1f46ed0df304da799bda01ff27b19dbfe4da..879546575296d9622292b88e186b06a2c84bd79c 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -2485,7 +2485,6 @@ he:
       visibility: 'נראוּת:'
       confirm_delete: למחוק את הנתיב הזה?
     trace_paging_nav:
       visibility: 'נראוּת:'
       confirm_delete: למחוק את הנתיב הזה?
     trace_paging_nav:

-      showing_page: הדף %{page}

       older: מסלולים ישנים יותר
       newer: מסלולים חדשים יותר
     trace:
       older: מסלולים ישנים יותר
       newer: מסלולים חדשים יותר
     trace:

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 22061d55bb533e6f00d4f332ddc48a5b6f60d3a4..a397b32b7830957ffd097d41415c92c55a0d93bd 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -211,7 +211,6 @@ hr:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

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


@@ -1535,7 +1534,6 @@ hr:
       trace_not_found: Trag nije pronađen!
       visibility: 'Vidljivost:'
     trace_paging_nav:
       trace_not_found: Trag nije pronađen!
       visibility: 'Vidljivost:'
     trace_paging_nav:

-      showing_page: Stranica %{page}

       older: Stariji tragovi
       newer: Noviji tragovi
     trace:
       older: Stariji tragovi
       newer: Noviji tragovi
     trace:

diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index cbcdd9b8a4b921aca2440ded940ec34989c6363e..79052ed5440f57f28346b41bb28cc8dcff80df6f 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -237,7 +237,6 @@ hsb:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

       github: GitHub
       wikipedia: Wikipedija
   api:
       github: GitHub
       wikipedia: Wikipedija
   api:


@@ -2135,7 +2134,6 @@ hsb:
       visibility: 'Widźomnosć:'
       confirm_delete: Tutu ćěr zhašeć?
     trace_paging_nav:
       visibility: 'Widźomnosć:'
       confirm_delete: Tutu ćěr zhašeć?
     trace_paging_nav:

-      showing_page: Strona %{page}

       older: Starše ćěrje
       newer: Nowše ćěrje
     trace:
       older: Starše ćěrje
       newer: Nowše ćěrje
     trace:

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 8cf4d9958f91d54553a02958505879f19b97f5af..5e3ac71abe8c9b35b98a1d72d86a85090de324d6 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -246,7 +246,6 @@ hu:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

       github: GitHub
       wikipedia: Wikipédia
   api:
       github: GitHub
       wikipedia: Wikipédia
   api:


@@ -2315,7 +2314,6 @@ hu:
       visibility: 'Láthatóság:'
       confirm_delete: Nyomvonal törlése?
     trace_paging_nav:
       visibility: 'Láthatóság:'
       confirm_delete: Nyomvonal törlése?
     trace_paging_nav:

-      showing_page: '%{page}. oldal'

       older: Régebbi nyomvonalak
       newer: Újabb nyomvonalak
     trace:
       older: Régebbi nyomvonalak
       newer: Újabb nyomvonalak
     trace:

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 88cf6b5b5e890d1d5405fd8d266f88a47ecfb7b7..3ac1f4a335a6cf4f78d5c59f83ed93f6b89f84f0 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -218,7 +218,6 @@ ia:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

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


@@ -368,7 +367,7 @@ ia:
       history_title_html: 'Historia del via: %{name}'
       nodes: Nodos
       nodes_count:
       history_title_html: 'Historia del via: %{name}'
       nodes: Nodos
       nodes_count:

-        one: 1 nodo
+        one: '%{count} nodo'

         other: '%{count} nodos'
       also_part_of_html:
         one: parte del via %{related_ways}
         other: '%{count} nodos'
       also_part_of_html:
         one: parte del via %{related_ways}


@@ -2473,7 +2472,6 @@ ia:
       visibility: 'Visibilitate:'
       confirm_delete: Deler iste tracia?
     trace_paging_nav:
       visibility: 'Visibilitate:'
       confirm_delete: Deler iste tracia?
     trace_paging_nav:

-      showing_page: Pagina %{page}

       older: Tracias plus ancian
       newer: Tracias plus nove
     trace:
       older: Tracias plus ancian
       newer: Tracias plus nove
     trace:

diff --git a/config/locales/id.yml b/config/locales/id.yml
index 461a31467aa736a73936199cc86916e5747fb870..00943412a12f44b73e3be23607e9c002ce67a8e1 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -249,7 +249,6 @@ id:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

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


@@ -2474,7 +2473,6 @@ id:
       visibility: Visibilitas
       confirm_delete: Hapus jejak ini?
     trace_paging_nav:
       visibility: Visibilitas
       confirm_delete: Hapus jejak ini?
     trace_paging_nav:

-      showing_page: Halaman %{page}

       older: Jejak-jejak Lama
       newer: Trek-trek terbaru
     trace:
       older: Jejak-jejak Lama
       newer: Trek-trek terbaru
     trace:

diff --git a/config/locales/is.yml b/config/locales/is.yml
index c561c763fea4e7de056aab9ebafda13603855c0c..297191f9d1cb974cabcdc4b38d0e02c812bbf079 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -230,7 +230,6 @@ is:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

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


@@ -387,7 +386,7 @@ is:
       history_title_html: 'Saga leiðar: %{name}'
       nodes: Liðir
       nodes_count:
       history_title_html: 'Saga leiðar: %{name}'
       nodes: Liðir
       nodes_count:

-        one: liður
+        one: '%{count} liður'

         other: '%{count} liðir'
       also_part_of_html:
         one: hluti leiðar %{related_ways}
         other: '%{count} liðir'
       also_part_of_html:
         one: hluti leiðar %{related_ways}


@@ -562,9 +561,9 @@ is:
       comment_link: Bæta athugasemd við þessa færslu
       reply_link: Senda skilaboð til höfundar
       comment_count:
       comment_link: Bæta athugasemd við þessa færslu
       reply_link: Senda skilaboð til höfundar
       comment_count:

-        zero: Engar athugasemdir

         one: '%{count} athugasemd'
         other: '%{count} athugasemdir'
         one: '%{count} athugasemd'
         other: '%{count} athugasemdir'

+      no_comments: Engar athugasemdir

       edit_link: Breyta þessari færslu
       hide_link: Fela þessa færslu
       unhide_link: Af-fela þessa færslu
       edit_link: Breyta þessari færslu
       hide_link: Fela þessa færslu
       unhide_link: Af-fela þessa færslu


@@ -1456,9 +1455,9 @@ is:
     show:
       title: '%{status} vandamál #%{issue_id}'
       reports:
     show:
       title: '%{status} vandamál #%{issue_id}'
       reports:

-        zero: Engar skýrslur

         one: '%{count} skýrsla'
         other: '%{count} skýrslur'
         one: '%{count} skýrsla'
         other: '%{count} skýrslur'

+      no_reports: Engar skýrslur

       report_created_at: Fyrst tilkynnt %{datetime}
       last_resolved_at: Síðast leyst %{datetime}
       last_updated_at: Síðast uppfært %{datetime} af %{displayname}
       report_created_at: Fyrst tilkynnt %{datetime}
       last_resolved_at: Síðast leyst %{datetime}
       last_updated_at: Síðast uppfært %{datetime} af %{displayname}


@@ -2553,7 +2552,6 @@ is:
       visibility: 'Sýnileiki:'
       confirm_delete: Eyða þessum ferli?
     trace_paging_nav:
       visibility: 'Sýnileiki:'
       confirm_delete: Eyða þessum ferli?
     trace_paging_nav:

-      showing_page: Síða %{page}

       older: Eldri ferlar
       newer: Nýrri ferlar
     trace:
       older: Eldri ferlar
       newer: Nýrri ferlar
     trace:

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 3396fdb05f704934449c7dde7cdca3068a88b208..f19773d34bdfaca1fc0852781d79a74afd670895 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -272,7 +272,6 @@ it:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

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


@@ -2530,7 +2529,6 @@ it:
       visibility: 'Visibilità:'
       confirm_delete: Cancellare questo tracciato?
     trace_paging_nav:
       visibility: 'Visibilità:'
       confirm_delete: Cancellare questo tracciato?
     trace_paging_nav:

-      showing_page: Pagina %{page}

       older: Tracce più vecchie
       newer: Tracce più recenti
     trace:
       older: Tracce più vecchie
       newer: Tracce più recenti
     trace:

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index d5f7a8f88a116444380b23746b38d3a106b641b0..9c945b80611f8dd1cafc0a8a7a62119ab910cb47 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -683,7 +683,7 @@ ja:
           cinema: 映画館
           clinic: 診療所
           clock: 時計
           cinema: 映画館
           clinic: 診療所
           clock: 時計

-          college: 大学
+          college: 短期大学・専門学校

           community_centre: コミュニティ センター
           conference_centre: 会議施設
           courthouse: 裁判所
           community_centre: コミュニティ センター
           conference_centre: 会議施設
           courthouse: 裁判所


@@ -1304,7 +1304,7 @@ ja:
           motorcycle: バイクショップ
           motorcycle_repair: バイク修理工場
           music: 音楽ショップ
           motorcycle: バイクショップ
           motorcycle_repair: バイク修理工場
           music: 音楽ショップ

-          musical_instrument: 楽器
+          musical_instrument: 楽器店

           newsagent: 新聞販売店
           nutrition_supplements: サプリ
           optician: メガネ店
           newsagent: 新聞販売店
           nutrition_supplements: サプリ
           optician: メガネ店


@@ -2167,7 +2167,6 @@ ja:
       visibility: '可視性:'
       confirm_delete: この位置情報を削除しますか？
     trace_paging_nav:
       visibility: '可視性:'
       confirm_delete: この位置情報を削除しますか？
     trace_paging_nav:

-      showing_page: ページ %{page}

       older: 以前のトレース
       newer: 以降のトレース
     trace:
       older: 以前のトレース
       newer: 以降のトレース
     trace:

diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index e04f8c5ad64e1c1eba4853d4f9815c480c4c31a1..747ff26f02624e5c2f3f66989be406f37d1c475b 100644 (file)
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -991,8 +991,6 @@ ka:
       description: 'აღწერა:'
       none: არა
       visibility: 'ხილვადობა:'
       description: 'აღწერა:'
       none: არა
       visibility: 'ხილვადობა:'

-    trace_paging_nav:
-      showing_page: გვერდი %{page}

     trace:
       pending: დამუშავება
       count_points: '%{count} წერტილი'
     trace:
       pending: დამუშავება
       count_points: '%{count} წერტილი'

diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index c83a7427abdaa9227e19dacdf0b165f7f0e75d6a..d2cb1a0d7d8e2d8d8c975c06d98c06ddf3d9c2c6 100644 (file)
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -187,7 +187,6 @@ kab:
       none: Ulac
       google: Google
       facebook: Facebook
       none: Ulac
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

       github: GitHub
       wikipedia: Wikipidya
   api:
       github: GitHub
       wikipedia: Wikipidya
   api:


@@ -1154,7 +1153,6 @@ kab:
       delete_trace: Kkes lǧerra-agi
       trace_not_found: Ulac lǧeṛṛa!
     trace_paging_nav:
       delete_trace: Kkes lǧerra-agi
       trace_not_found: Ulac lǧeṛṛa!
     trace_paging_nav:

-      showing_page: Asebter %{page}

       newer: Lɣerrat timaynutin
     trace:
       pending: YETTRAǦU
       newer: Lɣerrat timaynutin
     trace:
       pending: YETTRAǦU

diff --git a/config/locales/kk-cyrl.yml b/config/locales/kk-cyrl.yml
index 54827d18b99f90d88737667fa2f73a4403aa399d..9a7569784c77e2777ff004e2f75389aa42836543 100644 (file)
--- a/config/locales/kk-cyrl.yml
+++ b/config/locales/kk-cyrl.yml
@@ -192,7 +192,6 @@ kk-cyrl:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

       github: GitHub
       wikipedia: Уикипедия
   api:
       github: GitHub
       wikipedia: Уикипедия
   api:

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 7cc8e6feb355975fefbc3e08a46f71c3b5418df1..457735b7fc7c2b61442419caf2ed36dde29e2624 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -229,7 +229,6 @@ ko:
       openid: OpenID
       google: 구글
       facebook: 페이스북
       openid: OpenID
       google: 구글
       facebook: 페이스북

-      windowslive: Windows Live

       github: 깃허브
       wikipedia: 위키백과
   api:
       github: 깃허브
       wikipedia: 위키백과
   api:


@@ -2088,7 +2087,6 @@ ko:
       visibility: '공개 여부:'
       confirm_delete: 이 궤적을 삭제할까요?
     trace_paging_nav:
       visibility: '공개 여부:'
       confirm_delete: 이 궤적을 삭제할까요?
     trace_paging_nav:

-      showing_page: '%{page}쪽'

       older: 이전 궤적
       newer: 다음 궤적
     trace:
       older: 이전 궤적
       newer: 다음 궤적
     trace:

diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 4a739d40d097dc1996663d0d74f2a6358a7c27d0..5f245f4f8cb0f89d282627a7dd07fc2a17b0042b 100644 (file)
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -221,7 +221,6 @@ ku-Latn:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

       github: GitHub
       wikipedia: Wîkîpediya
   api:
       github: GitHub
       wikipedia: Wîkîpediya
   api:


@@ -2241,7 +2240,6 @@ ku-Latn:
       visibility: Kî dikare bibîneː
       confirm_delete: Vê şopê dixwazî jê bibî?
     trace_paging_nav:
       visibility: Kî dikare bibîneː
       confirm_delete: Vê şopê dixwazî jê bibî?
     trace_paging_nav:

-      showing_page: Rûpel %{page}

       older: Şopên kevintir
       newer: Şopên nûtir
     trace:
       older: Şopên kevintir
       newer: Şopên nûtir
     trace:

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 700c5ae041c1452ae2ac0f4c80f39cf662497439..18f7b6bc3697098c6b9c1f37d0fa878408fa7cdc 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -221,7 +221,6 @@ lb:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

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


@@ -2131,7 +2130,6 @@ lb:
       visibility: 'Visibilitéit:'
       confirm_delete: Dës Spuer läschen?
     trace_paging_nav:
       visibility: 'Visibilitéit:'
       confirm_delete: Dës Spuer läschen?
     trace_paging_nav:

-      showing_page: Säit %{page}

       older: Eeler Spueren
       newer: Méi nei Spueren
     trace:
       older: Eeler Spueren
       newer: Méi nei Spueren
     trace:

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index f21b45ba76f660e4b4a542e967833aefec92ac5a..6a9af30963553dc8c9a4bfff7f8e3ce202cd33ba 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -259,7 +259,6 @@ lt:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

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


@@ -2195,7 +2194,6 @@ lt:
       visibility: 'Matomumas:'
       confirm_delete: Trinti šį pėdsaką?
     trace_paging_nav:
       visibility: 'Matomumas:'
       confirm_delete: Trinti šį pėdsaką?
     trace_paging_nav:

-      showing_page: Puslapis %{page}

       older: Senesni pėdsakai
       newer: Naujesni pėdsakai
     trace:
       older: Senesni pėdsakai
       newer: Naujesni pėdsakai
     trace:

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 733b8816b0bbf95fdf38e18c4da8db5df716adb6..3c78c0c8a58fc011aebfe68d545a11692d311c03 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -170,7 +170,6 @@ lv:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

       github: GitHub
       wikipedia: Vikipēdija
   api:
       github: GitHub
       wikipedia: Vikipēdija
   api:


@@ -1818,7 +1817,6 @@ lv:
       trace_not_found: Trase nav atrasta!
       visibility: 'Redzamība:'
     trace_paging_nav:
       trace_not_found: Trase nav atrasta!
       visibility: 'Redzamība:'
     trace_paging_nav:

-      showing_page: Rāda lapu %{page}

       older: Vecākas trases
       newer: Jaunākas Trases
     trace:
       older: Vecākas trases
       newer: Jaunākas Trases
     trace:

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 253e7fc4054909aba6c2980eab8b4deb16f36ac3..84c971af52a35f32a75e91ee4c05b67279da7640 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -220,7 +220,6 @@ mk:
       openid: OpenID
       google: Google
       facebook: Фејсбук
       openid: OpenID
       google: Google
       facebook: Фејсбук

-      windowslive: Microsoft

       github: GitHub
       wikipedia: Википедија
   api:
       github: GitHub
       wikipedia: Википедија
   api:


@@ -367,7 +366,7 @@ mk:
       history_title_html: 'Историја на патот: %{name}'
       nodes: Јазли
       nodes_count:
       history_title_html: 'Историја на патот: %{name}'
       nodes: Јазли
       nodes_count:

-        one: 1 јазол
+        one: '%{count} јазол'

         other: '%{count} јазли'
       also_part_of_html:
         one: дел од патот %{related_ways}
         other: '%{count} јазли'
       also_part_of_html:
         one: дел од патот %{related_ways}


@@ -2460,7 +2459,6 @@ mk:
       visibility: 'Видливост:'
       confirm_delete: Да ја избришам трагава?
     trace_paging_nav:
       visibility: 'Видливост:'
       confirm_delete: Да ја избришам трагава?
     trace_paging_nav:

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

       older: Постари траги
       newer: Понови траги
     trace:
       older: Постари траги
       newer: Понови траги
     trace:

diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index c64c82961e98c56c4ef7c0f3e690704aecd716ed..c3b0736e24c2dfa2e84e2621b1af87098ff7e696 100644 (file)
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -1281,7 +1281,6 @@ mr:
       trace_not_found: अनुरेख आढळला नाही!
       visibility: 'दृश्यता:'
     trace_paging_nav:
       trace_not_found: अनुरेख आढळला नाही!
       visibility: 'दृश्यता:'
     trace_paging_nav:

-      showing_page: पान %{page}

       older: जुने अनुरेख
       newer: नवे अनुरेख
     trace:
       older: जुने अनुरेख
       newer: नवे अनुरेख
     trace:

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index c2b7ca6051542d33430c85ecd707bbdef206dd13..129e0d1a10efab85d963f59f6b35c6c9ebac3818 100644 (file)
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -200,7 +200,6 @@ ms:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

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


@@ -1039,8 +1038,10 @@ ms:
           mall: Medan Beli-Belah
           massage: Urut
           mobile_phone: Kedai Telefon Bimbit
           mall: Medan Beli-Belah
           massage: Urut
           mobile_phone: Kedai Telefon Bimbit

+          money_lender: Peminjam Wang

           motorcycle: Kedai Motosikal
           music: Kedai Muzik
           motorcycle: Kedai Motosikal
           music: Kedai Muzik

+          musical_instrument: Alat Muzik

           newsagent: Gerai Surat Khabar
           optician: Kedai Optik
           organic: Kedai Makanan Organik
           newsagent: Gerai Surat Khabar
           optician: Kedai Optik
           organic: Kedai Makanan Organik


@@ -1144,6 +1145,7 @@ ms:
         ignored: Diabaikan
         open: Buka
     show:
         ignored: Diabaikan
         open: Buka
     show:

+      no_reports: Tiada laporan

       ignore: Abaikan
       reopen: Buka semula
       read_reports: Baca Laporan
       ignore: Abaikan
       reopen: Buka semula
       read_reports: Baca Laporan


@@ -1513,7 +1515,10 @@ ms:
         menggunakan imejan udara, peranti GPS, dan peta lapangan berteknologi rendah
         untuk mengesahkan bahawa OSM adalah tepat dan mutakhir.
       community_driven_title: Didorong oleh Komuniti
         menggunakan imejan udara, peranti GPS, dan peta lapangan berteknologi rendah
         untuk mengesahkan bahawa OSM adalah tepat dan mutakhir.
       community_driven_title: Didorong oleh Komuniti

+      community_driven_osm_foundation: Yayasan OSM

       open_data_title: Data Terbuka
       open_data_title: Data Terbuka

+      open_data_open_data: data terbuka
+      open_data_copyright_license: Laman Hak Cipta dan Lesen

       partners_title: Rakan Kongsi
     copyright:
       foreign:
       partners_title: Rakan Kongsi
     copyright:
       foreign:


@@ -1538,12 +1543,14 @@ ms:
           alt: Contoh mengatribusikan OpenStreetMap pada halaman sesawang
           title: Contoh atribusi
         more_title_html: Mengetahui lebih lanjut
           alt: Contoh mengatribusikan OpenStreetMap pada halaman sesawang
           title: Contoh atribusi
         more_title_html: Mengetahui lebih lanjut

+        more_1_1_osmf_licence_page: Laman Lesen OSMF

         contributors_title_html: Penyumbang kami
         contributors_intro_html: 'Penyumbang kami merupakan ribuan individu. Kami
           turut menyertakan data yang dilesenkan secara terbuka daripada lembaga-lembaga
           pemetaan kebangsaan dan sumber-sumber yang lain, antaranya:'
         contributors_at_austria: Austria
         contributors_at_cc_by: CC BY
         contributors_title_html: Penyumbang kami
         contributors_intro_html: 'Penyumbang kami merupakan ribuan individu. Kami
           turut menyertakan data yang dilesenkan secara terbuka daripada lembaga-lembaga
           pemetaan kebangsaan dan sumber-sumber yang lain, antaranya:'
         contributors_at_austria: Austria
         contributors_at_cc_by: CC BY

+        contributors_au_australia: Australia

         contributors_ca_canada: Kanada
         contributors_fi_finland: Finland
         contributors_fi_nlsfi_license: Lesen NLSFI
         contributors_ca_canada: Kanada
         contributors_fi_finland: Finland
         contributors_fi_nlsfi_license: Lesen NLSFI


@@ -1557,6 +1564,7 @@ ms:
         contributors_si_slovenia: Slovenia
         contributors_si_mkgp: Kementerian Pertanian, Perhutanan dan Makanan
         contributors_es_spain: Sepanyol
         contributors_si_slovenia: Slovenia
         contributors_si_mkgp: Kementerian Pertanian, Perhutanan dan Makanan
         contributors_es_spain: Sepanyol

+        contributors_za_south_africa: Afrika Selatan

         contributors_gb_united_kingdom: United Kingdom
         contributors_footer_2_html: '  Penyertaan data dalam OpenStreetMap tidak bermaksud
           bahawa pembekal data asal menyokong OpenStreetMap, menyediakan sebarang
         contributors_gb_united_kingdom: United Kingdom
         contributors_footer_2_html: '  Penyertaan data dalam OpenStreetMap tidak bermaksud
           bahawa pembekal data asal menyokong OpenStreetMap, menyediakan sebarang


@@ -1839,7 +1847,6 @@ ms:
       visibility: 'Keterlihatan:'
       confirm_delete: Hapuskan jejak ini?
     trace_paging_nav:
       visibility: 'Keterlihatan:'
       confirm_delete: Hapuskan jejak ini?
     trace_paging_nav:

-      showing_page: Halaman %{page}

       older: Jejak Lama
       newer: Jejak Baru
     trace:
       older: Jejak Lama
       newer: Jejak Baru
     trace:


@@ -1953,6 +1960,7 @@ ms:
         digunakan dengan kami yang menggunakan piawaian %{oauth}? Anda mesti mendaftarkan
         aplikasi web anda sebelum ia boleh membuat permintaan OAuth kepada perkhidmatan
         ini.
         digunakan dengan kami yang menggunakan piawaian %{oauth}? Anda mesti mendaftarkan
         aplikasi web anda sebelum ia boleh membuat permintaan OAuth kepada perkhidmatan
         ini.

+      oauth: OAuth

       registered_apps: 'Anda telah mendaftarkan aplikasi-alikasi klien yang berikut:'
       register_new: Daftarkan aplikasi anda
     form:
       registered_apps: 'Anda telah mendaftarkan aplikasi-alikasi klien yang berikut:'
       register_new: Daftarkan aplikasi anda
     form:


@@ -2270,6 +2278,7 @@ ms:
         overlays: Bolehkan tindihan untuk mencari masalah dalam peta
         title: Lapisan
       openstreetmap_contributors: Penyumbang OpenStreetMap
         overlays: Bolehkan tindihan untuk mencari masalah dalam peta
         title: Lapisan
       openstreetmap_contributors: Penyumbang OpenStreetMap

+      andy_allan: Andy Allan

     site:
       edit_tooltip: Sunting peta
       edit_disabled_tooltip: Zum dekat untuk menyunting peta
     site:
       edit_tooltip: Sunting peta
       edit_disabled_tooltip: Zum dekat untuk menyunting peta


@@ -2288,6 +2297,7 @@ ms:
       klik di sini.
     directions:
       engines:
       klik di sini.
     directions:
       engines:

+        fossgis_osrm_bike: Basikal (OSRM)

         fossgis_osrm_car: Kereta (OSRM)
         graphhopper_bicycle: Basikal (GraphHopper)
         graphhopper_foot: Jalan kaki (GraphHopper)
         fossgis_osrm_car: Kereta (OSRM)
         graphhopper_bicycle: Basikal (GraphHopper)
         graphhopper_foot: Jalan kaki (GraphHopper)

diff --git a/config/locales/my.yml b/config/locales/my.yml
index 1dab15dd3dfa491611b2447ee829d15f71aed02f..4e978e7c96aacf47836e2e48fb79e52de0fb668e 100644 (file)
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -722,8 +722,6 @@ my:
       edit: ပြင်ဆင်
       owner: 'ပိုင်ဆိုင်သူ:'
       description: 'ဖော်ပြချက်:'
       edit: ပြင်ဆင်
       owner: 'ပိုင်ဆိုင်သူ:'
       description: 'ဖော်ပြချက်:'

-    trace_paging_nav:
-      showing_page: စာမျက်နှာ %{page}

     trace:
       more: ပို၍
       view_map: မြေပုံကို ကြည့်ရန်
     trace:
       more: ပို၍
       view_map: မြေပုံကို ကြည့်ရန်

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 59a6b12ea48baa782126d7d551c557c4ff1cf0c1..9a5fb3a94aab6f9c1476ed37b634b9a04618afb0 100644 (file)
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -236,7 +236,6 @@ nb:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

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


@@ -1952,7 +1951,6 @@ nb:
       visibility: 'Synlighet:'
       confirm_delete: Slett dette sporet?
     trace_paging_nav:
       visibility: 'Synlighet:'
       confirm_delete: Slett dette sporet?
     trace_paging_nav:

-      showing_page: Side %{page}

       older: Eldre spor
       newer: Nyere spor
     trace:
       older: Eldre spor
       newer: Nyere spor
     trace:

diff --git a/config/locales/nds.yml b/config/locales/nds.yml
index 9cf60dff992972308272ff20973187f3986d3f7a..0a465ab790eb30b73f678d101702fd7977c8d9f1 100644 (file)
--- a/config/locales/nds.yml
+++ b/config/locales/nds.yml
@@ -73,7 +73,6 @@ nds:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

       github: GitHub
       wikipedia: Wikipedia
   accounts:
       github: GitHub
       wikipedia: Wikipedia
   accounts:

diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index f1c37f278b966c946404eb8c0f4eecb67acef83b..68536eaf8d71e889dd052d659d2975fac97b01d6 100644 (file)
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -1049,8 +1049,6 @@ ne:
       delete_trace: यो ट्रेस मेट्ने
       trace_not_found: ट्रेस भेटिएन!
       visibility: 'दृश्यक्षमता:'
       delete_trace: यो ट्रेस मेट्ने
       trace_not_found: ट्रेस भेटिएन!
       visibility: 'दृश्यक्षमता:'

-    trace_paging_nav:
-      showing_page: पृष्ठ %{page}

     trace:
       pending: बाँकी रहेको
       count_points: पोइन्टहरु %{count}
     trace:
       pending: बाँकी रहेको
       count_points: पोइन्टहरु %{count}

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index e898125f7e8bdedba34743a1d60061468169db56..058ada96cc9ec8aa15eb0d45d07ba845eb9eb1a0 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -272,7 +272,6 @@ nl:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

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


@@ -424,7 +423,7 @@ nl:
       history_title_html: 'Weggeschiedenis: %{name}'
       nodes: Knooppunten
       nodes_count:
       history_title_html: 'Weggeschiedenis: %{name}'
       nodes: Knooppunten
       nodes_count:

-        one: 1 knooppunt
+        one: ${count} knooppunt

         other: '%{count} knooppunten'
       also_part_of_html:
         one: onderdeel van weg %{related_ways}
         other: '%{count} knooppunten'
       also_part_of_html:
         one: onderdeel van weg %{related_ways}


@@ -2545,7 +2544,6 @@ nl:
       visibility: 'Zichtbaarheid:'
       confirm_delete: Dit traject verwijderen?
     trace_paging_nav:
       visibility: 'Zichtbaarheid:'
       confirm_delete: Dit traject verwijderen?
     trace_paging_nav:

-      showing_page: Pagina %{page}

       older: Oudere trajecten
       newer: Nieuwere trajecten
     trace:
       older: Oudere trajecten
       newer: Nieuwere trajecten
     trace:

diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 6d510e7034061d93da2f89e7cddef785cb30c8e7..e5cda0b9c0babc3c75b33ab897cf31dc5653c617 100644 (file)
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -191,7 +191,6 @@ nn:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

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


@@ -1488,7 +1487,6 @@ nn:
       trace_not_found: Sporet vart ikkje funne!
       visibility: 'Synligheit:'
     trace_paging_nav:
       trace_not_found: Sporet vart ikkje funne!
       visibility: 'Synligheit:'
     trace_paging_nav:

-      showing_page: Side %{page}

       older: Eldre spor
       newer: Nyare spor
     trace:
       older: Eldre spor
       newer: Nyare spor
     trace:

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index a4b75184178db8037e457fd9c900be4f852fc6de..d401202273e86fbf1c748ccf328d7d1bd7eeac83 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -1594,7 +1594,6 @@ nqo:
       visibility: 'ߦߋߟߌ:'
       confirm_delete: ߞߊ߬ ߜߋ߬ߙߋ ߣߌ߲߬ ߖߏ߰ߛߌ߫؟
     trace_paging_nav:
       visibility: 'ߦߋߟߌ:'
       confirm_delete: ߞߊ߬ ߜߋ߬ߙߋ ߣߌ߲߬ ߖߏ߰ߛߌ߫؟
     trace_paging_nav:

-      showing_page: ߞߐߜߍ %{page}

       older: ߜߋ߬ߙߋ ߞߘߐ߬ߡߊ߲ ߠߎ߬
       newer: ߜߋ߬ߙߋ ߞߎߘߡߊ ߟߎ߬
     trace:
       older: ߜߋ߬ߙߋ ߞߘߐ߬ߡߊ߲ ߠߎ߬
       newer: ߜߋ߬ߙߋ ߞߎߘߡߊ ߟߎ߬
     trace:

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 357d434e0c8416f96856fa3e42e567f2f0a48a12..7f709f6b66080dd3186492a07b106c94ae48085c 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -221,7 +221,6 @@ oc:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

       github: GitHub
       wikipedia: Wikipèdia
   api:
       github: GitHub
       wikipedia: Wikipèdia
   api:


@@ -2143,7 +2142,6 @@ oc:
       visibility: 'Visibilitat :'
       confirm_delete: Suprimir aquesta traça ?
     trace_paging_nav:
       visibility: 'Visibilitat :'
       confirm_delete: Suprimir aquesta traça ?
     trace_paging_nav:

-      showing_page: Afichatge de la pagina %{page}

       older: Ancianas traças
       newer: Traças novèlas
     trace:
       older: Ancianas traças
       newer: Traças novèlas
     trace:

diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 6e3ddc178d749809df3eeba18cee3051d496568c..50a2e90cfbaf23f9516ffaa7b93ee2c7f57e1fc4 100644 (file)
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -1011,7 +1011,6 @@ pa:
       trace_not_found: ਖੁਰ-ਖੋਜ ਨਹੀਂ ਲੱਭਿਆ!
       visibility: 'ਦਿੱਸਣਯੋਗਤਾ:'
     trace_paging_nav:
       trace_not_found: ਖੁਰ-ਖੋਜ ਨਹੀਂ ਲੱਭਿਆ!
       visibility: 'ਦਿੱਸਣਯੋਗਤਾ:'
     trace_paging_nav:

-      showing_page: ਸਫ਼ਾ %{page}

       older: ਪੁਰਾਣੇ ਖੁਰਾ-ਖੋਜ
       newer: ਨਵੇਂ ਖੁਰਾ-ਖੋਜ
     trace:
       older: ਪੁਰਾਣੇ ਖੁਰਾ-ਖੋਜ
       newer: ਨਵੇਂ ਖੁਰਾ-ਖੋਜ
     trace:

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index df7bc45555b62d629d2dcce5530b469a5f030350..f248db1c1a7789b532d43f03b3d68e65f58a4cd7 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -303,7 +303,6 @@ pl:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

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


@@ -2477,7 +2476,6 @@ pl:
       visibility: 'Widoczność:'
       confirm_delete: Usunąć ten ślad?
     trace_paging_nav:
       visibility: 'Widoczność:'
       confirm_delete: Usunąć ten ślad?
     trace_paging_nav:

-      showing_page: Strona %{page}

       older: Starsze ślady
       newer: Nowsze ślady
     trace:
       older: Starsze ślady
       newer: Nowsze ślady
     trace:

diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml
index 1a25c462dc0678bbadc0c4b664804e59a6bc54e5..1ce103feae657e70b5076af10a38d87b7bdf25da 100644 (file)
--- a/config/locales/pnb.yml
+++ b/config/locales/pnb.yml
@@ -1764,7 +1764,6 @@ pnb:
       visibility: 'دِکھ:'
       confirm_delete: ایہہ کھر کھوج مٹاؤ؟
     trace_paging_nav:
       visibility: 'دِکھ:'
       confirm_delete: ایہہ کھر کھوج مٹاؤ؟
     trace_paging_nav:

-      showing_page: صفحہ نمبر %{page}

       older: پراݨے کھر کھوجاں
       newer: نویں کھر کھوجاں
     trace:
       older: پراݨے کھر کھوجاں
       newer: نویں کھر کھوجاں
     trace:

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index a154a76f0e9dca6cd178ab1f616c963c5508f174..5b3c3bdd5277a34b21909ed678fa380c4c5aa2c1 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -252,7 +252,6 @@ pt-PT:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

       github: GitHub
       wikipedia: Wikipédia
   api:
       github: GitHub
       wikipedia: Wikipédia
   api:


@@ -2495,7 +2494,6 @@ pt-PT:
       visibility: 'Visibilidade:'
       confirm_delete: Eliminar esta rota?
     trace_paging_nav:
       visibility: 'Visibilidade:'
       confirm_delete: Eliminar esta rota?
     trace_paging_nav:

-      showing_page: Página %{page}

       older: Rotas GPS mais antigas
       newer: Rotas GPS mais recentes
     trace:
       older: Rotas GPS mais antigas
       newer: Rotas GPS mais recentes
     trace:

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 2fd61dcddbd695ce17f8caf6e3c92431ccc0c6c7..fe8160327f91447f135f711c4d289a4aa34ad725 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -270,7 +270,6 @@ pt:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

       github: GitHub
       wikipedia: Wikipédia
   api:
       github: GitHub
       wikipedia: Wikipédia
   api:


@@ -2514,7 +2513,6 @@ pt:
       visibility: 'Visibilidade:'
       confirm_delete: Eliminar esta trilha?
     trace_paging_nav:
       visibility: 'Visibilidade:'
       confirm_delete: Eliminar esta trilha?
     trace_paging_nav:

-      showing_page: Página %{page}

       older: Trilhas mais antigas
       newer: Trilhas mais recentes
     trace:
       older: Trilhas mais antigas
       newer: Trilhas mais recentes
     trace:

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index b2e708d2adac363141300717c41c04c0b2bc23f3..f60c4cffb08c81256624a6a6dee717646ef64cfb 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -232,7 +232,6 @@ ro:
       openid: OpenID
       google: OpenID
       facebook: OpenID
       openid: OpenID
       google: OpenID
       facebook: OpenID

-      windowslive: Microsoft

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


@@ -2122,7 +2121,6 @@ ro:
       visibility: 'Vizibilitate:'
       confirm_delete: Șterge această urmă?
     trace_paging_nav:
       visibility: 'Vizibilitate:'
       confirm_delete: Șterge această urmă?
     trace_paging_nav:

-      showing_page: Pagina %{page}

       older: Urme mai vechi
       newer: Urme mai noi
     trace:
       older: Urme mai vechi
       newer: Urme mai noi
     trace:

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index b4b1cba9b9ba3be9c669b875f1a7198cc1c9ec3c..555ea01e4bc283da372cb01e29fceb6430f7bbf9 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -331,7 +331,6 @@ ru:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

       github: GitHub
       wikipedia: Википедия
   api:
       github: GitHub
       wikipedia: Википедия
   api:


@@ -2426,7 +2425,6 @@ ru:
       visibility: 'Видимость:'
       confirm_delete: Удалить этот трек?
     trace_paging_nav:
       visibility: 'Видимость:'
       confirm_delete: Удалить этот трек?
     trace_paging_nav:

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

       older: Более старые треки
       newer: Более новые треки
     trace:
       older: Более старые треки
       newer: Более новые треки
     trace:

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index 7f26b8be0fdb196445fca577377e01483b074492..c48c8e850a534f8dd36a6b33c14757fa2e33d800 100644 (file)
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -116,7 +116,6 @@ sat:
       openid: OpenID
       google: ᱜᱩᱜᱟᱹᱞ
       facebook: ᱯᱷᱮᱥᱵᱩᱠ
       openid: OpenID
       google: ᱜᱩᱜᱟᱹᱞ
       facebook: ᱯᱷᱮᱥᱵᱩᱠ

-      windowslive: Windows Live

       github: ᱜᱤᱴᱦᱚᱵ
       wikipedia: ᱣᱤᱠᱤᱯᱤᱰᱤᱭᱟ
   api:
       github: ᱜᱤᱴᱦᱚᱵ
       wikipedia: ᱣᱤᱠᱤᱯᱤᱰᱤᱭᱟ
   api:


@@ -616,8 +615,6 @@ sat:
       edit: ᱥᱟᱯᱲᱟᱣ
       owner: 'ᱢᱟᱹᱞᱤᱠ:'
       description: 'ᱵᱤᱵᱨᱚᱱ:'
       edit: ᱥᱟᱯᱲᱟᱣ
       owner: 'ᱢᱟᱹᱞᱤᱠ:'
       description: 'ᱵᱤᱵᱨᱚᱱ:'

-    trace_paging_nav:
-      showing_page: ᱥᱟᱦᱴᱟ %{page}

     trace:
       more: ᱵᱟᱹᱲᱛᱤ
       view_map: ᱱᱚᱠᱥᱟ ᱧᱮᱞ ᱢᱮ
     trace:
       more: ᱵᱟᱹᱲᱛᱤ
       view_map: ᱱᱚᱠᱥᱟ ᱧᱮᱞ ᱢᱮ

diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 1be3f8dc48ef5018c82dd242020c7dffc01160d2..5660a99aa63398a9b253c9a6ee3785928fb72f06 100644 (file)
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -221,7 +221,6 @@ sc:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

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


@@ -2507,7 +2506,6 @@ sc:
       visibility: 'Visibilidade:'
       confirm_delete: Iscantzellare custa rasta?
     trace_paging_nav:
       visibility: 'Visibilidade:'
       confirm_delete: Iscantzellare custa rasta?
     trace_paging_nav:

-      showing_page: Pàgina %{page}

       older: Rastas prus betzas
       newer: Rastas prus noas
     trace:
       older: Rastas prus betzas
       newer: Rastas prus noas
     trace:

diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index de38e15f156ee332b3ef1cae7e630809c4f6cd83..cb4aa3f5bd6f8c9fa128fa533b09e82e1f15dbae 100644 (file)
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -163,7 +163,6 @@ scn:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

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


@@ -1633,7 +1632,6 @@ scn:
       trace_not_found: Tracciatu nun attruvatu!
       visibility: 'Visibbilità:'
     trace_paging_nav:
       trace_not_found: Tracciatu nun attruvatu!
       visibility: 'Visibbilità:'
     trace_paging_nav:

-      showing_page: Pàggina %{page}

       older: Tracciati cchiù vecchî
       newer: Tracciati cchiù novi
     trace:
       older: Tracciati cchiù vecchî
       newer: Tracciati cchiù novi
     trace:

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 3fc4cfad4db34417a38fa2e398a1cd46dea9aaca..7bd8b6e87d3b10fea6a7e5736b55b74f1f042361 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -259,7 +259,6 @@ sk:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

       github: GitHub
       wikipedia: Wikipédia
   api:
       github: GitHub
       wikipedia: Wikipédia
   api:


@@ -2265,7 +2264,6 @@ sk:
       trace_not_found: Stopa nenájdená!
       visibility: 'Viditeľnosť:'
     trace_paging_nav:
       trace_not_found: Stopa nenájdená!
       visibility: 'Viditeľnosť:'
     trace_paging_nav:

-      showing_page: Stránka %{page}

       older: Staršie stopy
       newer: Novšie stopy
     trace:
       older: Staršie stopy
       newer: Novšie stopy
     trace:

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index afffbbf01dcea4b3e6b74c1c06756592e17249fa..bc4c08c21beacb5f67ca02b51a53dd51c023a265 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -255,7 +255,6 @@ sl:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

       github: GitHub
       wikipedia: Wikipedija
   api:
       github: GitHub
       wikipedia: Wikipedija
   api:


@@ -2530,7 +2529,6 @@ sl:
       visibility: 'Vidnost:'
       confirm_delete: Izbriši to sled?
     trace_paging_nav:
       visibility: 'Vidnost:'
       confirm_delete: Izbriši to sled?
     trace_paging_nav:

-      showing_page: Stran %{page}

       older: Starejše sledi
       newer: Novejše sledi
     trace:
       older: Starejše sledi
       newer: Novejše sledi
     trace:

diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 510b63fbb7d360e7544173b47c166ffc31e4b5a1..b85cfc647f910e1fbc9d222d992b60f7ed0eddae 100644 (file)
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1246,8 +1246,6 @@ sq:
       delete_trace: Fshi këtë gjurmë
       trace_not_found: Gjurma nuk u gjet!
       visibility: 'Dukshmëria:'
       delete_trace: Fshi këtë gjurmë
       trace_not_found: Gjurma nuk u gjet!
       visibility: 'Dukshmëria:'

-    trace_paging_nav:
-      showing_page: Duke shfaqun faqen %{page}

     trace:
       pending: NE PRITJE
       count_points: '%{count} pikë'
     trace:
       pending: NE PRITJE
       count_points: '%{count} pikë'

diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index c7bc31f96336f5ee5af009ac78895e7045fd3217..470019435c0f6b3fdea99edacb7f07f351c5b65c 100644 (file)
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1124,7 +1124,6 @@ sr-Latn:
       trace_not_found: Trag nije pronađen.
       visibility: 'Vidljivost:'
     trace_paging_nav:
       trace_not_found: Trag nije pronađen.
       visibility: 'Vidljivost:'
     trace_paging_nav:

-      showing_page: Prikaz stranice %{page}

       older: Stariji tragovi
       newer: Noviji tragovi
     trace:
       older: Stariji tragovi
       newer: Noviji tragovi
     trace:

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index e5923d2bcbe456d124ae7398fe9c4d453b664a6c..f980de83b83901a2940b3bcbf736f9f0d7131def 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -192,7 +192,6 @@ sr:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

       github: GitHub
       wikipedia: Википедија
   api:
       github: GitHub
       wikipedia: Википедија
   api:


@@ -1789,7 +1788,6 @@ sr:
       visibility: 'Видљивост:'
       confirm_delete: Избрисати овај траг?
     trace_paging_nav:
       visibility: 'Видљивост:'
       confirm_delete: Избрисати овај траг?
     trace_paging_nav:

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

       older: Старији трагови
       newer: Новији трагови
     trace:
       older: Старији трагови
       newer: Новији трагови
     trace:

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index da7f717f2de4ff7f89ba4cc821f91b3d3ad8bf16..847d18f508c0252a685bdcc963bd386a63551d64 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -259,7 +259,6 @@ sv:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

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


@@ -2273,7 +2272,6 @@ sv:
       visibility: 'Synlighet:'
       confirm_delete: Radera detta spår?
     trace_paging_nav:
       visibility: 'Synlighet:'
       confirm_delete: Radera detta spår?
     trace_paging_nav:

-      showing_page: Sida %{page}

       older: Äldre GPS-spår
       newer: Nyare GPS-spår
     trace:
       older: Äldre GPS-spår
       newer: Nyare GPS-spår
     trace:

diff --git a/config/locales/te.yml b/config/locales/te.yml
index ce8104b5b49e48b13ac61e233254204c890a848a..095c11d2f717fb3ea127b721db93fb33b553eb29 100644 (file)
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -220,7 +220,6 @@ te:
       openid: ఓపెన్‌ఐడీ
       google: Google
       facebook: Facebook
       openid: ఓపెన్‌ఐడీ
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

       github: GitHub
       wikipedia: వికీపీడియా
   api:
       github: GitHub
       wikipedia: వికీపీడియా
   api:


@@ -2118,7 +2117,6 @@ te:
       visibility: 'దృశ్యత:'
       confirm_delete: ఈ ట్రేసును తొలగించాలా?
     trace_paging_nav:
       visibility: 'దృశ్యత:'
       confirm_delete: ఈ ట్రేసును తొలగించాలా?
     trace_paging_nav:

-      showing_page: '%{page} పేజీ'

       older: పాత ట్రేసులు
       newer: కొత్త ట్రేసులు
     trace:
       older: పాత ట్రేసులు
       newer: కొత్త ట్రేసులు
     trace:

diff --git a/config/locales/th.yml b/config/locales/th.yml
index 3f2b900a04a7db20d392e8e5b801b60ae5edf2db..c11f31ee2c3f801e307786d12f9a570bf817e675 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -211,7 +211,6 @@ th:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

       github: GitHub
       wikipedia: วิกิพีเดีย
   api:
       github: GitHub
       wikipedia: วิกิพีเดีย
   api:


@@ -1756,7 +1755,6 @@ th:
       trace_not_found: ไม่พบรอยทางนี้!
       visibility: 'สถานะการแสดง:'
     trace_paging_nav:
       trace_not_found: ไม่พบรอยทางนี้!
       visibility: 'สถานะการแสดง:'
     trace_paging_nav:

-      showing_page: หน้า %{page}

       older: รอยทางที่เก่ากว่า
       newer: รอยทางที่ใหม่กว่า
     trace:
       older: รอยทางที่เก่ากว่า
       newer: รอยทางที่ใหม่กว่า
     trace:

diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 3d564dcbdae1aac245212175258e7b59fdaf7b03..41a18baf6375506301f239f69a97ecb16a9526f8 100644 (file)
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -202,7 +202,6 @@ tl:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

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


@@ -1803,7 +1802,6 @@ tl:
       visibility: 'Pagkanakikita:'
       confirm_delete: Burahin ang bakas na ito?
     trace_paging_nav:
       visibility: 'Pagkanakikita:'
       confirm_delete: Burahin ang bakas na ito?
     trace_paging_nav:

-      showing_page: Ika-%{page} na pahina

       older: Mas Lumang mga Bakas
       newer: Mas Bagong mga Bakas
     trace:
       older: Mas Lumang mga Bakas
       newer: Mas Bagong mga Bakas
     trace:

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 706111db0cad1e53b06732d05afd75f3c2ed1740..a70142f75c56c1ac6d1e9ca6464e722ba217cd25 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -262,7 +262,6 @@ tr:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

       github: GitHub
       wikipedia: Vikipedi
   api:
       github: GitHub
       wikipedia: Vikipedi
   api:


@@ -2400,7 +2399,6 @@ tr:
       visibility: 'Görünürlük:'
       confirm_delete: Bu izi sil?
     trace_paging_nav:
       visibility: 'Görünürlük:'
       confirm_delete: Bu izi sil?
     trace_paging_nav:

-      showing_page: '%{page}. sayfa'

       older: Daha Eski İzler
       newer: En Yeni İzler
     trace:
       older: Daha Eski İzler
       newer: En Yeni İzler
     trace:

diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index e9797e8b27553caf7b2a7b6bdc7b5e44516a72ee..f153a7d96c3f5fb2a0797ce613660bafadf1d8ec 100644 (file)
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -218,7 +218,6 @@ tt:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

       github: GitHub
       wikipedia: Википедия
   api:
       github: GitHub
       wikipedia: Википедия
   api:

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 93ec94a79b93e781a90935ef3d49e8bf9a8795bd..0b51488b71a721a2ca4b6eac2d10909e39994ac4 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -283,7 +283,6 @@ uk:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

       github: GitHub
       wikipedia: Вікіпедія
   api:
       github: GitHub
       wikipedia: Вікіпедія
   api:


@@ -2552,7 +2551,6 @@ uk:
       visibility: 'Видимість:'
       confirm_delete: Вилучити цей трек?
     trace_paging_nav:
       visibility: 'Видимість:'
       confirm_delete: Вилучити цей трек?
     trace_paging_nav:

-      showing_page: Сторінка %{page}

       older: Старіші треки
       newer: Новіші треки
     trace:
       older: Старіші треки
       newer: Новіші треки
     trace:

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 9a4e5cfb95ddadd72163af9380f01d004aaaba2e..530ebb70580912814d1c85da702799cfe6212cd7 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -221,7 +221,6 @@ vi:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

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


@@ -2172,7 +2171,6 @@ vi:
       visibility: 'Mức độ truy cập:'
       confirm_delete: Xóa tuyến đường này?
     trace_paging_nav:
       visibility: 'Mức độ truy cập:'
       confirm_delete: Xóa tuyến đường này?
     trace_paging_nav:

-      showing_page: Trang %{page}

       older: Tuyến đường Cũ hơn
       newer: Tuyến đường Mới hơn
     trace:
       older: Tuyến đường Cũ hơn
       newer: Tuyến đường Mới hơn
     trace:

diff --git a/config/locales/xmf.yml b/config/locales/xmf.yml
index be16d423b2772924394253316990b990320bc07d..86c4e27bcba0b8970a62132b7c7c0dc4351a3348 100644 (file)
--- a/config/locales/xmf.yml
+++ b/config/locales/xmf.yml
@@ -209,7 +209,6 @@ xmf:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows

       github: GitHub
       wikipedia: ვიკიპედია
   api:
       github: GitHub
       wikipedia: ვიკიპედია
   api:

diff --git a/config/locales/yi.yml b/config/locales/yi.yml
index 1f6ded06a65f0c8f17f83a173721bc7db5f687ed..d93073817e44a272f324e29ce279394e390ae650 100644 (file)
--- a/config/locales/yi.yml
+++ b/config/locales/yi.yml
@@ -140,8 +140,6 @@ yi:
       help: הילף
     edit:
       cancel: אַנולירן
       help: הילף
     edit:
       cancel: אַנולירן

-    trace_paging_nav:
-      showing_page: בלאַט %{page}

     trace:
       public: עפֿנטלעך
   users:
     trace:
       public: עפֿנטלעך
   users:

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 91f0aab8989a58012102b8823fcdca992a00368b..d07cacfeb0a2bb28b0db862189c273d8683ce376 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -287,7 +287,6 @@ zh-CN:
       openid: 开放式身份验证
       google: 谷歌
       facebook: 脸书
       openid: 开放式身份验证
       google: 谷歌
       facebook: 脸书

-      windowslive: Microsoft

       github: GitHub
       wikipedia: 维基百科
   api:
       github: GitHub
       wikipedia: 维基百科
   api:


@@ -2314,7 +2313,6 @@ zh-CN:
       visibility: 可见性：
       confirm_delete: 删除这条轨迹？
     trace_paging_nav:
       visibility: 可见性：
       confirm_delete: 删除这条轨迹？
     trace_paging_nav:

-      showing_page: 第%{page}页

       older: 较旧轨迹
       newer: 较新轨迹
     trace:
       older: 较旧轨迹
       newer: 较新轨迹
     trace:

diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index de6282c10a74a0ab4c8f009e68d5e5fb72bacf2c..5662aa6f8d5cca7888895c7158ff5f02a812b777 100644 (file)
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -210,7 +210,6 @@ zh-HK:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

       github: GitHub
       wikipedia: 維基百科
   api:
       github: GitHub
       wikipedia: 維基百科
   api:

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 9fe6e90a04277f5f27a4ca33a9f795640d882d16..4d74ecd4176952ce5c98de18938e0ada872d2f5e 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -255,7 +255,6 @@ zh-TW:
       openid: OpenID
       google: Google
       facebook: 臉書
       openid: OpenID
       google: Google
       facebook: 臉書

-      windowslive: Microsoft

       github: GitHub
       wikipedia: 維基百科
   api:
       github: GitHub
       wikipedia: 維基百科
   api:


@@ -387,6 +386,7 @@ zh-TW:
       history_title_html: 路徑歷史：%{name}
       nodes: 節點
       nodes_count:
       history_title_html: 路徑歷史：%{name}
       nodes: 節點
       nodes_count:

+        one: '%{count} 個節點'

         other: '%{count} 個節點'
       also_part_of_html:
         one: 路徑 %{related_ways} 的部份
         other: '%{count} 個節點'
       also_part_of_html:
         one: 路徑 %{related_ways} 的部份


@@ -2301,7 +2301,6 @@ zh-TW:
       visibility: 能見度
       confirm_delete: 刪除這個軌跡？
     trace_paging_nav:
       visibility: 能見度
       confirm_delete: 刪除這個軌跡？
     trace_paging_nav:

-      showing_page: 第 %{page} 頁

       older: 較舊軌跡
       newer: 較新軌跡
     trace:
       older: 較舊軌跡
       newer: 較新軌跡
     trace: