Localisation updates from https://translatewiki.net.

diff --git a/config/locales/af.yml b/config/locales/af.yml
index fd2f4c1fa8a49b43aefc6557a2667f1bfccd91c8..915d3bf2616e68e7d1d281279ea8da7167dd5215 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -1593,6 +1593,7 @@ af:
       legal_title: Regsaspekte
       partners_title: Vennote
     copyright:
       legal_title: Regsaspekte
       partners_title: Vennote
     copyright:

+      title: Kopiereg en lisensie

       foreign:
         title: Aangaande dié vertaling
       native:
       foreign:
         title: Aangaande dié vertaling
       native:


@@ -1600,7 +1601,6 @@ af:
         native_link: Afrikaanse weergawe
         mapping_link: begin karteer
       legal_babble:
         native_link: Afrikaanse weergawe
         mapping_link: begin karteer
       legal_babble:

-        title_html: Kopiereg en lisensie

         credit_title_html: Hoe om na OpenStreetMap te verwys
         contributors_title_html: Ons bydraers
         infringement_title_html: Kopieregoortreding
         credit_title_html: Hoe om na OpenStreetMap te verwys
         contributors_title_html: Ons bydraers
         infringement_title_html: Kopieregoortreding

diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index 33317892cb7829ac4dbfa74bde94d7427f104f8b..a924af237af9dcf333557c83e03a9cb4142c6a02 100644 (file)
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -816,6 +816,7 @@ aln:
       logout_button: Dil
   site:
     copyright:
       logout_button: Dil
   site:
     copyright:

+      title: Copyright

       foreign:
         title: Rreth kti përkthimi
         html: Në ni ngjarje të ni konflikti me faqen e përkthyme dhe %{english_original_link},
       foreign:
         title: Rreth kti përkthimi
         html: Në ni ngjarje të ni konflikti me faqen e përkthyme dhe %{english_original_link},


@@ -829,7 +830,6 @@ aln:
         native_link: Gegë verzion
         mapping_link: fillo hartografimin
       legal_babble:
         native_link: Gegë verzion
         mapping_link: fillo hartografimin
       legal_babble:

-        title_html: Copyright

         credit_title_html: Si të kreditit OpenStreetMap
         credit_1_html: |-
           Nëse jeni duke përdorur harta imazhe OpenStreetMap, ne kërkojmë që
         credit_title_html: Si të kreditit OpenStreetMap
         credit_1_html: |-
           Nëse jeni duke përdorur harta imazhe OpenStreetMap, ne kërkojmë që

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 1aa1673f098fbe1fcc73871c5f133c7358c2571e..b4a11d5a2382ed786f542830681857c62da32065 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1981,6 +1981,7 @@ ar:
       legal_2_2_registered_trademarks: العلامات التجارية المسجلة لـ OSMF
       partners_title: الشركاء
     copyright:
       legal_2_2_registered_trademarks: العلامات التجارية المسجلة لـ OSMF
       partners_title: الشركاء
     copyright:

+      title: حقوق النشر والترخيص

       foreign:
         title: حول هذه الترجمة
         html: في حالة التعارض ما بين هذه الصفحة المترجمة و %{english_original_link},
       foreign:
         title: حول هذه الترجمة
         html: في حالة التعارض ما بين هذه الصفحة المترجمة و %{english_original_link},


@@ -1994,7 +1995,6 @@ ar:
         native_link: النسخة العربية
         mapping_link: ابدأ التخطيط
       legal_babble:
         native_link: النسخة العربية
         mapping_link: ابدأ التخطيط
       legal_babble:

-        title_html: حقوق النشر والترخيص

         introduction_1_open_data: البيانات المفتوحة
         introduction_1_osm_foundation: مؤسسة خريطة الشارع المفتوحة
         introduction_2_html: "أنت حر في نسخ، وتوزيع، ونقل وتطويع بياناتنا، \nطالما
         introduction_1_open_data: البيانات المفتوحة
         introduction_1_osm_foundation: مؤسسة خريطة الشارع المفتوحة
         introduction_2_html: "أنت حر في نسخ، وتوزيع، ونقل وتطويع بياناتنا، \nطالما

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index a715692ab4345f2d18374388df2362cbf589e232..b52e16a732e1c197a0d9fd6f373e3607eb3c4324 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -1500,6 +1500,7 @@ ast:
       legal_title: Llegal
       partners_title: Asociaos
     copyright:
       legal_title: Llegal
       partners_title: Asociaos
     copyright:

+      title: Drechos d'autor y llicencia

       foreign:
         title: Tocante a esta traducción
         html: En casu d'haber un conflictu ente esta páxina traducida y %{english_original_link},
       foreign:
         title: Tocante a esta traducción
         html: En casu d'haber un conflictu ente esta páxina traducida y %{english_original_link},


@@ -1513,7 +1514,6 @@ ast:
         native_link: versión n'asturianu
         mapping_link: principiar col mapéu
       legal_babble:
         native_link: versión n'asturianu
         mapping_link: principiar col mapéu
       legal_babble:

-        title_html: Drechos d'autor y llicencia

         credit_title_html: Cómo dar reconocimientu a OpenStreetMap
         credit_1_html: Riquimos qu'uses el créditu “© Collaboradores d'OpenStreetMap”.
         attribution_example:
         credit_title_html: Cómo dar reconocimientu a OpenStreetMap
         credit_1_html: Riquimos qu'uses el créditu “© Collaboradores d'OpenStreetMap”.
         attribution_example:

diff --git a/config/locales/az.yml b/config/locales/az.yml
index 9c0cd7630e74b6358700eb60c0d46aae6c1e8e92..5928cdae5ab356d705931c5f3628defcf19a4185 100644 (file)
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -925,6 +925,7 @@ az:
       logout_button: Sistemdən çıx
   site:
     copyright:
       logout_button: Sistemdən çıx
   site:
     copyright:

+      title: Müəllif hüquqları və Lisenziyalar

       foreign:
         title: Bu tərcümə haqqında
         english_link: ingiliscə orijinalına
       foreign:
         title: Bu tərcümə haqqında
         english_link: ingiliscə orijinalına


@@ -933,7 +934,6 @@ az:
         native_link: azərbaycan versiyası
         mapping_link: kartoqrafiyalaşdırmağa başla
       legal_babble:
         native_link: azərbaycan versiyası
         mapping_link: kartoqrafiyalaşdırmağa başla
       legal_babble:

-        title_html: Müəllif hüquqları və Lisenziyalar

         credit_title_html: OpenStreetMap-ə Necə istinad etmək olar
         attribution_example:
           alt: Nümunə üçün, veb-səhifədən OpenStreetMap-ə necə istinad vermək
         credit_title_html: OpenStreetMap-ə Necə istinad etmək olar
         attribution_example:
           alt: Nümunə üçün, veb-səhifədən OpenStreetMap-ə necə istinad vermək

diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index aed7bb646dbd0fac956ac5c970a70f3004a075c5..bde368c27a3bda921c86427ce05021d587f24a73 100644 (file)
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -1082,6 +1082,7 @@ be-Tarask:
     about:
       open_data_title: Адкрытыя зьвесткі
     copyright:
     about:
       open_data_title: Адкрытыя зьвесткі
     copyright:

+      title: Аўтарскія правы і ліцэнзія

       foreign:
         title: Пра гэты пераклад
         html: У выпадку канфлікту паміж гэтай перакладзенай старонкай і %{english_original_link},
       foreign:
         title: Пра гэты пераклад
         html: У выпадку канфлікту паміж гэтай перакладзенай старонкай і %{english_original_link},


@@ -1095,7 +1096,6 @@ be-Tarask:
         native_link: беларускай вэрсіі
         mapping_link: пачаць стварэньне мапы
       legal_babble:
         native_link: беларускай вэрсіі
         mapping_link: пачаць стварэньне мапы
       legal_babble:

-        title_html: Аўтарскія правы і ліцэнзія

         credit_title_html: Як спасылацца на OpenStreetMap
         credit_1_html: 'Карыстаючыся зьвесткамі OpenStreetMap, вы павінны выканаць
           дзьве ўмовы:'
         credit_title_html: Як спасылацца на OpenStreetMap
         credit_1_html: 'Карыстаючыся зьвесткамі OpenStreetMap, вы павінны выканаць
           дзьве ўмовы:'

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 11e78ea3b83a2ff630e6bc3dbd6cd57180360d84..3d50f058d6eeb401982b5343eec8c14e3146a5d7 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -2093,6 +2093,7 @@ be:
       legal_title: Прававыя пытанні
       partners_title: Партнёры
     copyright:
       legal_title: Прававыя пытанні
       partners_title: Партнёры
     copyright:

+      title: Аўтарскія правы і ліцэнзія

       foreign:
         title: Пра гэты пераклад
         html: У выпадку супярэчнасці паміж гэтай перакладзенай старонкай і %{english_original_link},
       foreign:
         title: Пра гэты пераклад
         html: У выпадку супярэчнасці паміж гэтай перакладзенай старонкай і %{english_original_link},


@@ -2106,7 +2107,6 @@ be:
         native_link: беларуская версія
         mapping_link: пачаць маляваць карту
       legal_babble:
         native_link: беларуская версія
         mapping_link: пачаць маляваць карту
       legal_babble:

-        title_html: Аўтарскія правы і ліцэнзія

         credit_title_html: Як спасылацца на OpenStreetMap
         credit_1_html: 'Там, дзе вы выкарыстоўваеце даныя OpenStreetMap, вы павінны
           выканаць наступныя дзве рэчы:'
         credit_title_html: Як спасылацца на OpenStreetMap
         credit_1_html: 'Там, дзе вы выкарыстоўваеце даныя OpenStreetMap, вы павінны
           выканаць наступныя дзве рэчы:'

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index a4c28a374a80d49b37b53a39d2dd6c9d29ce75a9..606b049d63cf3bbc991211cb9968843899ebb51e 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1549,6 +1549,7 @@ bg:
       legal_2_2_registered_trademarks: регистрирани търговски марки на OSMF
       partners_title: Партньори
     copyright:
       legal_2_2_registered_trademarks: регистрирани търговски марки на OSMF
       partners_title: Партньори
     copyright:

+      title: Авторски права и лиценз

       foreign:
         title: За този превод
         html: В случай на противоречие между тази преведена страница и %{english_original_link},
       foreign:
         title: За този превод
         html: В случай на противоречие между тази преведена страница и %{english_original_link},


@@ -1562,7 +1563,6 @@ bg:
         native_link: българската версия
         mapping_link: картографирате
       legal_babble:
         native_link: българската версия
         mapping_link: картографирате
       legal_babble:

-        title_html: Авторски права и лиценз

         credit_title_html: Как да кредитирате OpenStreetMap
         more_title_html: Открийте повече
         contributors_title_html: Нашите сътрудници
         credit_title_html: Как да кредитирате OpenStreetMap
         more_title_html: Открийте повече
         contributors_title_html: Нашите сътрудници

diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 3459542d13b603d2086fa37432d3e8e6f2c616bd..4485b871c9db2a735ae600408f0531de53988bec 100644 (file)
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -1596,6 +1596,7 @@ bn:
       legal_1_1_privacy_policy: গোপনীয়তার নীতি
       partners_title: অংশীদার
     copyright:
       legal_1_1_privacy_policy: গোপনীয়তার নীতি
       partners_title: অংশীদার
     copyright:

+      title: কপিরাইট ও লাইসেন্স

       foreign:
         title: এই অনুবাদ সম্পর্কে
         english_link: মূল ইংরেজি
       foreign:
         title: এই অনুবাদ সম্পর্কে
         english_link: মূল ইংরেজি


@@ -1607,7 +1608,6 @@ bn:
         native_link: THIS_LANGUAGE_NAME_HERE সংস্করণ
         mapping_link: মানচিত্রকরণ শুরু করুন
       legal_babble:
         native_link: THIS_LANGUAGE_NAME_HERE সংস্করণ
         mapping_link: মানচিত্রকরণ শুরু করুন
       legal_babble:

-        title_html: কপিরাইট ও লাইসেন্স

         introduction_2_legal_code: আইনি কোড
         credit_title_html: ওপেনস্ট্রিটম্যাপকে কীভাবে কৃতিত্ব দিবেন
         attribution_example:
         introduction_2_legal_code: আইনি কোড
         credit_title_html: ওপেনস্ট্রিটম্যাপকে কীভাবে কৃতিত্ব দিবেন
         attribution_example:

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 981632918df5d75d4cc33b684d13ddd6bf084344..2a525a11d42472a8cf9317d9d407fddc59305310 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -2008,6 +2008,7 @@ br:
       legal_2_2_registered_trademarks: merkoù marilhet an OSMF
       partners_title: Kevelerien
     copyright:
       legal_2_2_registered_trademarks: merkoù marilhet an OSMF
       partners_title: Kevelerien
     copyright:

+      title: Gwirioù oberour hag aotre-implijout

       foreign:
         title: Diwar-benn an droidigezh-mañ
         html: Ma vez digendalc'h etre ar bajenn troet-mañ hag %{english_original_link}
       foreign:
         title: Diwar-benn an droidigezh-mañ
         html: Ma vez digendalc'h etre ar bajenn troet-mañ hag %{english_original_link}


@@ -2020,7 +2021,6 @@ br:
         native_link: Stumm brezhonek
         mapping_link: kregiñ da gemer perzh
       legal_babble:
         native_link: Stumm brezhonek
         mapping_link: kregiñ da gemer perzh
       legal_babble:

-        title_html: Gwirioù oberour hag aotre-implijout

         introduction_1_html: OpenStreetMap%{registered_trademark_link} a zo %{open_data},
           dindan an aotre-implijout %{odc_odbl_link} (ODbL) gant %{osm_foundation_link}
           (OSMF).
         introduction_1_html: OpenStreetMap%{registered_trademark_link} a zo %{open_data},
           dindan an aotre-implijout %{odc_odbl_link} (ODbL) gant %{osm_foundation_link}
           (OSMF).

diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 43026e26394b505bcfa8e34548f3fabb5b9a10ef..8a72a277e2d1d16dc18aa6c6afd75195e65fef45 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1064,6 +1064,7 @@ bs:
       next: Sljedeće
       open_data_title: Open Data
     copyright:
       next: Sljedeće
       open_data_title: Open Data
     copyright:

+      title: Autorska prava i dozvola

       foreign:
         title: O ovom prevodu
         html: U slučaju konflikta između ove prevedene stranice i %{english_original_link},
       foreign:
         title: O ovom prevodu
         html: U slučaju konflikta između ove prevedene stranice i %{english_original_link},


@@ -1077,7 +1078,6 @@ bs:
         native_link: bosansko izdanje
         mapping_link: počnite sa ucrtavanjem
       legal_babble:
         native_link: bosansko izdanje
         mapping_link: počnite sa ucrtavanjem
       legal_babble:

-        title_html: Autorska prava i dozvola

         credit_title_html: Kako navesti zasluge OpenStreetMap projekta kao izvora
         credit_1_html: |-
           Tražimo da koristite navedete zasluge “© OpenStreetMap
         credit_title_html: Kako navesti zasluge OpenStreetMap projekta kao izvora
         credit_1_html: |-
           Tražimo da koristite navedete zasluge “© OpenStreetMap

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 6b41a80d506859794f8b2adae946a737ab00d820..ff64cd59b56519a447bea26a8b5b50fea8072ca4 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1979,6 +1979,7 @@ ca:
       legal_2_2_registered_trademarks: marca registrada de l'OSMF
       partners_title: Socis
     copyright:
       legal_2_2_registered_trademarks: marca registrada de l'OSMF
       partners_title: Socis
     copyright:

+      title: Drets d'autor i llicència

       foreign:
         title: Quant a la traducció
         html: En cas de conflicte entre aquesta pàgina traduïda i %{english_original_link},
       foreign:
         title: Quant a la traducció
         html: En cas de conflicte entre aquesta pàgina traduïda i %{english_original_link},


@@ -1992,7 +1993,6 @@ ca:
         native_link: Versió en català
         mapping_link: Comença a cartografiar
       legal_babble:
         native_link: Versió en català
         mapping_link: Comença a cartografiar
       legal_babble:

-        title_html: Drets d'autor i llicència

         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} són %{open_data}, sota la llicència
           %{odc_odbl_link} (ODbL) per la %{osm_foundation_link} (OSMF).
         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} són %{open_data}, sota la llicència
           %{odc_odbl_link} (ODbL) per la %{osm_foundation_link} (OSMF).

diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index ce2a0acc62f2301980320195e05cf9bf20dcfc09..10092ac1b2fd7da2687b7f9c3118508379593f8e 100644 (file)
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -29,7 +29,7 @@ ce:
         update: Хийцам Ӏалашбе
       trace:
         create: Сервер тӀейаккха
         update: Хийцам Ӏалашбе
       trace:
         create: Сервер тӀейаккха

-        update: ХийÑ\86амаÑ\88 дÓ\80аÓ\80алаÑ\88бе
+        update: ХийÑ\86амаÑ\88 дÓ\80аÓ\80алаÑ\88бан

       user_block:
         create: Кхолла блок
         update: Карлайаккха блок
       user_block:
         create: Кхолла блок
         update: Карлайаккха блок


@@ -182,7 +182,7 @@ ce:
         link text: хӀун йу хӀара?
       contributor terms:
         link text: хӀун йу хӀара?
         link text: хӀун йу хӀара?
       contributor terms:
         link text: хӀун йу хӀара?

-      save changes button: Ӏалашбе хийцамаш
+      save changes button: Хийцамаш дӀаӀалашбан

   browse:
     version: Верси
     in_changeset: Нисдарш
   browse:
     version: Верси
     in_changeset: Нисдарш


@@ -971,7 +971,7 @@ ce:
       download: Схьаэца
       short_url: Йоца хьажорг
     embed:
       download: Схьаэца
       short_url: Йоца хьажорг
     embed:

-      report_problem: Ð\93Ó\80алаÑ\82еÑ\85 Ñ\85аам баÑ\80
+      report_problem: Ð\9fÑ\80облемаÑ\85 лаÑ\8cÑ\86на Ñ\85аийÑ\82а

     map:
       layers:
         header: Картан чкъор
     map:
       layers:
         header: Картан чкъор

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 0698af17713c08adb23e934c56e0c05f6f01f71c..d7a6501c7678e3df1e247ba5aacf22636dee9b2b 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -2100,6 +2100,7 @@ cs:
       legal_2_2_registered_trademarks: zapsané ochranné známky OSMF
       partners_title: Partneři
     copyright:
       legal_2_2_registered_trademarks: zapsané ochranné známky OSMF
       partners_title: Partneři
     copyright:

+      title: Autorská práva a licence

       foreign:
         title: O tomto překladu
         html: V případě rozporů mezi touto přeloženou verzí a %{english_original_link}
       foreign:
         title: O tomto překladu
         html: V případě rozporů mezi touto přeloženou verzí a %{english_original_link}


@@ -2113,7 +2114,6 @@ cs:
         native_link: českou verzi
         mapping_link: začít mapovat
       legal_babble:
         native_link: českou verzi
         mapping_link: začít mapovat
       legal_babble:

-        title_html: Autorská práva a licence

         introduction_1_html: OpenStreetMap%{registered_trademark_link} jsou %{open_data},
           která za podmínek %{odc_odbl_link} (ODbL) nabízí %{osm_foundation_link}
           (OSMF).
         introduction_1_html: OpenStreetMap%{registered_trademark_link} jsou %{open_data},
           která za podmínek %{odc_odbl_link} (ODbL) nabízí %{osm_foundation_link}
           (OSMF).

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index f2d25da83f679791c717be05ac11e4853255106f..72f3e9bdf0473612de2bd651329201ec2a834454 100644 (file)
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -270,13 +270,13 @@ cy:
         opened_at_by_html: Crëwyd %{when} gan %{user}
         commented_at_html: Diweddarwyd %{when}
         commented_at_by_html: Diweddarwyd %{when} gan %{user}
         opened_at_by_html: Crëwyd %{when} gan %{user}
         commented_at_html: Diweddarwyd %{when}
         commented_at_by_html: Diweddarwyd %{when} gan %{user}

-        closed_at_html: Wedi datrys %{when}
-        closed_at_by_html: Wedi datrys %{when} gan %{user}
-        reopened_at_html: Wedi ailgychwyn %{when}
-        reopened_at_by_html: Wedi ailgychwyn %{when} gan %{user}
+        closed_at_html: Datryswyd %{when}
+        closed_at_by_html: Datryswyd %{when} gan %{user}
+        reopened_at_html: Ailysgogwyd %{when}
+        reopened_at_by_html: Ailysgogwyd %{when} gan %{user}

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

-        description_all: Rhestr o nodiadau newydd, gyda sylwadau, a wedi cau
+        description_all: Rhestr o nodiadau newydd, gyda sylwadau, neu wedi cau

         description_area: Rhestr o nodiadau, adroddwyd, gyda sylwadau, neu wedi cau
           yn eich ardal [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
         description_item: Ffrwd RSS ar gyfer nodyn %{id}
         description_area: Rhestr o nodiadau, adroddwyd, gyda sylwadau, neu wedi cau
           yn eich ardal [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
         description_item: Ffrwd RSS ar gyfer nodyn %{id}


@@ -489,8 +489,8 @@ cy:
       feed:
         title: Grŵp newid %{id}
         title_comment: Grŵp newid %{id} - %{comment}
       feed:
         title: Grŵp newid %{id}
         title_comment: Grŵp newid %{id} - %{comment}

-        created: Wedi creu
-        closed: Wedi cau
+        created: Crëwyd
+        closed: Caëwyd

         belongs_to: Awdur
     subscribe:
       button: Tanysgrifio i drafodaeth
         belongs_to: Awdur
     subscribe:
       button: Tanysgrifio i drafodaeth


@@ -506,10 +506,10 @@ cy:
       title: 'Grŵp newid: %{id}'
       created: 'Crëwyd: %{when}'
       closed: 'Caëwyd: %{when}'
       title: 'Grŵp newid: %{id}'
       created: 'Crëwyd: %{when}'
       closed: 'Caëwyd: %{when}'

-      created_ago_html: Wedi creu %{time_ago}
-      closed_ago_html: Wedi cau %{time_ago}
-      created_ago_by_html: Wedi creu %{time_ago} gan %{user}
-      closed_ago_by_html: Wedi cau %{time_ago} gan %{user}
+      created_ago_html: Crëwyd %{time_ago}
+      closed_ago_html: Caëwyd %{time_ago}
+      created_ago_by_html: Crëwyd %{time_ago} gan %{user}
+      closed_ago_by_html: Caëwyd %{time_ago} gan %{user}

       discussion: Sgwrs
       join_discussion: Mewngofnodwch i ymuno â'r sgwrs
       still_open: Mae'r grŵp newid dal ar agor - bydd trafodaeth yn agor pan fydd
       discussion: Sgwrs
       join_discussion: Mewngofnodwch i ymuno â'r sgwrs
       still_open: Mae'r grŵp newid dal ar agor - bydd trafodaeth yn agor pan fydd


@@ -1873,6 +1873,7 @@ cy:
       legal_2_2_registered_trademarks: nodau masnach cofrestredig yr OSMF
       partners_title: Partneriaid
     copyright:
       legal_2_2_registered_trademarks: nodau masnach cofrestredig yr OSMF
       partners_title: Partneriaid
     copyright:

+      title: Hawlfraint a Thrwydded

       foreign:
         title: Ynglŷn â'r cyfieithiad hwn
         html: Mewn achos o wrthdaro rhwng y dudalen hon a gyfieithwyd a %{english_original_link},
       foreign:
         title: Ynglŷn â'r cyfieithiad hwn
         html: Mewn achos o wrthdaro rhwng y dudalen hon a gyfieithwyd a %{english_original_link},


@@ -1883,7 +1884,6 @@ cy:
         native_link: fersiwn Cymraeg
         mapping_link: dechrau mapio
       legal_babble:
         native_link: fersiwn Cymraeg
         mapping_link: dechrau mapio
       legal_babble:

-        title_html: Hawlfraint a Thrwydded

         introduction_1_open_data: data agored
         introduction_1_odc_odbl: Open Data Commons Open Database License
         introduction_1_osm_foundation: OpenStreetMap Foundation
         introduction_1_open_data: data agored
         introduction_1_odc_odbl: Open Data Commons Open Database License
         introduction_1_osm_foundation: OpenStreetMap Foundation


@@ -2612,6 +2612,7 @@ cy:
       title: Blociau gan %{name}
       heading_html: Rhestr Blociau gan %{name}
     show:
       title: Blociau gan %{name}
       heading_html: Rhestr Blociau gan %{name}
     show:

+      title: '%{block_on} a flociwyd gan %{block_by}'

       heading_html: '%{block_on} a flociwyd gan %{block_by}'
       created: 'Crëwyd:'
       duration: 'Cyfnod:'
       heading_html: '%{block_on} a flociwyd gan %{block_by}'
       created: 'Crëwyd:'
       duration: 'Cyfnod:'


@@ -2622,6 +2623,8 @@ cy:
       confirm: Ydych chi'n siŵr?
       reason: 'Rheswm dros y bloc:'
       revoker: 'Dad-flociwr:'
       confirm: Ydych chi'n siŵr?
       reason: 'Rheswm dros y bloc:'
       revoker: 'Dad-flociwr:'

+      needs_view: Mae angen i'r defnyddiwr fewngofnodi cyn y bydd y bloc hwn yn cael
+        ei glirio.

     block:
       not_revoked: (heb ei ddirymu)
       show: Dangos
     block:
       not_revoked: (heb ei ddirymu)
       show: Dangos


@@ -2811,6 +2814,8 @@ cy:
           at %{directions}
         onramp_right_without_exit: Trowch i'r dde ar y ramp i %{name}
         onramp_right_with_directions: Trowch i'r dde ar y ramp tuag at %{directions}
           at %{directions}
         onramp_right_without_exit: Trowch i'r dde ar y ramp i %{name}
         onramp_right_with_directions: Trowch i'r dde ar y ramp tuag at %{directions}

+        onramp_right_without_directions: Trowch i'r dde i'r ramp
+        onramp_right: Trowch i'r dde i'r ramp

         merge_right_without_exit: Cyfunwch i'r dde ar %{name}
         turn_right_without_exit: Trowch i'r dde ar %{name}
         sharp_right_without_exit: Siarp i'r dde ar %{name}
         merge_right_without_exit: Cyfunwch i'r dde ar %{name}
         turn_right_without_exit: Trowch i'r dde ar %{name}
         sharp_right_without_exit: Siarp i'r dde ar %{name}


@@ -2819,6 +2824,8 @@ cy:
         turn_left_without_exit: Trowch i'r chwith ar %{name}
         offramp_left: Cymerwch y ramp ar y chwith
         offramp_left_with_exit: Cymerwch y %{exit} allanfa ar y chwith
         turn_left_without_exit: Trowch i'r chwith ar %{name}
         offramp_left: Cymerwch y ramp ar y chwith
         offramp_left_with_exit: Cymerwch y %{exit} allanfa ar y chwith

+        onramp_left_without_directions: Trowch i'r chwith i'r ramp
+        onramp_left: Trowch i'r chwith i'r ramp

         merge_left_without_exit: Cyfuno i'r chwith ar %{name}
         slight_left_without_exit: Ychydig i'r chwith i %{name}
         via_point_without_exit: (trwy bwynt)
         merge_left_without_exit: Cyfuno i'r chwith ar %{name}
         slight_left_without_exit: Ychydig i'r chwith i %{name}
         via_point_without_exit: (trwy bwynt)

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 0636b5ef9d6b471ef306807b44e6661a29cb98d0..c462c23591b6407e4baea13a5f57be4f70bac7a7 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -2020,6 +2020,7 @@ da:
       legal_2_2_registered_trademarks: varemærker registreret af OSMF
       partners_title: Partnere
     copyright:
       legal_2_2_registered_trademarks: varemærker registreret af OSMF
       partners_title: Partnere
     copyright:

+      title: Ophavsret og licens

       foreign:
         title: Om denne oversættelse
         html: I tilfælde af en konflikt mellem denne oversatte side og %{english_original_link}
       foreign:
         title: Om denne oversættelse
         html: I tilfælde af en konflikt mellem denne oversatte side og %{english_original_link}


@@ -2033,7 +2034,6 @@ da:
         native_link: den danske udgave
         mapping_link: begynde kortlægningen
       legal_babble:
         native_link: den danske udgave
         mapping_link: begynde kortlægningen
       legal_babble:

-        title_html: Ophavsret og licens

         introduction_1_html: OpenStreetMap%{registered_trademark_link} er %{open_data},
           licenseret under %{odc_odbl_link} (ODbL) af %{osm_foundation_link} (OSMF).
         introduction_1_open_data: åbne data
         introduction_1_html: OpenStreetMap%{registered_trademark_link} er %{open_data},
           licenseret under %{odc_odbl_link} (ODbL) af %{osm_foundation_link} (OSMF).
         introduction_1_open_data: åbne data

diff --git a/config/locales/de.yml b/config/locales/de.yml
index f485543faee67a0fe1530093e99a0fac3e8c7d6c..d227bc20ca5837620aca0bd7b743e452aa7d560f 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2163,6 +2163,7 @@ de:
       legal_2_2_registered_trademarks: eingetragenes Markenzeichen der OSMF
       partners_title: Partner
     copyright:
       legal_2_2_registered_trademarks: eingetragenes Markenzeichen der OSMF
       partners_title: Partner
     copyright:

+      title: Urheberrecht und Lizenz

       foreign:
         title: Über diese Übersetzung
         html: Für den Fall einer Abweichung zwischen der vorliegenden Übersetzung
       foreign:
         title: Über diese Übersetzung
         html: Für den Fall einer Abweichung zwischen der vorliegenden Übersetzung


@@ -2177,7 +2178,6 @@ de:
         native_link: deutschen Sprachversion
         mapping_link: mit dem Kartieren anfangen
       legal_babble:
         native_link: deutschen Sprachversion
         mapping_link: mit dem Kartieren anfangen
       legal_babble:

-        title_html: Urheberrecht und Lizenz

         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} sind %{open_data} (open data), lizenziert unter der
           %{odc_odbl_link} (ODbL) von der %{osm_foundation_link} (OSMF).
         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} sind %{open_data} (open data), lizenziert unter der
           %{odc_odbl_link} (ODbL) von der %{osm_foundation_link} (OSMF).

diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index 5d435eaf6ed90cde3fc876ba909744847e4008c6..8332cd24aa80d3437b39fb4fde81117e21442770 100644 (file)
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -1149,6 +1149,7 @@ dsb:
       open_data_title: Zjawne daty
       partners_title: Partnarje
     copyright:
       open_data_title: Zjawne daty
       partners_title: Partnarje
     copyright:

+      title: Awtorske pšawo a licenca

       foreign:
         title: Wó toś tom pśełožku
         html: W paźe konflikta mjazy pśełožonym bokom a %{english_original_link},
       foreign:
         title: Wó toś tom pśełožku
         html: W paźe konflikta mjazy pśełožonym bokom a %{english_original_link},


@@ -1161,7 +1162,6 @@ dsb:
         native_link: dolnoserbskej wersiji
         mapping_link: kartěrowanje zachopiś
       legal_babble:
         native_link: dolnoserbskej wersiji
         mapping_link: kartěrowanje zachopiś
       legal_babble:

-        title_html: Awtorske pšawo a licenca

         credit_title_html: Kak naspomnjeś awtorstwo OpenStreetMap
         credit_1_html: Pominamy se, až  pódawaš sobustatkujucych “© OpenStreetMap”.
         attribution_example:
         credit_title_html: Kak naspomnjeś awtorstwo OpenStreetMap
         credit_1_html: Pominamy se, až  pódawaš sobustatkujucych “© OpenStreetMap”.
         attribution_example:

diff --git a/config/locales/el.yml b/config/locales/el.yml
index 19e26897fd80ef5ced7b2ceb298112e2c12d7747..3e35c209fd22e9d413db545d42eb473399dca644 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -2090,6 +2090,7 @@ el:
       legal_2_2_registered_trademarks: εγγεγραμμένα εμπορικά σήματα του OSMF
       partners_title: Συνεργάτες
     copyright:
       legal_2_2_registered_trademarks: εγγεγραμμένα εμπορικά σήματα του OSMF
       partners_title: Συνεργάτες
     copyright:

+      title: Πνευματικά δικαιώματα και άδεια χρήσης

       foreign:
         title: Σχετικά με αυτήν τη μετάφραση
         html: Σε περίπτωση διένεξης μεταξύ αυτής της μεταφρασμένης σελίδας και %{english_original_link},
       foreign:
         title: Σχετικά με αυτήν τη μετάφραση
         html: Σε περίπτωση διένεξης μεταξύ αυτής της μεταφρασμένης σελίδας και %{english_original_link},


@@ -2103,7 +2104,6 @@ el:
         native_link: ελληνική έκδοση
         mapping_link: αρχίστε τη χαρτογράφηση
       legal_babble:
         native_link: ελληνική έκδοση
         mapping_link: αρχίστε τη χαρτογράφηση
       legal_babble:

-        title_html: Πνευματικά δικαιώματα και άδεια χρήσης

         introduction_1_html: |-
           Το OpenStreetMap%{registered_trademark_link} είναι %{open_data}, με άδεια χρήσης υπό το
           %{odc_odbl_link} (ODbL) από το %{osm_foundation_link} (OSMF).
         introduction_1_html: |-
           Το OpenStreetMap%{registered_trademark_link} είναι %{open_data}, με άδεια χρήσης υπό το
           %{odc_odbl_link} (ODbL) από το %{osm_foundation_link} (OSMF).

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 213127d454ee3e0bb5255c7bd42c8ae78777a864..d2cda9abebc55134b3831ee620c0f4c0e95c2b1b 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1400,6 +1400,7 @@ en-GB:
       legal_title: Legal
       partners_title: Partners
     copyright:
       legal_title: Legal
       partners_title: Partners
     copyright:

+      title: Copyright and Licence

       foreign:
         title: About this translation
         html: In the event of a conflict between this translated page and %{english_original_link},
       foreign:
         title: About this translation
         html: In the event of a conflict between this translated page and %{english_original_link},


@@ -1413,7 +1414,6 @@ en-GB:
         native_link: British English version
         mapping_link: start mapping
       legal_babble:
         native_link: British English version
         mapping_link: start mapping
       legal_babble:

-        title_html: Copyright and Licence

         credit_title_html: How to credit OpenStreetMap
         attribution_example:
           alt: Example of how to attribute OpenStreetMap on a webpage
         credit_title_html: How to credit OpenStreetMap
         attribution_example:
           alt: Example of how to attribute OpenStreetMap on a webpage

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index f65b3cd93ae07949d32445ec203d7bcaca85864c..3599a7465e0914161b86c91fafe99ad6be9af103 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -2021,6 +2021,7 @@ eo:
       legal_2_2_registered_trademarks: registritaj varmarkoj de la Fondaĵo OpenStreetMap
       partners_title: Kunlaborantoj
     copyright:
       legal_2_2_registered_trademarks: registritaj varmarkoj de la Fondaĵo OpenStreetMap
       partners_title: Kunlaborantoj
     copyright:

+      title: Aŭtorrajto kaj permesilo

       foreign:
         title: Pri ĉi tiu traduko
         html: Se okazus konflikto inter ĉi tiu tradukita paĝo kaj %{english_original_link},
       foreign:
         title: Pri ĉi tiu traduko
         html: Se okazus konflikto inter ĉi tiu tradukita paĝo kaj %{english_original_link},


@@ -2033,7 +2034,6 @@ eo:
         native_link: Esperanta versio
         mapping_link: ekigi mapigadon
       legal_babble:
         native_link: Esperanta versio
         mapping_link: ekigi mapigadon
       legal_babble:

-        title_html: Aŭtorrajto kaj permesilo

         introduction_1_html: OpenStreetMap%{registered_trademark_link} estas %{open_data}
           eldonataj laŭ la permesilo %{odc_odbl_link} (ODbL) fare de la %{osm_foundation_link}
           (OSMF).
         introduction_1_html: OpenStreetMap%{registered_trademark_link} estas %{open_data}
           eldonataj laŭ la permesilo %{odc_odbl_link} (ODbL) fare de la %{osm_foundation_link}
           (OSMF).

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 9a147a13672fd34a4c351d22a5f9e335fce08075..1a64edcf5bcb4f338cea69e494e6a0c062ccc1e6 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -2140,6 +2140,7 @@ es:
       legal_2_2_registered_trademarks: marcas registradas de la OSMF
       partners_title: Socios
     copyright:
       legal_2_2_registered_trademarks: marcas registradas de la OSMF
       partners_title: Socios
     copyright:

+      title: Derechos de autor y licencia

       foreign:
         title: Acerca de esta traducción
         html: En el caso de un conflicto entre esta página traducida y %{english_original_link},
       foreign:
         title: Acerca de esta traducción
         html: En el caso de un conflicto entre esta página traducida y %{english_original_link},


@@ -2153,7 +2154,6 @@ es:
         native_link: versión en español
         mapping_link: comenzar a mapear
       legal_babble:
         native_link: versión en español
         mapping_link: comenzar a mapear
       legal_babble:

-        title_html: Derechos de autor y licencia

         introduction_1_html: "OpenStreetMap%{registered_trademark_link} es %{open_data},
           licenciada bajo los términos de \n%{odc_odbl_link} (ODbL) por la %{osm_foundation_link}"
         introduction_1_open_data: datos abiertos
         introduction_1_html: "OpenStreetMap%{registered_trademark_link} es %{open_data},
           licenciada bajo los términos de \n%{odc_odbl_link} (ODbL) por la %{osm_foundation_link}"
         introduction_1_open_data: datos abiertos

diff --git a/config/locales/et.yml b/config/locales/et.yml
index 4c153959e920790984c3be9e24ebea2eb1bea2e0..3a8656239f2ae70e4abbb7bcd8ac5c227309b754 100644 (file)
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1948,6 +1948,7 @@ et:
       legal_2_2_registered_trademarks: OSMF-i registreeritud kaubamärgid
       partners_title: Partnerid
     copyright:
       legal_2_2_registered_trademarks: OSMF-i registreeritud kaubamärgid
       partners_title: Partnerid
     copyright:

+      title: Autoriõigused ja litsents

       foreign:
         title: Info selle tõlke kohta
         html: Kui selle tõlgitud lehekülje ja %{english_original_link} vahel on vastuolu,
       foreign:
         title: Info selle tõlke kohta
         html: Kui selle tõlgitud lehekülje ja %{english_original_link} vahel on vastuolu,


@@ -1961,7 +1962,6 @@ et:
         native_link: eestikeelse versiooni
         mapping_link: alustada kaardistamist
       legal_babble:
         native_link: eestikeelse versiooni
         mapping_link: alustada kaardistamist
       legal_babble:

-        title_html: Autoriõigused ja litsents

         introduction_1_html: |-
           OpenStreetMapi%{registered_trademark_link} andmed on %{open_data}, mille
           %{osm_foundation_link} (OSMF) on avaldanud Open Data Commonsi litsentsi %{odc_odbl_link} (ODbL) all.
         introduction_1_html: |-
           OpenStreetMapi%{registered_trademark_link} andmed on %{open_data}, mille
           %{osm_foundation_link} (OSMF) on avaldanud Open Data Commonsi litsentsi %{odc_odbl_link} (ODbL) all.

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 98f30c2ddacfdd75c08c3e1d46768dceb1ddbdab..17e6a9f4af800f84bbb5692a8e5f3bc0c93708d8 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1986,6 +1986,7 @@ eu:
       legal_2_2_registered_trademarks: OSMFren marka erregistratuak
       partners_title: Parte-hartzaileak
     copyright:
       legal_2_2_registered_trademarks: OSMFren marka erregistratuak
       partners_title: Parte-hartzaileak
     copyright:

+      title: Egile-eskubideak eta lizentzia

       foreign:
         title: Itzulpen honi buruz
         html: Itzulitako orrialde hau eta %{english_original_link} arteko gatazka
       foreign:
         title: Itzulpen honi buruz
         html: Itzulitako orrialde hau eta %{english_original_link} arteko gatazka


@@ -1999,7 +2000,6 @@ eu:
         native_link: Euskara version
         mapping_link: kartografiarekin hasi
       legal_babble:
         native_link: Euskara version
         mapping_link: kartografiarekin hasi
       legal_babble:

-        title_html: Egile-eskubideak eta lizentzia

         introduction_1_open_data: Datu Irekiak
         introduction_1_odc_odbl: Open Data Commons Open Database Lizentzia
         introduction_1_osm_foundation: OpenStreetMap Fundazioa
         introduction_1_open_data: Datu Irekiak
         introduction_1_odc_odbl: Open Data Commons Open Database Lizentzia
         introduction_1_osm_foundation: OpenStreetMap Fundazioa

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index ad2d928e192908a2c305516968e5f23a961480e0..f5946b2589e407048f08f703170b7ac98d40c2df 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1887,6 +1887,7 @@ fa:
       legal_1_1_privacy_policy: سیاست محرمانگی
       partners_title: شرکای تجاری
     copyright:
       legal_1_1_privacy_policy: سیاست محرمانگی
       partners_title: شرکای تجاری
     copyright:

+      title: حق نشر و پروانه

       foreign:
         title: دربارهٔ این ترجمه
         html: اگر بین برگردان فارسی و %{english_original_link} ناسازگاری باشد، صفحهٔ
       foreign:
         title: دربارهٔ این ترجمه
         html: اگر بین برگردان فارسی و %{english_original_link} ناسازگاری باشد، صفحهٔ


@@ -1900,7 +1901,6 @@ fa:
         native_link: نسخهٔ فارسی
         mapping_link: شروع به نقشه‌کشی
       legal_babble:
         native_link: نسخهٔ فارسی
         mapping_link: شروع به نقشه‌کشی
       legal_babble:

-        title_html: حق نشر و پروانه

         credit_title_html: چگونه از OpenStreetMap یاد کنیم
         credit_1_html: 'جایی که دارید از داده‌های اوپن‌استریت‌مپ استفاده می‌کنید،
           لازم است دو کار زیر را انجام دهید:'
         credit_title_html: چگونه از OpenStreetMap یاد کنیم
         credit_1_html: 'جایی که دارید از داده‌های اوپن‌استریت‌مپ استفاده می‌کنید،
           لازم است دو کار زیر را انجام دهید:'

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 5bdf2698f9240488a8ab8ddb5dc1d2ac9e852b44..091c0220020f35acc20a8a1bda1cdd1944cc7b9e 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1919,6 +1919,7 @@ fi:
       legal_2_2_registered_trademarks: OSM-säätiön rekisteröityjä tuotemerkkejä
       partners_title: Kumppanit
     copyright:
       legal_2_2_registered_trademarks: OSM-säätiön rekisteröityjä tuotemerkkejä
       partners_title: Kumppanit
     copyright:

+      title: Tekijänoikeus ja lisenssi

       foreign:
         title: Tietoja tästä käännöksestä
         html: Jos tämän käännetyn sivun ja %{english_original_link} välillä on eroja,
       foreign:
         title: Tietoja tästä käännöksestä
         html: Jos tämän käännetyn sivun ja %{english_original_link} välillä on eroja,


@@ -1932,7 +1933,6 @@ fi:
         native_link: suomenkielinen versio
         mapping_link: aloittaa kartoituksen
       legal_babble:
         native_link: suomenkielinen versio
         mapping_link: aloittaa kartoituksen
       legal_babble:

-        title_html: Tekijänoikeus ja lisenssi

         introduction_1_html: OpenStreetMap%{registered_trademark_link} on %{open_data},
           jonka %{osm_foundation_link} (OSMF) on lisensoinut %{odc_odbl_link} (ODbL).
         introduction_1_open_data: avointa dataa
         introduction_1_html: OpenStreetMap%{registered_trademark_link} on %{open_data},
           jonka %{osm_foundation_link} (OSMF) on lisensoinut %{odc_odbl_link} (ODbL).
         introduction_1_open_data: avointa dataa

diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index c2461d1648e50057bc88643b57ac9ec8cff1bb7c..74c5f889a7048c99b7d9b14a8bbd40daa83c912b 100644 (file)
--- a/config/locales/fit.yml
+++ b/config/locales/fit.yml
@@ -738,6 +738,7 @@ fit:
       legal_title: Lakitekninen jako
       partners_title: Kumppanit
     copyright:
       legal_title: Lakitekninen jako
       partners_title: Kumppanit
     copyright:

+      title: Tekijänoikeus ja lisensi

       foreign:
         title: Tietoja tästä käänöksestä
         html: Jos tämän käänätyn sivun ja %{english_original_link} välillä oon eroja,
       foreign:
         title: Tietoja tästä käänöksestä
         html: Jos tämän käänätyn sivun ja %{english_original_link} välillä oon eroja,


@@ -751,7 +752,6 @@ fit:
         native_link: meänkielinen versuuni
         mapping_link: aloittaa kartoituksen
       legal_babble:
         native_link: meänkielinen versuuni
         mapping_link: aloittaa kartoituksen
       legal_babble:

-        title_html: Tekijänoikeus ja lisensi

         credit_title_html: OpenStreetMapin mainitseminen
         credit_1_html: OpenStreetMapin sisältöä levitettäessä oon mainittava teksti
           "© OpenStreetMapin tekijät" tai sen engelskankielinen vastine
         credit_title_html: OpenStreetMapin mainitseminen
         credit_1_html: OpenStreetMapin sisältöä levitettäessä oon mainittava teksti
           "© OpenStreetMapin tekijät" tai sen engelskankielinen vastine

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 4ce8d20e5270b307bea3ee41f09dba3ccae8abd2..c04e09a5fb85b0b5baf372f62616f8e49fd18746 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -2175,6 +2175,7 @@ fr:
       legal_2_2_registered_trademarks: marques commerciales enregistrées de l’OSMF
       partners_title: Partenaires
     copyright:
       legal_2_2_registered_trademarks: marques commerciales enregistrées de l’OSMF
       partners_title: Partenaires
     copyright:

+      title: Droits d’auteur et licence

       foreign:
         title: À propos de cette traduction
         html: En cas de conflit entre la présente page traduite et %{english_original_link},
       foreign:
         title: À propos de cette traduction
         html: En cas de conflit entre la présente page traduite et %{english_original_link},


@@ -2188,7 +2189,6 @@ fr:
         native_link: traduction française
         mapping_link: commencer à contribuer
       legal_babble:
         native_link: traduction française
         mapping_link: commencer à contribuer
       legal_babble:

-        title_html: Droits d’auteur et licence

         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} est en %{open_data}, sous licence 
           %{odc_odbl_link} (ODbL) par la %{osm_foundation_link} (OSMF).
         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} est en %{open_data}, sous licence 
           %{odc_odbl_link} (ODbL) par la %{osm_foundation_link} (OSMF).

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index d4689691af5821ffe2fb1c8da4a1e9c873cc5a75..1bcf85781b1c79e1e76ec0a3aedda1b11e7ee8f7 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -1188,13 +1188,13 @@ fur:
       legal_2_1_contact_the_osmf: contate il OSMF
       partners_title: Associâts
     copyright:
       legal_2_1_contact_the_osmf: contate il OSMF
       partners_title: Associâts
     copyright:

+      title: Copyright e licence

       foreign:
         title: Informazions su cheste traduzion
       native:
         title: Informazions su cheste pagjine
         mapping_link: scomence a mapâ
       legal_babble:
       foreign:
         title: Informazions su cheste traduzion
       native:
         title: Informazions su cheste pagjine
         mapping_link: scomence a mapâ
       legal_babble:

-        title_html: Copyright e licence

         attribution_example:
           title: Esempli di atribuzion
         more_title_html: Par savênt di plui
         attribution_example:
           title: Esempli di atribuzion
         more_title_html: Par savênt di plui

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index c628f4180a83da6d06ffeee4cb12167e2ba83fcb..b0cb52c0f67080d90e7d37db3bde14149e76e1f9 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1822,6 +1822,7 @@ fy:
       legal_title: Juridysk
       partners_title: Partners
     copyright:
       legal_title: Juridysk
       partners_title: Partners
     copyright:

+      title: Auteursrjochten en lisinsje

       foreign:
         title: Oer dizze oersetting
         html: Yn it gefal dizze oersette side en %{english_original_link} fan inoar
       foreign:
         title: Oer dizze oersetting
         html: Yn it gefal dizze oersette side en %{english_original_link} fan inoar


@@ -1835,7 +1836,6 @@ fy:
         native_link: Frysktalige ferzje
         mapping_link: mei kaartmeitsjen úteinsette
       legal_babble:
         native_link: Frysktalige ferzje
         mapping_link: mei kaartmeitsjen úteinsette
       legal_babble:

-        title_html: Auteursrjochten en lisinsje

         credit_title_html: Hoe moat OpenStreetMap neamd wurde
         credit_1_html: 'Dêr wêr''t jo OpenStreetMap-data brûke, binne jo ferplichte
           en doch de neikommende twa dingen:'
         credit_title_html: Hoe moat OpenStreetMap neamd wurde
         credit_1_html: 'Dêr wêr''t jo OpenStreetMap-data brûke, binne jo ferplichte
           en doch de neikommende twa dingen:'

diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index d42c7285b3edead7d6ea2229589a1c757bb47f68..2e2308fc723ea0c73c649430787e837da0a5d03e 100644 (file)
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -1348,6 +1348,7 @@ ga:
       legal_title: Dlíthiúil
       partners_title: Comhpháirtithe
     copyright:
       legal_title: Dlíthiúil
       partners_title: Comhpháirtithe
     copyright:

+      title: Cóipcheart agus Ceadúnas

       foreign:
         title: Maidir leis an aistriúchán seo
         html: Sa chás nach mbeidh an leathanach aistrithe seo agus an %{english_original_link}
       foreign:
         title: Maidir leis an aistriúchán seo
         html: Sa chás nach mbeidh an leathanach aistrithe seo agus an %{english_original_link}


@@ -1361,7 +1362,6 @@ ga:
         native_link: Leagan THIS_LANGUAGE_NAME_HERE
         mapping_link: dul i mbun léarscáilithe
       legal_babble:
         native_link: Leagan THIS_LANGUAGE_NAME_HERE
         mapping_link: dul i mbun léarscáilithe
       legal_babble:

-        title_html: Cóipcheart agus Ceadúnas

         credit_title_html: Conas OpenStreetMap a lua
         credit_1_html: Ceanglaímid ort an lua “©Rannchuiditheoirí OpenStreetMap”
           a úsáid.
         credit_title_html: Conas OpenStreetMap a lua
         credit_1_html: Ceanglaímid ort an lua “©Rannchuiditheoirí OpenStreetMap”
           a úsáid.

diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index e22400a38ac7641d12b42a3b56054877a63b7f69..47186ea5cf5c427bccc2faebc964a52342c239dd 100644 (file)
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1200,6 +1200,7 @@ gd:
       legal_title: Nòtaichean laghail
       partners_title: Com-pàirtichean
     copyright:
       legal_title: Nòtaichean laghail
       partners_title: Com-pàirtichean
     copyright:

+      title: Còir-lethbhreac agus ceadachas

       foreign:
         title: Mun eadar-theangachadh seo
         html: Ma bhios còmhstri eadar an duilleag air eadar-theangachadh seo agus
       foreign:
         title: Mun eadar-theangachadh seo
         html: Ma bhios còmhstri eadar an duilleag air eadar-theangachadh seo agus


@@ -1213,7 +1214,6 @@ gd:
         native_link: tionndadh sa Ghàidhlig
         mapping_link: tòiseachadh air an obair-mhapa
       legal_babble:
         native_link: tionndadh sa Ghàidhlig
         mapping_link: tòiseachadh air an obair-mhapa
       legal_babble:

-        title_html: Còir-lethbhreac agus ceadachas

         credit_title_html: Mar a bheir thu urram dha OpenStreetMap
         credit_1_html: |-
           Tha e riatanach gun chleachd thu “© OpenStreetMap
         credit_title_html: Mar a bheir thu urram dha OpenStreetMap
         credit_1_html: |-
           Tha e riatanach gun chleachd thu “© OpenStreetMap

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index b8ac4f2cf5815cc31dae3583d0f2d9a6e72f7be3..1b460faaae5c37e92f8e5b981766b0b1e9977a41 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -2061,6 +2061,7 @@ gl:
       legal_2_2_registered_trademarks: marcas rexistradas da OSMF
       partners_title: Socios
     copyright:
       legal_2_2_registered_trademarks: marcas rexistradas da OSMF
       partners_title: Socios
     copyright:

+      title: Dereitos de autoría e licenza

       foreign:
         title: Acerca desta tradución
         html: En caso de conflito entre esta páxina traducida e %{english_original_link},
       foreign:
         title: Acerca desta tradución
         html: En caso de conflito entre esta páxina traducida e %{english_original_link},


@@ -2074,7 +2075,6 @@ gl:
         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:

-        title_html: Dereitos de autoría e licenza

         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} son %{open_data}, baixo a licenza
           %{odc_odbl_link} (ODbL) da %{osm_foundation_link} (OSMF).
         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} son %{open_data}, baixo a licenza
           %{odc_odbl_link} (ODbL) da %{osm_foundation_link} (OSMF).

diff --git a/config/locales/he.yml b/config/locales/he.yml
index b55b156204a1758878c3b9ee20215d04192312d3..8a8bf6b616a87e7e702d54f99db98bdfce799c65 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -2060,6 +2060,7 @@ he:
       legal_2_2_registered_trademarks: סימנים מסחריים של OSMF
       partners_title: שותפים
     copyright:
       legal_2_2_registered_trademarks: סימנים מסחריים של OSMF
       partners_title: שותפים
     copyright:

+      title: זכויות יוצרים ורישיון

       foreign:
         title: אודות התרגום הזה
         html: במקרה של חוסר תאימות בין הדף המתורגם הזה לבין %{english_original_link},
       foreign:
         title: אודות התרגום הזה
         html: במקרה של חוסר תאימות בין הדף המתורגם הזה לבין %{english_original_link},


@@ -2072,7 +2073,6 @@ he:
         native_link: גרסה העברית
         mapping_link: להתחיל למפות
       legal_babble:
         native_link: גרסה העברית
         mapping_link: להתחיל למפות
       legal_babble:

-        title_html: זכויות יוצרים ורישיון

         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} הוא מיזם %{open_data}, שמתפרסמים לפי תנאי
           %{odc_odbl_link} (ר״ת ODbL) על־ידי %{osm_foundation_link} (ר״ת OSMF).
         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} הוא מיזם %{open_data}, שמתפרסמים לפי תנאי
           %{odc_odbl_link} (ר״ת ODbL) על־ידי %{osm_foundation_link} (ר״ת OSMF).

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index cbc190f5394f972f9e5e5661c2f74a287e7fb078..a15504ccfd0c83a69d7858882e5522f1cca569fa 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1261,6 +1261,7 @@ hr:
       legal_title: Pravno
       partners_title: Partneri
     copyright:
       legal_title: Pravno
       partners_title: Partneri
     copyright:

+      title: Autorska prava i Dozvola

       foreign:
         title: O ovom prijevodu
         html: U slučaju konflikta između ove prevedene stranice i %{english_original_link},
       foreign:
         title: O ovom prijevodu
         html: U slučaju konflikta između ove prevedene stranice i %{english_original_link},


@@ -1274,7 +1275,6 @@ hr:
         native_link: hrvatsko izdanje
         mapping_link: počnite kartirati
       legal_babble:
         native_link: hrvatsko izdanje
         mapping_link: počnite kartirati
       legal_babble:

-        title_html: Autorska prava i Dozvola

         introduction_1_html: OpenStreetMap%{registered_trademark_link} su %{open_data},
           koje je licencirao %{osm_foundation_link} (OSMF) pod %{odc_odbl_link} (ODbL).
         introduction_2_html: Slobodni ste kopirati, distribuirati, prenositi i adaptirati
         introduction_1_html: OpenStreetMap%{registered_trademark_link} su %{open_data},
           koje je licencirao %{osm_foundation_link} (OSMF) pod %{odc_odbl_link} (ODbL).
         introduction_2_html: Slobodni ste kopirati, distribuirati, prenositi i adaptirati

diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index e845df375e0469573da4a1ff8617592c9c72da38..1ee2220c054c4b5398ea3cec07ba76d25b1d472e 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -1881,6 +1881,7 @@ hsb:
       legal_1_1_privacy_policy: Prawidła priwatnosće
       partners_title: Partnerojo
     copyright:
       legal_1_1_privacy_policy: Prawidła priwatnosće
       partners_title: Partnerojo
     copyright:

+      title: Awtorske prawo a licenca

       foreign:
         title: Wo tutym přełožku
         html: W padźe wotchilenja mjez přełoženej stronu a %{english_original_link}
       foreign:
         title: Wo tutym přełožku
         html: W padźe wotchilenja mjez přełoženej stronu a %{english_original_link}


@@ -1894,7 +1895,6 @@ hsb:
         native_link: hornjoserbskej wersiji
         mapping_link: z kartěrowanjom započeć
       legal_babble:
         native_link: hornjoserbskej wersiji
         mapping_link: z kartěrowanjom započeć
       legal_babble:

-        title_html: Awtorske prawo a licenca

         introduction_1_open_data: wotewrjene daty
         introduction_1_osm_foundation: Załožba OpenStreetMap
         credit_title_html: Kak ma so na awtorstwo OpenStreetMap pokazać
         introduction_1_open_data: wotewrjene daty
         introduction_1_osm_foundation: Załožba OpenStreetMap
         credit_title_html: Kak ma so na awtorstwo OpenStreetMap pokazać

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 3ed904d0c4ef9862c093d47108844c67cd1edf38..4c7c4677e1b453e85eca101e7ddf970444e73530 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -2037,6 +2037,7 @@ hu:
       legal_2_2_registered_trademarks: az OSMF bejegyzett védjegyei
       partners_title: Partnerek
     copyright:
       legal_2_2_registered_trademarks: az OSMF bejegyzett védjegyei
       partners_title: Partnerek
     copyright:

+      title: Szerzői jog és licenc

       foreign:
         title: Erről a fordításról
         html: Abban az esetben, ha ez a lefordított oldal és %{english_original_link}
       foreign:
         title: Erről a fordításról
         html: Abban az esetben, ha ez a lefordított oldal és %{english_original_link}


@@ -2049,7 +2050,6 @@ hu:
         native_link: magyar nyelvű változatára
         mapping_link: kezdheted a térképezést
       legal_babble:
         native_link: magyar nyelvű változatára
         mapping_link: kezdheted a térképezést
       legal_babble:

-        title_html: Szerzői jog és licenc

         introduction_1_html: Az OpenStreetMap%{registered_trademark_link} %{open_data},
           amely %{osm_foundation_link} (OSMF) %{odc_odbl_link} (ODbL) licencével rendelkezik.
         introduction_1_open_data: nyílt adat
         introduction_1_html: Az OpenStreetMap%{registered_trademark_link} %{open_data},
           amely %{osm_foundation_link} (OSMF) %{odc_odbl_link} (ODbL) licencével rendelkezik.
         introduction_1_open_data: nyílt adat

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 81b65fb3a6f2d42914fb330bd4e176b87206f5f6..8b0153a762748bf120ec9cb73db26be6f03b9794 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -2036,6 +2036,7 @@ ia:
       legal_2_2_registered_trademarks: marcas commercial registrate del OSMF
       partners_title: Partners
     copyright:
       legal_2_2_registered_trademarks: marcas commercial registrate del OSMF
       partners_title: Partners
     copyright:

+      title: Copyright e Licentia

       foreign:
         title: A proposito de iste traduction
         html: In caso de un conflicto inter iste pagina traducite e %{english_original_link},
       foreign:
         title: A proposito de iste traduction
         html: In caso de un conflicto inter iste pagina traducite e %{english_original_link},


@@ -2049,7 +2050,6 @@ ia:
         native_link: version in interlingua
         mapping_link: comenciar le cartographia
       legal_babble:
         native_link: version in interlingua
         mapping_link: comenciar le cartographia
       legal_babble:

-        title_html: Copyright e Licentia

         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} es %{open_data}, licentiate sub
           %{odc_odbl_link} (ODbL) per le %{osm_foundation_link} (OSMF).
         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} es %{open_data}, licentiate sub
           %{odc_odbl_link} (ODbL) per le %{osm_foundation_link} (OSMF).

diff --git a/config/locales/id.yml b/config/locales/id.yml
index 263f783604ab9584e0c2dc6e9bd294078b25aff6..f7f8f08374ee6a536b6605521447cfc8904c2e5e 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -2006,6 +2006,7 @@ id:
       legal_2_2_registered_trademarks: merek dagang terdaftar OSMF
       partners_title: Rekan
     copyright:
       legal_2_2_registered_trademarks: merek dagang terdaftar OSMF
       partners_title: Rekan
     copyright:

+      title: Hak Cipta & Lisensi

       foreign:
         title: Tentang terjemahan ini
         html: Saat terjadi konflik antara halaman terjemahan dan %{english_original_link},
       foreign:
         title: Tentang terjemahan ini
         html: Saat terjadi konflik antara halaman terjemahan dan %{english_original_link},


@@ -2019,7 +2020,6 @@ id:
         native_link: versi bahasa Indonesia
         mapping_link: memulai pemetaan
       legal_babble:
         native_link: versi bahasa Indonesia
         mapping_link: memulai pemetaan
       legal_babble:

-        title_html: Hak Cipta & Lisensi

         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} tergolong %{open_data}, berlisensi
           %{odc_odbl_link} (ODbL) yang diterbitkan oleh %{osm_foundation_link} (OSMF).
         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} tergolong %{open_data}, berlisensi
           %{odc_odbl_link} (ODbL) yang diterbitkan oleh %{osm_foundation_link} (OSMF).

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 7e6039c7351fea393b75d37001a8c99038d37705..967d57c4560a1603638f5840bc47d709a5730127 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1967,6 +1967,7 @@ is:
       legal_2_2_registered_trademarks: skráð vörumerki OSMF
       partners_title: Samstarfsaðilar
     copyright:
       legal_2_2_registered_trademarks: skráð vörumerki OSMF
       partners_title: Samstarfsaðilar
     copyright:

+      title: Höfundaréttur og notkunarleyfi

       foreign:
         title: Um þessa þýðingu
         html: Stangist þessi þýðing á við %{english_original_link}, gildir hin síðari
       foreign:
         title: Um þessa þýðingu
         html: Stangist þessi þýðing á við %{english_original_link}, gildir hin síðari


@@ -1981,7 +1982,6 @@ is:
         native_link: íslensku útgáfuna
         mapping_link: farið að kortleggja
       legal_babble:
         native_link: íslensku útgáfuna
         mapping_link: farið að kortleggja
       legal_babble:

-        title_html: Höfundaréttur og notkunarleyfi

         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} eru %{open_data}, gefin út með
           %{odc_odbl_link} (ODbL) af %{osm_foundation_link} (OSMF).
         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} eru %{open_data}, gefin út með
           %{odc_odbl_link} (ODbL) af %{osm_foundation_link} (OSMF).

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 25cb7fcbb722b5bab86db3070852255eb04b15c9..6ed8f6d242d75c2e657fdba31173c4c4ef3c0de5 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -2094,6 +2094,7 @@ it:
       legal_2_2_registered_trademarks: marchi registrati dell'OSMF
       partners_title: Partner
     copyright:
       legal_2_2_registered_trademarks: marchi registrati dell'OSMF
       partners_title: Partner
     copyright:

+      title: Copyright e licenza

       foreign:
         title: A proposito di questa traduzione
         html: In caso di incoerenza fra questa pagina di traduzione e %{english_original_link},
       foreign:
         title: A proposito di questa traduzione
         html: In caso di incoerenza fra questa pagina di traduzione e %{english_original_link},


@@ -2107,7 +2108,6 @@ it:
         native_link: versione in italiano
         mapping_link: inizia a mappare
       legal_babble:
         native_link: versione in italiano
         mapping_link: inizia a mappare
       legal_babble:

-        title_html: Copyright e licenza

         introduction_1_html: OpenStreetMap%{registered_trademark_link} è basato su
           %{open_data}, rilasciato con %{odc_odbl_link} (ODbL) dalla %{osm_foundation_link}
           (OSMF).
         introduction_1_html: OpenStreetMap%{registered_trademark_link} è basato su
           %{open_data}, rilasciato con %{odc_odbl_link} (ODbL) dalla %{osm_foundation_link}
           (OSMF).

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 4c05c4acedc31da789f0067c8d0e3f3c09fa1343..941761212e90b36b99689453c8816098a1c2acbf 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1843,6 +1843,7 @@ ja:
       legal_1_1_privacy_policy: プライバシー・ポリシー
       partners_title: パートナー
     copyright:
       legal_1_1_privacy_policy: プライバシー・ポリシー
       partners_title: パートナー
     copyright:

+      title: 著作権とライセンス

       foreign:
         title: この翻訳について
         html: この翻訳版のページと%{english_original_link}の間で競合が発生した場合は、英語版の内容が優先されます
       foreign:
         title: この翻訳について
         html: この翻訳版のページと%{english_original_link}の間で競合が発生した場合は、英語版の内容が優先されます


@@ -1853,7 +1854,6 @@ ja:
         native_link: 日本語版
         mapping_link: マッピングを開始
       legal_babble:
         native_link: 日本語版
         mapping_link: マッピングを開始
       legal_babble:

-        title_html: 著作権とライセンス

         credit_title_html: OpenStreetMap のクレジット表記の仕方
         credit_1_html: OpenStreetMap を使う場所では、以下の2つの条件を必ず守ってください。
         attribution_example:
         credit_title_html: OpenStreetMap のクレジット表記の仕方
         credit_1_html: OpenStreetMap を使う場所では、以下の2つの条件を必ず守ってください。
         attribution_example:

diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index c2d262a3eb1474134841a8193ae260d3e893a888..d9abfa136c7ed1a508814b98fa7a2ad049bba135 100644 (file)
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -884,14 +884,13 @@ ka:
       logout_button: გასვლა
   site:
     copyright:
       logout_button: გასვლა
   site:
     copyright:

+      title: საავტორო უფლებები და ლიცენზია

       foreign:
         english_link: ინგლისური ორიგინალი
       native:
         title: ამ გვერდის შესახებ
         native_link: ქართული ვერსია
         mapping_link: კარტოგრაფირების დაწყება
       foreign:
         english_link: ინგლისური ორიგინალი
       native:
         title: ამ გვერდის შესახებ
         native_link: ქართული ვერსია
         mapping_link: კარტოგრაფირების დაწყება

-      legal_babble:
-        title_html: საავტორო უფლებები და ლიცენზია

     edit:
       user_page_link: მომხმარებლის გვერდი
     export:
     edit:
       user_page_link: მომხმარებლის გვერდი
     export:

diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index b27abff771a9c051876b811a83beb8ef2c74b4f2..1dc2d535f9fd87c72d591d9eb92ace64108a81a1 100644 (file)
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -987,6 +987,7 @@ kab:
       legal_title: Asaḍuf
       partners_title: Imendiden
     copyright:
       legal_title: Asaḍuf
       partners_title: Imendiden
     copyright:

+      title: Izerfan n umeskar d turagt

       foreign:
         title: Ɣef tsuqilt-agi
         html: Ma llant tilla gar usebter-agi yettwasiqlen d %{english_original_link},Lqem
       foreign:
         title: Ɣef tsuqilt-agi
         html: Ma llant tilla gar usebter-agi yettwasiqlen d %{english_original_link},Lqem


@@ -997,7 +998,6 @@ kab:
         native_link: Tasuqilt s teqbaylit
         mapping_link: Bdu attekki
       legal_babble:
         native_link: Tasuqilt s teqbaylit
         mapping_link: Bdu attekki
       legal_babble:

-        title_html: Izerfan n umeskar d turagt

         credit_title_html: Amek ara ternuḍ asmad i OpenStreetMap
         attribution_example:
           alt: Amedɣa ɣef wamek ara tettekkiḍ di OpenStreetMap s usebter web
         credit_title_html: Amek ara ternuḍ asmad i OpenStreetMap
         attribution_example:
           alt: Amedɣa ɣef wamek ara tettekkiḍ di OpenStreetMap s usebter web

diff --git a/config/locales/kn.yml b/config/locales/kn.yml
index a41272f9c3ad49854062e9db540207cdbe173173..42676b0f1a032613de9373a0caffd0753bf5ca7f 100644 (file)
--- a/config/locales/kn.yml
+++ b/config/locales/kn.yml
@@ -788,6 +788,7 @@ kn:
       local_knowledge_title: ಸ್ಥಳೀಯ ಜ್ಞಾನ
       open_data_title: ಮುಕ್ತ ದತ್ತಾಂಶ
     copyright:
       local_knowledge_title: ಸ್ಥಳೀಯ ಜ್ಞಾನ
       open_data_title: ಮುಕ್ತ ದತ್ತಾಂಶ
     copyright:

+      title: ಕೃತಿಸ್ವಾಮ್ಯ ಮತ್ತು ಪರವಾನಗಿ

       foreign:
         title: ಈ ಅನುವಾದದ ಬಗ್ಗೆ
         english_link: ಆಂಗ್ಲದ ಮೂಲ
       foreign:
         title: ಈ ಅನುವಾದದ ಬಗ್ಗೆ
         english_link: ಆಂಗ್ಲದ ಮೂಲ


@@ -795,7 +796,6 @@ kn:
         title: ಈ ಪುಟದ ಬಗ್ಗೆ
         mapping_link: ನಕ್ಷೆಯನ್ನು ಸಂಪಾದಿಸಿಲು ಪ್ರಾರಂಭಿಸಿ
       legal_babble:
         title: ಈ ಪುಟದ ಬಗ್ಗೆ
         mapping_link: ನಕ್ಷೆಯನ್ನು ಸಂಪಾದಿಸಿಲು ಪ್ರಾರಂಭಿಸಿ
       legal_babble:

-        title_html: ಕೃತಿಸ್ವಾಮ್ಯ ಮತ್ತು ಪರವಾನಗಿ

         contributors_at_austria: ಆಸ್ಟ್ರಿಯಾ
         contributors_au_australia: ಆಸ್ಟ್ರೇಲಿಯಾ
         contributors_ca_canada: ಕೆನಡಾ
         contributors_at_austria: ಆಸ್ಟ್ರಿಯಾ
         contributors_au_australia: ಆಸ್ಟ್ರೇಲಿಯಾ
         contributors_ca_canada: ಕೆನಡಾ

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index de1c6a90f29a0e087bea92a7cf830715ecd7eb0e..887a934ea0a34a8f0560d5f6d927bb203352a254 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1885,6 +1885,7 @@ ko:
       legal_2_2_registered_trademarks: OSMF의 등록 상표
       partners_title: 파트너
     copyright:
       legal_2_2_registered_trademarks: OSMF의 등록 상표
       partners_title: 파트너
     copyright:

+      title: 저작권 및 라이선스

       foreign:
         title: 이 번역에 대한 정보
         html: 이 번역한 문서와 %{english_original_link} 사이에 상충하는 경우 영어 문서가 우선합니다
       foreign:
         title: 이 번역에 대한 정보
         html: 이 번역한 문서와 %{english_original_link} 사이에 상충하는 경우 영어 문서가 우선합니다


@@ -1896,7 +1897,6 @@ ko:
         native_link: 한국어 버전
         mapping_link: 매핑을 시작
       legal_babble:
         native_link: 한국어 버전
         mapping_link: 매핑을 시작
       legal_babble:

-        title_html: 저작권 및 라이선스

         introduction_1_html: 오픈스트리트맵%{registered_trademark_link}은 %{open_data}이며,
           %{osm_foundation_link} (OSMF)에 의해 %{odc_odbl_link} (ODbL) 라이선스가 부여되어 있습니다.
         introduction_1_open_data: 개방형 데이터
         introduction_1_html: 오픈스트리트맵%{registered_trademark_link}은 %{open_data}이며,
           %{osm_foundation_link} (OSMF)에 의해 %{odc_odbl_link} (ODbL) 라이선스가 부여되어 있습니다.
         introduction_1_open_data: 개방형 데이터

diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 9b69c798e471818e740d90910b289b0d9b1dcb52..52f3bf72b3bd6bca19357b1e946e0698c12b7204 100644 (file)
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -1899,6 +1899,7 @@ ku-Latn:
       legal_title: Zagonî
       partners_title: Şirîkên me
     copyright:
       legal_title: Zagonî
       partners_title: Şirîkên me
     copyright:

+      title: Mafê daneriyê û lîsans

       foreign:
         title: Derbarê vê wergerê de
         html: Eger di navbera vê rûpela tercumekirî û %{english_original_link} de
       foreign:
         title: Derbarê vê wergerê de
         html: Eger di navbera vê rûpela tercumekirî û %{english_original_link} de


@@ -1913,7 +1914,6 @@ ku-Latn:
         native_link: versiyona bi kurdî
         mapping_link: dest bi çêkirina nexşeyan bike
       legal_babble:
         native_link: versiyona bi kurdî
         mapping_link: dest bi çêkirina nexşeyan bike
       legal_babble:

-        title_html: Mafê daneriyê û lîsans

         credit_title_html: Em çawan wekî çavkaniyekê behsa OpenStreetMapê bikin
         credit_1_html: 'Li cihê ku daneya OpenStreetMapê bi kar bînî, divê van du
           tiştan bikî:'
         credit_title_html: Em çawan wekî çavkaniyekê behsa OpenStreetMapê bikin
         credit_1_html: 'Li cihê ku daneya OpenStreetMapê bi kar bînî, divê van du
           tiştan bikî:'

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 22eea7485f83271a9e777b29e757ea31056897ee..9f5a904a9c7dc32b3247b1844bbae7ab57181138 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -1873,6 +1873,7 @@ lb:
       legal_1_1_privacy_policy: Dateschutzrichtlinnen
       partners_title: Partneren
     copyright:
       legal_1_1_privacy_policy: Dateschutzrichtlinnen
       partners_title: Partneren
     copyright:

+      title: Copyright a Lizenz

       foreign:
         title: Iwwer dës Iwwersetzung
         html: Fir de Fall vun enger Ofwäichung tëscht der virleiender Iwwersetzung
       foreign:
         title: Iwwer dës Iwwersetzung
         html: Fir de Fall vun enger Ofwäichung tëscht der virleiender Iwwersetzung


@@ -1883,7 +1884,6 @@ lb:
         native_link: lëtzebuergesch Versioun
         mapping_link: mat dem Kaartéieren ufänken
       legal_babble:
         native_link: lëtzebuergesch Versioun
         mapping_link: mat dem Kaartéieren ufänken
       legal_babble:

-        title_html: Copyright a Lizenz

         credit_title_html: Wéi et op d'Urhiewerschaft vun OpenStreetMap hinzeweise
           gëllt
         credit_1_html: 'Wann Dir Donnéeë vun OpenStreetMap benotz muss Dir dës zwou
         credit_title_html: Wéi et op d'Urhiewerschaft vun OpenStreetMap hinzeweise
           gëllt
         credit_1_html: 'Wann Dir Donnéeë vun OpenStreetMap benotz muss Dir dës zwou

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 301b4596113f32be2729258ff9e20137ac4f63bb..55e4ff98469a3623c01b3bfa2d8d3958ee3f9513 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1962,6 +1962,7 @@ lt:
       legal_2_2_registered_trademarks: OSMF registruotie prekių ženklai
       partners_title: Partneriai
     copyright:
       legal_2_2_registered_trademarks: OSMF registruotie prekių ženklai
       partners_title: Partneriai
     copyright:

+      title: Autorinės teisės ir licencija

       foreign:
         title: Apie šį vertimą
         html: Esant konfliktui tarp šio išversto puslapio ir  %{english_original_link},
       foreign:
         title: Apie šį vertimą
         html: Esant konfliktui tarp šio išversto puslapio ir  %{english_original_link},


@@ -1975,7 +1976,6 @@ lt:
         native_link: Lietuviška versija
         mapping_link: pradėti žymėjimą
       legal_babble:
         native_link: Lietuviška versija
         mapping_link: pradėti žymėjimą
       legal_babble:

-        title_html: Autorinės teisės ir licencija

         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} yra %{open_data}, licencijuota pagal
           %{odc_odbl_link} (ODbL) pagal %{osm_foundation_link} (OSMF).
         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} yra %{open_data}, licencijuota pagal
           %{odc_odbl_link} (ODbL) pagal %{osm_foundation_link} (OSMF).

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 66e48d179acd441947181867dcbebf972ad55653..e5c48e40e458022c6f92ffe8d1a96f71cbf0af56 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1497,6 +1497,7 @@ lv:
       legal_title: Juridiskie jautājumi
       partners_title: Partneri
     copyright:
       legal_title: Juridiskie jautājumi
       partners_title: Partneri
     copyright:

+      title: Autortiesības un Licence

       foreign:
         title: Par šo tulkojumu
         html: Gadījumā, ja šī tulkotā lapa ir nesaskaņā ar %{english_original_link},
       foreign:
         title: Par šo tulkojumu
         html: Gadījumā, ja šī tulkotā lapa ir nesaskaņā ar %{english_original_link},


@@ -1509,7 +1510,6 @@ lv:
         native_link: latviskā versija
         mapping_link: sākt kartēt
       legal_babble:
         native_link: latviskā versija
         mapping_link: sākt kartēt
       legal_babble:

-        title_html: Autortiesības un Licence

         credit_title_html: Kā atsaukties uz OpenStreetMap
         credit_1_html: |-
           Mēs pieprasām, ka tu izmanto atsauci “© OpenStreetMap
         credit_title_html: Kā atsaukties uz OpenStreetMap
         credit_1_html: |-
           Mēs pieprasām, ka tu izmanto atsauci “© OpenStreetMap

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 03f1a137de8d99c2492522aa76ab5f9638371fe6..50d7b9d11ebe4818e6f909f2fcb8bf3b941ab248 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -2023,6 +2023,7 @@ mk:
       legal_2_2_registered_trademarks: заштитни знаци на OSMF
       partners_title: Партнери
     copyright:
       legal_2_2_registered_trademarks: заштитни знаци на OSMF
       partners_title: Партнери
     copyright:

+      title: Авторски права и лиценца

       foreign:
         title: За овој превод
         html: Во случај на спротивставеност помеѓу оваа преведена страница и %{english_original_link},
       foreign:
         title: За овој превод
         html: Во случај на спротивставеност помеѓу оваа преведена страница и %{english_original_link},


@@ -2036,7 +2037,6 @@ mk:
         native_link: македонската верзија
         mapping_link: почнете да ги работите картите
       legal_babble:
         native_link: македонската верзија
         mapping_link: почнете да ги работите картите
       legal_babble:

-        title_html: Авторски права и лиценца

         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} работи на %{open_data}, заштитен со лиценцата
           %{odc_odbl_link} (ODbL) од %{osm_foundation_link} (OSMF).
         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} работи на %{open_data}, заштитен со лиценцата
           %{odc_odbl_link} (ODbL) од %{osm_foundation_link} (OSMF).

diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index 6047d55a6367c2e1666dcabc9a8746965e199313..314507fd4b8ce8e54057afdb78b9868f1eb6dd69 100644 (file)
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -1043,6 +1043,7 @@ mr:
       open_data_title: मुक्त माहिती
       partners_title: भागीदार
     copyright:
       open_data_title: मुक्त माहिती
       partners_title: भागीदार
     copyright:

+      title: प्रताधिकार व परवाना

       foreign:
         title: या भाषांतराबद्दल
         html: या भाषांतरीत पानाच्या व %{english_original_link} यादरम्यान काही वादाचा
       foreign:
         title: या भाषांतराबद्दल
         html: या भाषांतरीत पानाच्या व %{english_original_link} यादरम्यान काही वादाचा


@@ -1056,7 +1057,6 @@ mr:
         native_link: मराठी आवृत्ती
         mapping_link: नकाशा आरेखन
       legal_babble:
         native_link: मराठी आवृत्ती
         mapping_link: नकाशा आरेखन
       legal_babble:

-        title_html: प्रताधिकार व परवाना

         credit_title_html: ओपनस्ट्रीटमॅपला श्रेय कसे द्यावे
         credit_1_html: |-
           “© OpenStreetMap
         credit_title_html: ओपनस्ट्रीटमॅपला श्रेय कसे द्यावे
         credit_1_html: |-
           “© OpenStreetMap

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 4c98423b38d2cc69b0b86e8bcf981411bf0e1194..36fd91e657baaf87c9fe19a2d8445a9074b0d634 100644 (file)
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1495,6 +1495,7 @@ ms:
       open_data_copyright_license: Laman Hak Cipta dan Lesen
       partners_title: Rakan Kongsi
     copyright:
       open_data_copyright_license: Laman Hak Cipta dan Lesen
       partners_title: Rakan Kongsi
     copyright:

+      title: Hak Cipta dan Lesen

       foreign:
         title: Perihal terjemahan ini
         html: Sekiranya terdapat percanggahan antara halaman yang diterjemah ini dengan
       foreign:
         title: Perihal terjemahan ini
         html: Sekiranya terdapat percanggahan antara halaman yang diterjemah ini dengan


@@ -1508,7 +1509,6 @@ ms:
         native_link: versi Bahasa Melayu
         mapping_link: mula membuat peta
       legal_babble:
         native_link: versi Bahasa Melayu
         mapping_link: mula membuat peta
       legal_babble:

-        title_html: Hak Cipta dan Lesen

         introduction_1_open_data: data terbuka
         credit_title_html: Cara memberikan penghargaan kepada OpenStreetMap
         credit_1_html: Kami memerlukan anda menggunakan dikenali sebagai “©
         introduction_1_open_data: data terbuka
         credit_title_html: Cara memberikan penghargaan kepada OpenStreetMap
         credit_1_html: Kami memerlukan anda menggunakan dikenali sebagai “©

diff --git a/config/locales/my.yml b/config/locales/my.yml
index 5ecbe410f848e1261bacb242a3c5c1fa146a520b..d289ddda45eecd6fa9dffcf9d433316200b6c34b 100644 (file)
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -629,13 +629,13 @@ my:
       legal_title: တရားဝင်
       partners_title: လုပ်ဖော်ကိုင်ဖက်များ
     copyright:
       legal_title: တရားဝင်
       partners_title: လုပ်ဖော်ကိုင်ဖက်များ
     copyright:

+      title: မူပိုင်ခွင့်နှင့် လိုင်စင်

       foreign:
         title: ဤဘာသာပြန်အကြောင်း
       native:
         title: ဤစာမျက်နှာအကြောင်း
         mapping_link: မြေပုံ စတင်ရေးဆွဲရန်
       legal_babble:
       foreign:
         title: ဤဘာသာပြန်အကြောင်း
       native:
         title: ဤစာမျက်နှာအကြောင်း
         mapping_link: မြေပုံ စတင်ရေးဆွဲရန်
       legal_babble:

-        title_html: မူပိုင်ခွင့်နှင့် လိုင်စင်

         contributors_title_html: မိမိတို့၏ ပံ့ပို့ပေးသူများ
     edit:
       user_page_link: အသုံးပြုသူ စာမျက်နှာ
         contributors_title_html: မိမိတို့၏ ပံ့ပို့ပေးသူများ
     edit:
       user_page_link: အသုံးပြုသူ စာမျက်နှာ

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index fefdc51be70ef1e672d5bdb8f68b99ee8723e0f2..503881c555f4c9f5ad4b89cc595e2f444bf33a83 100644 (file)
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -1693,6 +1693,7 @@ nb:
       legal_title: Juridisk
       partners_title: Partnere
     copyright:
       legal_title: Juridisk
       partners_title: Partnere
     copyright:

+      title: Opphavsrett og lisenser

       foreign:
         title: Om denne oversettelsen
         html: I tilfelle konflikt mellom denne oversatte siden og %{english_original_link}
       foreign:
         title: Om denne oversettelsen
         html: I tilfelle konflikt mellom denne oversatte siden og %{english_original_link}


@@ -1706,7 +1707,6 @@ nb:
         native_link: Norsk versjon
         mapping_link: start kartlegging
       legal_babble:
         native_link: Norsk versjon
         mapping_link: start kartlegging
       legal_babble:

-        title_html: Opphavsrett og lisenser

         credit_title_html: Hvordan kreditere OpenStreetMap
         credit_1_html: Vi krever at du bruker godskrivinga «© OpenStreetMap-bidragsyterene».
         attribution_example:
         credit_title_html: Hvordan kreditere OpenStreetMap
         credit_1_html: Vi krever at du bruker godskrivinga «© OpenStreetMap-bidragsyterene».
         attribution_example:

diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 9752989d2bf3f6ccb8cb798cd8147e20760d35ed..84d03ebbe87542e2452bf841819fa639cc229fa9 100644 (file)
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -300,6 +300,7 @@ ne:
       entry_html: सम्बन्ध %{relation_name}
       entry_role_html: सम्बन्ध %{relation_name} (as %{relation_role})
     not_found:
       entry_html: सम्बन्ध %{relation_name}
       entry_role_html: सम्बन्ध %{relation_name} (as %{relation_role})
     not_found:

+      title: फेला परेन

       sorry: 'माफ गर्नुहोला, %{type} #%{id} फेला पार्न सकिएन ।'
       type:
         node: नोड
       sorry: 'माफ गर्नुहोला, %{type} #%{id} फेला पार्न सकिएन ।'
       type:
         node: नोड


@@ -308,6 +309,7 @@ ne:
         changeset: परिवर्तनसेट
         note: टिपोट
     timeout:
         changeset: परिवर्तनसेट
         note: टिपोट
     timeout:

+      title: समयसमाप्ति त्रुटि

       sorry: माफ गर्नुहोला, %{id} अाइडि भएको %{type}को लागि तथ्याङ्क प्राप्त गर्न
         निक्कै समय लाग्यो ।
       type:
       sorry: माफ गर्नुहोला, %{id} अाइडि भएको %{type}को लागि तथ्याङ्क प्राप्त गर्न
         निक्कै समय लाग्यो ।
       type:


@@ -338,6 +340,7 @@ ne:
       wikidata_link: '%{page} वस्तु विकिडेटा मा'
       wikipedia_link: '%{page}को बारेमा विकिपीडियामा भएको लेख'
       telephone_link: '%{phone_number} मा फोन गर्नुहोस्'
       wikidata_link: '%{page} वस्तु विकिडेटा मा'
       wikipedia_link: '%{page}को बारेमा विकिपीडियामा भएको लेख'
       telephone_link: '%{phone_number} मा फोन गर्नुहोस्'

+      colour_preview: रङ %{colour_value} पूर्वावलोकन

     query:
       title: क्वेरी गुणहरू
       introduction: नजिकैका फिचरहरू भेटाउन नक्सामा क्लिक गर्नुहोस्
     query:
       title: क्वेरी गुणहरू
       introduction: नजिकैका फिचरहरू भेटाउन नक्सामा क्लिक गर्नुहोस्


@@ -455,25 +458,28 @@ ne:
     no_such_entry:
       title: त्यस्तो कुनै दैनिकी भेटिएन
       heading: '%{id} आइडी भएको कुनै अभिलेख भेटिएन'
     no_such_entry:
       title: त्यस्तो कुनै दैनिकी भेटिएन
       heading: '%{id} आइडी भएको कुनै अभिलेख भेटिएन'

-      body: माफ गर्नुहोला, %{id} आइडी भएको कुनै डायरी छैन । कृपया हिज्जे जाँच गर्नुहोस्,
-        वा गलत लिङ्क क्लिक गर्नुभयो कि हेर्नुहोस् ।
+      body: माफ गर्नुहोला, %{id} आइडी भएको कुनै डायरी छैन। कृपया हिज्जे जाँच गर्नुहोस्,
+        वा गलत लिङ्क क्लिक गर्नुभयो कि हेर्नुहोस्।

     diary_entry:
       posted_by_html: '%{link_user}द्वारा %{created}मा %{language_link}भाषामा पोस्ट
         गरिएको'
       comment_link: यस प्रविष्टीमा टिप्पणी गर्ने
       reply_link: लेखकलाई सन्देश पठाउनुहोस्
       comment_count:
     diary_entry:
       posted_by_html: '%{link_user}द्वारा %{created}मा %{language_link}भाषामा पोस्ट
         गरिएको'
       comment_link: यस प्रविष्टीमा टिप्पणी गर्ने
       reply_link: लेखकलाई सन्देश पठाउनुहोस्
       comment_count:

-        zero: कुनै टिप्पणीहरू छैनन्

         one: '%{count} टिप्पणी'
         other: '%{count} टिप्पणीहरू'
         one: '%{count} टिप्पणी'
         other: '%{count} टिप्पणीहरू'

+      no_comments: कुनै पनि टिप्पणीहरू छैनन्

       edit_link: यो प्रविष्टी सम्पादन गर्ने
       hide_link: यो प्रविष्टी लुकाउने
       edit_link: यो प्रविष्टी सम्पादन गर्ने
       hide_link: यो प्रविष्टी लुकाउने

+      unhide_link: यो प्रविष्टी देखाउने

       confirm: निश्चित गर्नुहोस्
       report: यो प्रविष्टीको उजुरी गर्नुहोस्
     diary_comment:
       comment_from_html: '%{link_user}द्वारा %{comment_created_at}मा गरिएको टिप्पणी'
       hide_link: यो टिप्पणी लुकाउनुहोस्
       confirm: निश्चित गर्नुहोस्
       report: यो प्रविष्टीको उजुरी गर्नुहोस्
     diary_comment:
       comment_from_html: '%{link_user}द्वारा %{comment_created_at}मा गरिएको टिप्पणी'
       hide_link: यो टिप्पणी लुकाउनुहोस्

+      unhide_link: यो टिप्पणी देखाउने

       confirm: निश्चित गर्नुहोस्
       confirm: निश्चित गर्नुहोस्

+      report: यस टिप्पणी माथि उजुरी गर्ने

     location:
       location: 'स्थान:'
       view: अवलोकन गर्नुहोस्
     location:
       location: 'स्थान:'
       view: अवलोकन गर्नुहोस्


@@ -490,6 +496,10 @@ ne:
       all:
         title: OpenStreetMap डायरी प्रविष्टीहरू
         description: OpenStreetMap प्रयोगकर्ताहरूका हालैका डायरी प्रविष्टीहरू
       all:
         title: OpenStreetMap डायरी प्रविष्टीहरू
         description: OpenStreetMap प्रयोगकर्ताहरूका हालैका डायरी प्रविष्टीहरू

+    subscribe:
+      button: छलफलको लागि सदस्यता लिनुहोस्
+    unsubscribe:
+      button: छलफलबाट सदस्यता रद्द गर्नुहोस्

   diary_comments:
     index:
       post: पोष्ट
   diary_comments:
     index:
       post: पोष्ट


@@ -498,6 +508,8 @@ ne:
       newer_comments: नयाँ टिप्पणीहरू
       older_comments: पूरानो टिप्पणीहरू
   errors:
       newer_comments: नयाँ टिप्पणीहरू
       older_comments: पूरानो टिप्पणीहरू
   errors:

+    contact:
+      contact: सम्पर्क

     forbidden:
       title: निषेध गरिएको
     internal_server_error:
     forbidden:
       title: निषेध गरिएको
     internal_server_error:


@@ -532,7 +544,7 @@ ne:
         aeroway:
           aerodrome: हवाईड्रोम
           airstrip: हवाई यात्रा
         aeroway:
           aerodrome: हवाईड्रोम
           airstrip: हवाई यात्रा

-          apron: तà¤\9fबनà¥\8dद
+          apron: à¤\8fयरपà¥\8bरà¥\8dà¤\9f à¤\8fपà¥\8dरà¥\8bन

           gate: विमानस्थलको गेट
           hangar: ह्याङ्गर
           helipad: हेलिकप्टर बस्ने ठाउँ
           gate: विमानस्थलको गेट
           hangar: ह्याङ्गर
           helipad: हेलिकप्टर बस्ने ठाउँ


@@ -649,14 +661,38 @@ ne:
         building:
           garages: ग्यारेजहरू
           hangar: ह्याङ्गर
         building:
           garages: ग्यारेजहरू
           hangar: ह्याङ्गर

+          hotel: होटल भवन

           house: घर
           house: घर

+          hut: झुप्रो
+          industrial: औद्योगिक भवन
+          manufacture: निर्माण भवन
+          office: कार्यालय भवन

           public: सार्वजनिक भवन
           public: सार्वजनिक भवन

+          residential: आवासीय भवन
+          retail: खुद्रा भवन
+          roof: छत
+          ruins: भत्किएको भवन
+          school: विद्यालय भवन
+          semidetached_house: अर्ध-विभाजित घर
+          service: सेवा भवन
+          stable: स्थिर
+          temple: मन्दिर भवन
+          university: विश्वविद्यालय भवन
+          warehouse: गोदाम

           "yes": भवन
           "yes": भवन

+        club:
+          scout: स्काउट समूह आधार
+          sport: खेलकुद क्लब
+          "yes": क्लब

         craft:
         craft:

+          beekeeper: मौरीपालक

           brewery: ब्रुएरी
           carpenter: सिकर्मी
           electrician: विद्युतकर्मी
           brewery: ब्रुएरी
           carpenter: सिकर्मी
           electrician: विद्युतकर्मी

+          electronics_repair: इलेक्ट्रोनिक्स मर्मत

           gardener: माली
           gardener: माली

+          handicraft: हस्तकला
+          metal_construction: धातु निर्माता

           painter: पेन्टर
           photographer: फोटोग्रा
           plumber: प्लमर
           painter: पेन्टर
           photographer: फोटोग्रा
           plumber: प्लमर


@@ -664,17 +700,23 @@ ne:
           tailor: सुचीकार
           "yes": कला पसल
         emergency:
           tailor: सुचीकार
           "yes": कला पसल
         emergency:

+          access_point: पहुँच बिन्दु

           ambulance_station: एम्बुलेन्स पार्क
           defibrillator: डिफिब्रिलेटर
           ambulance_station: एम्बुलेन्स पार्क
           defibrillator: डिफिब्रिलेटर

+          fire_extinguisher: अग्निरोधक

           landing_site: आकस्मिक अवतरण क्षेत्र
           phone: आकस्मिक फोन
           landing_site: आकस्मिक अवतरण क्षेत्र
           phone: आकस्मिक फोन

+          siren: आपतकालीन साइरन
+          water_tank: आपतकालीन पानी ट्याङ्की

         highway:
           abandoned: छोडिएको राजमार्ग
           bus_stop: बस बिसौनी
           construction: निर्माणाधिन राजमार्ग
         highway:
           abandoned: छोडिएको राजमार्ग
           bus_stop: बस बिसौनी
           construction: निर्माणाधिन राजमार्ग

+          corridor: कोरिडोर

           cycleway: साइकल मार्ग
           elevator: भर्‍याङ
           footway: पदमार्ग
           cycleway: साइकल मार्ग
           elevator: भर्‍याङ
           footway: पदमार्ग

+          ford: फोर्ड

           living_street: आवासिय गल्ली
           milestone: कोसेढुङ्गा
           motorway: मोटरमार्ग
           living_street: आवासिय गल्ली
           milestone: कोसेढुङ्गा
           motorway: मोटरमार्ग


@@ -698,16 +740,24 @@ ne:
           stop: रोक्ने चिह्न
           street_lamp: सडक बत्ती
           track: ट्रयाक
           stop: रोक्ने चिह्न
           street_lamp: सडक बत्ती
           track: ट्रयाक

+          traffic_mirror: ट्राफिक ऐना

           traffic_signals: ट्राफिक चिह्नहरू
           traffic_signals: ट्राफिक चिह्नहरू

+          unclassified: अवर्गीकृत सडक

           "yes": सडक
         historic:
           "yes": सडक
         historic:

+          aircraft: ऐतिहासिक विमान
+          archaeological_site: पुरातात्विक स्थल
+          battlefield: रणभूमि
+          building: ऐतिहासिक भवन

           bunker: बङ्कर
           bunker: बङ्कर

+          cannon: ऐतिहासिक तोप

           castle: गढी
           church: गिर्जाघर
           city_gate: सहर प्रवेशद्वार
           citywalls: सहरी पर्खाल
           fort: किल्ला
           heritage: सम्पादा क्षेत्र
           castle: गढी
           church: गिर्जाघर
           city_gate: सहर प्रवेशद्वार
           citywalls: सहरी पर्खाल
           fort: किल्ला
           heritage: सम्पादा क्षेत्र

+          hollow_way: खाली बाटो

           house: घर
           memorial: स्मारक
           mine: खानी
           house: घर
           memorial: स्मारक
           mine: खानी


@@ -716,13 +766,14 @@ ne:
           stone: पत्थर
           tomb: चिहान
           tower: टावर
           stone: पत्थर
           tomb: चिहान
           tower: टावर

+          wreck: भग्नावशेष

           "yes": ऐतिहासिक स्थल
         landuse:
           basin: बेसिन
           cemetery: अन्त्यष्टी स्थल
           commercial: व्यवसायिक क्षेत्र
           "yes": ऐतिहासिक स्थल
         landuse:
           basin: बेसिन
           cemetery: अन्त्यष्टी स्थल
           commercial: व्यवसायिक क्षेत्र

-          conservation: संरक्षण
-          construction: निर्माण
+          conservation: संरक्षण क्षेत्र
+          construction: निर्माण क्षेत्र

           farmland: खेतीयोग्य जमिन
           farmyard: खेत
           forest: वन
           farmland: खेतीयोग्य जमिन
           farmyard: खेत
           forest: वन


@@ -734,40 +785,78 @@ ne:
           military: सैनिक इलाका
           mine: खानी
           railway: रेलमार्ग
           military: सैनिक इलाका
           mine: खानी
           railway: रेलमार्ग

+          religious: धार्मिक स्थल

           reservoir: जलाशय
           residential: आवासीय क्षेत्र
           reservoir: जलाशय
           residential: आवासीय क्षेत्र

-          retail: खुद्रा
+          retail: खुद्रा व्यापार क्षेत्र

           vineyard: अङ्गुर-बगैँचा
           "yes": भू-उपयोग
         leisure:
           vineyard: अङ्गुर-बगैँचा
           "yes": भू-उपयोग
         leisure:

+          adult_gaming_centre: वयस्क खेल केन्द्र
+          beach_resort: समुद्र तट रिसोर्ट
+          common: साझा भूमि
+          dance: नृत्य हल
+          dog_park: कुकुर पार्क
+          fishing: मत्स्य क्षेत्र
+          fitness_centre: फिटनेस सेन्टर
+          fitness_station: फिटनेस स्टेशन

           garden: बगैँचा
           garden: बगैँचा

+          golf_course: गल्फ खेलक्षेत्र
+          horse_riding: घोडसवार केन्द्र
+          nature_reserve: प्रकृति आरक्ष
+          outdoor_seating: बाहिरी बैठक

           park: उद्यान
           park: उद्यान

+          picnic_table: पिकनिक टेबल
+          pitch: खेलकुद पिच

           playground: खेलमैदान
           playground: खेलमैदान

+          recreation_ground: मनोरञ्जन स्थल

           resort: रिसोर्ट
           sauna: सौना
           resort: रिसोर्ट
           sauna: सौना

+          sports_centre: खेलकुद केन्द्र

           stadium: रङ्गाशाला
           swimming_pool: पौली पोखरी
           stadium: रङ्गाशाला
           swimming_pool: पौली पोखरी

+          track: दौडिने बाटो
+          water_park: पानी पार्क

           "yes": फुर्सद
         man_made:
           "yes": फुर्सद
         man_made:

+          advertising: विज्ञापन
+          antenna: एन्टेना
+          avalanche_protection: हिमस्खलन संरक्षण
+          beehive: मौरीको घार

           bridge: पुल
           bunker_silo: बङ्कर
           chimney: चिम्नी
           bridge: पुल
           bunker_silo: बङ्कर
           chimney: चिम्नी

+          communications_tower: सञ्चार टावर

           crane: क्रेन
           embankment: तटबन्ध
           lighthouse: प्रकाश घर
           mine: खानी
           pipeline: पाइपरेखा
           crane: क्रेन
           embankment: तटबन्ध
           lighthouse: प्रकाश घर
           mine: खानी
           pipeline: पाइपरेखा

+          reservoir_covered: ढाकिएको जलाशय
+          snow_cannon: हिउँ तोप
+          storage_tank: भण्डारण ट्याङ्की
+          surveillance: निगरानी
+          telescope: टेलिस्कोप

           tower: टावर
           tower: टावर

+          utility_pole: उपयोगिता पोल
+          water_tap: पानीको धारा
+          water_tower: पानीको टावर

           works: कारखाना
           works: कारखाना

+          "yes": मानव निर्मित

         military:
           barracks: सैनिक घर
           bunker: बङ्कर
         military:
           barracks: सैनिक घर
           bunker: बङ्कर

+          checkpoint: जाँच बिन्दु

           "yes": सेना
         mountain_pass:
           "yes": पर्वतीय भञ्ज्याङ
         natural:
           "yes": सेना
         mountain_pass:
           "yes": पर्वतीय भञ्ज्याङ
         natural:

+          atoll: प्रवालद्वीप

           bay: खाडी
           beach: समुद्र किनारा
           bay: खाडी
           beach: समुद्र किनारा

+          cave_entrance: गुफा प्रवेश
+          cliff: चट्टान
+          coastline: तटीय रेखा

           crater: क्रेटर
           forest: वन
           glacier: हिमनदी
           crater: क्रेटर
           forest: वन
           glacier: हिमनदी


@@ -779,32 +868,50 @@ ne:
           marsh: धाप
           mud: हिलो मााटो
           peak: शिखर
           marsh: धाप
           mud: हिलो मााटो
           peak: शिखर

+          peninsula: प्रायद्वीप

           point: बिन्दु
           rock: रक
           sand: बालुवा
           spring: स्प्रिङ
           stone: पत्थर
           point: बिन्दु
           rock: रक
           sand: बालुवा
           spring: स्प्रिङ
           stone: पत्थर

+          strait: जलसन्धि

           tree: रूख
           tree: रूख

+          tundra: टुन्ड्रा

           valley: उपत्यका
           volcano: ज्वालामुखी
           water: पानी
           wetland: सिमसार
           wood: कुञ्ज
           valley: उपत्यका
           volcano: ज्वालामुखी
           water: पानी
           wetland: सिमसार
           wood: कुञ्ज

+          "yes": प्राकृतिक विशेषता

         office:
           accountant: लेखापाल
           administrative: प्रबन्धकीय स्थल
         office:
           accountant: लेखापाल
           administrative: प्रबन्धकीय स्थल

+          advertising_agency: विज्ञापन संस्थान

           architect: आर्किटेक्ट
           architect: आर्किटेक्ट

+          association: सङ्घ

           company: कम्पनी
           company: कम्पनी

+          diplomatic: कूटनीतिक कार्यालय
+          educational_institution: शैक्षिक संस्था
+          employment_agency: रोजगार संस्था
+          energy_supplier: ऊर्जा आपूर्तिकर्ता कार्यालय

           estate_agent: घरजग्गा एजेन्ट
           estate_agent: घरजग्गा एजेन्ट

+          financial: वित्तीय कार्यालय

           government: सरकारी कार्यालय
           insurance: बीमा कार्यालय
           it: आइटी कार्यालय
           lawyer: वकिल
           government: सरकारी कार्यालय
           insurance: बीमा कार्यालय
           it: आइटी कार्यालय
           lawyer: वकिल

+          logistics: रसद कार्यालय
+          newspaper: समाचार पत्र कार्यालय

           ngo: एनजिओ कार्यलय
           ngo: एनजिओ कार्यलय

+          notary: नोटरी
+          religion: धार्मिक कार्यालय
+          research: अनुसन्धान कार्यालय
+          tax_advisor: कर सल्लाहकार

           telecommunication: दूरसञ्चार कार्यलय
           travel_agent: ट्राभल एजेन्सी
           "yes": कार्यलय
         place:
           telecommunication: दूरसञ्चार कार्यलय
           travel_agent: ट्राभल एजेन्सी
           "yes": कार्यलय
         place:

+          archipelago: द्वीपसमूह

           city: शहर
           country: देश
           county: ईलाका
           city: शहर
           country: देश
           county: ईलाका


@@ -818,9 +925,13 @@ ne:
           municipality: नगरपालिका
           neighbourhood: छिमेक
           postcode: पोस्ट कोड
           municipality: नगरपालिका
           neighbourhood: छिमेक
           postcode: पोस्ट कोड

+          quarter: चौमासिक

           region: क्षेत्र
           sea: समुद्र
           region: क्षेत्र
           sea: समुद्र

+          square: वर्ग

           state: राज्य
           state: राज्य

+          subdivision: उपविभाग
+          suburb: उपनगर

           town: नगर
           village: गाउँ
           "yes": स्थानहरू
           town: नगर
           village: गाउँ
           "yes": स्थानहरू


@@ -862,7 +973,7 @@ ne:
           grocery: किराना पसल
           hairdresser: नाइ पसल
           hardware: हार्डवेयर पसल
           grocery: किराना पसल
           hairdresser: नाइ पसल
           hardware: हार्डवेयर पसल

-          hifi: हाइ-फाइ
+          hifi: हाइ-फाइ पसल

           jewelry: गहना पसल
           mall: सपिङ मल
           mobile_phone: मोबाइल फोन पसल
           jewelry: गहना पसल
           mall: सपिङ मल
           mobile_phone: मोबाइल फोन पसल


@@ -1070,31 +1181,73 @@ ne:
       tab_title: प्रवेश
       password: पासवर्ड
       login_button: प्रवेश
       tab_title: प्रवेश
       password: पासवर्ड
       login_button: प्रवेश

+      register now: अहिले दर्ता गर्नुहोस्
+      with external: वा तेस्रो पक्षसँग लग इन गर्नुहोस्
+      or: अथवा
+      auth failure: माफ गर्नुहोस्, ती विवरणहरूसँग लग इन गर्न सकिएन।

     destroy:
       title: लगआउट
     destroy:
       title: लगआउट

+      heading: ओपनस्ट्रिटम्यापबाट निर्गमन गर्नुहोस्

       logout_button: निर्गमन
       logout_button: निर्गमन

+    suspended_flash:
+      suspended: माफ गर्नुहोस्, तपाईको खाता सन्दिग्ध गतिविधिको कारण निलम्बित गरिएको
+        छ।

   shared:
     markdown_help:
       link: कडी
   shared:
     markdown_help:
       link: कडी

+      text: पाठ

       image: तस्विर
       image: तस्विर

+      alt: वैकल्पिक पाठ
+      url: युआरएल

     richtext_field:
       edit: सम्पादन गर्नुहोस्
     richtext_field:
       edit: सम्पादन गर्नुहोस्

+      preview: पूर्वावलोकन

   site:
     about:
       next: अर्को
       local_knowledge_title: स्थानीय ज्ञान
       community_driven_title: समूदायबाट सञ्चालित
   site:
     about:
       next: अर्को
       local_knowledge_title: स्थानीय ज्ञान
       community_driven_title: समूदायबाट सञ्चालित

+      community_driven_osm_blog: ओपनस्ट्रिटम्याप ब्लग

       open_data_title: खुल्ला डेटा
       open_data_title: खुल्ला डेटा

+      open_data_open_data: खुल्ला डेटा
+      open_data_copyright_license: प्रतिलिपी अधिकार र इजाजतपत्र पृष्ठ

       legal_title: कानूनी
       partners_title: समर्थकहरू
     copyright:
       legal_title: कानूनी
       partners_title: समर्थकहरू
     copyright:

+      title: प्रतिलिपी अधिकार र इजाजतपत्र
+      foreign:
+        title: यस अनुवादको बारेमा
+        english_link: अङ्ग्रेजी मूल

       native:
         title: यो पृष्ठको बारेमा
         mapping_link: म्यापिङ गर्न सुरु गर्नुहोस्
       legal_babble:
       native:
         title: यो पृष्ठको बारेमा
         mapping_link: म्यापिङ गर्न सुरु गर्नुहोस्
       legal_babble:

+        introduction_1_open_data: खुल्ला डेटा
+        introduction_1_osm_foundation: ओपनस्ट्रीटम्याप फाउन्डेसन
+        introduction_1_osm_foundation_url: https://osmfoundation.org/
+        introduction_2_legal_code: कानूनी कोड
+        introduction_2_legal_code_url: https://opendatacommons.org/licenses/odbl/1.0/

         more_title_html: थप जान्नको लागि
         contributors_title_html: हाम्रा योगदान कर्ताहरू
         more_title_html: थप जान्नको लागि
         contributors_title_html: हाम्रा योगदान कर्ताहरू

+        contributors_at_austria: अस्ट्रिया
+        contributors_au_australia: अस्ट्रेलिया
+        contributors_ca_canada: क्यानडा
+        contributors_cz_czechia: चेकिया
+        contributors_fi_finland: फिन्ल्यान्ड

         contributors_fr_france: फ्रान्स
         contributors_fr_france: फ्रान्स

+        contributors_hr_croatia: क्रोएसिया
+        contributors_nl_netherlands: नेदरल्यान्ड
+        contributors_nl_and: www.and.com
+        contributors_nl_and_url: https://www.and.com
+        contributors_nz_new_zealand: न्युजिल्यान्ड
+        contributors_rs_serbia: सर्बिया
+        contributors_si_slovenia: स्लोभेनिया
+        contributors_si_mkgp: कृषि, वन तथा खाद्य मन्त्रालय
+        contributors_es_spain: स्पेन
+        contributors_gb_united_kingdom: संयुक्त अधिराज्य
+        contributors_2_contributors_page: योगदानकर्ताहरूको पृष्ठ
+        trademarks_title: ट्रेडमार्कहरू
+        trademarks_1_1_trademark_policy: ट्रेडमार्क नीति

     edit:
       user_page_link: प्रयोगकर्ता पृष्ठ
     export:
     edit:
       user_page_link: प्रयोगकर्ता पृष्ठ
     export:


@@ -1132,7 +1285,7 @@ ne:
       title: कसरी सहायता पाउने
       welcome:
         url: /welcome
       title: कसरी सहायता पाउने
       welcome:
         url: /welcome

-        title: OSM मा स्वागत् छ
+        title: ओपन स्ट्रिट म्यापमा स्वागत छ!

       beginners_guide:
         title: सुरुवातकर्ताहरूको लागि मार्गदर्शन
         description: सुरुवातकर्ताहरूको लागि समुदायद्वारा निर्मित निर्देशिका
       beginners_guide:
         title: सुरुवातकर्ताहरूको लागि मार्गदर्शन
         description: सुरुवातकर्ताहरूको लागि समुदायद्वारा निर्मित निर्देशिका


@@ -1142,6 +1295,8 @@ ne:
         title: आईआरसि
       switch2osm:
         title: स्विचटु‍ओएसएम
         title: आईआरसि
       switch2osm:
         title: स्विचटु‍ओएसएम

+      wiki:
+        title: ओपनस्ट्रिटम्याप विकि

     sidebar:
       close: बन्द गर्नुहोस्
     search:
     sidebar:
       close: बन्द गर्नुहोस्
     search:


@@ -1189,19 +1344,28 @@ ne:
           hospital: अस्पताल
           summit: शिखर
           peak: शिखर
           hospital: अस्पताल
           summit: शिखर
           peak: शिखर

+          bus_stop: बस बिसौनी
+          stop: रोक्ने

           bicycle_shop: साइकल पसल
           bicycle_shop: साइकल पसल

+          bicycle_rental: साइकल भाडामा

           bicycle_parking: साकल पार्किङ
           bicycle_parking: साकल पार्किङ

+          bicycle_parking_small: सानो साइकल पार्किङ

           toilets: शौचालय
     welcome:
       title: स्वागत!
       whats_on_the_map:
         title: म्यापमा के छ
       basic_terms:
           toilets: शौचालय
     welcome:
       title: स्वागत!
       whats_on_the_map:
         title: म्यापमा के छ
       basic_terms:

+        editor: सम्पादक

         node: नोड
         way: बाटो
         node: नोड
         way: बाटो

+        tag: चिनो

       rules:
         title: नियमहरू !
       rules:
         title: नियमहरू !

+        imports: आयात

       start_mapping: म्यापिङ गर्न सुरु गर्नुहोस्
       start_mapping: म्यापिङ गर्न सुरु गर्नुहोस्

+    communities:
+      title: समुदायहरू

   traces:
     new:
       upload_trace: GPS Trace अपलोड गर्ने
   traces:
     new:
       upload_trace: GPS Trace अपलोड गर्ने


@@ -1238,7 +1402,9 @@ ne:
       visibility: 'दृश्यक्षमता:'
     trace:
       pending: बाँकी रहेको
       visibility: 'दृश्यक्षमता:'
     trace:
       pending: बाँकी रहेको

-      count_points: पोइन्टहरु %{count}
+      count_points:
+        one: '%{count} अङ्क'
+        other: '%{count} अङ्कहरू'

       more: थप
       trace_details: ट्रेसको विस्तृत जानकारी हेर्ने
       view_map: नक्सा हेर्ने
       more: थप
       trace_details: ट्रेसको विस्तृत जानकारी हेर्ने
       view_map: नक्सा हेर्ने


@@ -1257,9 +1423,25 @@ ne:
       made_public: सार्वजनिक बनाइएको ट्रेस
   application:
     auth_providers:
       made_public: सार्वजनिक बनाइएको ट्रेस
   application:
     auth_providers:

+      openid_login_button: जारी राख्ने
+      openid:
+        title: ओपनआईडीसँग प्रवेश गर्नुहोस्
+      google:
+        title: गुगल प्रयोग गरेर प्रवेश गर्नुहोस्
+      facebook:
+        title: फेसबुक प्रयोग गरेर प्रवेश गर्नुहोस्
+        alt: फेसबुक खाताको साथ प्रवेश गर्नुहोस्
+      microsoft:
+        title: माइक्रोसफ्टको साथ प्रवेश गर्नुहोस्
+        alt: माइक्रोसफ्ट खाताको साथ प्रवेश गर्नुहोस्
+      github:
+        title: गिटहबको साथ प्रवेश गर्नुहोस्
+        alt: गिटहब खाताको साथ प्रवेश गर्नुहोस्

       wikipedia:
         title: विकिपिडियाकाे प्रयाेग गरि प्रवेश गर्नुहाेस्
         alt: विकिपिडिया खाताद्वारा प्रवेश गर्नुहोस्
       wikipedia:
         title: विकिपिडियाकाे प्रयाेग गरि प्रवेश गर्नुहाेस्
         alt: विकिपिडिया खाताद्वारा प्रवेश गर्नुहोस्

+      wordpress:
+        title: वर्डप्रेस खाताबाट प्रवेश गर्नुहोस्

   oauth_clients:
     show:
       confirm: निश्चित हुनुहुन्छ ?
   oauth_clients:
     show:
       confirm: निश्चित हुनुहुन्छ ?


@@ -1284,8 +1466,13 @@ ne:
       about:
         header: खुल्ला र सम्पादन गर्न मिल्ने
       continue: खाता खाेल्नुहाेस्
       about:
         header: खुल्ला र सम्पादन गर्न मिल्ने
       continue: खाता खाेल्नुहाेस्

+      privacy_policy: गोपनीयता नीति

     terms:
     terms:

+      title: सर्तहरू
+      heading: सर्तहरू
+      heading_ct: योगदानकर्ता सर्तहरू

       consider_pd_why: यो के हो ?
       consider_pd_why: यो के हो ?

+      continue: जारी राख्ने

       decline: असहमत
       legale_names:
         france: फ्रान्स
       decline: असहमत
       legale_names:
         france: फ्रान्स


@@ -1341,10 +1528,13 @@ ne:
   user_blocks:
     show:
       created: सृजना गरिएको
   user_blocks:
     show:
       created: सृजना गरिएको

+      duration: 'अवधि:'

       status: 'स्थिति:'
       show: देखाउनुहोस्
       edit: सम्पादन गर्नुहोस्
       status: 'स्थिति:'
       show: देखाउनुहोस्
       edit: सम्पादन गर्नुहोस्

+      revoke: रद्द गर्नुहोस्!

       confirm: निश्चित हुनुहुन्छ ?
       confirm: निश्चित हुनुहुन्छ ?

+      reason: 'प्रतिबन्धको कारण:'

     block:
       show: देखाउनुहोस्
       edit: सम्पादन गर्नुहोस्
     block:
       show: देखाउनुहोस्
       edit: सम्पादन गर्नुहोस्


@@ -1368,6 +1558,7 @@ ne:
       closed_title: 'समाधान गरिएको टिप्पणी #%{note_name}'
       hidden_title: 'लुकाइएको टिप्पणी #%{note_name}'
       report: यस टिपोटलाई उजुरी गर्नुहोस्
       closed_title: 'समाधान गरिएको टिप्पणी #%{note_name}'
       hidden_title: 'लुकाइएको टिप्पणी #%{note_name}'
       report: यस टिपोटलाई उजुरी गर्नुहोस्

+      coordinates_html: '%{latitude}; %{longitude}'

       hide: लुकाउनुहोस्
       comment: टिप्पणी
     new:
       hide: लुकाउनुहोस्
       comment: टिप्पणी
     new:


@@ -1394,7 +1585,10 @@ ne:
         notes: म्याप टिप्पणीहरू
         gps: सार्वजनिक GPS ट्रेसहरू
       make_a_donation: दान गर्नुहोस्
         notes: म्याप टिप्पणीहरू
         gps: सार्वजनिक GPS ट्रेसहरू
       make_a_donation: दान गर्नुहोस्

+      tracestrack: ट्रेसट्र्याक

     directions:
     directions:

+      directions: दिशाहरू
+      distance: दूरी

       instructions:
         exit_counts:
           first: प्रथम
       instructions:
         exit_counts:
           first: प्रथम

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index e9d17d84dd0616ed26588860ccf182024bbdc8d5..cfc0b543ca6719ca1ec710382ce4ae8ad028eeb5 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -2102,6 +2102,7 @@ nl:
       legal_2_2_registered_trademarks: geregistreerde handelsmerken van de OSMF
       partners_title: Partners
     copyright:
       legal_2_2_registered_trademarks: geregistreerde handelsmerken van de OSMF
       partners_title: Partners
     copyright:

+      title: Auteursrechten en licentie

       foreign:
         title: Over deze vertaling
         html: In het geval deze taalversie en %{english_original_link} elkaar tegenspreken,
       foreign:
         title: Over deze vertaling
         html: In het geval deze taalversie en %{english_original_link} elkaar tegenspreken,


@@ -2115,7 +2116,6 @@ nl:
         native_link: Nederlandstalige versie
         mapping_link: begin met mappen
       legal_babble:
         native_link: Nederlandstalige versie
         mapping_link: begin met mappen
       legal_babble:

-        title_html: Auteursrechten en licentie

         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} is %{open_data}, in licentie gegeven onder de
           %{odc_odbl_link} (ODbL) door de %{osm_foundation_link} (OSMF).
         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} is %{open_data}, in licentie gegeven onder de
           %{odc_odbl_link} (ODbL) door de %{osm_foundation_link} (OSMF).

diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 77eec99f017931b53b4b9d474a2ff9c49e41c5a4..be0bdb0bd568fddac0f74a60d0a5baa56b666b14 100644 (file)
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1857,6 +1857,7 @@ nn:
       legal_2_2_registered_trademarks: regristrerte varemerke til OSMF
       partners_title: Partnarar
     copyright:
       legal_2_2_registered_trademarks: regristrerte varemerke til OSMF
       partners_title: Partnarar
     copyright:

+      title: Opphavsrett og lisensar

       foreign:
         title: Om denne omsetjinga
         html: Om denne omsetjinga kjem i motsetjing med %{english_original_link},
       foreign:
         title: Om denne omsetjinga
         html: Om denne omsetjinga kjem i motsetjing med %{english_original_link},


@@ -1870,7 +1871,6 @@ nn:
         native_link: Nynorsk versjon
         mapping_link: start kartlegging
       legal_babble:
         native_link: Nynorsk versjon
         mapping_link: start kartlegging
       legal_babble:

-        title_html: Opphavsrett og lisensar

         introduction_1_html: OpenStreetMap%{registered_trademark_link} er %{open_data},
           med lisens %{odc_odbl_link} (ODbL) av %{osm_foundation_link} (OSMF).
         introduction_1_open_data: ope data
         introduction_1_html: OpenStreetMap%{registered_trademark_link} er %{open_data},
           med lisens %{odc_odbl_link} (ODbL) av %{osm_foundation_link} (OSMF).
         introduction_1_open_data: ope data

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 7e7331dd146d28a128a51692423e2847b5c40637..06e0ae1dd6cbda928067cd62d533987e5b11c4ce 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -1390,6 +1390,7 @@ nqo:
       open_data_title: ߓߟߏߡߟߊ߫ ߘߊߦߟߍ߬ߣߍ߲
       partners_title: ߞߊ߬ߝߏ߬ߢߐ߲߮ ߠߎ߬
     copyright:
       open_data_title: ߓߟߏߡߟߊ߫ ߘߊߦߟߍ߬ߣߍ߲
       partners_title: ߞߊ߬ߝߏ߬ߢߐ߲߮ ߠߎ߬
     copyright:

+      title: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ ߣߌ߫ ߕߌ߰ߦߊ

       foreign:
         title: ߞߊ߬ ߓߍ߲߬ ߘߟߊߡߌߘߊߟߌ ߣߌ߲߬ ߡߊ߬
         english_link: ߊ߲߬ߜ߭ߌߟߋ ߓߊߖߎߡߊ
       foreign:
         title: ߞߊ߬ ߓߍ߲߬ ߘߟߊߡߌߘߊߟߌ ߣߌ߲߬ ߡߊ߬
         english_link: ߊ߲߬ߜ߭ߌߟߋ ߓߊߖߎߡߊ


@@ -1398,7 +1399,6 @@ nqo:
         native_link: ߒߞߏ_ߕߐ߮_ߦߋ߫_ߦߊ߲߬ ߟߦߍ߬ߡߊ߲߬ߠߌ߲
         mapping_link: ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߌ ߘߊߡߌ߬ߣߊ߫
       legal_babble:
         native_link: ߒߞߏ_ߕߐ߮_ߦߋ߫_ߦߊ߲߬ ߟߦߍ߬ߡߊ߲߬ߠߌ߲
         mapping_link: ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߌ ߘߊߡߌ߬ߣߊ߫
       legal_babble:

-        title_html: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ ߣߌ߫ ߕߌ߰ߦߊ

         credit_title_html: ߟߊߒߣߦߊ ߦߋ߫ ߛߐ߬ߘߐ߲߬ ߠߊ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߊ߫ ߘߌ߬
         more_title_html: ߛߌߦߊߡߊ߲߫ ߜߘߍ߫ ߟߎ߫ ߢߌߣߌ߲ ߦߴߌ ߘߐ߫
         contributors_title_html: ߊ߲ ߠߊ߫ ߓߟߏߡߊߜߍ߲ ߠߎ߬
         credit_title_html: ߟߊߒߣߦߊ ߦߋ߫ ߛߐ߬ߘߐ߲߬ ߠߊ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߊ߫ ߘߌ߬
         more_title_html: ߛߌߦߊߡߊ߲߫ ߜߘߍ߫ ߟߎ߫ ߢߌߣߌ߲ ߦߴߌ ߘߐ߫
         contributors_title_html: ߊ߲ ߠߊ߫ ߓߟߏߡߊߜߍ߲ ߠߎ߬

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index d98593a62a38cb65bc48ec8d17ec57da5825da1d..de0a5d02199e1ec339aca9aa870b76c7a61e2483 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -1836,6 +1836,7 @@ oc:
       legal_title: Juridic
       partners_title: Partenaris
     copyright:
       legal_title: Juridic
       partners_title: Partenaris
     copyright:

+      title: Copyright e Licéncia

       foreign:
         title: A prepaus d'aquesta traduccion
         html: En cas de conflicte entre aquesta pagina e la pagina %{english_original_link},
       foreign:
         title: A prepaus d'aquesta traduccion
         html: En cas de conflicte entre aquesta pagina e la pagina %{english_original_link},


@@ -1849,7 +1850,6 @@ oc:
         native_link: version occitana
         mapping_link: començar a contribuir
       legal_babble:
         native_link: version occitana
         mapping_link: començar a contribuir
       legal_babble:

-        title_html: Copyright e Licéncia

         credit_title_html: Cossí creditar OpenStreetMap
         credit_1_html: Demandam que vòstre crèdit compòrte la mencion « © lei contribueires
           d’OpenStreetMap ».
         credit_title_html: Cossí creditar OpenStreetMap
         credit_1_html: Demandam que vòstre crèdit compòrte la mencion « © lei contribueires
           d’OpenStreetMap ».

diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 4ee921521b2b83d14c51fd7cab31603d9bae32ec..0d6fd997cce2626305f4dfde1e9a2fae9980f811 100644 (file)
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -988,6 +988,7 @@ pa:
       legal_title: ਕਾਨੂੰਨੀ
       partners_title: ਸਾਂਝੀਦਾਰ
     copyright:
       legal_title: ਕਾਨੂੰਨੀ
       partners_title: ਸਾਂਝੀਦਾਰ
     copyright:

+      title: ਨਕਲ-ਹੱਕ ਤੇ ਲਾਇਸੰਸ

       foreign:
         title: ਇਸ ਤਰਜਮੇ ਬਾਰੇ
         english_link: ਮੂਲ ਅੰਗਰੇਜ਼ੀ
       foreign:
         title: ਇਸ ਤਰਜਮੇ ਬਾਰੇ
         english_link: ਮੂਲ ਅੰਗਰੇਜ਼ੀ


@@ -996,7 +997,6 @@ pa:
         native_link: ਪੰਜਾਬੀ ਵਰਜਨ
         mapping_link: ਨਕਸ਼ਾਬੰਦੀ ਸ਼ੁਰੂ ਕਰੋ
       legal_babble:
         native_link: ਪੰਜਾਬੀ ਵਰਜਨ
         mapping_link: ਨਕਸ਼ਾਬੰਦੀ ਸ਼ੁਰੂ ਕਰੋ
       legal_babble:

-        title_html: ਨਕਲ-ਹੱਕ ਤੇ ਲਾਇਸੰਸ

         introduction_1_osm_foundation: ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ ਸੰਸਥਾ
         credit_title_html: ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ ਨੂੰ ਕਿਵੇਂ ਸੇਹਰਾ ਦੇਣਾ ਹੈ
         credit_1_html: 'ਜਿੱਥੇ ਤੁਸੀਂ ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ ਡੇਟਾ ਦੀ ਵਰਤੋਂ ਕਰਦੇ ਹੋ, ਤੁਹਾਨੂੰ
         introduction_1_osm_foundation: ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ ਸੰਸਥਾ
         credit_title_html: ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ ਨੂੰ ਕਿਵੇਂ ਸੇਹਰਾ ਦੇਣਾ ਹੈ
         credit_1_html: 'ਜਿੱਥੇ ਤੁਸੀਂ ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ ਡੇਟਾ ਦੀ ਵਰਤੋਂ ਕਰਦੇ ਹੋ, ਤੁਹਾਨੂੰ

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index b43068952c3b1f40cf947725133a90d552dbcf6f..6fb63fe3fdb567198ffc894a3778eb2000716b77 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -2047,6 +2047,7 @@ pl:
       legal_2_1_contact_the_osmf: skontaktuj się z OSM
       partners_title: Partnerzy
     copyright:
       legal_2_1_contact_the_osmf: skontaktuj się z OSM
       partners_title: Partnerzy
     copyright:

+      title: Prawa autorskie i licencja

       foreign:
         title: Informacje o tłumaczeniu
         html: W przypadku rozbieżności pomiędzy tym tłumaczeniem a %{english_original_link}
       foreign:
         title: Informacje o tłumaczeniu
         html: W przypadku rozbieżności pomiędzy tym tłumaczeniem a %{english_original_link}


@@ -2060,7 +2061,6 @@ pl:
         native_link: wersji po polsku
         mapping_link: rozpocząć tworzenie mapy
       legal_babble:
         native_link: wersji po polsku
         mapping_link: rozpocząć tworzenie mapy
       legal_babble:

-        title_html: Prawa autorskie i licencja

         introduction_1_html: OpenStreetMap%{registered_trademark_link} to projekt
           %{open_data}, rozpowszechniany na licencji %{odc_odbl_link} (ODbL) przez
           %{osm_foundation_link} (OSMF).
         introduction_1_html: OpenStreetMap%{registered_trademark_link} to projekt
           %{open_data}, rozpowszechniany na licencji %{odc_odbl_link} (ODbL) przez
           %{osm_foundation_link} (OSMF).

diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml
index 726e4c66558bee2f87fc17b80f4073a97ffe9698..02703fea1125b068da9a6c6b945fc9b425bcf208 100644 (file)
--- a/config/locales/pnb.yml
+++ b/config/locales/pnb.yml
@@ -1482,6 +1482,7 @@ pnb:
       legal_title: کانونی
       partners_title: سانجھیدار
     copyright:
       legal_title: کانونی
       partners_title: سانجھیدار
     copyright:

+      title: نکل حق تے لائیسنس

       foreign:
         title: ایس ترجمے بارے
         html: جے ایس پنجابی صفحے تے %{english_original_link} وکھرے اے، پچھلا انگریزی
       foreign:
         title: ایس ترجمے بارے
         html: جے ایس پنجابی صفحے تے %{english_original_link} وکھرے اے، پچھلا انگریزی


@@ -1494,7 +1495,6 @@ pnb:
         native_link: پنجابی شاہمکھی ورژن
         mapping_link: نقشابندی شروع کرو
       legal_babble:
         native_link: پنجابی شاہمکھی ورژن
         mapping_link: نقشابندی شروع کرو
       legal_babble:

-        title_html: نکل حق تے لائیسنس

         credit_title_html: ایہہ نقشے لئی حوالے
         credit_1_html: 'ڈیٹا ورتݨ دے قواعد:'
         attribution_example:
         credit_title_html: ایہہ نقشے لئی حوالے
         credit_1_html: 'ڈیٹا ورتݨ دے قواعد:'
         attribution_example:

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 2626cbc116d3a8fe20fd205ea7fa5748b4dd9e40..7e012ea0201f5a36782c982c08bd098a4f03dbe9 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -2073,6 +2073,7 @@ pt-PT:
       legal_2_2_registered_trademarks: marcas registadas da OSMF
       partners_title: Parceiros
     copyright:
       legal_2_2_registered_trademarks: marcas registadas da OSMF
       partners_title: Parceiros
     copyright:

+      title: Licença e Direitos de Autor

       foreign:
         title: Sobre Esta Tradução
         html: Se houver um conflito entre esta página traduzida e %{english_original_link},
       foreign:
         title: Sobre Esta Tradução
         html: Se houver um conflito entre esta página traduzida e %{english_original_link},


@@ -2085,7 +2086,6 @@ pt-PT:
         native_link: Versão em português europeu
         mapping_link: começar a mapear
       legal_babble:
         native_link: Versão em português europeu
         mapping_link: começar a mapear
       legal_babble:

-        title_html: Licença e Direitos de Autor

         introduction_1_html: O OpenStreetMap%{registered_trademark_link} é composto
           por %{open_data}, licenciados sob %{odc_odbl_link} (ODbL) pela %{osm_foundation_link}
           (OSMF).
         introduction_1_html: O OpenStreetMap%{registered_trademark_link} é composto
           por %{open_data}, licenciados sob %{odc_odbl_link} (ODbL) pela %{osm_foundation_link}
           (OSMF).

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 8080db17a31a9f19be2e34e5f706428827995fd6..191c9e80ed9bd369cfd3d9a0ef6ef57fbb2ba507 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -2055,6 +2055,7 @@ pt:
       legal_2_2_registered_trademarks: marcas registadas da OSMF
       partners_title: Parceiros
     copyright:
       legal_2_2_registered_trademarks: marcas registadas da OSMF
       partners_title: Parceiros
     copyright:

+      title: Direitos autorais e licença

       foreign:
         title: Sobre esta tradução
         html: Caso haja um conflito entre esta tradução e %{english_original_link},
       foreign:
         title: Sobre esta tradução
         html: Caso haja um conflito entre esta tradução e %{english_original_link},


@@ -2068,7 +2069,6 @@ pt:
         native_link: Versão em Português do Brasil
         mapping_link: começar a mapear
       legal_babble:
         native_link: Versão em Português do Brasil
         mapping_link: começar a mapear
       legal_babble:

-        title_html: Direitos autorais e licença

         introduction_1_html: O OpenStreetMap%{registered_trademark_link} é composto
           por %{open_data}, licenciados sob %{odc_odbl_link} (ODbL) pela %{osm_foundation_link}
           (OSMF).
         introduction_1_html: O OpenStreetMap%{registered_trademark_link} é composto
           por %{open_data}, licenciados sob %{odc_odbl_link} (ODbL) pela %{osm_foundation_link}
           (OSMF).

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index c0b0cc6368535042a0469b052c411020bd92c1f8..99e27f7e211b84cd85804f688c50beabdae46b2d 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -1994,6 +1994,7 @@ ro:
       legal_2_2_registered_trademarks: mărci înregistrate ale OSMF
       partners_title: Parteneri
     copyright:
       legal_2_2_registered_trademarks: mărci înregistrate ale OSMF
       partners_title: Parteneri
     copyright:

+      title: Drepturi de autor și licență

       foreign:
         title: Despre această traducere
         html: În cazul unui conflict între această pagină tradusă și %{english_original_link},
       foreign:
         title: Despre această traducere
         html: În cazul unui conflict între această pagină tradusă și %{english_original_link},


@@ -2007,7 +2008,6 @@ ro:
         native_link: Versiune THIS_LANGUAGE_NAME_HERE
         mapping_link: Începeți să cartografiați
       legal_babble:
         native_link: Versiune THIS_LANGUAGE_NAME_HERE
         mapping_link: Începeți să cartografiați
       legal_babble:

-        title_html: Drepturi de autor și licență

         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} este %{open_data}, licențiat în conformitate cu
           %{odc_odbl_link} (ODbL) de către %{osm_foundation_link} (OSMF).
         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} este %{open_data}, licențiat în conformitate cu
           %{odc_odbl_link} (ODbL) de către %{osm_foundation_link} (OSMF).

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 1e1f2a844f2696f3d96142eb562bbba3678226a8..f8d3e0a8986800abb8a64a39de2c38f2e4e8264c 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -2119,6 +2119,7 @@ ru:
       legal_2_2_registered_trademarks: зарегистрированными товарными знаками OSMF
       partners_title: Партнёры
     copyright:
       legal_2_2_registered_trademarks: зарегистрированными товарными знаками OSMF
       partners_title: Партнёры
     copyright:

+      title: Авторские права и лицензирование

       foreign:
         title: Об этом переводе
         html: В случае конфликта между этой переведённой страницей и %{english_original_link},
       foreign:
         title: Об этом переводе
         html: В случае конфликта между этой переведённой страницей и %{english_original_link},


@@ -2132,7 +2133,6 @@ ru:
         native_link: русской версии
         mapping_link: начать картографирование
       legal_babble:
         native_link: русской версии
         mapping_link: начать картографирование
       legal_babble:

-        title_html: Авторские права и лицензирование

         introduction_1_html: "OpenStreetMap%{registered_trademark_link} — это %{open_data},
           лицензированные по \n%{odc_odbl_link} (ODbL), разработанной %{osm_foundation_link}
           (OSMF)."
         introduction_1_html: "OpenStreetMap%{registered_trademark_link} — это %{open_data},
           лицензированные по \n%{odc_odbl_link} (ODbL), разработанной %{osm_foundation_link}
           (OSMF)."

diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index f91dcca38b2127e36cf48624b7698c275ab16589..2826c81e3b2a2145aee181dadbec23a7c749b639 100644 (file)
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -1984,6 +1984,7 @@ sc:
       legal_2_2_registered_trademarks: marcas registradas de s'OSMF
       partners_title: Sòtzios
     copyright:
       legal_2_2_registered_trademarks: marcas registradas de s'OSMF
       partners_title: Sòtzios
     copyright:

+      title: Deretu de autore e litzèntzia

       foreign:
         title: Informatziones subra de custa tradutzione
         html: In casu de cunflitu intre custa pàgina bortada e %{english_original_link},
       foreign:
         title: Informatziones subra de custa tradutzione
         html: In casu de cunflitu intre custa pàgina bortada e %{english_original_link},


@@ -1997,7 +1998,6 @@ sc:
         native_link: versione in sardu
         mapping_link: incumintzare a mapare
       legal_babble:
         native_link: versione in sardu
         mapping_link: incumintzare a mapare
       legal_babble:

-        title_html: Deretu de autore e litzèntzia

         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} est basadu subra de %{open_data}, suta de sa litzèntzia
           %{odc_odbl_link} (ODbL) dae sa %{osm_foundation_link} (OSMF).
         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} est basadu subra de %{open_data}, suta de sa litzèntzia
           %{odc_odbl_link} (ODbL) dae sa %{osm_foundation_link} (OSMF).

diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index 3cddda06981b61300b53f14697a4bc4b620de064..e7acd27e5006f1be11dafe0becfe58e9e5e80586 100644 (file)
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -1330,6 +1330,7 @@ scn:
       legal_title: Noti ligali
       partners_title: Cullabburatura
     copyright:
       legal_title: Noti ligali
       partners_title: Cullabburatura
     copyright:

+      title: Dritti d'auturi e Licenza

       foreign:
         title: A prupòsitu di sta traduzzioni
         html: N casu di cunflittu tra di sta pàggina traduciuta e %{english_original_link},
       foreign:
         title: A prupòsitu di sta traduzzioni
         html: N casu di cunflittu tra di sta pàggina traduciuta e %{english_original_link},


@@ -1343,7 +1344,6 @@ scn:
         native_link: virsioni n sicilianu
         mapping_link: accuminzari a mappari
       legal_babble:
         native_link: virsioni n sicilianu
         mapping_link: accuminzari a mappari
       legal_babble:

-        title_html: Dritti d'auturi e Licenza

         credit_title_html: Comu s'attribbuisci a OpenStreetMap
         credit_1_html: Addumannamu chi s'usa l'attribbuzzioni «© li cuntribbutura
           d'OpenStreetMap».
         credit_title_html: Comu s'attribbuisci a OpenStreetMap
         credit_1_html: Addumannamu chi s'usa l'attribbuzzioni «© li cuntribbutura
           d'OpenStreetMap».

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 20bd6cbf0b2bdf818b5fb666f6e50790ee93e86e..57bb548cca49bb1bf694c9f5771195ab41f4ae1b 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -806,6 +806,7 @@ sco:
       logout_button: Logoot
   site:
     copyright:
       logout_button: Logoot
   site:
     copyright:

+      title: Copyricht an License

       foreign:
         title: Aboot this translation
         html: In the event of a conflict atween this translatit page an %{english_original_link},
       foreign:
         title: Aboot this translation
         html: In the event of a conflict atween this translatit page an %{english_original_link},


@@ -819,7 +820,6 @@ sco:
         native_link: Scots version
         mapping_link: stairt cairttin
       legal_babble:
         native_link: Scots version
         mapping_link: stairt cairttin
       legal_babble:

-        title_html: Copyricht an License

         credit_title_html: Hou tae credit OpenStreetMap
         credit_1_html: |-
           We require that ye uise the credit “© OpenStreetMap
         credit_title_html: Hou tae credit OpenStreetMap
         credit_1_html: |-
           We require that ye uise the credit “© OpenStreetMap

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 5f2f002759065e5a9f137ae7b8670350c6815bb5..b7fa9dabb7e634294296678e462ef83c55498a01 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -450,7 +450,7 @@ sk:
       load_data: Načítať údaje
       loading: Nahrávanie...
     tag_details:
       load_data: Načítať údaje
       loading: Nahrávanie...
     tag_details:

-      tags: Tagy
+      tags: Značky

       wiki_link:
         key: Stránka s popisom značky %{key} na wiki
         tag: Stránka s popisom značky %{key}=%{value} na wiki
       wiki_link:
         key: Stránka s popisom značky %{key} na wiki
         tag: Stránka s popisom značky %{key}=%{value} na wiki


@@ -465,6 +465,15 @@ sk:
       introduction: Pre nájdenie okolitých prvkov kliknite na mapu.
       nearby: Okolité prvky
       enclosing: Obklopujúce prvky
       introduction: Pre nájdenie okolitých prvkov kliknite na mapu.
       nearby: Okolité prvky
       enclosing: Obklopujúce prvky

+  old_nodes:
+    not_found:
+      sorry: 'Ľutujeme, uzol #%{id} verzie %{version} sa nepodarilo nájsť.'
+  old_ways:
+    not_found:
+      sorry: 'Ľutujeme, cestu #%{id} verzie %{version} sa nepodarilo nájsť.'
+  old_relations:
+    not_found:
+      sorry: 'Ľutujeme, reláciu #%{id} verzie %{version} sa nepodarilo nájsť.'

   changesets:
     changeset_paging_nav:
       showing_page: Stránka %{page}
   changesets:
     changeset_paging_nav:
       showing_page: Stránka %{page}


@@ -1579,9 +1588,9 @@ sk:
       befriend_them: Môžete ich tiež pridať ako priateľov na %{befriendurl}.
       befriend_them_html: Môžete ho/ju tiež pridať ako priateľov na %{befriendurl}.
     gpx_description:
       befriend_them: Môžete ich tiež pridať ako priateľov na %{befriendurl}.
       befriend_them_html: Môžete ho/ju tiež pridať ako priateľov na %{befriendurl}.
     gpx_description:

-      description_with_tags_html: 'Vyzerá, že váš GPX súbor %{trace_name} s popisom
+      description_with_tags_html: 'vyzerá, že váš GPX súbor %{trace_name} s popisom

         %{trace_description} a nasledujúcimi značkami: %{tags}'
         %{trace_description} a nasledujúcimi značkami: %{tags}'

-      description_with_no_tags_html: Vyzerá, že váš súbor GPX %{trace_name} s popisom
+      description_with_no_tags_html: vyzerá, že váš súbor GPX %{trace_name} s popisom

         %{trace_description} a bez značiek
     gpx_failure:
       hi: Ahoj %{to_user},
         %{trace_description} a bez značiek
     gpx_failure:
       hi: Ahoj %{to_user},


@@ -1916,6 +1925,7 @@ sk:
       legal_2_2_registered_trademarks: registrované ochranné známky OSMF
       partners_title: Partneri
     copyright:
       legal_2_2_registered_trademarks: registrované ochranné známky OSMF
       partners_title: Partneri
     copyright:

+      title: Autorské práva a licencia

       foreign:
         title: O tomto preklade
         html: V prípade rozporu medzi touto preloženou verziou a %{english_original_link}
       foreign:
         title: O tomto preklade
         html: V prípade rozporu medzi touto preloženou verziou a %{english_original_link}


@@ -1929,7 +1939,6 @@ sk:
         native_link: slovenskú verziu
         mapping_link: začať mapovať
       legal_babble:
         native_link: slovenskú verziu
         mapping_link: začať mapovať
       legal_babble:

-        title_html: Autorské práva a licencia

         introduction_1_html: "OpenStreetMap%{registered_trademark_link} sú %{open_data},
           ktoré licencované za podmienok \n%{odc_odbl_link} (ODbL) poskytuje %{osm_foundation_link}
           (OSMF)."
         introduction_1_html: "OpenStreetMap%{registered_trademark_link} sú %{open_data},
           ktoré licencované za podmienok \n%{odc_odbl_link} (ODbL) poskytuje %{osm_foundation_link}
           (OSMF)."


@@ -2336,11 +2345,12 @@ sk:
       identifiable: IDENTIFIKOVATEĽNÁ
       private: SÚKROMNÁ
       trackable: STOPOVATEĽNÁ
       identifiable: IDENTIFIKOVATEĽNÁ
       private: SÚKROMNÁ
       trackable: STOPOVATEĽNÁ

+      details_with_tags_html: '%{time_ago} používateľom %{user} v %{tags}'

     index:
       public_traces: Verejné GPS stopy
       public_traces_from: Verejné GPS stopy od %{user}
       description: Prechádzať nedávno nahrané GPS stopy
     index:
       public_traces: Verejné GPS stopy
       public_traces_from: Verejné GPS stopy od %{user}
       description: Prechádzať nedávno nahrané GPS stopy

-      tagged_with: označený s %{tags}
+      tagged_with: ' označený s %{tags}'

       upload_trace: Nahrať stopu
       all_traces: Všetky stopy
       my_traces: Moje stopy
       upload_trace: Nahrať stopu
       all_traces: Všetky stopy
       my_traces: Moje stopy


@@ -2518,9 +2528,14 @@ sk:
         automaticky.
       about:
         header: Slobodné a upravovateľné
         automaticky.
       about:
         header: Slobodné a upravovateľné

+        paragraph_1: Na rozdiel od iných máp OpenStreetMap tvoria výhradne dobrovoľníci
+          ako ste vy a každý si ju môže bezplatne opraviť, aktualizovať, stiahnuť
+          a použiť.

         paragraph_2: Ak chcete začať prispievať, zaregistrujte sa.
       display name description: Vaše verejne zobrazené meno užívateľa. Môžete ho potom
         zmeniť v nastaveniach.
         paragraph_2: Ak chcete začať prispievať, zaregistrujte sa.
       display name description: Vaše verejne zobrazené meno užívateľa. Môžete ho potom
         zmeniť v nastaveniach.

+      by_signing_up_html: Registráciou súhlasíte s našimi %{tou_link}, %{privacy_policy_link}
+        a %{contributor_terms_link}.

       external auth: 'Autentifikácia treťou stranou:'
       continue: Zaregistrovať sa
       terms accepted: Ďakujeme za odsúhlasenie nových podmienok prispievania!
       external auth: 'Autentifikácia treťou stranou:'
       continue: Zaregistrovať sa
       terms accepted: Ďakujeme za odsúhlasenie nových podmienok prispievania!


@@ -2528,6 +2543,7 @@ sk:
         pozornosť našim %{privacy_policy_link}.
       privacy_policy_title: Pravidlá ochrany osobných údajov OSMF vrátane sekcie o
         e-mailových adresách
         pozornosť našim %{privacy_policy_link}.
       privacy_policy_title: Pravidlá ochrany osobných údajov OSMF vrátane sekcie o
         e-mailových adresách

+      consider_pd_html: Moje príspevky považujem za %{consider_pd_link}.

       use external auth: prípadne využite na registráciu služby tretích strán
     terms:
       title: Podmienky
       use external auth: prípadne využite na registráciu služby tretích strán
     terms:
       title: Podmienky

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 013f5f4450b1c867b4f89a42385b23caf268cfa8..eba875e881bf65084f8c241b28d96e6bde2a2e5d 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -2076,6 +2076,7 @@ sl:
       legal_2_2_registered_trademarks: registrirane tržne znamke OSMF
       partners_title: Partnerji
     copyright:
       legal_2_2_registered_trademarks: registrirane tržne znamke OSMF
       partners_title: Partnerji
     copyright:

+      title: Avtorske pravice in licenca

       foreign:
         title: O tem prevodu
         html: V primeru neskladja med tem prevodom in %{english_original_link} prevlada
       foreign:
         title: O tem prevodu
         html: V primeru neskladja med tem prevodom in %{english_original_link} prevlada


@@ -2088,7 +2089,6 @@ sl:
         native_link: Slovensko verzijo
         mapping_link: začnete kartirati
       legal_babble:
         native_link: Slovensko verzijo
         mapping_link: začnete kartirati
       legal_babble:

-        title_html: Avtorske pravice in licenca

         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} so %{open_data}, ki jih je pod licenco
           %{odc_odbl_link} (ODbL) objavila %{osm_foundation_link} (OSMF).
         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} so %{open_data}, ki jih je pod licenco
           %{odc_odbl_link} (ODbL) objavila %{osm_foundation_link} (OSMF).

diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index f1aa317ee1d331511805cce0783169ec5805dc03..d8bff3a3cfc00c8ae4f8b56a36d0b00b2f07f958 100644 (file)
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1052,6 +1052,7 @@ sq:
     about:
       next: Tjetra
     copyright:
     about:
       next: Tjetra
     copyright:

+      title: Të drejtat autoriale dhe licensa

       foreign:
         title: Rreth këtij përkthimi
         html: Në rast të një konflikti ndërmjet kësaj faqeje të përkthyer dhe %{english_original_link},
       foreign:
         title: Rreth këtij përkthimi
         html: Në rast të një konflikti ndërmjet kësaj faqeje të përkthyer dhe %{english_original_link},


@@ -1065,7 +1066,6 @@ sq:
         native_link: Versioni në THIS_LANGUAGE_NAME_HERE
         mapping_link: fillo hatrografimin
       legal_babble:
         native_link: Versioni në THIS_LANGUAGE_NAME_HERE
         mapping_link: fillo hatrografimin
       legal_babble:

-        title_html: Të drejtat autoriale dhe licensa

         credit_title_html: Si të citoni OpenStreetMap
         credit_1_html: Ne kërkojmë që ju të përdorni kreditet e “© OpenStreetMap
           contributors”.
         credit_title_html: Si të citoni OpenStreetMap
         credit_1_html: Ne kërkojmë që ju të përdorni kreditet e “© OpenStreetMap
           contributors”.

diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 44a9b0f818f0cdc89aba0390ce6d7735fe2eecc3..4cccc539101409f1b9e3912f37cd1d7e79af1717 100644 (file)
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -928,6 +928,7 @@ sr-Latn:
       logout_button: Odjavi me
   site:
     copyright:
       logout_button: Odjavi me
   site:
     copyright:

+      title: Autorska prava i licenca

       foreign:
         title: O prevodu
         html: U slučaju sukoba između prevedene stranice i %{english_original_link},
       foreign:
         title: O prevodu
         html: U slučaju sukoba između prevedene stranice i %{english_original_link},


@@ -941,7 +942,6 @@ sr-Latn:
         native_link: srpsko izdanje
         mapping_link: počnite s mapiranjem
       legal_babble:
         native_link: srpsko izdanje
         mapping_link: počnite s mapiranjem
       legal_babble:

-        title_html: Autorska prava i licenca

         credit_title_html: Kako da imenujete Openstritmap
         credit_1_html: |2-
             Ako koristite naše slike mapa, tražimo da zasluge sadrže
         credit_title_html: Kako da imenujete Openstritmap
         credit_1_html: |2-
             Ako koristite naše slike mapa, tražimo da zasluge sadrže

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 976f87f10fa8f5476345da0f4dbd11f7d0026157..512f3f3bb64ac43e5441cf973c0ae20d048c3dd6 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1688,6 +1688,7 @@ sr:
       legal_1_1_privacy_policy: политике приватности
       partners_title: Партнери
     copyright:
       legal_1_1_privacy_policy: политике приватности
       partners_title: Партнери
     copyright:

+      title: Ауторска права и лиценца

       foreign:
         title: О овом преводу
         html: У случају неслагања између преведене странице и %{english_original_link},
       foreign:
         title: О овом преводу
         html: У случају неслагања између преведене странице и %{english_original_link},


@@ -1701,7 +1702,6 @@ sr:
         native_link: српско издање
         mapping_link: почни с уређивањем карте
       legal_babble:
         native_link: српско издање
         mapping_link: почни с уређивањем карте
       legal_babble:

-        title_html: Ауторска права и лиценца

         introduction_2_html: Можете да умножавате, делите, преносите и прилагођавате
           наше податке, све док наводите OpenStreetMap и њене уреднике. Ако желите
           да мењате и дограђујете наше податке, можете их делити само под истом лиценцом.
         introduction_2_html: Можете да умножавате, делите, преносите и прилагођавате
           наше податке, све док наводите OpenStreetMap и њене уреднике. Ако желите
           да мењате и дограђујете наше податке, можете их делити само под истом лиценцом.

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index dd36d9c47ae821583258675ed0f7edd2b543d753..bd635a307a292eae321c79b121a89ff9ca76bf01 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -2062,6 +2062,7 @@ sv:
       legal_2_2_registered_trademarks: varmärken registrerade av OSMF
       partners_title: Partners
     copyright:
       legal_2_2_registered_trademarks: varmärken registrerade av OSMF
       partners_title: Partners
     copyright:

+      title: Upphovsrätt och licens

       foreign:
         title: Om denna översättning
         html: I händelse av en konflikt mellan denna översatta sida och %{english_original_link}
       foreign:
         title: Om denna översättning
         html: I händelse av en konflikt mellan denna översatta sida och %{english_original_link}


@@ -2075,7 +2076,6 @@ sv:
         native_link: svensk version
         mapping_link: börja kartlägga
       legal_babble:
         native_link: svensk version
         mapping_link: börja kartlägga
       legal_babble:

-        title_html: Upphovsrätt och licens

         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} är %{open_data}, licensierad under
           %{odc_odbl_link} (ODbL) av %{osm_foundation_link} (OSMF).
         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} är %{open_data}, licensierad under
           %{odc_odbl_link} (ODbL) av %{osm_foundation_link} (OSMF).

diff --git a/config/locales/te.yml b/config/locales/te.yml
index f92484f4c602b003e6c83f7fed988daa2cafebc2..17a5d7d47e49703bc23b5dc8909e36c49ac8432c 100644 (file)
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -1803,6 +1803,7 @@ te:
       open_data_title: ఓపెన్ డేటా
       partners_title: భాగస్వాములు
     copyright:
       open_data_title: ఓపెన్ డేటా
       partners_title: భాగస్వాములు
     copyright:

+      title: కాపీహక్కు, లైసెన్సు

       foreign:
         title: ఈ అనువాదం గురించి
         html: అనువదించిన పేజీకీ %{english_original_link} కూ మధ్య ఘర్షణ ఏర్పడినపుడు
       foreign:
         title: ఈ అనువాదం గురించి
         html: అనువదించిన పేజీకీ %{english_original_link} కూ మధ్య ఘర్షణ ఏర్పడినపుడు


@@ -1815,7 +1816,6 @@ te:
         native_link: THIS_LANGUAGE_NAME_HERE కూర్పు
         mapping_link: మ్యాపింగు మొదలుపెట్టండి
       legal_babble:
         native_link: THIS_LANGUAGE_NAME_HERE కూర్పు
         mapping_link: మ్యాపింగు మొదలుపెట్టండి
       legal_babble:

-        title_html: కాపీహక్కు, లైసెన్సు

         introduction_1_open_data: ఓపెన్ డేటా
         introduction_2_legal_code: చట్టపరమైన కోడ్
         credit_title_html: OpenStreetMap కు శ్రేయస్సు నివ్వడం ఎలా
         introduction_1_open_data: ఓపెన్ డేటా
         introduction_2_legal_code: చట్టపరమైన కోడ్
         credit_title_html: OpenStreetMap కు శ్రేయస్సు నివ్వడం ఎలా

diff --git a/config/locales/th.yml b/config/locales/th.yml
index 816651756e6cd4f1b086161b6afe706cc225b264..1546dfd3f05d9220562844edac1f20eb9cab3df0 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1476,6 +1476,7 @@ th:
       legal_title: ข้อกำหนดทางกฎหมาย
       partners_title: องค์กรพันธมิตร
     copyright:
       legal_title: ข้อกำหนดทางกฎหมาย
       partners_title: องค์กรพันธมิตร
     copyright:

+      title: ลิขสิทธิ์และสัญญาอนุญาต

       foreign:
         title: เกี่ยวกับการแปลนี้
         html: หากมีข้อขัดแย้งจากากรตีความหน้าที่แปลนี้กับหน้าเดิมในภาษาอังกฤษ %{english_original_link}
       foreign:
         title: เกี่ยวกับการแปลนี้
         html: หากมีข้อขัดแย้งจากากรตีความหน้าที่แปลนี้กับหน้าเดิมในภาษาอังกฤษ %{english_original_link}


@@ -1488,7 +1489,6 @@ th:
         native_link: รุ่นภาษาTHIS_LANGUAGE_NAME_HERE
         mapping_link: เริ่มการทำแผนที่
       legal_babble:
         native_link: รุ่นภาษาTHIS_LANGUAGE_NAME_HERE
         mapping_link: เริ่มการทำแผนที่
       legal_babble:

-        title_html: ลิขสิทธิ์และสัญญาอนุญาต

         credit_title_html: วิธีการแสดงที่มาหรือคำขอบคุณ OpenStreetMap
         credit_1_html: |-
           เราจำเป็นต้องให้ท่านแสดงที่มาหรือคำขอบคุณแก่ “© ผู้ร่วมสร้างสรรค์ OpenStreetMap
         credit_title_html: วิธีการแสดงที่มาหรือคำขอบคุณ OpenStreetMap
         credit_1_html: |-
           เราจำเป็นต้องให้ท่านแสดงที่มาหรือคำขอบคุณแก่ “© ผู้ร่วมสร้างสรรค์ OpenStreetMap

diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 25c1f4a5dceef01fdc6999b443ddc4db3d49a9bb..4eed4cf1af590d83045ea63ce86bda4553f7065f 100644 (file)
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -1513,6 +1513,7 @@ tl:
       legal_title: Legal na paunawa
       partners_title: Mga Kawaksi
     copyright:
       legal_title: Legal na paunawa
       partners_title: Mga Kawaksi
     copyright:

+      title: Karapatan sa Paglalathala at Lisensiya

       foreign:
         title: Tungkol sa salinwikang ito
         html: Kung sakaling maganap ang isang salungatan sa pagitan ng isinalinwikang
       foreign:
         title: Tungkol sa salinwikang ito
         html: Kung sakaling maganap ang isang salungatan sa pagitan ng isinalinwikang


@@ -1527,7 +1528,6 @@ tl:
         native_link: Bersyon ng Tagalog
         mapping_link: simulan ang pagmamapa
       legal_babble:
         native_link: Bersyon ng Tagalog
         mapping_link: simulan ang pagmamapa
       legal_babble:

-        title_html: Karapatan sa Paglalathala at Lisensiya

         credit_title_html: Paano babanggitin ang OpenStreetMap
         credit_1_html: 'Kung saan mo ginagamit ang datos ng OpenStreetMap, kailangan
           mong gawin ang sumusunod na dalawang bagay:'
         credit_title_html: Paano babanggitin ang OpenStreetMap
         credit_1_html: 'Kung saan mo ginagamit ang datos ng OpenStreetMap, kailangan
           mong gawin ang sumusunod na dalawang bagay:'

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index dfd2a166f867dd5f32b62db5480309c6b2800c07..2f903493d62b56b0ca6902504f438092357a845d 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -2084,6 +2084,7 @@ tr:
       legal_2_2_registered_trademarks: OSMF'nin tescilli ticari markaları
       partners_title: İş birlikçiler
     copyright:
       legal_2_2_registered_trademarks: OSMF'nin tescilli ticari markaları
       partners_title: İş birlikçiler
     copyright:

+      title: Telif Hakkı ve Lisans

       foreign:
         title: Bu çeviri hakkında
         html: Tercüme edilmiş bu sayfa ile %{english_original_link} arasında meydana
       foreign:
         title: Bu çeviri hakkında
         html: Tercüme edilmiş bu sayfa ile %{english_original_link} arasında meydana


@@ -2098,7 +2099,6 @@ tr:
         native_link: Türkçe sürümü
         mapping_link: haritacılığa başla
       legal_babble:
         native_link: Türkçe sürümü
         mapping_link: haritacılığa başla
       legal_babble:

-        title_html: Telif Hakkı ve Lisans

         introduction_1_html: OpenStreetMap%{registered_trademark_link} %{odc_odbl_link}
           (ODbL) altında %{osm_foundation_link} (OSMF) tarafından lisanslanan %{open_data}dir.
         introduction_1_open_data: açık veri
         introduction_1_html: OpenStreetMap%{registered_trademark_link} %{odc_odbl_link}
           (ODbL) altında %{osm_foundation_link} (OSMF) tarafından lisanslanan %{open_data}dir.
         introduction_1_open_data: açık veri

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 20e1768d2446e7ea1306c127c1422f700f2fcd14..923ae56e9242a347d2d68ba51103634a29f217bb 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -2120,6 +2120,7 @@ uk:
       legal_2_2_registered_trademarks: зареєстрованими торговими марками OSMF
       partners_title: Партнери
     copyright:
       legal_2_2_registered_trademarks: зареєстрованими торговими марками OSMF
       partners_title: Партнери
     copyright:

+      title: Авторські права та ліцензування

       foreign:
         title: Про цей переклад
         html: У разі суперечностей між цим перекладом та %{english_original_link},
       foreign:
         title: Про цей переклад
         html: У разі суперечностей між цим перекладом та %{english_original_link},


@@ -2133,7 +2134,6 @@ uk:
         native_link: української версії
         mapping_link: почати мапити
       legal_babble:
         native_link: української версії
         mapping_link: почати мапити
       legal_babble:

-        title_html: Авторські права та ліцензування

         introduction_1_html: OpenStreetMap%{registered_trademark_link} — це %{open_data},
           ліцензовані %{osm_foundation_link} (OSMF) на умовах ліцензії %{odc_odbl_link}
           (ODbL).
         introduction_1_html: OpenStreetMap%{registered_trademark_link} — це %{open_data},
           ліцензовані %{osm_foundation_link} (OSMF) на умовах ліцензії %{odc_odbl_link}
           (ODbL).

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 000e4394fb2b455eb0fad47d3c8302352e8fb450..6c84bcc1cf34fb70e0eb2c604b5b6fd542bd846f 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1916,6 +1916,7 @@ vi:
       legal_2_2_registered_trademarks: nhãn hiệu đăng ký của OSMF
       partners_title: Nhà bảo trợ
     copyright:
       legal_2_2_registered_trademarks: nhãn hiệu đăng ký của OSMF
       partners_title: Nhà bảo trợ
     copyright:

+      title: Bản quyền và Giấy phép

       foreign:
         title: Thông tin về bản dịch này
         html: Trong trường hợp có xung đột giữa trang dịch và trang %{english_original_link},
       foreign:
         title: Thông tin về bản dịch này
         html: Trong trường hợp có xung đột giữa trang dịch và trang %{english_original_link},


@@ -1928,7 +1929,6 @@ vi:
         native_link: bản dịch tiếng Việt
         mapping_link: bắt đầu vẽ bản đồ
       legal_babble:
         native_link: bản dịch tiếng Việt
         mapping_link: bắt đầu vẽ bản đồ
       legal_babble:

-        title_html: Bản quyền và Giấy phép

         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} là %{open_data} được %{osm_foundation_link} (OSMF) phát hành theo
           %{odc_odbl_link} (ODbL).
         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} là %{open_data} được %{osm_foundation_link} (OSMF) phát hành theo
           %{odc_odbl_link} (ODbL).

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 2f13b6d2577ae5c252d52a2dac10f9909c7b66a7..d4a160dbc60a2213d57678712b6967a193c7080a 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1980,6 +1980,7 @@ zh-CN:
       legal_2_2_registered_trademarks: OSMF 的注册商标
       partners_title: 合作伙伴
     copyright:
       legal_2_2_registered_trademarks: OSMF 的注册商标
       partners_title: 合作伙伴
     copyright:

+      title: 著作权与许可

       foreign:
         title: 关于本译文
         html: 当该翻译页面与%{english_original_link}冲突时，英语页面会被优先采用
       foreign:
         title: 关于本译文
         html: 当该翻译页面与%{english_original_link}冲突时，英语页面会被优先采用


@@ -1990,7 +1991,6 @@ zh-CN:
         native_link: 简体中文版本
         mapping_link: 开始绘制地图
       legal_babble:
         native_link: 简体中文版本
         mapping_link: 开始绘制地图
       legal_babble:

-        title_html: 著作权与许可

         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} 是%{open_data}，由 %{osm_foundation_link} (OSMF) 在
           %{odc_odbl_link} (ODbL) 下获得许可。
         introduction_1_html: |-
           OpenStreetMap%{registered_trademark_link} 是%{open_data}，由 %{osm_foundation_link} (OSMF) 在
           %{odc_odbl_link} (ODbL) 下获得许可。

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 14635ba162e5c1009293377a7e36e8ecdf356a84..0b93da8c53102af546900a33c14e7d602a0c4e9a 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1947,6 +1947,7 @@ zh-TW:
       legal_2_2_registered_trademarks: OSMF 的註冊商標
       partners_title: 合作夥伴
     copyright:
       legal_2_2_registered_trademarks: OSMF 的註冊商標
       partners_title: 合作夥伴
     copyright:

+      title: 版權與授權條款

       foreign:
         title: 關於本翻譯
         html: 這個翻譯頁面和 %{english_original_link} 若有衝突，會以英文頁面為準
       foreign:
         title: 關於本翻譯
         html: 這個翻譯頁面和 %{english_original_link} 若有衝突，會以英文頁面為準


@@ -1957,7 +1958,6 @@ zh-TW:
         native_link: 繁體中文版
         mapping_link: 開始製圖
       legal_babble:
         native_link: 繁體中文版
         mapping_link: 開始製圖
       legal_babble:

-        title_html: 版權與授權條款

         introduction_1_html: OpenStreetMap%{registered_trademark_link}是%{open_data}，透過%{osm_foundation_link}（OSMF）在%{odc_odbl_link}（ODbL）下授權。
         introduction_1_open_data: 開放資料
         introduction_1_odc_odbl: 開放資料共享開放資料庫授權
         introduction_1_html: OpenStreetMap%{registered_trademark_link}是%{open_data}，透過%{osm_foundation_link}（OSMF）在%{odc_odbl_link}（ODbL）下授權。
         introduction_1_open_data: 開放資料
         introduction_1_odc_odbl: 開放資料共享開放資料庫授權