Localisation updates from https://translatewiki.net.

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 7c128bdd30cf6658fdfd557a86d05644759b6f60..6a9d72adba759f49e4ae15549c038204ec2e3848 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -217,7 +217,6 @@ af:
   auth:
     providers:
       none: Geen
   auth:
     providers:
       none: Geen

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub


@@ -1664,8 +1663,6 @@ af:
         title: Welkom by OpenStreetMap
       beginners_guide:
         title: Gids vir beginners
         title: Welkom by OpenStreetMap
       beginners_guide:
         title: Gids vir beginners

-      help:
-        title: Help Forum

       mailing_lists:
         title: Poslyste
       irc:
       mailing_lists:
         title: Poslyste
       irc:

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 86b35e00b27f70973633ae75010dd263e2adbd92..6ec27d455c9de29c0b1b4698cbba10304600de62 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1878,7 +1878,6 @@ ar:
       heading: تسجيل الدخول
       email or username: 'عنوان البريد الإلكتروني أو اسم المستخدم:'
       password: 'كلمة السر:'
       heading: تسجيل الدخول
       email or username: 'عنوان البريد الإلكتروني أو اسم المستخدم:'
       password: 'كلمة السر:'

-      openid_html: '%{logo} الهوية المفتوحة:'

       remember: تذكرني
       lost password link: أنسيت كلمة المرور؟
       login_button: تسجيل الدخول
       remember: تذكرني
       lost password link: أنسيت كلمة المرور؟
       login_button: تسجيل الدخول


@@ -2140,10 +2139,6 @@ ar:
         url: http://wiki.openstreetmap.org/wiki/Ar:Beginners%27_guide
         title: دليل المبتدئين
         description: دليل من المجتمع للمبتدئين.
         url: http://wiki.openstreetmap.org/wiki/Ar:Beginners%27_guide
         title: دليل المبتدئين
         description: دليل من المجتمع للمبتدئين.

-      help:
-        title: منتدى المساعدة
-        description: اطرح سؤالاً أو ابحث عن إجابات في قسم أسئلة وأجوبة الخاص بموقع
-          خريطة الشارع المفتوحة

       mailing_lists:
         title: القوائم البريدية
         description: طرح سؤال أو مناقشة المسائل المثيرة للاهتمام بشأن مجموعة واسعة
       mailing_lists:
         title: القوائم البريدية
         description: طرح سؤال أو مناقشة المسائل المثيرة للاهتمام بشأن مجموعة واسعة


@@ -2784,7 +2779,6 @@ ar:
           other: أنت على بعد %{count} قدم من هذه النقطة
       base:
         standard: قياسي
           other: أنت على بعد %{count} قدم من هذه النقطة
       base:
         standard: قياسي

-        cyclosm: CyclOSM

         cycle_map: خريطة الدراجات
         transport_map: خريطة النقل و المواصلات
         hot: الخريطة الإنسانية
         cycle_map: خريطة الدراجات
         transport_map: خريطة النقل و المواصلات
         hot: الخريطة الإنسانية

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 04ede1a1482234c5728e7a3cf94708fda77c7a72..b0a6b8115eb4cfb69bf6968b53874210039bea14 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -192,7 +192,6 @@ ast:
   auth:
     providers:
       none: Nengún
   auth:
     providers:
       none: Nengún

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub


@@ -1476,7 +1475,6 @@ ast:
       heading: Entrar
       email or username: 'Direición de corréu o nome d''usuariu:'
       password: 'Contraseña:'
       heading: Entrar
       email or username: 'Direición de corréu o nome d''usuariu:'
       password: 'Contraseña:'

-      openid_html: '%{logo} OpenID:'

       remember: Recordame
       lost password link: ¿Perdisti la contraseña?
       login_button: Entrar
       remember: Recordame
       lost password link: ¿Perdisti la contraseña?
       login_button: Entrar


@@ -1633,10 +1631,6 @@ ast:
         url: https://wiki.openstreetmap.org/wiki/Ast:Beginners%27_guide
         title: Guía del principiante
         description: Guía pa principiantes, mantenida pola comunidá.
         url: https://wiki.openstreetmap.org/wiki/Ast:Beginners%27_guide
         title: Guía del principiante
         description: Guía pa principiantes, mantenida pola comunidá.

-      help:
-        title: Foru d'ayuda
-        description: Entrugar o buscar respuestes nel sitiu d'entrugues y respuestes
-          d'OpenStreetMap.

       mailing_lists:
         title: Llistes de corréu
         description: Fai una entruga o alderica sobro asuntos interesantes nun ampliu
       mailing_lists:
         title: Llistes de corréu
         description: Fai una entruga o alderica sobro asuntos interesantes nun ampliu

diff --git a/config/locales/az.yml b/config/locales/az.yml
index 11da2b7701925d9ef8f26c6b6b335ef6f28dd435..bbd43bcaf44af3ebe71eb78103466c69659081af 100644 (file)
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -139,7 +139,6 @@ az:
   auth:
     providers:
       none: Heç biri
   auth:
     providers:
       none: Heç biri

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub


@@ -912,7 +911,6 @@ az:
       title: Daxil olun
       heading: Daxil olun
       password: 'Parol:'
       title: Daxil olun
       heading: Daxil olun
       password: 'Parol:'

-      openid_html: '%{logo} OpenID:'

       remember: Məni xatırla
       login_button: Daxil ol
       register now: İndi qeydiyyatdan keç
       remember: Məni xatırla
       login_button: Daxil ol
       register now: İndi qeydiyyatdan keç

diff --git a/config/locales/ba.yml b/config/locales/ba.yml
index 94e4f97602727dabcb69289eeb684786be53d258..bfe066976e6ea69b9e746b126bead98df98f2083 100644 (file)
--- a/config/locales/ba.yml
+++ b/config/locales/ba.yml
@@ -221,7 +221,6 @@ ba:
   auth:
     providers:
       none: Юҡ
   auth:
     providers:
       none: Юҡ

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Майкрософт
       google: Google
       facebook: Facebook
       microsoft: Майкрософт

diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index a400a2f3cacd39204ca78f21b8b24d461a61ef00..6b19a5830cf23a485bb318ff7690e2cd3537f1a3 100644 (file)
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -46,6 +46,11 @@ be-Tarask:
       messages:
         invalid_email_address: не падобны на карэктны адрас э-пошты
         email_address_not_routable: не маршрутызаваны
       messages:
         invalid_email_address: не падобны на карэктны адрас э-пошты
         email_address_not_routable: не маршрутызаваны

+        display_name_is_user_n: ня можа быць user_n, калі n — ня ваш карыстальніцкі
+          id
+      models:
+        user_mute:
+          is_already_muted: ужо сьцішана

     models:
       acl: Сьпіс абмежаваньня доступу
       changeset: Набор зьменаў
     models:
       acl: Сьпіс абмежаваньня доступу
       changeset: Набор зьменаў


@@ -212,7 +217,6 @@ be-Tarask:
   auth:
     providers:
       none: Няма
   auth:
     providers:
       none: Няма

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub


@@ -240,6 +244,10 @@ be-Tarask:
       entry:
         comment: Камэнтар
         full: Поўны тэкст
       entry:
         comment: Камэнтар
         full: Поўны тэкст

+  account:
+    deletions:
+      show:
+        confirm_delete: Вы ўпэўненыя?

   accounts:
     edit:
       title: Рэдагаваньне рахунку
   accounts:
     edit:
       title: Рэдагаваньне рахунку


@@ -1028,7 +1036,7 @@ be-Tarask:
     new:
       title: Згублены пароль
       heading: Забылі пароль?
     new:
       title: Згублены пароль
       heading: Забылі пароль?

-      email address: 'Адрас электроннай пошты:'
+      email address: Адрас электроннай пошты

       new password button: Ачысьціць пароль
       help_text: Увядзіце адрас электроннай пошты, які Вы выкарыстоўвалі пры рэгістрацыі,
         і мы вышлем Вам спасылку, якую Вы зможаце выкарыстаць для зьмены паролю.
       new password button: Ачысьціць пароль
       help_text: Увядзіце адрас электроннай пошты, які Вы выкарыстоўвалі пры рэгістрацыі,
         і мы вышлем Вам спасылку, якую Вы зможаце выкарыстаць для зьмены паролю.


@@ -1060,9 +1068,8 @@ be-Tarask:
     new:
       title: Увайсьці
       heading: Уваход
     new:
       title: Увайсьці
       heading: Уваход

-      email or username: 'Адрас электроннай пошты ці імя карыстальніка:'
-      password: 'Пароль:'
-      openid_html: '%{logo} OpenID:'
+      email or username: Адрас электроннай пошты ці імя карыстальніка
+      password: Пароль

       remember: Запомніць мяне
       lost password link: Забылі пароль?
       login_button: Увайсьці
       remember: Запомніць мяне
       lost password link: Забылі пароль?
       login_button: Увайсьці


@@ -1154,13 +1161,13 @@ be-Tarask:
           rail: Чыгунка
           subway: Мэтро
           cable_car: Канатная дарога
           rail: Чыгунка
           subway: Мэтро
           cable_car: Канатная дарога

-          chair_lift: крэславы пад’ёмнік
+          chair_lift: Ð\9aрэславы пад’ёмнік

           runway: Узьлётная паласа
           runway: Узьлётная паласа

-          taxiway: рулёжная дарога
+          taxiway: Рулёжная дарога

           apron: Пэрон аэрапорта
           admin: Адміністрацыйная мяжа
           forest: Лес
           apron: Пэрон аэрапорта
           admin: Адміністрацыйная мяжа
           forest: Лес

-          wood: Ð\9fÑ\83Ñ\88Ñ\87а
+          wood: Ð\9bеÑ\81

           golf: Поле для гольфу
           park: Парк
           common: Грамадзкая зямля
           golf: Поле для гольфу
           park: Парк
           common: Грамадзкая зямля


@@ -1170,7 +1177,7 @@ be-Tarask:
           commercial: Камэрцыйны раён
           heathland: Пусташ
           lake: Возера
           commercial: Камэрцыйны раён
           heathland: Пусташ
           lake: Возера

-          reservoir: вадасховішча
+          reservoir: Ð\92адасховішча

           farm: Фэрма
           brownfield: Закінутая тэрыторыя
           cemetery: Могілкі
           farm: Фэрма
           brownfield: Закінутая тэрыторыя
           cemetery: Могілкі


@@ -1180,11 +1187,11 @@ be-Tarask:
           reserve: Запаведнік
           military: Вайсковая тэрыторыя
           school: Школа
           reserve: Запаведнік
           military: Вайсковая тэрыторыя
           school: Школа

-          university: унівэрсытэт
+          university: Унівэрсытэт

           building: Значны будынак
           station: Чыгуначная станцыя
           summit: Вяршыня
           building: Значны будынак
           station: Чыгуначная станцыя
           summit: Вяршыня

-          peak: пік
+          peak: Ð\9fік

           tunnel: Пункцір = тунэль
           bridge: Чорная лінія = мост
           private: Прыватны доступ
           tunnel: Пункцір = тунэль
           bridge: Чорная лінія = мост
           private: Прыватны доступ


@@ -1503,7 +1510,7 @@ be-Tarask:
       show: Паказаць
       edit: Рэдагаваць
       revoke: Адклікаць!
       show: Паказаць
       edit: Рэдагаваць
       revoke: Адклікаць!

-      confirm: Вы ўпэўнены?
+      confirm: Вы ўпэўненыя?

       reason: 'Прычына блякаваньня:'
       back: Паказаць усе блякаваньні
       revoker: 'Адклікаўшы:'
       reason: 'Прычына блякаваньня:'
       back: Паказаць усе блякаваньні
       revoker: 'Адклікаўшы:'

diff --git a/config/locales/be.yml b/config/locales/be.yml
index d537dd03ec12142c3de198c1e08705740049dcf3..44dd6b835970128c903baefcb778a0e55176bb0d 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -251,7 +251,6 @@ be:
   auth:
     providers:
       none: Няма
   auth:
     providers:
       none: Няма

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub


@@ -1482,7 +1481,6 @@ be:
       heading: Уваход
       email or username: 'Пошта ці імя карыстальніка:'
       password: 'Пароль:'
       heading: Уваход
       email or username: 'Пошта ці імя карыстальніка:'
       password: 'Пароль:'

-      openid_html: '%{logo} OpenID:'

       remember: Памятаць мяне
       lost password link: Згубілі пароль?
       login_button: Увайсці
       remember: Памятаць мяне
       lost password link: Згубілі пароль?
       login_button: Увайсці


@@ -1650,10 +1648,6 @@ be:
       beginners_guide:
         title: Дапаможнік для пачаткоўцаў
         description: Супольнасць падтрымлівае дапаможнік для пачаткоўцаў.
       beginners_guide:
         title: Дапаможнік для пачаткоўцаў
         description: Супольнасць падтрымлівае дапаможнік для пачаткоўцаў.

-      help:
-        title: Пытанні і адказы
-        description: Задайце пытанне або шукайце адказы на сайце пытанняў і адказаў
-          OSM.

       mailing_lists:
         title: Рассылкі
         description: Задайце пытанне ці далучыцеся да абмеркавання цікавых тэм на
       mailing_lists:
         title: Рассылкі
         description: Задайце пытанне ці далучыцеся да абмеркавання цікавых тэм на

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 62c07a643af6e959ed6309a32e631bbd36f375b7..4dfd484352f06bbbd30941f2b053bed1aa843421 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -209,7 +209,6 @@ bg:
   auth:
     providers:
       none: Нищо
   auth:
     providers:
       none: Нищо

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Майкрософт
       google: Google
       facebook: Facebook
       microsoft: Майкрософт


@@ -1431,7 +1430,6 @@ bg:
       heading: Влизане
       email or username: 'Електронна поща или потребителско име:'
       password: 'Парола:'
       heading: Влизане
       email or username: 'Електронна поща или потребителско име:'
       password: 'Парола:'

-      openid_html: '%{logo} OpenID:'

       remember: Запомняне
       lost password link: Забравена парола?
       login_button: Влизане
       remember: Запомняне
       lost password link: Забравена парола?
       login_button: Влизане


@@ -1591,17 +1589,13 @@ bg:
       beginners_guide:
         title: Наръчник за начинаещи
         description: Ръководство за начинаещи, поддържано от общността.
       beginners_guide:
         title: Наръчник за начинаещи
         description: Ръководство за начинаещи, поддържано от общността.

-      help:
-        title: Форум за поддръжка
-        description: Задайте въпрос или потърсете отговори в сайта за въпроси и отговори
-          на OpenStreetMap.
+      community:
+        title: Форум на общността
+        description: Споделено място за разговори за OpenStreetMap.

       mailing_lists:
         title: Пощенски списъци
         description: Задайте въпрос или дискутирайте интересни теми в широк спектър
           от тематични и регионални пощенски списъци.
       mailing_lists:
         title: Пощенски списъци
         description: Задайте въпрос или дискутирайте интересни теми в широк спектър
           от тематични и регионални пощенски списъци.

-      community:
-        title: Форум на общността
-        description: Споделено място за разговори за OpenStreetMap.

       irc:
         title: IRC
         description: Интерактивен чат на много различни езици и по много теми.
       irc:
         title: IRC
         description: Интерактивен чат на много различни езици и по много теми.

diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 4fc7440d6179c41f2807693f2e82b4e8caef9f3e..28d51f5d892e9a9f8948ad9b3a687842e7ca3c83 100644 (file)
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -1682,8 +1682,6 @@ bn:
       beginners_guide:
         title: আরম্ভকারী সহায়িকা
         description: নতুনদের জন্য সম্প্রদায় পরিচালিত নির্দেশিকা।
       beginners_guide:
         title: আরম্ভকারী সহায়িকা
         description: নতুনদের জন্য সম্প্রদায় পরিচালিত নির্দেশিকা।

-      help:
-        title: সাহায্য ফোরাম

       mailing_lists:
         title: মেইলিং তালিকা
       irc:
       mailing_lists:
         title: মেইলিং তালিকা
       irc:

diff --git a/config/locales/br.yml b/config/locales/br.yml
index bef1c760f80e5f2aae9849a06b36b970c11b64e6..21281216435586b0db90a3c9dfefbafa407a889a 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -57,6 +57,8 @@ br:
       messages:
         invalid_email_address: ne ziskouez ket bezañ ur chomlec'h postel mat
         email_address_not_routable: n'haller ket routañ
       messages:
         invalid_email_address: ne ziskouez ket bezañ ur chomlec'h postel mat
         email_address_not_routable: n'haller ket routañ

+        display_name_is_user_n: n'hall ket bezañ user_n nemet hag e vefe "n" ho kod
+          anaout implijer

       models:
         user_mute:
           is_already_muted: a zo bet kuzhet dija
       models:
         user_mute:
           is_already_muted: a zo bet kuzhet dija


@@ -259,7 +261,6 @@ br:
   auth:
     providers:
       none: Hini ebet
   auth:
     providers:
       none: Hini ebet

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -483,6 +484,18 @@ br:
       introduction: Klikit war ar gartenn evit kavout arc'hweladurioù e-kichen.
       nearby: Arc'hweladurioù e-kichen
       enclosing: Arc'hweladurioù enklozañ
       introduction: Klikit war ar gartenn evit kavout arc'hweladurioù e-kichen.
       nearby: Arc'hweladurioù e-kichen
       enclosing: Arc'hweladurioù enklozañ

+  old_nodes:
+    not_found:
+      sorry: 'Hon digarezit, n''eo ket bet kavet ar stumm %{version} eus ar skoulm
+        #%{id}.'
+  old_ways:
+    not_found:
+      sorry: 'Hon digarezit, n''eo ket bet kavet ar stumm %{version} eus ar roudenn
+        #%{id}.'
+  old_relations:
+    not_found:
+      sorry: 'Hon digarezit, n''eo ket bet kavet ar stumm %{version} eus an darempred
+        #%{id}.'

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


@@ -1895,7 +1908,6 @@ br:
       heading: Kevreañ
       email or username: Chomlec'h postel pe anv implijer
       password: Ger-tremen
       heading: Kevreañ
       email or username: Chomlec'h postel pe anv implijer
       password: Ger-tremen

-      openid_html: '%{logo} OpenID :'

       remember: Derc'hel soñj ac'hanon
       lost password link: Ankouaet ho ker-tremen ganeoc'h ?
       login_button: Kevreañ
       remember: Derc'hel soñj ac'hanon
       lost password link: Ankouaet ho ker-tremen ganeoc'h ?
       login_button: Kevreañ


@@ -2158,17 +2170,13 @@ br:
         url: http://wiki.openstreetmap.org/wiki/FR:Sturlevr an deraouidi
         title: Sturlevr evit deraouidi
         description: Sturlevr evit an deraouidi dalc'het gant ar gumuniezh
         url: http://wiki.openstreetmap.org/wiki/FR:Sturlevr an deraouidi
         title: Sturlevr evit deraouidi
         description: Sturlevr evit an deraouidi dalc'het gant ar gumuniezh

-      help:
-        title: Forom skoazellañ
-        description: Ober ur goulenn pe klask respontoù e lec'hienn goulennoù-respontoù
-          OpenStreetMap
+      community:
+        title: Forom ar gumuniezh ha skoazell
+        description: Ul lec'h boutin evit goulenn sikour ha kaozeal diwar-benn OpenStreetMap.

       mailing_lists:
         title: Roll skignañ
         description: Sevel ur goulenn pe divizout diwar-benn goulennoù dedennus war
           un niver bras a demoù pe diwar-benn rolloù skignañ rannvroel.
       mailing_lists:
         title: Roll skignañ
         description: Sevel ur goulenn pe divizout diwar-benn goulennoù dedennus war
           un niver bras a demoù pe diwar-benn rolloù skignañ rannvroel.

-      community:
-        title: Forom ar gumuniezh
-        description: Ul lec'h boutin evit kaozeal diwar-benn OpenStreetMap.

       irc:
         title: IRC
         description: Flap etreoberiat e meur a yezh disheñvel ha diwar-benn danvezioù
       irc:
         title: IRC
         description: Flap etreoberiat e meur a yezh disheñvel ha diwar-benn danvezioù


@@ -2606,6 +2614,11 @@ br:
       support: skor
       about:
         header: Digoust hag aozadus
       support: skor
       about:
         header: Digoust hag aozadus

+        paragraph_1: E-skoaz ar c'hartennoù all eo savet OpenStreetMap penn-da-benn
+          gant tud eveldoc'h ha tu zo da bep hini reizhañ, hizivaat, pellgargañ hag
+          implijout e gartennoù.
+        paragraph_2: Lakait hoc'h anv ha stagit da gemer perzh. Kaset a vo ur postel
+          deoc'h a-benn kadarnaat ho kont.

       display name description: Emañ hoc'h anv implijer a-wel d'an holl. Se a c'hallit
         cheñch diwezhatoc'h en ho penndibaboù.
       external auth: 'Dilesadur trede :'
       display name description: Emañ hoc'h anv implijer a-wel d'an holl. Se a c'hallit
         cheñch diwezhatoc'h en ho penndibaboù.
       external auth: 'Dilesadur trede :'


@@ -2996,7 +3009,6 @@ br:
           other: Emaoc'h dindan %{count} troad diouzh ar poent-mañ
       base:
         standard: Standard
           other: Emaoc'h dindan %{count} troad diouzh ar poent-mañ
       base:
         standard: Standard

-        cyclosm: CyclOSM

         cycle_map: Kelc'hiad kartenn
         transport_map: Kartenn treuzdougen
         hot: Denegour
         cycle_map: Kelc'hiad kartenn
         transport_map: Kartenn treuzdougen
         hot: Denegour

diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 4a6edbf7810cf352142c6a155f9a1ef5142837e6..11d95da6df7443d141f1e32c8a0846790a70d75e 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1054,7 +1054,6 @@ bs:
       heading: Prijava
       email or username: 'E-mail adresa ili korisničko ime:'
       password: 'Lozinka:'
       heading: Prijava
       email or username: 'E-mail adresa ili korisničko ime:'
       password: 'Lozinka:'

-      openid_html: '%{logo} OtvoreniID:'

       remember: Zapamti me
       lost password link: Izgubili ste lozinku?
       login_button: Prijava
       remember: Zapamti me
       lost password link: Izgubili ste lozinku?
       login_button: Prijava

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 35a1aa453fdaf24f754e45078a23c651355475a5..7f76ca149e780d9fea64d0053339820ffc212b6a 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -254,7 +254,6 @@ ca:
   auth:
     providers:
       none: Cap
   auth:
     providers:
       none: Cap

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -1896,7 +1895,6 @@ ca:
       heading: Inicia la sessió
       email or username: 'Adreça de correu o nom d''usuari:'
       password: 'Contrasenya:'
       heading: Inicia la sessió
       email or username: 'Adreça de correu o nom d''usuari:'
       password: 'Contrasenya:'

-      openid_html: '%{logo} OpenID:'

       remember: Recorda'm
       lost password link: Heu perdut la contrasenya?
       login_button: Accés
       remember: Recorda'm
       lost password link: Heu perdut la contrasenya?
       login_button: Accés


@@ -2210,17 +2208,13 @@ ca:
         url: http://wiki.openstreetmap.org/wiki/Ca:Beginners%27_guide
         title: Guia per a principiants
         description: Guia per a principiants mantinguda per la comunitat.
         url: http://wiki.openstreetmap.org/wiki/Ca:Beginners%27_guide
         title: Guia per a principiants
         description: Guia per a principiants mantinguda per la comunitat.

-      help:
-        title: Fòrum d'ajuda
-        description: Feu una pregunta o cerqueu respostes a la pàgina de preguntes
-          i respostes d'OpenStreetMap.
+      community:
+        title: Fòrum comunitari
+        description: Un espai compartit per a les converses d'OpenStreetMap.

       mailing_lists:
         title: Llistes de correu
         description: Pregunta o debat sobre qüestions interessants en un ampli ventall
           de llistes de correu temàtiques i regionals.
       mailing_lists:
         title: Llistes de correu
         description: Pregunta o debat sobre qüestions interessants en un ampli ventall
           de llistes de correu temàtiques i regionals.

-      community:
-        title: Fòrum comunitari
-        description: Un espai compartit per a les converses d'OpenStreetMap.

       irc:
         title: IRC
         description: Xat interactiu en llengües diferents i sobre diferents temes.
       irc:
         title: IRC
         description: Xat interactiu en llengües diferents i sobre diferents temes.


@@ -3040,7 +3034,6 @@ ca:
           other: Sou a menys de %{count} peus del punt
       base:
         standard: Estàndard
           other: Sou a menys de %{count} peus del punt
       base:
         standard: Estàndard

-        cyclosm: CyclOSM

         cycle_map: Mapa ciclista
         transport_map: Mapa de transports
         tracestracktop_topo: Tracestrack Topo
         cycle_map: Mapa ciclista
         transport_map: Mapa de transports
         tracestracktop_topo: Tracestrack Topo

diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index 14455d1a3c04fbdbf417f838f3ded49b740f9167..d65e3fc34e405adaecc0ebcda9442e251b9c6a56 100644 (file)
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -781,7 +781,6 @@ ce:
       heading: ЧугӀо
       email or username: 'Эл. пошт йа декъашхочун цӀе:'
       password: 'Пароль:'
       heading: ЧугӀо
       email or username: 'Эл. пошт йа декъашхочун цӀе:'
       password: 'Пароль:'

-      openid_html: '%{logo} OpenID:'

       remember: Дагалаца со
       lost password link: Йицйелла пароль?
       login_button: ЧугӀо
       remember: Дагалаца со
       lost password link: Йицйелла пароль?
       login_button: ЧугӀо

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 4e1874c12b6ed46f6aea06dc7edededc97b7e39b..e4b22fd6ec92fab290c327d942acfe8a4980bf78 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -286,7 +286,6 @@ cs:
   auth:
     providers:
       none: Žádná
   auth:
     providers:
       none: Žádná

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -1958,7 +1957,6 @@ cs:
       heading: Přihlášení
       email or username: 'E-mailová adresa nebo uživatelské jméno:'
       password: 'Heslo:'
       heading: Přihlášení
       email or username: 'E-mailová adresa nebo uživatelské jméno:'
       password: 'Heslo:'

-      openid_html: '%{logo} OpenID:'

       remember: Zapamatuj si mě
       lost password link: Ztratili jste heslo?
       login_button: Přihlásit
       remember: Zapamatuj si mě
       lost password link: Ztratili jste heslo?
       login_button: Přihlásit


@@ -2303,17 +2301,13 @@ cs:
         url: https://wiki.openstreetmap.org/wiki/Cs:Pr%C5%AFvodce_za%C4%8D%C3%A1te%C4%8Dn%C3%ADka
         title: Průvodce začátečníka
         description: Komunitou spravovaná příručka pro začátečníky.
         url: https://wiki.openstreetmap.org/wiki/Cs:Pr%C5%AFvodce_za%C4%8D%C3%A1te%C4%8Dn%C3%ADka
         title: Průvodce začátečníka
         description: Komunitou spravovaná příručka pro začátečníky.

-      help:
-        title: Fórum pomoci
-        description: Položte dotaz nebo vyhledejte odpovědi na stránce otázek a odpovědí
-          týkajících se OpenStreetMap.
+      community:
+        title: Komunitní fórum
+        description: Sdílený prostor pro diskuse o OpenStreetMap.

       mailing_lists:
         title: E-mailové konference
         description: Položte dotaz nebo diskutujte o zajímavých věcech na některé
           ze široké nabídky tematických či regionálních e-mailových konferencí.
       mailing_lists:
         title: E-mailové konference
         description: Položte dotaz nebo diskutujte o zajímavých věcech na některé
           ze široké nabídky tematických či regionálních e-mailových konferencí.

-      community:
-        title: Komunitní fórum
-        description: Sdílený prostor pro diskuse o OpenStreetMap.

       irc:
         title: IRC
         description: Interaktivní chat v mnoha jazycích a na mnoho témat.
       irc:
         title: IRC
         description: Interaktivní chat v mnoha jazycích a na mnoho témat.


@@ -3126,7 +3120,6 @@ cs:
           other: Od tohoto bodu jste méně než %{count} stop
       base:
         standard: Standardní
           other: Od tohoto bodu jste méně než %{count} stop
       base:
         standard: Standardní

-        cyclosm: CyclOSM

         cycle_map: Cyklomapa
         transport_map: Dopravní mapa
         tracestracktop_topo: Tracestrack Topo
         cycle_map: Cyklomapa
         transport_map: Dopravní mapa
         tracestracktop_topo: Tracestrack Topo

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index a6171c98c20afc6fbb83f04379487a7f06f95645..c3c263bc4594bf9c3a86fb786b69861b9eebd919 100644 (file)
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -256,7 +256,6 @@ cy:
   auth:
     providers:
       none: Dim
   auth:
     providers:
       none: Dim

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


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

+        description_all: Rhestr o nodiadau newydd, gyda sylwadau, a 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}


@@ -299,6 +299,8 @@ cy:
           ei ailddefnyddio gan gyfrifon eraill.
         retain_edits: Bydd eich golygiadau i'r gronfa ddata mapiau, os ydynt yn bodoli,
           yn cael eu cadw.
           ei ailddefnyddio gan gyfrifon eraill.
         retain_edits: Bydd eich golygiadau i'r gronfa ddata mapiau, os ydynt yn bodoli,
           yn cael eu cadw.

+        retain_traces: Cedwir unrhyw arllwybrau rydych chi wedi uwchlwytho os ydynt
+          yn bodoli.

         retain_changeset_discussions: Bydd eich trafodaethau grwpiau newid, os ydynt
           yn bodoli, yn cael eu cadw.
         retain_email: Bydd eich cyfeiriad e-bost yn cael ei gadw.
         retain_changeset_discussions: Bydd eich trafodaethau grwpiau newid, os ydynt
           yn bodoli, yn cael eu cadw.
         retain_email: Bydd eich cyfeiriad e-bost yn cael ei gadw.


@@ -528,6 +530,8 @@ cy:
       friend: Ffrind
     show:
       title: Dangosfwrdd
       friend: Ffrind
     show:
       title: Dangosfwrdd

+      no_home_location_html: '%{edit_profile_link} a gosodwch eich lleoliad i weld
+        defnyddwyr cyfagos.'

       edit_your_profile: Golygu eich proffil
       my friends: Fy ffrindiau
       no friends: Nid ydych wedi ychwanegu unrhyw ffrindiau eto.
       edit_your_profile: Golygu eich proffil
       my friends: Fy ffrindiau
       no friends: Nid ydych wedi ychwanegu unrhyw ffrindiau eto.


@@ -647,7 +651,10 @@ cy:
   errors:
     contact:
       contact_url_title: Esboniad o sianeli cyswllt amrywiol
   errors:
     contact:
       contact_url_title: Esboniad o sianeli cyswllt amrywiol

-      contact: cysylltu
+      contact: Cysylltwch
+      contact_the_community_html: '%{contact_link} â''r gymuned OpenStreetMap os ydych
+        chi wedi dod o hyd i nam neu ddolen sydd wedi torri. Nodwch yr URL cywir o''ch
+        cais.'

     forbidden:
       title: Gwaharddedig
     internal_server_error:
     forbidden:
       title: Gwaharddedig
     internal_server_error:


@@ -1418,10 +1425,12 @@ cy:
       resolve: Datrys
       ignore: Anwybyddu
       reopen: Ailagor
       resolve: Datrys
       ignore: Anwybyddu
       reopen: Ailagor

+      reports_of_this_issue: Adroddiadau o'r Mater hwn

       read_reports: Darllen Adroddiadau
       new_reports: Adroddiadau Newydd
     comments:
       comment_from_html: Sylw gan %{user_link} ar %{comment_created_at}
       read_reports: Darllen Adroddiadau
       new_reports: Adroddiadau Newydd
     comments:
       comment_from_html: Sylw gan %{user_link} ar %{comment_created_at}

+      reassign_param: Ailbennu'r Mater?

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


@@ -1709,7 +1718,6 @@ cy:
       heading: Mewngofnodi
       email or username: Cyfeiriad E-Bost neu Enw Defnyddiwr
       password: Cyfrinair
       heading: Mewngofnodi
       email or username: Cyfeiriad E-Bost neu Enw Defnyddiwr
       password: Cyfrinair

-      openid_html: '%{logo} OpenID'

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


@@ -1778,8 +1786,15 @@ cy:
       community_driven_community_blogs: blogiau cymunedol
       community_driven_osm_foundation: OSM Foundation
       open_data_title: Data Agored
       community_driven_community_blogs: blogiau cymunedol
       community_driven_osm_foundation: OSM Foundation
       open_data_title: Data Agored

-      open_data_open_data: data agored
-      open_data_copyright_license: Tudalen Hawlfraint a Thrwydded
+      open_data_1_html: |-
+        Mae OpenStreetMap yn %{open_data}: mae modd i'w ddefnyddio at unrhyw ddiben
+        ond mae rhaid rhoi cydnabyddiaeth i OpenStreetMap a'i gyfranwyr. Os
+        ydych chi'n newid neu
+        adeiladu ar y ddata mewn rhai ffyrdd, gallwch chi
+        ddosbarthu'r canlyniad
+        o dan yr un drwydded yn unig. Gweler y %{copyright_license_link} am fanylion.
+      open_data_open_data: ddata agored
+      open_data_copyright_license: Dudalen Hawlfraint a Thrwydded

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


@@ -1801,6 +1816,7 @@ cy:
       legal_babble:
         title_html: Hawlfraint a Thrwydded
         introduction_1_open_data: data agored
       legal_babble:
         title_html: Hawlfraint a Thrwydded
         introduction_1_open_data: data agored

+        introduction_1_odc_odbl: Open Data Commons Open Database License

         introduction_1_osm_foundation: OpenStreetMap Foundation
         introduction_2_html: |-
           Rydych yn rhydd i gopïo, dosbarthu, trosglwyddo ac addasu ein data, cyn belled â'ch bod yn cydnabod OpenStreetMap a'i
         introduction_1_osm_foundation: OpenStreetMap Foundation
         introduction_2_html: |-
           Rydych yn rhydd i gopïo, dosbarthu, trosglwyddo ac addasu ein data, cyn belled â'ch bod yn cydnabod OpenStreetMap a'i


@@ -1910,12 +1926,10 @@ cy:
       beginners_guide:
         title: Llawlyfr Dechreuwyr
         description: Canllaw'r gymuned i ddechreuwyr
       beginners_guide:
         title: Llawlyfr Dechreuwyr
         description: Canllaw'r gymuned i ddechreuwyr

-      help:
-        title: Fforwm Cymorth
-      mailing_lists:
-        title: Rhestrau Post

       community:
         title: Fforwm Cymunedol
       community:
         title: Fforwm Cymunedol

+      mailing_lists:
+        title: Rhestrau Post

       irc:
         title: IRC
       switch2osm:
       irc:
         title: IRC
       switch2osm:


@@ -2169,6 +2183,7 @@ cy:
       oauth1_settings: Gosodiadau OAuth 1
       oauth2_applications: Apiau OAuth 2
       oauth2_authorizations: Awdurdodiadau OAuth 2
       oauth1_settings: Gosodiadau OAuth 1
       oauth2_applications: Apiau OAuth 2
       oauth2_authorizations: Awdurdodiadau OAuth 2

+      muted_users: Defnyddwyr ag Anwybyddwyd

   oauth:
     authorize:
       title: Awdurdodi mynediad i'ch cyfrif
   oauth:
     authorize:
       title: Awdurdodi mynediad i'ch cyfrif


@@ -2219,14 +2234,17 @@ cy:
       confirm: Ydych chi'n siŵr?
     index:
       title: Fy Manylion OAuth
       confirm: Ydych chi'n siŵr?
     index:
       title: Fy Manylion OAuth

+      my_tokens: Fy Apiau Awdurdodedig

       application: Enw'r Ap
       issued_at: Dyddiad awdurdodi
       revoke: Dirymu!
       my_apps: Fy Apiau Cleient
       oauth: OAuth
       application: Enw'r Ap
       issued_at: Dyddiad awdurdodi
       revoke: Dirymu!
       my_apps: Fy Apiau Cleient
       oauth: OAuth

+      register_new: Cofrestru eich ap

   oauth2_applications:
     index:
       title: Fy Apiau Cleient
   oauth2_applications:
     index:
       title: Fy Apiau Cleient

+      new: Cofrestru ap newydd

       name: Enw
       permissions: Caniatâd
     application:
       name: Enw
       permissions: Caniatâd
     application:


@@ -2354,7 +2372,16 @@ cy:
     index:
       title: Defnyddwyr
       heading: Defnyddwyr
     index:
       title: Defnyddwyr
       heading: Defnyddwyr

+      showing:
+        zero: Tudalen %{page} (%{first_item} o %{items})
+        one: Tudalen %{page} (%{first_item} o %{items})
+        two: Tudalen %{page} (%{first_item}-%{last_item} o %{items})
+        few: Tudalen %{page} (%{first_item}-%{last_item} o %{items})
+        many: Tudalen %{page} (%{first_item}-%{last_item} o %{items})
+        other: Tudalen %{page} (%{first_item}-%{last_item} o %{items})

       summary_no_ip_html: '%{name} wedi''i greu ar %{date}'
       summary_no_ip_html: '%{name} wedi''i greu ar %{date}'

+      confirm: Cadarnhau Defnyddwyr Dewisiedig
+      hide: Cuddio Defnyddwyr Dewisiedig

     suspended:
       title: Cyfrif wedi'i atal
       heading: Cyfrif wedi'i atal
     suspended:
       title: Cyfrif wedi'i atal
       heading: Cyfrif wedi'i atal


@@ -2363,6 +2390,7 @@ cy:
         awtomatig oherwydd gweithgarwch amheus.
     auth_failure:
       no_authorization_code: Dim cod awdurdodi
         awtomatig oherwydd gweithgarwch amheus.
     auth_failure:
       no_authorization_code: Dim cod awdurdodi

+      invalid_scope: Sgop annilys

   user_role:
     grant:
       confirm: Cadarnhau
   user_role:
     grant:
       confirm: Cadarnhau


@@ -2464,13 +2492,16 @@ cy:
     index:
       table:
         thead:
     index:
       table:
         thead:

+          muted_user: Defnyddiwr ag Anwybyddwyd

           actions: Gweithredoedd
         tbody:
           actions: Gweithredoedd
         tbody:

+          unmute: Dad-anwybyddu

           send_message: Anfon neges
     create:
       notice: Rydych chi wedi anwybyddu %{name}.
   notes:
     index:
           send_message: Anfon neges
     create:
       notice: Rydych chi wedi anwybyddu %{name}.
   notes:
     index:

+      title: Nodiadau ag agorwyd neu y gwnaed sylw arnynt gan %{user}

       heading: Nodiadau %{user}
       subheading_submitted: cyflwynwyd
       subheading_commented: rhoddwyd sylw
       heading: Nodiadau %{user}
       subheading_submitted: cyflwynwyd
       subheading_commented: rhoddwyd sylw


@@ -2550,7 +2581,6 @@ cy:
         title: Dangos Fy Lleoliad
       base:
         standard: Safonol
         title: Dangos Fy Lleoliad
       base:
         standard: Safonol

-        cyclosm: CyclOSM

         cycle_map: Map Beicio
         transport_map: Map Trafnidiaeth
         tracestracktop_topo: Tracestrack Topo
         cycle_map: Map Beicio
         transport_map: Map Trafnidiaeth
         tracestracktop_topo: Tracestrack Topo

diff --git a/config/locales/da.yml b/config/locales/da.yml
index d7a7d7a024bb812d27fdf87c8ad34a3a32a04319..0489206f0e6642a19a39f30f7f743016fbe0c1e6 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -248,7 +248,6 @@ da:
   auth:
     providers:
       none: Ingen
   auth:
     providers:
       none: Ingen

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -1929,7 +1928,6 @@ da:
       heading: Log på
       email or username: E-mailadresse eller brugernavn
       password: Adgangskode
       heading: Log på
       email or username: E-mailadresse eller brugernavn
       password: Adgangskode

-      openid_html: '%{logo} OpenID'

       remember: Husk mig
       lost password link: Glemt din adgangskode?
       login_button: Log på
       remember: Husk mig
       lost password link: Glemt din adgangskode?
       login_button: Log på


@@ -2278,17 +2276,13 @@ da:
         url: https://wiki.openstreetmap.org/wiki/Da:Beginners%27_guide
         title: Hjælp for nybegyndere
         description: Hjælp for nybegyndere, som vedligeholdes af fællesskabet.
         url: https://wiki.openstreetmap.org/wiki/Da:Beginners%27_guide
         title: Hjælp for nybegyndere
         description: Hjælp for nybegyndere, som vedligeholdes af fællesskabet.

-      help:
-        title: Hjælpeforum
-        description: Stil et spørgsmål eller find et svar på OpenStreetMap's spørgsmål
-          og svar side.
+      community:
+        title: Fællesskabs-forum
+        description: Et sted for fælles diskussioner om OpenStreetMap.

       mailing_lists:
         title: Mailinglister
         description: Stil et spørgsmål eller diskuter interessante spørgsmål på en
           bred vifte af tematiske eller regionale mailinglister.
       mailing_lists:
         title: Mailinglister
         description: Stil et spørgsmål eller diskuter interessante spørgsmål på en
           bred vifte af tematiske eller regionale mailinglister.

-      community:
-        title: Fællesskabs-forum
-        description: Et sted for fælles diskussioner om OpenStreetMap.

       irc:
         title: IRC
         description: Interaktiv chat på mange forskellige sprog, og om mange emner.
       irc:
         title: IRC
         description: Interaktiv chat på mange forskellige sprog, og om mange emner.


@@ -3160,7 +3154,6 @@ da:
           other: Du er indenfor %{count} fod fra dette punkt
       base:
         standard: Standard
           other: Du er indenfor %{count} fod fra dette punkt
       base:
         standard: Standard

-        cyclosm: CyclOSM

         cycle_map: Cykelkort
         transport_map: Transportkort
         tracestracktop_topo: Tracestrack Topo
         cycle_map: Cykelkort
         transport_map: Transportkort
         tracestracktop_topo: Tracestrack Topo

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 16ca737d732e23060508f1080fd8334b72370cf3..7d10526f8651489a97dffce2404d526c08574043 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -321,7 +321,6 @@ de:
   auth:
     providers:
       none: Keine
   auth:
     providers:
       none: Keine

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -2015,7 +2014,6 @@ de:
       heading: Anmelden
       email or username: 'E-Mail-Adresse oder Benutzername:'
       password: 'Passwort:'
       heading: Anmelden
       email or username: 'E-Mail-Adresse oder Benutzername:'
       password: 'Passwort:'

-      openid_html: '%{logo} OpenID:'

       remember: Anmeldedaten merken
       lost password link: Passwort vergessen?
       login_button: Anmelden
       remember: Anmeldedaten merken
       lost password link: Passwort vergessen?
       login_button: Anmelden


@@ -2387,16 +2385,13 @@ de:
         url: https://wiki.openstreetmap.org/wiki/DE:Beginners%27_guide
         title: Anleitung für Anfänger
         description: Eine durch die Gemeinschaft gewartete Anleitung für Anfänger.
         url: https://wiki.openstreetmap.org/wiki/DE:Beginners%27_guide
         title: Anleitung für Anfänger
         description: Eine durch die Gemeinschaft gewartete Anleitung für Anfänger.

-      help:
-        title: Hilfe Forum
-        description: Stelle eine Frage oder suche nach Antworten auf der OSM-Fragen-und-Antworten-Seite.
+      community:
+        title: Community-Forum
+        description: Ein gemeinsamer Ort für Gespräche über OpenStreetMap.

       mailing_lists:
         title: Mailinglisten
         description: Stelle eine Frage und diskutiere interessante Sachen zu einem
           weiten Bereich von thematischen oder regionalen Mailinglisten.
       mailing_lists:
         title: Mailinglisten
         description: Stelle eine Frage und diskutiere interessante Sachen zu einem
           weiten Bereich von thematischen oder regionalen Mailinglisten.

-      community:
-        title: Community-Forum
-        description: Ein gemeinsamer Ort für Gespräche über OpenStreetMap.

       irc:
         title: IRC
         description: Interaktiver Chat in vielen unterschiedlichen Sprachen und zu
       irc:
         title: IRC
         description: Interaktiver Chat in vielen unterschiedlichen Sprachen und zu


@@ -3298,7 +3293,6 @@ de:
           other: Du bist weniger als %{count} Fuß von diesem Punkt entfernt
       base:
         standard: Standard
           other: Du bist weniger als %{count} Fuß von diesem Punkt entfernt
       base:
         standard: Standard

-        cyclosm: CyclOSM

         cycle_map: Radfahrerkarte
         transport_map: Verkehrskarte
         tracestracktop_topo: Tracestrack Topo
         cycle_map: Radfahrerkarte
         transport_map: Verkehrskarte
         tracestracktop_topo: Tracestrack Topo

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 545c5ac4336c163d502dcf02430fb7cab3b0b82e..5b8d496ea6e63087c77c9d75c4bedfd7add66e7b 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -147,7 +147,6 @@ diq:
   auth:
     providers:
       none: Çıniyo
   auth:
     providers:
       none: Çıniyo

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub


@@ -850,7 +849,6 @@ diq:
       heading: Cıkewtış
       email or username: 'Adresa e-posteyi ya zi nameyê karberi:'
       password: 'Parola:'
       heading: Cıkewtış
       email or username: 'Adresa e-posteyi ya zi nameyê karberi:'
       password: 'Parola:'

-      openid_html: '%{logo} OpenID:'

       remember: Mı biya xo viri
       lost password link: Şıma parolay xo ke xo vira?
       login_button: Cıkewtış
       remember: Mı biya xo viri
       lost password link: Şıma parolay xo ke xo vira?
       login_button: Cıkewtış

diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index 2d319c4f2de7e15858eb612cdb8369c187794fef..ebe90306916f36ddf5b613a1c3fc942f39e6c64e 100644 (file)
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -1095,7 +1095,6 @@ dsb:
       heading: Pśizjawjenje
       email or username: 'E-mailowa adresa abo wužywarske mě:'
       password: 'Gronidło:'
       heading: Pśizjawjenje
       email or username: 'E-mailowa adresa abo wužywarske mě:'
       password: 'Gronidło:'

-      openid_html: '%{logo} OpenID:'

       remember: Spomnjeś se
       lost password link: Sy swójo gronidło zabył?
       login_button: Pśizjawiś se
       remember: Spomnjeś se
       lost password link: Sy swójo gronidło zabył?
       login_button: Pśizjawiś se


@@ -1220,10 +1219,6 @@ dsb:
         title: Witaj k OSM
         description: Zachop z toś tym spěšnym rozpokazanim, kótarež wopsímujo zakłady
           OpenStreetMap.
         title: Witaj k OSM
         description: Zachop z toś tym spěšnym rozpokazanim, kótarež wopsímujo zakłady
           OpenStreetMap.

-      help:
-        title: help.openstreetmap.org
-        description: Pšašaj se něcogo abo pytaj za wótegronami na boku pšašanjow a
-          wótegronow OpenStreetMap.

       wiki:
         title: wiki.openstreetmap.org
         description: Pśepytaj wiki za nadrobneju OSM-dokumentaciju
       wiki:
         title: wiki.openstreetmap.org
         description: Pśepytaj wiki za nadrobneju OSM-dokumentaciju

diff --git a/config/locales/el.yml b/config/locales/el.yml
index f52dab6f2d3faeabbcf5a62f0a46ebf8e1202ccd..257c3d1238cbddb1fe7525a73e069488794da352 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -257,7 +257,6 @@ el:
   auth:
     providers:
       none: Κανένα
   auth:
     providers:
       none: Κανένα

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -487,6 +486,15 @@ el:
       introduction: Κάντε κλικ στον χάρτη για να βρείτε κοντινά χαρακτηριστικά.
       nearby: Κοντινά χαρακτηριστικά
       enclosing: Περικλείει τα χαρακτηριστικά
       introduction: Κάντε κλικ στον χάρτη για να βρείτε κοντινά χαρακτηριστικά.
       nearby: Κοντινά χαρακτηριστικά
       enclosing: Περικλείει τα χαρακτηριστικά

+  old_nodes:
+    not_found:
+      sorry: 'Λυπούμαστε, η έκδοση %{version} του κόμβου #%{id} δεν βρέθηκε.'
+  old_ways:
+    not_found:
+      sorry: 'Λυπούμαστε, η έκδοση %{version} της γραμμής #%{id} δεν βρέθηκε.'
+  old_relations:
+    not_found:
+      sorry: 'Λυπούμαστε, η έκδοση %{version} της σχέσης #%{id} δεν βρέθηκε.'

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


@@ -1897,7 +1905,7 @@ el:
     new:
       title: Χάσατε το συνθηματικό σας
       heading: Ξεχάσατε το συνθηματικό σας;
     new:
       title: Χάσατε το συνθηματικό σας
       heading: Ξεχάσατε το συνθηματικό σας;

-      email address: 'Διεύθυνση ηλεκτρονικού ταχυδρομείου:'
+      email address: Διεύθυνση ηλεκτρονικού ταχυδρομείου

       new password button: Επαναφορά συνθηματικού
       help_text: Πληκτρολογήστε τη διεύθυνση ηλεκτρονικού ταχυδρομείου που χρησιμοποιήσατε
         για να εγγραφείτε. Θα στείλουμε έναν σύνδεσμο τον οποίον μπορείτε να χρησιμοποιήσετε
       new password button: Επαναφορά συνθηματικού
       help_text: Πληκτρολογήστε τη διεύθυνση ηλεκτρονικού ταχυδρομείου που χρησιμοποιήσατε
         για να εγγραφείτε. Θα στείλουμε έναν σύνδεσμο τον οποίον μπορείτε να χρησιμοποιήσετε


@@ -1959,9 +1967,8 @@ el:
     new:
       title: Είσοδος
       heading: Είσοδος
     new:
       title: Είσοδος
       heading: Είσοδος

-      email or username: 'Διεύθυνση Ηλ. Ταχυδρομείου ή Όνομα Χρήστη:'
-      password: 'Συνθηματικό:'
-      openid_html: '%{logo} OpenID:'
+      email or username: Διεύθυνση Ηλ. Ταχυδρομείου ή Όνομα Χρήστη
+      password: Συνθηματικό

       remember: Να με θυμάσαι
       lost password link: Ξεχάσατε το συνθηματικό σας;
       login_button: Είσοδος
       remember: Να με θυμάσαι
       lost password link: Ξεχάσατε το συνθηματικό σας;
       login_button: Είσοδος


@@ -2286,17 +2293,14 @@ el:
         url: https://wiki.openstreetmap.org/wiki/El:Beginners%27_guide
         title: Οδηγός Αρχαρίων
         description: Οδηγός αρχαρίων διατηρούμενος από την κοινότητα.
         url: https://wiki.openstreetmap.org/wiki/El:Beginners%27_guide
         title: Οδηγός Αρχαρίων
         description: Οδηγός αρχαρίων διατηρούμενος από την κοινότητα.

-      help:
-        title: Î\9aοινÏ\8cÏ\84ηÏ\84α βοήθειας
-        description: Î\9aάνÏ\84ε μία εÏ\81Ï\8eÏ\84ηÏ\83η ή αναζηÏ\84ήÏ\83εÏ\84ε αÏ\80ανÏ\84ήÏ\83ειÏ\82 Ï\83Ï\84ην ιÏ\83Ï\84οÏ\83ελίδα εÏ\81Ï\89Ï\84ήÏ\83εÏ\89ν
-          και απαντήσεων του OpenStreetMap.
+      community:
+        title: ΦÏ\8cÏ\81οÏ\85μ κοινÏ\8cÏ\84ηÏ\84αÏ\82 & βοήθειας
+        description: Î\88να κοινÏ\8cÏ\87Ï\81ηÏ\83Ï\84ο μέÏ\81οÏ\82 για αναζήÏ\84ηÏ\83η βοήθειαÏ\82 και για Ï\83Ï\85νομιλίεÏ\82
+          σχετικά με το OpenStreetMap.

       mailing_lists:
         title: Λίστες Αλληλογραφίας
         description: Κάντε μία ερώτηση ή συζητήστε ενδιαφέροντα θέματα σε ένα ευρύ
           φάσμα τοπικών ή περιφερειακών λιστών αλληλογραφίας.
       mailing_lists:
         title: Λίστες Αλληλογραφίας
         description: Κάντε μία ερώτηση ή συζητήστε ενδιαφέροντα θέματα σε ένα ευρύ
           φάσμα τοπικών ή περιφερειακών λιστών αλληλογραφίας.

-      community:
-        title: Φόρουμ κοινότητας
-        description: Ένα κοινόχρηστο μέρος για συνομιλίες σχετικά με το OpenStreetMap.

       irc:
         title: IRC
         description: Διαδραστική συνομιλία σε πολλές διαφορετικές γλώσσες και για
       irc:
         title: IRC
         description: Διαδραστική συνομιλία σε πολλές διαφορετικές γλώσσες και για


@@ -2679,6 +2683,7 @@ el:
   oauth_clients:
     new:
       title: Καταχώρηση νέας εφαρμογής
   oauth_clients:
     new:
       title: Καταχώρηση νέας εφαρμογής

+      disabled: Η εγγραφή των εφαρμογών OAuth 1 έχει απενεργοποιηθεί

     edit:
       title: Επεξεργασία της αίτησής σας
     show:
     edit:
       title: Επεξεργασία της αίτησής σας
     show:


@@ -2762,6 +2767,7 @@ el:
       title: Οι Εξουσιοδοτημένες Εφαρμογές μου
       application: Εφαρμογή
       permissions: Άδειες
       title: Οι Εξουσιοδοτημένες Εφαρμογές μου
       application: Εφαρμογή
       permissions: Άδειες

+      last_authorized: Τελευταία Εξουσιοδότηση

       no_applications_html: Δεν έχετε εξουσιοδοτήσει ακόμη %{oauth2} εφαρμογές.
     application:
       revoke: Ανάκληση πρόσβασης
       no_applications_html: Δεν έχετε εξουσιοδοτήσει ακόμη %{oauth2} εφαρμογές.
     application:
       revoke: Ανάκληση πρόσβασης

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 3da8d38ab6ed607a9de27463dbfbf9c994077ac4..39f49ce275d15022e30fe0bb723efe9585a52dc1 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -218,7 +218,6 @@ en-GB:
   auth:
     providers:
       none: None
   auth:
     providers:
       none: None

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub


@@ -1376,7 +1375,6 @@ en-GB:
       heading: Login
       email or username: 'E-mail Address or Username:'
       password: 'Password:'
       heading: Login
       email or username: 'E-mail Address or Username:'
       password: 'Password:'

-      openid_html: '%{logo} OpenID:'

       remember: Remember me
       lost password link: Lost your password?
       login_button: Login
       remember: Remember me
       lost password link: Lost your password?
       login_button: Login


@@ -1528,10 +1526,6 @@ en-GB:
       beginners_guide:
         title: Beginners' Guide
         description: Community maintained guide for beginners.
       beginners_guide:
         title: Beginners' Guide
         description: Community maintained guide for beginners.

-      help:
-        title: Help Forum
-        description: Ask a question or look up answers on OpenStreetMap's question-and-answer
-          site.

       mailing_lists:
         title: Mailing Lists
         description: Ask a question or discuss interesting matters on a wide range
       mailing_lists:
         title: Mailing Lists
         description: Ask a question or discuss interesting matters on a wide range

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 69fd1a2fd2336cce2d58c49030dff56a55e96d1e..7397d33652441e4617506e2ecda6f83c9d151b9c 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -236,7 +236,6 @@ eo:
   auth:
     providers:
       none: Neniu
   auth:
     providers:
       none: Neniu

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -1899,7 +1898,6 @@ eo:
       heading: Ensaluti
       email or username: Retpoŝta adreso aŭ uzantnomo
       password: Pasvorto
       heading: Ensaluti
       email or username: Retpoŝta adreso aŭ uzantnomo
       password: Pasvorto

-      openid_html: '%{logo} OpenID'

       remember: Memori min
       lost password link: Ĉu vi forgesis vian pasvorton?
       login_button: Ensaluti
       remember: Memori min
       lost password link: Ĉu vi forgesis vian pasvorton?
       login_button: Ensaluti


@@ -2241,17 +2239,13 @@ eo:
       beginners_guide:
         title: Manlibro por komencantoj
         description: Manlibro por komencantoj kreata de la komunumo (en la angla).
       beginners_guide:
         title: Manlibro por komencantoj
         description: Manlibro por komencantoj kreata de la komunumo (en la angla).

-      help:
-        title: Helpa forumo
-        description: Demandu aŭ serĉu respondojn ĉe retpaĝo de demandoj-kaj-respondoj
-          pri OpenStreetMap.
+      community:
+        title: Forumoj de komunumo
+        description: Loko por diskuti pri OpenStreetMap.

       mailing_lists:
         title: Dissendolistoj
         description: Demandu aŭ diskutu pri interesaj temoj en multaj pritemaj aŭ
           regionaj dissendolistoj.
       mailing_lists:
         title: Dissendolistoj
         description: Demandu aŭ diskutu pri interesaj temoj en multaj pritemaj aŭ
           regionaj dissendolistoj.

-      community:
-        title: Forumoj de komunumo
-        description: Loko por diskuti pri OpenStreetMap.

       irc:
         title: IRC
         description: Interaga babilejo en multaj diversaj lingvoj kaj pri multaj temoj.
       irc:
         title: IRC
         description: Interaga babilejo en multaj diversaj lingvoj kaj pri multaj temoj.


@@ -3114,7 +3108,6 @@ eo:
           other: Vi estas %{count} futoj for de tiu punkto
       base:
         standard: Norma mapo
           other: Vi estas %{count} futoj for de tiu punkto
       base:
         standard: Norma mapo

-        cyclosm: CyclOSM

         cycle_map: Biciklada mapo
         transport_map: Transporta mapo
         tracestracktop_topo: Topografia mapo
         cycle_map: Biciklada mapo
         transport_map: Transporta mapo
         tracestracktop_topo: Topografia mapo

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 656a9d199adb2fc9a90a0052d69ac220527d42d0..8e8f2e5fca240a60c611aea11b5cd5cf2dffd89c 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -309,7 +309,6 @@ es:
   auth:
     providers:
       none: Ninguno
   auth:
     providers:
       none: Ninguno

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -2003,7 +2002,6 @@ es:
       heading: Iniciar sesión
       email or username: 'Dirección de correo electrónico o nombre de usuario:'
       password: Contraseña
       heading: Iniciar sesión
       email or username: 'Dirección de correo electrónico o nombre de usuario:'
       password: Contraseña

-      openid_html: '%{logo} OpenID:'

       remember: Recordarme
       lost password link: ¿Has perdido tu contraseña?
       login_button: Iniciar sesión
       remember: Recordarme
       lost password link: ¿Has perdido tu contraseña?
       login_button: Iniciar sesión


@@ -2364,17 +2362,13 @@ es:
         url: https://wiki.openstreetmap.org/wiki/ES:Gu%C3%ADa_de_principiantes
         title: Guía para principiantes
         description: Guía para principiantes, mantenida por la comunidad.
         url: https://wiki.openstreetmap.org/wiki/ES:Gu%C3%ADa_de_principiantes
         title: Guía para principiantes
         description: Guía para principiantes, mantenida por la comunidad.

-      help:
-        title: Foro de ayuda
-        description: Haz una pregunta o busca respuestas en el sitio de preguntas
-          y respuestas de OpenStreetMap.
+      community:
+        title: Foro de la Comunidad
+        description: Un lugar compartido para conversaciones sobre OpenStreetMap.

       mailing_lists:
         title: Listas de correo
         description: Haz una pregunta o discute asuntos interesantes en una amplia
           gama de listas de correo regionales o temáticas.
       mailing_lists:
         title: Listas de correo
         description: Haz una pregunta o discute asuntos interesantes en una amplia
           gama de listas de correo regionales o temáticas.

-      community:
-        title: Foro de la Comunidad
-        description: Un lugar compartido para conversaciones sobre OpenStreetMap.

       irc:
         title: IRC
         description: Chat interactivo en muchos idiomas diferentes y sobre muchos
       irc:
         title: IRC
         description: Chat interactivo en muchos idiomas diferentes y sobre muchos


@@ -3264,7 +3258,6 @@ es:
           other: Estás a %{count} pies desde este punto
       base:
         standard: Estándar
           other: Estás a %{count} pies desde este punto
       base:
         standard: Estándar

-        cyclosm: CyclOSM

         cycle_map: Mapa ciclista
         transport_map: Mapa de transporte
         tracestracktop_topo: Tracestrack Topo
         cycle_map: Mapa ciclista
         transport_map: Mapa de transporte
         tracestracktop_topo: Tracestrack Topo

diff --git a/config/locales/et.yml b/config/locales/et.yml
index 5fb170c07b6a222238b37c12994805c37a3193ed..bc6e1df96d12421a4c840dff772c4643acb35ba9 100644 (file)
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1393,7 +1393,6 @@ et:
       heading: Logi sisse
       email or username: 'E-posti aadress või kasutajanimi:'
       password: 'Parool:'
       heading: Logi sisse
       email or username: 'E-posti aadress või kasutajanimi:'
       password: 'Parool:'

-      openid_html: '%{logo} OpenID:'

       remember: Jäta mind meelde
       lost password link: Kas unustasid parooli?
       login_button: Logi sisse
       remember: Jäta mind meelde
       lost password link: Kas unustasid parooli?
       login_button: Logi sisse


@@ -1741,17 +1740,13 @@ et:
         url: https://wiki.openstreetmap.org/wiki/Et:Beginners%27_guide
         title: Juhend algajatele
         description: Kogukonna hallatav juhend algajatele.
         url: https://wiki.openstreetmap.org/wiki/Et:Beginners%27_guide
         title: Juhend algajatele
         description: Kogukonna hallatav juhend algajatele.

-      help:
-        title: Abifoorum
-        description: Esita küsimus või otsi vastuseid OpenStreetMapi küsimuste ja
-          vastuste veebilehel.
+      community:
+        title: Kogukonna foorum
+        description: Ühine arutelukoht OpenStreetMapi kohta käivateks vestlusteks.

       mailing_lists:
         title: Postiloendid
         description: Esita küsimusi või arutle huvipakkuvatel teemadel paljudes temaatilistes
           või piirkondlikes postiloendites.
       mailing_lists:
         title: Postiloendid
         description: Esita küsimusi või arutle huvipakkuvatel teemadel paljudes temaatilistes
           või piirkondlikes postiloendites.

-      community:
-        title: Kogukonna foorum
-        description: Ühine arutelukoht OpenStreetMapi kohta käivateks vestlusteks.

       irc:
         title: IRC
         description: Interaktiivne suhtluskanal paljudes keeltes ja paljudel teemadel.
       irc:
         title: IRC
         description: Interaktiivne suhtluskanal paljudes keeltes ja paljudel teemadel.

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 6e2908a4deba539c9645d8c06cb84a4d1cd23a7c..466666b3bd5f3551669d01cbecdaf99c01b3bc5a 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -229,7 +229,6 @@ eu:
   auth:
     providers:
       none: Ezer
   auth:
     providers:
       none: Ezer

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -1856,7 +1855,6 @@ eu:
       heading: Saio-hasiera
       email or username: 'Eposta helbidea edo Erabiltzaile izena:'
       password: 'Pasahitza:'
       heading: Saio-hasiera
       email or username: 'Eposta helbidea edo Erabiltzaile izena:'
       password: 'Pasahitza:'

-      openid_html: '%{logo} OpenID:'

       remember: Gogora nazazu
       lost password link: Pasahitza ahaztu duzu?
       login_button: Saioa hasi
       remember: Gogora nazazu
       lost password link: Pasahitza ahaztu duzu?
       login_button: Saioa hasi


@@ -2118,16 +2116,13 @@ eu:
         url: http://wiki.openstreetmap.org/wiki/Eu:Beginners%27_guide
         title: Hasiberrientzako gida
         description: Hasiberrientzako mantentze-gida komunitarioa.
         url: http://wiki.openstreetmap.org/wiki/Eu:Beginners%27_guide
         title: Hasiberrientzako gida
         description: Hasiberrientzako mantentze-gida komunitarioa.

-      help:
-        title: Laguntza foroa
-        description: Egin galdera bat edo begiratu OSMn galdera-eta-erantzun gunean.
+      community:
+        title: Komunitatearen ataria
+        description: OpenStreetMapi buruzko elkarrizketetarako leku partekatua.

       mailing_lists:
         title: Posta Bidaltze Zerrendak
         description: Galdera bat egin edo eztabaidatu gai interesgarriak gaikako edo
           eskualdekako posta zerrendetan.
       mailing_lists:
         title: Posta Bidaltze Zerrendak
         description: Galdera bat egin edo eztabaidatu gai interesgarriak gaikako edo
           eskualdekako posta zerrendetan.

-      community:
-        title: Komunitatearen ataria
-        description: OpenStreetMapi buruzko elkarrizketetarako leku partekatua.

       irc:
         title: IRC
         description: Hizkuntza eta gai askotako hizketaldi interaktiboa.
       irc:
         title: IRC
         description: Hizkuntza eta gai askotako hizketaldi interaktiboa.


@@ -2883,7 +2878,6 @@ eu:
           other: Puntu honetatik %{count} oinetara zaude
       base:
         standard: Arrunta
           other: Puntu honetatik %{count} oinetara zaude
       base:
         standard: Arrunta

-        cyclosm: CyclOSM

         cycle_map: Bizikletentzako mapa
         transport_map: Garraioen mapa
         hot: Humanitarioa
         cycle_map: Bizikletentzako mapa
         transport_map: Garraioen mapa
         hot: Humanitarioa

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 6c6c4ac922b6d2a0e63eb26c078f013f7769503c..e1237dbfb1c11bf9ad69b425ca90222988c00c11 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -255,7 +255,6 @@ fa:
   auth:
     providers:
       none: هیچ‌کدام
   auth:
     providers:
       none: هیچ‌کدام

-      openid: OpenID

       google: گوگل
       facebook: فیس‌بوک
       microsoft: مایکروسافت
       google: گوگل
       facebook: فیس‌بوک
       microsoft: مایکروسافت


@@ -1822,7 +1821,6 @@ fa:
       heading: ورود
       email or username: نشانی رایانامه یا نام کاربری
       password: رمز عبور
       heading: ورود
       email or username: نشانی رایانامه یا نام کاربری
       password: رمز عبور

-      openid_html: '%{logo} OpenID:'

       remember: مرا به خاطر بسپار
       lost password link: رمز عبورتان را فراموش کرده‌اید؟
       login_button: ورود
       remember: مرا به خاطر بسپار
       lost password link: رمز عبورتان را فراموش کرده‌اید؟
       login_button: ورود


@@ -2027,9 +2025,6 @@ fa:
         url: https://wiki.openstreetmap.org/wiki/Fa:Beginners%27_guide
         title: راهنمای مبتدیان
         description: راهنمایی برای تازه‌واردان که اعضای جامعه آماده کرده‌اند.
         url: https://wiki.openstreetmap.org/wiki/Fa:Beginners%27_guide
         title: راهنمای مبتدیان
         description: راهنمایی برای تازه‌واردان که اعضای جامعه آماده کرده‌اند.

-      help:
-        title: انجمن کمک
-        description: در وبگاه پرسش‌وپاسخ OSM سؤال بپرسید یا بین پاسخ‌ها بگردید.

       mailing_lists:
         title: فهرست‌های پستی
         description: در فهرست‌های پستی متنوعِ موضوعی یا منطقه‌ای سوال بپرسید یا دربارهٔ
       mailing_lists:
         title: فهرست‌های پستی
         description: در فهرست‌های پستی متنوعِ موضوعی یا منطقه‌ای سوال بپرسید یا دربارهٔ

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 6af0bca939091c1f284ea44840f902ac86819aa4..7c5a55ec8227ee448f2d6fda853572075dfc318b 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -261,7 +261,6 @@ fi:
   auth:
     providers:
       none: Ei mitään
   auth:
     providers:
       none: Ei mitään

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -1835,7 +1834,6 @@ fi:
       heading: Kirjaudu
       email or username: Sähköpostiosoite tai käyttäjätunnus
       password: Salasana
       heading: Kirjaudu
       email or username: Sähköpostiosoite tai käyttäjätunnus
       password: Salasana

-      openid_html: '%{logo} OpenID'

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


@@ -2119,17 +2117,13 @@ fi:
         url: https://wiki.openstreetmap.org/wiki/Fi:Beginners%27_guide
         title: Aloitusopas
         description: Yhteisön ylläpitämä opas aloittelijoille.
         url: https://wiki.openstreetmap.org/wiki/Fi:Beginners%27_guide
         title: Aloitusopas
         description: Yhteisön ylläpitämä opas aloittelijoille.

-      help:
-        title: Apufoorumi
-        description: Etsi vastauksia tai esitä oma kysymyksesi OpenStreetMapin kysy-
-          ja vastaa -sivustolla. (englanninkielinen)
+      community:
+        title: Yhteisön keskustelupalsta
+        description: Jaettu paikka OpenStreetMapiin liittyville keskusteluille.

       mailing_lists:
         title: Postituslistat
         description: Esitä kysymyksiä tai keskustele laajalti kiinnostavista aiheista
           aiheita koskevilla tai alueellisilla sähköpostilistoilla.
       mailing_lists:
         title: Postituslistat
         description: Esitä kysymyksiä tai keskustele laajalti kiinnostavista aiheista
           aiheita koskevilla tai alueellisilla sähköpostilistoilla.

-      community:
-        title: Yhteisön keskustelupalsta
-        description: Jaettu paikka OpenStreetMapiin liittyville keskusteluille.

       irc:
         title: IRC
         description: Interaktiivinen chat monilla eri kielillä ja monista eri aiheista.
       irc:
         title: IRC
         description: Interaktiivinen chat monilla eri kielillä ja monista eri aiheista.


@@ -2885,7 +2879,6 @@ fi:
           other: Olet %{count} jalan etäisyydellä tästä pisteestä
       base:
         standard: Perinteinen
           other: Olet %{count} jalan etäisyydellä tästä pisteestä
       base:
         standard: Perinteinen

-        cyclosm: CyclOSM

         cycle_map: Pyöräilykartta
         transport_map: Joukkoliikenne
         hot: Humanitaarinen
         cycle_map: Pyöräilykartta
         transport_map: Joukkoliikenne
         hot: Humanitaarinen

diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index 894428501fab0a9fc956aaa675d93c9ebb91b2a6..bdf5c7c98f6fe4f6eca5b75c93fcd9659372cfeb 100644 (file)
--- a/config/locales/fit.yml
+++ b/config/locales/fit.yml
@@ -797,8 +797,6 @@ fit:
       welcome:
         url: /welcome
         title: Tervetuloa OpenStreetMaphiin
       welcome:
         url: /welcome
         title: Tervetuloa OpenStreetMaphiin

-      help:
-        title: Apufoorumi

       irc:
         title: IRC
       wiki:
       irc:
         title: IRC
       wiki:

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 5034cb13d09c094e6248ba28fa89f53a1d5878f8..0dfd24e6c187c9369fd9280d0f20e3c5e4aced7d 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -60,6 +60,7 @@
 # Author: Mathieu
 # Author: McDutchie
 # Author: Mdk
 # Author: Mathieu
 # Author: McDutchie
 # Author: Mdk

+# Author: Melimeli

 # Author: Metroitendo
 # Author: Momo50WM
 # Author: Mulcyber
 # Author: Metroitendo
 # Author: Momo50WM
 # Author: Mulcyber


@@ -141,6 +142,8 @@ fr:
       messages:
         invalid_email_address: ne semble pas être une adresse de courriel valide
         email_address_not_routable: n’est pas routable
       messages:
         invalid_email_address: ne semble pas être une adresse de courriel valide
         email_address_not_routable: n’est pas routable

+        display_name_is_user_n: ne peut pas être user_n à moins que n soit votre identifiant
+          d'utilisateur

       models:
         user_mute:
           is_already_muted: est déjà en sourdine
       models:
         user_mute:
           is_already_muted: est déjà en sourdine


@@ -319,7 +322,6 @@ fr:
   auth:
     providers:
       none: Aucun
   auth:
     providers:
       none: Aucun

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -558,6 +560,15 @@ fr:
       introduction: Cliquer sur la carte pour trouver des objets à proximité.
       nearby: Objets à proximité
       enclosing: Objets englobants
       introduction: Cliquer sur la carte pour trouver des objets à proximité.
       nearby: Objets à proximité
       enclosing: Objets englobants

+  old_nodes:
+    not_found:
+      sorry: 'Désolé, le nœud #%{id} version %{version} est introuvable.'
+  old_ways:
+    not_found:
+      sorry: 'Désolé, la façon #%{id} version %{version} ne pouvait pas être trouvée.'
+  old_relations:
+    not_found:
+      sorry: 'Désolé, la relation #%{id} version %{version} est introuvable.'

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


@@ -1759,6 +1770,8 @@ fr:
         one: s’est chargé correctement avec %{trace_points} dd %{count} point possible.
         other: s’est chargé correctement avec %{trace_points} des %{count} points
           possibles.
         one: s’est chargé correctement avec %{trace_points} dd %{count} point possible.
         other: s’est chargé correctement avec %{trace_points} des %{count} points
           possibles.

+      all_your_traces_html: Toutes vos traces de GPX téléchargées avec succès peuvent
+        être trouvées à %{url}.

       subject: '[OpenStreetMap] Import GPX réussi'
     signup_confirm:
       subject: '[OpenStreetMap] Bienvenue dans OpenStreetMap'
       subject: '[OpenStreetMap] Import GPX réussi'
     signup_confirm:
       subject: '[OpenStreetMap] Bienvenue dans OpenStreetMap'


@@ -1928,6 +1941,9 @@ fr:
       people_mapping_nearby: personnes proche de vous
     muted:
       title: Messages en sourdine
       people_mapping_nearby: personnes proche de vous
     muted:
       title: Messages en sourdine

+      messages:
+        one: un ancien message
+        other: '%{count} anciens messages'

     reply:
       wrong_user: Vous êtes identifié(e) comme « %{user} » mais le message auquel
         vous souhaitez répondre n’a pas été envoyé à cet utilisateur. Veuillez vous
     reply:
       wrong_user: Vous êtes identifié(e) comme « %{user} » mais le message auquel
         vous souhaitez répondre n’a pas été envoyé à cet utilisateur. Veuillez vous


@@ -2024,7 +2040,6 @@ fr:
       heading: Se connecter
       email or username: 'Adresse de courriel ou nom d’utilisateur :'
       password: 'Mot de passe :'
       heading: Se connecter
       email or username: 'Adresse de courriel ou nom d’utilisateur :'
       password: 'Mot de passe :'

-      openid_html: '%{logo} OpenID :'

       remember: Se souvenir de moi
       lost password link: Vous avez perdu votre mot de passe ?
       login_button: Se connecter
       remember: Se souvenir de moi
       lost password link: Vous avez perdu votre mot de passe ?
       login_button: Se connecter


@@ -2402,17 +2417,13 @@ fr:
         url: https://wiki.openstreetmap.org/wiki/FR:Guide_du_d%C3%A9butant
         title: Guide du débutant
         description: Guide maintenu par la communauté pour les débutants.
         url: https://wiki.openstreetmap.org/wiki/FR:Guide_du_d%C3%A9butant
         title: Guide du débutant
         description: Guide maintenu par la communauté pour les débutants.

-      help:
-        title: Forum d’aide
-        description: Poser une question ou chercher des réponses sur le site de questions-et-réponses
-          d’OpenStreetMap.
+      community:
+        title: Forum de la communauté
+        description: Un lieu partagé pour les conversations sur OpenStreetMap.

       mailing_lists:
         title: Listes de diffusion
         description: Poser une question ou discuter de questions intéressantes sur
           un large éventail de listes de diffusion thématiques ou régionales.
       mailing_lists:
         title: Listes de diffusion
         description: Poser une question ou discuter de questions intéressantes sur
           un large éventail de listes de diffusion thématiques ou régionales.

-      community:
-        title: Forum de la communauté
-        description: Un lieu partagé pour les conversations sur OpenStreetMap.

       irc:
         title: IRC
         description: Discussion interactive dans de nombreuses langues différentes
       irc:
         title: IRC
         description: Discussion interactive dans de nombreuses langues différentes


@@ -2801,6 +2812,7 @@ fr:
       read_gpx: Lire les traces GPC privées
       write_gpx: Mettre à jour les traces GPC
       write_notes: Modifier les notes
       read_gpx: Lire les traces GPC privées
       write_gpx: Mettre à jour les traces GPC
       write_notes: Modifier les notes

+      write_redactions: Rédiger les données cartographiques

       read_email: Lire l’adresse courriel de l’utilisateur
       skip_authorization: Demande d’approbation automatique
   oauth_clients:
       read_email: Lire l’adresse courriel de l’utilisateur
       skip_authorization: Demande d’approbation automatique
   oauth_clients:


@@ -2982,6 +2994,8 @@ fr:
       my_dashboard: Mon tableau de bord
       blocks on me: Blocages me concernant
       blocks by me: Blocages de ma part
       my_dashboard: Mon tableau de bord
       blocks on me: Blocages me concernant
       blocks by me: Blocages de ma part

+      create_mute: Désactiver cet utilisateur
+      destroy_mute: Réactiver le son de cet utilisateur

       edit_profile: Modifier le profil
       send message: Envoyer un message
       diary: Carnet
       edit_profile: Modifier le profil
       send message: Envoyer un message
       diary: Carnet


@@ -3013,6 +3027,7 @@ fr:
           importer: Supprimer le droit d’importation
       block_history: Blocages actifs
       moderator_history: Blocages donnés
           importer: Supprimer le droit d’importation
       block_history: Blocages actifs
       moderator_history: Blocages donnés

+      revoke_all_blocks: Révoquer tous les blocs

       comments: Commentaires
       create_block: Bloquer cet utilisateur ou cette utilisatrice
       activate_user: Activer cet utilisateur ou cette utilisatrice
       comments: Commentaires
       create_block: Bloquer cet utilisateur ou cette utilisatrice
       activate_user: Activer cet utilisateur ou cette utilisatrice


@@ -3125,6 +3140,15 @@ fr:
       confirm: Êtes-vous sûr(e) de vouloir annuler ce blocage ?
       revoke: Révoquer !
       flash: Ce blocage a été annulé.
       confirm: Êtes-vous sûr(e) de vouloir annuler ce blocage ?
       revoke: Révoquer !
       flash: Ce blocage a été annulé.

+    revoke_all:
+      title: Révoquer tous les blocages sur %{block_on}
+      heading_html: Révoquer tous les blocages sur %{block_on}
+      empty: '%{name} n''a pas de blocs actifs.'
+      active_blocks:
+        one: '%{count} active block'
+        other: '%{count} active blocks'
+      revoke: Révoquer
+      flash: Tous les blocages actifs ont été révoqués.

     helper:
       time_future_html: Prends fin dans %{time}.
       until_login: Actif jusqu’à ce que l’utilisateur se connecte.
     helper:
       time_future_html: Prends fin dans %{time}.
       until_login: Actif jusqu’à ce que l’utilisateur se connecte.


@@ -3186,11 +3210,27 @@ fr:
       previous: ◂ Précédent
   user_mutes:
     index:
       previous: ◂ Précédent
   user_mutes:
     index:

+      title: Utilisateurs muets
+      my_muted_users: Mes utilisateurs désactivés
+      you_have_muted_n_users:
+        one: Vous avez désactivé %{count} utilisateurs
+        other: Vous avez désactivé %{count} utilisateurs
+      user_mute_explainer: Les messages des utilisateurs mis en sourdine sont déplacés
+        vers une boîte de réception distincte et vous ne recevrez pas de notifications
+        par e-mail.
+      user_mute_admins_and_moderators: Vous pouvez désactiver le son des administrateurs
+        et des modérateurs, mais leurs messages ne seront pas mis en sourdine.

       table:
         thead:
           actions: Actions
         tbody:
       table:
         thead:
           actions: Actions
         tbody:

+          unmute: Activer le son

           send_message: Envoyer un message
           send_message: Envoyer un message

+    create:
+      notice: Vous avez désactivé %{name}.
+      error: '%{name} n''a pas pu être mis en sourdine. %{full_message}.'
+    destroy:
+      notice: Vous avez rétabli le son de %{name}.

   notes:
     index:
       title: Notes soumises ou commentées par « %{user} »
   notes:
     index:
       title: Notes soumises ou commentées par « %{user} »


@@ -3286,7 +3326,6 @@ fr:
           other: Vous êtes à moins de %{count} pieds de ce point
       base:
         standard: Standard
           other: Vous êtes à moins de %{count} pieds de ce point
       base:
         standard: Standard

-        cyclosm: CyclOSM

         cycle_map: Carte cyclable
         transport_map: Carte de transport
         tracestracktop_topo: Topo de Tracestack
         cycle_map: Carte cyclable
         transport_map: Carte de transport
         tracestracktop_topo: Topo de Tracestack

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index f4035fff1af1ebdebb86d7d95aeb7c48dc33772a..431f44cbd8caa8fb51cbd8e868b140c139b8c81a 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -193,7 +193,6 @@ fur:
   auth:
     providers:
       none: Nissune
   auth:
     providers:
       none: Nissune

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -1154,7 +1153,6 @@ fur:
       heading: Jentre
       email or username: 'Direzion di pueste eletroniche o non utent:'
       password: 'Password:'
       heading: Jentre
       email or username: 'Direzion di pueste eletroniche o non utent:'
       password: 'Password:'

-      openid_html: '%{logo} OpenID:'

       remember: Visiti di me
       lost password link: Password pierdude?
       login_button: Jentre
       remember: Visiti di me
       lost password link: Password pierdude?
       login_button: Jentre


@@ -1285,8 +1283,6 @@ fur:
         title: Benvignûts in OpenStreetMap
       beginners_guide:
         title: Guide pai principiants
         title: Benvignûts in OpenStreetMap
       beginners_guide:
         title: Guide pai principiants

-      help:
-        title: Forum di jutori

       irc:
         title: IRC
       welcomemat:
       irc:
         title: IRC
       welcomemat:

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 0b3d226e54efda80dad7ae64f3fa48fa92c8884f..2f6ab86c7d9f26e3de5e8239ecebd5864170b28f 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -210,7 +210,6 @@ fy:
   auth:
     providers:
       none: gjint
   auth:
     providers:
       none: gjint

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub


@@ -1782,7 +1781,6 @@ fy:
       heading: Oanmelde
       email or username: 'E-mailadres as meidochnamme:'
       password: 'Wachtwurd:'
       heading: Oanmelde
       email or username: 'E-mailadres as meidochnamme:'
       password: 'Wachtwurd:'

-      openid_html: '%{logo} OpenID:'

       remember: My ûnthâlde
       lost password link: Jo wachtwurd kwyt?
       login_button: Oanmelde
       remember: My ûnthâlde
       lost password link: Jo wachtwurd kwyt?
       login_button: Oanmelde


@@ -1957,16 +1955,13 @@ fy:
       beginners_guide:
         title: Paadwizer foar begjinners
         description: Troch de mienskip byholden paadwizer foar begjinners.
       beginners_guide:
         title: Paadwizer foar begjinners
         description: Troch de mienskip byholden paadwizer foar begjinners.

-      help:
-        title: Help-foarum
-        description: Stel in fraach of besjoch antwurden op OpenStreetMaps fraach-en-antwurdside.
+      community:
+        title: Mienskipsfoarum
+        description: In mienskiplik plak foar petear oer OpenStreetMap.

       mailing_lists:
         title: Mailinglisten
         description: Stel in fraach of bepraat nijsgjirrige saken op útienrinnende
           tematyske as regionale mailinglisten.
       mailing_lists:
         title: Mailinglisten
         description: Stel in fraach of bepraat nijsgjirrige saken op útienrinnende
           tematyske as regionale mailinglisten.

-      community:
-        title: Mienskipsfoarum
-        description: In mienskiplik plak foar petear oer OpenStreetMap.

       irc:
         title: IRC
         description: Ynteraktyf tsjetten yn ferskate talen en op alderlei mêd.
       irc:
         title: IRC
         description: Ynteraktyf tsjetten yn ferskate talen en op alderlei mêd.

diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index ee738451801b2a62ca620287163b8e47ae30c9dc..9380e7fed4af2097bc7aaf38267ef92dccdac26c 100644 (file)
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -168,7 +168,6 @@ ga:
   auth:
     providers:
       none: Ceann ar bith
   auth:
     providers:
       none: Ceann ar bith

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub


@@ -1332,7 +1331,6 @@ ga:
       heading: Logáil isteach
       email or username: 'Seoladh Ríomhphoist nó Ainm Úsáideora:'
       password: 'Focal Faire:'
       heading: Logáil isteach
       email or username: 'Seoladh Ríomhphoist nó Ainm Úsáideora:'
       password: 'Focal Faire:'

-      openid_html: '%{logo} OpenID:'

       remember: Cuimhnigh orm
       lost password link: Focal faire caillte agat?
       login_button: Logáil isteach
       remember: Cuimhnigh orm
       lost password link: Focal faire caillte agat?
       login_button: Logáil isteach


@@ -1475,10 +1473,6 @@ ga:
         url: https://wiki.openstreetmap.org/wiki/GA:Beginners%27_guide
         title: Treoir do Thosaitheoirí
         description: Treoir do thosaitheoirí atá faoi stiúir an phobail.
         url: https://wiki.openstreetmap.org/wiki/GA:Beginners%27_guide
         title: Treoir do Thosaitheoirí
         description: Treoir do thosaitheoirí atá faoi stiúir an phobail.

-      help:
-        title: Fóram Cabhrach
-        description: Is féidir ceist a chur nó freagraí a chuardach ar shuíomh ceisteanna
-          agus freagraí OpenStreetMap.

       mailing_lists:
         title: Liosta Seachadta
         description: Is féidir ceist a chur nó ábhair shuimiúla a phlé ar raon leathan
       mailing_lists:
         title: Liosta Seachadta
         description: Is féidir ceist a chur nó ábhair shuimiúla a phlé ar raon leathan

diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 9d8be73317f5739fbbc34887b874aeae1738a979..28a88347baaf3bf601a06ae37433d33ffb22bc66 100644 (file)
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1173,7 +1173,6 @@ gd:
       heading: Clàraich a-steach
       email or username: 'Seòladh puist-d no ainm-cleachdaiche:'
       password: 'Facal-faire:'
       heading: Clàraich a-steach
       email or username: 'Seòladh puist-d no ainm-cleachdaiche:'
       password: 'Facal-faire:'

-      openid_html: 'OpenID %{logo}:'

       remember: Cuimhnich orm
       lost password link: Na chaill thu am facal-faire agad?
       login_button: Clàraich a-steach
       remember: Cuimhnich orm
       lost password link: Na chaill thu am facal-faire agad?
       login_button: Clàraich a-steach


@@ -1339,10 +1338,6 @@ gd:
       beginners_guide:
         title: Treòir an luchd-tòiseachaidh
         description: Treòir leis a’ choimhearsnachd do luchd-tòiseachaidh
       beginners_guide:
         title: Treòir an luchd-tòiseachaidh
         description: Treòir leis a’ choimhearsnachd do luchd-tòiseachaidh

-      help:
-        title: help.openstreetmap.org
-        description: Faighnich ceist no rùraich na freagairtean air làrach nan ceistean
-          àbhaisteach aig OSM.

       mailing_lists:
         title: Liostaichean-puist
       switch2osm:
       mailing_lists:
         title: Liostaichean-puist
       switch2osm:

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index adbd62d7c36fe0e7adb9746b13a51193d939102a..f04f1468d5ebed84758fe933039a36d078de6980 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -234,7 +234,6 @@ gl:
   auth:
     providers:
       none: Ningún
   auth:
     providers:
       none: Ningún

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -382,7 +381,7 @@ gl:
         title_comment: Conxunto de modificacións %{id} - %{comment}
       join_discussion: Inicia a sesión para unirte á parola
       discussion: Parola
         title_comment: Conxunto de modificacións %{id} - %{comment}
       join_discussion: Inicia a sesión para unirte á parola
       discussion: Parola

-      still_open: O conxunto de modificacións segue aberto - Abrirase a parola cando
+      still_open: O conxunto de modificacións segue aberto. Abrirase a parola cando

         o conxunto de modificacións estea pechado.
     node:
       title_html: 'Nó: %{name}'
         o conxunto de modificacións estea pechado.
     node:
       title_html: 'Nó: %{name}'


@@ -1928,7 +1927,6 @@ gl:
       heading: Rexistro
       email or username: Enderezo de correo electrónico ou nome de usuario
       password: Contrasinal
       heading: Rexistro
       email or username: Enderezo de correo electrónico ou nome de usuario
       password: Contrasinal

-      openid_html: '%{logo} OpenID'

       remember: Lembrádeme
       lost password link: Perdiches o teu contrasinal?
       login_button: Iniciar a sesión
       remember: Lembrádeme
       lost password link: Perdiches o teu contrasinal?
       login_button: Iniciar a sesión


@@ -2299,17 +2297,13 @@ gl:
       beginners_guide:
         title: Guía do principiante
         description: Guía para principiantes, mantida pola comunidade.
       beginners_guide:
         title: Guía do principiante
         description: Guía para principiantes, mantida pola comunidade.

-      help:
-        title: Foro de axuda
-        description: Deixa algunha pregunta ou pescuda respostas no sitio de cuestións
-          e respostas do OpenStreetMap.
+      community:
+        title: Axuda e foro comunitario
+        description: Un lugar para buscar axuda e compartir conversas sobre o OpenStreetMap.

       mailing_lists:
         title: Listaxes de correo
         description: Pregunta ou parola sobre temas interesantes nun amplo abano de
           listaxes de correo temáticas ou rexionais.
       mailing_lists:
         title: Listaxes de correo
         description: Pregunta ou parola sobre temas interesantes nun amplo abano de
           listaxes de correo temáticas ou rexionais.

-      community:
-        title: Foro comunitario
-        description: Un lugar para compartir conversas sobre OpenStreetMap.

       irc:
         title: IRC
         description: Parola interactiva en moitas linguas diferentes e sobre moitos
       irc:
         title: IRC
         description: Parola interactiva en moitas linguas diferentes e sobre moitos


@@ -2685,6 +2679,7 @@ gl:
   oauth_clients:
     new:
       title: Rexistrar unha nova aplicación
   oauth_clients:
     new:
       title: Rexistrar unha nova aplicación

+      disabled: Desactivouse o rexistro de aplicacións OAuth 1

     edit:
       title: Editar a túa aplicación
     show:
     edit:
       title: Editar a túa aplicación
     show:


@@ -2768,6 +2763,7 @@ gl:
       title: As miñas aplicacións autorizadas
       application: Aplicación
       permissions: Permisos
       title: As miñas aplicacións autorizadas
       application: Aplicación
       permissions: Permisos

+      last_authorized: Última autorización

       no_applications_html: Non autorizaches ningunha aplicación %{oauth2}.
     application:
       revoke: Revogar acceso
       no_applications_html: Non autorizaches ningunha aplicación %{oauth2}.
     application:
       revoke: Revogar acceso

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 0bb2dc9efd872057aea905b0ea07ccaf758ab5bd..78838d02ac1c07bed82756b820a6a344a642ad58 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -275,7 +275,6 @@ he:
   auth:
     providers:
       none: ללא
   auth:
     providers:
       none: ללא

-      openid: OpenID

       google: גוגל
       facebook: פייסבוק
       microsoft: מיקרוסופט
       google: גוגל
       facebook: פייסבוק
       microsoft: מיקרוסופט


@@ -501,6 +500,15 @@ he:
       introduction: יש ללחוץ על המפה כדי למצוא ישויות בסביבה.
       nearby: ישויות בסביבה
       enclosing: ישויות מכילות
       introduction: יש ללחוץ על המפה כדי למצוא ישויות בסביבה.
       nearby: ישויות בסביבה
       enclosing: ישויות מכילות

+  old_nodes:
+    not_found:
+      sorry: לא ניתן למצוא את נקודה מס׳ %{id} בגרסה %{version}, מחילה.
+  old_ways:
+    not_found:
+      sorry: לא ניתן למצוא את דרך מס׳ %{id} בגרסה %{version}, מחילה.
+  old_relations:
+    not_found:
+      sorry: לא ניתן למצוא את יחס מס׳ %{id} בגרסה %{version}, מחילה.

   changesets:
     changeset_paging_nav:
       showing_page: הדף %{page}
   changesets:
     changeset_paging_nav:
       showing_page: הדף %{page}


@@ -1679,6 +1687,7 @@ he:
         two: נטען בהצלחה עם %{trace_points} נקודות מתוך %{count} נקודות אפשריות.
         many: נטען בהצלחה עם %{trace_points} נקודות מתוך %{count} נקודות אפשריות.
         other: נטען בהצלחה עם %{trace_points} נקודות מתוך %{count} נקודות אפשריות.
         two: נטען בהצלחה עם %{trace_points} נקודות מתוך %{count} נקודות אפשריות.
         many: נטען בהצלחה עם %{trace_points} נקודות מתוך %{count} נקודות אפשריות.
         other: נטען בהצלחה עם %{trace_points} נקודות מתוך %{count} נקודות אפשריות.

+      all_your_traces_html: אפשר למצוא את כל עקבות ה־GPX שלך שהועלו בהצלחה דרך %{url}.

       subject: '[אופן סטריט מאפ OpenStreetMap] ייבוא GPX הצליח'
     signup_confirm:
       subject: '[אופן סטריט מאפ OpenStreetMap] ברוך בואך לאופן סטריט מאפ'
       subject: '[אופן סטריט מאפ OpenStreetMap] ייבוא GPX הצליח'
     signup_confirm:
       subject: '[אופן סטריט מאפ OpenStreetMap] ברוך בואך לאופן סטריט מאפ'


@@ -1865,7 +1874,7 @@ he:
     new:
       title: הסיסמה הלכה לאיבוד
       heading: שכחת סיסמה?
     new:
       title: הסיסמה הלכה לאיבוד
       heading: שכחת סיסמה?

-      email address: 'כתובת דוא״ל:'
+      email address: כתובת דוא״ל

       new password button: נא לשלוח לי סיסמה חדשה
       help_text: נא להזין את כתובת הדוא״ל שהשתמשת בה כדי להירשם. אנו נשלח אליה קישור
         שאפשר להשתמש בו כדי לאפס את סיסמתך.
       new password button: נא לשלוח לי סיסמה חדשה
       help_text: נא להזין את כתובת הדוא״ל שהשתמשת בה כדי להירשם. אנו נשלח אליה קישור
         שאפשר להשתמש בו כדי לאפס את סיסמתך.


@@ -1924,9 +1933,8 @@ he:
     new:
       title: כניסה
       heading: כניסה
     new:
       title: כניסה
       heading: כניסה

-      email or username: 'כתובת דואר אלקטרוני או שם משתמש:'
-      password: 'סיסמה:'
-      openid_html: '%{logo} OpenID:'
+      email or username: כתובת דוא״ל או שם משתמש
+      password: סיסמה

       remember: לזכור אותי
       lost password link: איבדת את הסיסמה שלך?
       login_button: כניסה
       remember: לזכור אותי
       lost password link: איבדת את הסיסמה שלך?
       login_button: כניסה


@@ -1974,8 +1982,8 @@ he:
       headings: כותרות
       heading: כותרת
       subheading: כותרת משנה
       headings: כותרות
       heading: כותרת
       subheading: כותרת משנה

-      unordered: רש×\99×\9e×\94 ×\91×\9cת×\99Ö¾×\9e×\9e×\95×\99× ×ª
-      ordered: רש×\99×\9e×\94 ×\9e×\9e×\95×\99× ת
+      unordered: רש×\99×\9eת ת×\91×\9c×\99×\98×\99×\9d
+      ordered: רש×\99×\9e×\94 ×\9e×\9e×\95ספרת

       first: הפריט הראשון
       second: הפריט השני
       link: קישור
       first: הפריט הראשון
       second: הפריט השני
       link: קישור


@@ -2287,16 +2295,13 @@ he:
         url: https://wiki.openstreetmap.org/wiki/He:Beginners%27_guide
         title: המדריך למתחילים
         description: מדריך בתחזוקת הקהילה למתחילים.
         url: https://wiki.openstreetmap.org/wiki/He:Beginners%27_guide
         title: המדריך למתחילים
         description: מדריך בתחזוקת הקהילה למתחילים.

-      help:
-        title: פ×\95ר×\95×\9d ×\94×¢×\96ר×\94
-        description: ×\9cש×\90×\95×\9c ש×\90×\9c×\94 ×\90×\95 ×\9c×\97פש תש×\95×\91×\95ת ×\91×\90תר ×\94ש×\90×\9c×\95ת ×\95×\94תש×\95×\91×\95ת של OpenStreetMap.
+      community:
+        title: פ×\95ר×\95×\9d ק×\94×\99×\9cת×\99
+        description: ×\9eק×\95×\9d ×\9eש×\95תף ×\9cש×\99×\97×\95ת ×¢ל OpenStreetMap.

       mailing_lists:
         title: רשימות תפוצה
         description: לשאול שאלה או לדון בדברים מעניינים ברשימות תפוצה נושאים ואזוריות
           רבות.
       mailing_lists:
         title: רשימות תפוצה
         description: לשאול שאלה או לדון בדברים מעניינים ברשימות תפוצה נושאים ואזוריות
           רבות.

-      community:
-        title: פורום קהילתי
-        description: מקום משותף לשיחות על OpenStreetMap.

       irc:
         title: IRC
         description: שיחה אינטראקטיבית בשפות שונות רבות ובנושאים רבים.
       irc:
         title: IRC
         description: שיחה אינטראקטיבית בשפות שונות רבות ובנושאים רבים.


@@ -3149,7 +3154,6 @@ he:
           other: המרחק שלך מהנקודה הזאת הוא עד %{count} רגל
       base:
         standard: תקני
           other: המרחק שלך מהנקודה הזאת הוא עד %{count} רגל
       base:
         standard: תקני

-        cyclosm: CyclOSM

         cycle_map: מפת אופניים
         transport_map: מפת תחבורה
         tracestracktop_topo: טופוגרפיה של Tracestrack
         cycle_map: מפת אופניים
         transport_map: מפת תחבורה
         tracestracktop_topo: טופוגרפיה של Tracestrack

diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index bd68389fae806ba62d8314e6e1f5adc04c8694fe..68f43d8c3350d3e561c8c8f7c2c47ec0bcc8900b 100644 (file)
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -228,7 +228,6 @@ hi:
   auth:
     providers:
       none: कुछ नहीं
   auth:
     providers:
       none: कुछ नहीं

-      openid: OpenID

       google: गूगल
       facebook: फेसबुक
       microsoft: विन्डोज़ लाइव
       google: गूगल
       facebook: फेसबुक
       microsoft: विन्डोज़ लाइव

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index b6d934a7a96991d796c8ba98d088707afe3a1469..084524196e1f79fe6dd62068a70f9c3d306349ed 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -208,7 +208,6 @@ hr:
   auth:
     providers:
       none: Nijedan
   auth:
     providers:
       none: Nijedan

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub


@@ -1235,7 +1234,6 @@ hr:
       heading: Prijava
       email or username: 'Email adresa ili korisničko ime:'
       password: 'Lozinka:'
       heading: Prijava
       email or username: 'Email adresa ili korisničko ime:'
       password: 'Lozinka:'

-      openid_html: '%{logo} OpenID:'

       remember: Zapamti me
       lost password link: Izgubljena zaporka?
       login_button: Prijava
       remember: Zapamti me
       lost password link: Izgubljena zaporka?
       login_button: Prijava


@@ -1373,8 +1371,6 @@ hr:
         title: Dobrodošao/la na OSM
       beginners_guide:
         url: http://wiki.openstreetmap.org/wiki/Hr:Beginners%27_guide
         title: Dobrodošao/la na OSM
       beginners_guide:
         url: http://wiki.openstreetmap.org/wiki/Hr:Beginners%27_guide

-      help:
-        title: help.openstreetmap.org

       wiki:
         title: wiki.openstreetmap.org
     any_questions:
       wiki:
         title: wiki.openstreetmap.org
     any_questions:

diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index af2921f85220aba58a373f4b9bc07b17ac5f3fb9..9f9b2a01fc152eb28948216dbded2ce039992a7e 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -234,7 +234,6 @@ hsb:
   auth:
     providers:
       none: Žane
   auth:
     providers:
       none: Žane

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub


@@ -1764,7 +1763,6 @@ hsb:
       heading: Přizjewjenje
       email or username: 'E-mejlowa adresa abo wužiwarske mjeno:'
       password: 'Hesło:'
       heading: Přizjewjenje
       email or username: 'E-mejlowa adresa abo wužiwarske mjeno:'
       password: 'Hesło:'

-      openid_html: '%{logo} OpenID:'

       remember: Spomjatkować sej
       lost password link: Swoje hesło zabył?
       login_button: Přizjewjenje
       remember: Spomjatkować sej
       lost password link: Swoje hesło zabył?
       login_button: Přizjewjenje


@@ -1938,10 +1936,6 @@ hsb:
         url: http://wiki.openstreetmap.org/wiki/hsb:Beginners%27_guide
         title: Instrukcije za nowačkow
         description: Přez zhromadźenstwo wothladowany nawod za započatkowarjow.
         url: http://wiki.openstreetmap.org/wiki/hsb:Beginners%27_guide
         title: Instrukcije za nowačkow
         description: Přez zhromadźenstwo wothladowany nawod za započatkowarjow.

-      help:
-        title: Forum pomocy
-        description: Prašej so za něčim abo pytaj za wotmołwami na stronje prašenjow
-          a wotmołwow OpenStreetMap.

       mailing_lists:
         title: Rozesyłanske lisćiny
         description: Staj prašenje abo diskutuj zajimawe wěcy w šěrokim wobłuku temow
       mailing_lists:
         title: Rozesyłanske lisćiny
         description: Staj prašenje abo diskutuj zajimawe wěcy w šěrokim wobłuku temow


@@ -2617,7 +2611,6 @@ hsb:
           other: Sće mjenje hač %{count} stopow wot tutoho dypka zdaleny
       base:
         standard: Standard
           other: Sće mjenje hač %{count} stopow wot tutoho dypka zdaleny
       base:
         standard: Standard

-        cyclosm: CyclOSM

         cycle_map: Kolesowa karta
         transport_map: Wobchadna karta
         hot: Sobuskutkowacy humanitarneje pomocy
         cycle_map: Kolesowa karta
         transport_map: Wobchadna karta
         hot: Sobuskutkowacy humanitarneje pomocy

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 36ab594aff98dedf4400e728c5e4f6e97cf462c3..f73ceb8af3c1b79a1593a81d9b84526242c3fc59 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -247,7 +247,6 @@ hu:
   auth:
     providers:
       none: Nincs
   auth:
     providers:
       none: Nincs

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -1885,7 +1884,6 @@ hu:
       heading: Bejelentkezés
       email or username: 'E-mail-cím vagy felhasználónév:'
       password: 'Jelszó:'
       heading: Bejelentkezés
       email or username: 'E-mail-cím vagy felhasználónév:'
       password: 'Jelszó:'

-      openid_html: '%{logo} OpenID:'

       remember: Emlékezz rám
       lost password link: Elfelejtetted a jelszavad?
       login_button: Bejelentkezés
       remember: Emlékezz rám
       lost password link: Elfelejtetted a jelszavad?
       login_button: Bejelentkezés


@@ -2168,17 +2166,13 @@ hu:
         url: https://wiki.openstreetmap.org/wiki/Hu:Beginners%27_guide
         title: Kezdők kézikönyve
         description: A közösség által karbantartott útmutató kezdőknek.
         url: https://wiki.openstreetmap.org/wiki/Hu:Beginners%27_guide
         title: Kezdők kézikönyve
         description: A közösség által karbantartott útmutató kezdőknek.

-      help:
-        title: Segítségnyújtó fórum
-        description: Kérdezz vagy keress válaszokat az OpenStreetMap kérdések-és-válaszok
-          lapján.
+      community:
+        title: Közösségi portál
+        description: Egy hely, ahol az OpenStreetMap a téma.

       mailing_lists:
         title: Levelezőlisták
         description: Kérdezz vagy beszélgess érdekességekről a számos tematikus vagy
           helyi levelezőlistán.
       mailing_lists:
         title: Levelezőlisták
         description: Kérdezz vagy beszélgess érdekességekről a számos tematikus vagy
           helyi levelezőlistán.

-      community:
-        title: Közösségi portál
-        description: Egy hely, ahol az OpenStreetMap a téma.

       irc:
         title: IRC
         description: Interaktív chat számos nyelven, számos témában.
       irc:
         title: IRC
         description: Interaktív chat számos nyelven, számos témában.


@@ -2997,7 +2991,6 @@ hu:
           other: '%{count} lábnál közelebb vagy ehhez a ponthoz'
       base:
         standard: Alapértelmezett
           other: '%{count} lábnál közelebb vagy ehhez a ponthoz'
       base:
         standard: Alapértelmezett

-        cyclosm: CyclOSM

         cycle_map: Kerékpártérkép
         transport_map: Tömegközlekedés
         hot: Humanitárius
         cycle_map: Kerékpártérkép
         transport_map: Tömegközlekedés
         hot: Humanitárius

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 7b675604e00461e8ab041fdaaa40f8ae5b1d98a6..6273b658eb3b2854bbdfa1d74b532f29f4c28406 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -219,7 +219,6 @@ ia:
   auth:
     providers:
       none: Necun
   auth:
     providers:
       none: Necun

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -1914,7 +1913,6 @@ ia:
       heading: Aperir session
       email or username: Adresse de e-mail o nomine de usator
       password: Contrasigno
       heading: Aperir session
       email or username: Adresse de e-mail o nomine de usator
       password: Contrasigno

-      openid_html: OpenID de %{logo}

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


@@ -2270,17 +2268,13 @@ ia:
         url: https://wiki.openstreetmap.org/wiki/Ia:Beginners%27_guide
         title: Guida pro comenciantes
         description: Guida pro comenciantes, mantenite per le communitate.
         url: https://wiki.openstreetmap.org/wiki/Ia:Beginners%27_guide
         title: Guida pro comenciantes
         description: Guida pro comenciantes, mantenite per le communitate.

-      help:
-        title: Foro de adjuta
-        description: Pone un question o cerca responsas sur le sito de questiones
-          e responsas de OpenStreetMap.
+      community:
+        title: Foro del communitate
+        description: Un sito commun de conversation sur OpenStreetMap.

       mailing_lists:
         title: Listas de diffusion
         description: Pone un question o discute cosas interessante sur un varietate
           de listas de diffusion thematic o regional.
       mailing_lists:
         title: Listas de diffusion
         description: Pone un question o discute cosas interessante sur un varietate
           de listas de diffusion thematic o regional.

-      community:
-        title: Foro del communitate
-        description: Un sito commun de conversation sur OpenStreetMap.

       irc:
         title: IRC
         description: Conversation interactive in multe linguas differente e sur multe
       irc:
         title: IRC
         description: Conversation interactive in multe linguas differente e sur multe


@@ -3154,7 +3148,6 @@ ia:
           other: Tu es minus de %{count} pedes distante de iste puncto
       base:
         standard: Standard
           other: Tu es minus de %{count} pedes distante de iste puncto
       base:
         standard: Standard

-        cyclosm: CyclOSM

         cycle_map: Carta cyclista
         transport_map: Carta de transporto
         tracestracktop_topo: Tracestrack Topo
         cycle_map: Carta cyclista
         transport_map: Carta de transporto
         tracestracktop_topo: Tracestrack Topo

diff --git a/config/locales/id.yml b/config/locales/id.yml
index bb45ebfccbcfc8c62a82779b9fd153ac83b9452b..3c33b1f6106e67c716099f23259800a70bd6bae7 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -239,7 +239,6 @@ id:
   auth:
     providers:
       none: Tidak ada
   auth:
     providers:
       none: Tidak ada

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -1919,7 +1918,6 @@ id:
       heading: Login
       email or username: Alamat Email atau Nama Pengguna
       password: Kata Sandi
       heading: Login
       email or username: Alamat Email atau Nama Pengguna
       password: Kata Sandi

-      openid_html: '%{logo} OpenID'

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


@@ -2263,17 +2261,13 @@ id:
         url: http://wiki.openstreetmap.org/wiki/Panduan%27_pemula
         title: Pedoman Pemula
         description: Panduan yang ditunjang komunitas bagi pemula.
         url: http://wiki.openstreetmap.org/wiki/Panduan%27_pemula
         title: Pedoman Pemula
         description: Panduan yang ditunjang komunitas bagi pemula.

-      help:
-        title: Forum Bantuan
-        description: Ajukan pertanyaan atau mencari jawaban di situs tanya-jawab OpenStreetMap
-          ini.
+      community:
+        title: Forum komunitas
+        description: Forum bincang-bincang OpenStreetMap.

       mailing_lists:
         title: Daftar Alamat
         description: Bertanya atau berdiskusi hal-hal menarik dalam daftar alamat
           menurut berbagai topik dan daerah.
       mailing_lists:
         title: Daftar Alamat
         description: Bertanya atau berdiskusi hal-hal menarik dalam daftar alamat
           menurut berbagai topik dan daerah.

-      community:
-        title: Forum komunitas
-        description: Forum bincang-bincang OpenStreetMap.

       irc:
         title: IRC
         description: Obrolan interaktif dalam berbagai bahasa mengenai bermacam-macam
       irc:
         title: IRC
         description: Obrolan interaktif dalam berbagai bahasa mengenai bermacam-macam


@@ -3136,7 +3130,6 @@ id:
           other: Anda berjarak %{count} kaki dari titik ini
       base:
         standard: Standar
           other: Anda berjarak %{count} kaki dari titik ini
       base:
         standard: Standar

-        cyclosm: CyclOSM

         cycle_map: Peta Sepeda
         transport_map: Peta Transportasi
         tracestracktop_topo: Tracestrack Topo
         cycle_map: Peta Sepeda
         transport_map: Peta Transportasi
         tracestracktop_topo: Tracestrack Topo

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 4c79362609cf76245a1a197d8b92a90207dd497a..489c0d29bb669f6e533abfd1f94bf2049d4e020c 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -227,7 +227,6 @@ is:
   auth:
     providers:
       none: Ekkert
   auth:
     providers:
       none: Ekkert

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub


@@ -1877,7 +1876,6 @@ is:
       heading: Innskrá
       email or username: 'Netfang eða notandanafn:'
       password: 'Lykilorð:'
       heading: Innskrá
       email or username: 'Netfang eða notandanafn:'
       password: 'Lykilorð:'

-      openid_html: '%{logo} OpenID:'

       remember: Muna innskráninguna
       lost password link: Gleymdirðu lykilorðinu þínu?
       login_button: Innskrá
       remember: Muna innskráninguna
       lost password link: Gleymdirðu lykilorðinu þínu?
       login_button: Innskrá


@@ -2272,18 +2270,14 @@ is:
         url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
         title: Leiðbeiningar fyrir byrjendur
         description: Leiðarvísir fyrir byrjendur sem haldið er við af samfélaginu.
         url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
         title: Leiðbeiningar fyrir byrjendur
         description: Leiðarvísir fyrir byrjendur sem haldið er við af samfélaginu.

-      help:
-        url: https://help.openstreetmap.org/
-        title: Hjálparvefur
-        description: Spyrðu spurninga eða flettu upp svörum á spyrja/svara hluta OpenStreetMap-vefsvæðisins.
-      mailing_lists:
-        title: Póstlistar
-        description: Spyrðu spurninga eða spjallaðu um áhugaverð málefni á einhverjum
-          af fjölmörgum póstlistum tengdum tungumálum eða viðfangsefnum.

       community:
         url: https://community.openstreetmap.org/
         title: Samfélagsgátt
         description: Sameiginlegur staður fyrir umræður um OpenStreetMap.
       community:
         url: https://community.openstreetmap.org/
         title: Samfélagsgátt
         description: Sameiginlegur staður fyrir umræður um OpenStreetMap.

+      mailing_lists:
+        title: Póstlistar
+        description: Spyrðu spurninga eða spjallaðu um áhugaverð málefni á einhverjum
+          af fjölmörgum póstlistum tengdum tungumálum eða viðfangsefnum.

       irc:
         title: IRC
         description: Gagnvirkt spjall á mörgum tungumálum og um margvísleg málefni.
       irc:
         title: IRC
         description: Gagnvirkt spjall á mörgum tungumálum og um margvísleg málefni.


@@ -3100,7 +3094,6 @@ is:
           other: Þú ert minna en %{count} fet frá þessum punkti
       base:
         standard: Staðlað
           other: Þú ert minna en %{count} fet frá þessum punkti
       base:
         standard: Staðlað

-        cyclosm: CyclOSM

         cycle_map: Hjólakort
         transport_map: Umferðarkort
         hot: Hjálparstarf
         cycle_map: Hjólakort
         transport_map: Umferðarkort
         hot: Hjálparstarf

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 2dce0bc1d22c28b73bef589f51622d3847b6346d..5734fc540672779ece4c2cd71c6e639ef6eea8db 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -272,7 +272,6 @@ it:
   auth:
     providers:
       none: Nessuno
   auth:
     providers:
       none: Nessuno

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -1959,7 +1958,6 @@ it:
       heading: Entra
       email or username: Indirizzo e-mail o nome utente
       password: Password
       heading: Entra
       email or username: Indirizzo e-mail o nome utente
       password: Password

-      openid_html: '%{logo} OpenID'

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


@@ -2312,17 +2310,13 @@ it:
         url: https://wiki.openstreetmap.org/wiki/IT:Beginners%27_guide
         title: Guida per principianti
         description: Guida per i principianti gestita dalla comunità.
         url: https://wiki.openstreetmap.org/wiki/IT:Beginners%27_guide
         title: Guida per principianti
         description: Guida per i principianti gestita dalla comunità.

-      help:
-        title: Forum di aiuto
-        description: Fai una domanda o cerca risposte sul sito di domande e risposte
-          di OpenStreetMap.
+      community:
+        title: Forum di assistenza e comunità
+        description: Un luogo condiviso dove cercare aiuto e conversare su OpenStreetMap.

       mailing_lists:
         title: Mailing List
         description: Poni la tua domanda o discuti questioni di interesse su una vasta
           gamma di mailing list tematiche o regionali.
       mailing_lists:
         title: Mailing List
         description: Poni la tua domanda o discuti questioni di interesse su una vasta
           gamma di mailing list tematiche o regionali.

-      community:
-        title: Forum della comunità
-        description: Un luogo condiviso per le conversazioni su OpenStreetMap.

       irc:
         title: IRC
         description: Chat interattiva in molte lingue diverse e su molti argomenti.
       irc:
         title: IRC
         description: Chat interattiva in molte lingue diverse e su molti argomenti.


@@ -3201,7 +3195,6 @@ it:
           other: Ti trovi entro %{count} piedi da questo punto
       base:
         standard: Standard
           other: Ti trovi entro %{count} piedi da questo punto
       base:
         standard: Standard

-        cyclosm: CyclOSM

         cycle_map: Mappa ciclabile
         transport_map: Mappa dei trasporti
         tracestracktop_topo: Tracestrack Topo
         cycle_map: Mappa ciclabile
         transport_map: Mappa dei trasporti
         tracestracktop_topo: Tracestrack Topo

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index c4a6d8af46540e2be7591f61eebf7e74883a7828..ef05c2da76ab1d8df05fe82b0bbc71c7a19df5ab 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -256,7 +256,6 @@ ja:
   auth:
     providers:
       none: なし
   auth:
     providers:
       none: なし

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: マイクロソフト
       google: Google
       facebook: Facebook
       microsoft: マイクロソフト


@@ -1768,7 +1767,6 @@ ja:
       heading: ログイン
       email or username: 'メールアドレスまたは利用者名:'
       password: 'パスワード:'
       heading: ログイン
       email or username: 'メールアドレスまたは利用者名:'
       password: 'パスワード:'

-      openid_html: '%{logo} OpenID:'

       remember: ログイン状態を保持
       lost password link: パスワードを忘れた場合はこちら
       login_button: ログイン
       remember: ログイン状態を保持
       lost password link: パスワードを忘れた場合はこちら
       login_button: ログイン


@@ -1949,14 +1947,11 @@ ja:
       beginners_guide:
         title: 初心者向けの手引き
         description: コミュニティは、初心者向けガイドが整備しています。
       beginners_guide:
         title: 初心者向けの手引き
         description: コミュニティは、初心者向けガイドが整備しています。

-      help:
-        title: ヘルプフォーラム
-        description: OpenStreetMap の Q&A サイトで質問したり回答を検索したりする。
+      community:
+        title: コミュニティフォーラム

       mailing_lists:
         title: メーリング リスト
         description: メーリングリストは話題や地域ごとに多種多様で、質問や興味のある事項について議論できる場です。
       mailing_lists:
         title: メーリング リスト
         description: メーリングリストは話題や地域ごとに多種多様で、質問や興味のある事項について議論できる場です。

-      community:
-        title: コミュニティフォーラム

       irc:
         title: IRC
         description: 多様な言語によるいろいろな話題を取上げた双方向性チャット
       irc:
         title: IRC
         description: 多様な言語によるいろいろな話題を取上げた双方向性チャット


@@ -2619,7 +2614,6 @@ ja:
           other: この地点まで%{count}フィート
       base:
         standard: 標準
           other: この地点まで%{count}フィート
       base:
         standard: 標準

-        cyclosm: CyclOSM

         cycle_map: サイクリングマップ
         transport_map: 交通マップ
         hot: Humanitarian
         cycle_map: サイクリングマップ
         transport_map: 交通マップ
         hot: Humanitarian

diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 4b2b25057f446ee412b78ea6b00c7ea86829d198..5a4fe12e5c52b3be0c1d517f7f48e8dde000e6af 100644 (file)
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -873,7 +873,6 @@ ka:
       heading: შესვლა
       email or username: 'ელ. ფოსტის მისამართი, ან მომხმარებლის სახელი:'
       password: 'პაროლი:'
       heading: შესვლა
       email or username: 'ელ. ფოსტის მისამართი, ან მომხმარებლის სახელი:'
       password: 'პაროლი:'

-      openid_html: '%{logo} OpenID:'

       remember: დამიმახსოვრე
       lost password link: დაგავიწყდათ პაროლი?
       login_button: შესვლა
       remember: დამიმახსოვრე
       lost password link: დაგავიწყდათ პაროლი?
       login_button: შესვლა

diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index f170bc8e5eacfdd9d23d2ce83f3748481ab95d0a..6cc9bc27192a42cbed6c18709b682e43c465dadd 100644 (file)
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -969,7 +969,6 @@ kab:
       heading: Qqen
       email or username: 'Tansa imayl neɣ isem n useqdac:'
       password: 'Awal uffir:'
       heading: Qqen
       email or username: 'Tansa imayl neɣ isem n useqdac:'
       password: 'Awal uffir:'

-      openid_html: '%{logo} OpenID:'

       remember: Cfu fell-i
       lost password link: Tweddreḍ awal-ik uffir?
       login_button: Qqen
       remember: Cfu fell-i
       lost password link: Tweddreḍ awal-ik uffir?
       login_button: Qqen


@@ -1078,9 +1077,6 @@ kab:
       beginners_guide:
         title: Amnir n ulemad
         description: Aminir i yinelmaden imaynuten i t-xeddem tmezdagnut.
       beginners_guide:
         title: Amnir n ulemad
         description: Aminir i yinelmaden imaynuten i t-xeddem tmezdagnut.

-      help:
-        title: help.openstreetmap.org
-        description: Steqsi neɣ nadi tiririyin deg usmel akked isteqsiyen n OSM.

       mailing_lists:
         title: Tabraṭṭ n tnezwit
       irc:
       mailing_lists:
         title: Tabraṭṭ n tnezwit
       irc:

diff --git a/config/locales/kk-cyrl.yml b/config/locales/kk-cyrl.yml
index 924edef603cc6b62810bb47d905f7a68bad8593a..76571b8231a3ab9f5a4e5da9375393b57962d8b6 100644 (file)
--- a/config/locales/kk-cyrl.yml
+++ b/config/locales/kk-cyrl.yml
@@ -189,7 +189,6 @@ kk-cyrl:
   auth:
     providers:
       none: Жоқ
   auth:
     providers:
       none: Жоқ

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub


@@ -900,7 +899,6 @@ kk-cyrl:
       title: Кіру
       heading: Кіру
       password: 'Құпиясөз:'
       title: Кіру
       heading: Кіру
       password: 'Құпиясөз:'

-      openid_html: '%{logo} OpenID:'

       remember: Жүйеде қалу
       login_button: Кіру
       no account: Тіркелгіңіз жоқ па?
       remember: Жүйеде қалу
       login_button: Кіру
       no account: Тіркелгіңіз жоқ па?


@@ -1129,7 +1127,6 @@ kk-cyrl:
         out: Кішірейту
       base:
         standard: Cтандартты
         out: Кішірейту
       base:
         standard: Cтандартты

-        cyclosm: CyclOSM

         transport_map: Көлік картасы
       layers:
         header: Карта қабаттары
         transport_map: Көлік картасы
       layers:
         header: Карта қабаттары

diff --git a/config/locales/kn.yml b/config/locales/kn.yml
index 87394bf2eec4b47212572064542ff16c9bffe12b..d16523b6d36c121beb41fc49e0ba9995bc812858 100644 (file)
--- a/config/locales/kn.yml
+++ b/config/locales/kn.yml
@@ -842,8 +842,6 @@ kn:
       welcome:
         url: /welcome
         title: ಒಪನ್ ಸ್ಟ್ರೀಟ್ ಮ್ಯಾಪ್ ಗೆ  ಸುಸ್ವಾಗತ
       welcome:
         url: /welcome
         title: ಒಪನ್ ಸ್ಟ್ರೀಟ್ ಮ್ಯಾಪ್ ಗೆ  ಸುಸ್ವಾಗತ

-      help:
-        title: ಸಹಾಯ ವೇದಿಕೆ

       irc:
         title: ಐ ಆರ್ ಸಿ
       wiki:
       irc:
         title: ಐ ಆರ್ ಸಿ
       wiki:

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index b450eaa1ec816a78475f85752551c70159b445cd..3945f4f7b55937b805d38e2aa50c7ec1a0216cb0 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -238,7 +238,6 @@ ko:
   auth:
     providers:
       none: 없음
   auth:
     providers:
       none: 없음

-      openid: OpenID

       google: 구글
       facebook: 페이스북
       microsoft: 마이크로소프트
       google: 구글
       facebook: 페이스북
       microsoft: 마이크로소프트


@@ -1771,7 +1770,6 @@ ko:
       heading: 로그인
       email or username: '이메일 주소 또는 사용자 이름:'
       password: '비밀번호:'
       heading: 로그인
       email or username: '이메일 주소 또는 사용자 이름:'
       password: '비밀번호:'

-      openid_html: '%{logo} OpenID:'

       remember: 로그인 상태를 기억하기
       lost password link: 비밀번호를 잊으셨나요?
       login_button: 로그인
       remember: 로그인 상태를 기억하기
       lost password link: 비밀번호를 잊으셨나요?
       login_button: 로그인


@@ -2074,15 +2072,12 @@ ko:
         url: https://wiki.openstreetmap.org/wiki/Ko:%EC%B4%88%EB%B3%B4%EC%9E%90_%EC%95%88%EB%82%B4%EC%84%9C
         title: 초보자 길라잡이
         description: 커뮤니티에서 관리하는 초보자 길라잡이
         url: https://wiki.openstreetmap.org/wiki/Ko:%EC%B4%88%EB%B3%B4%EC%9E%90_%EC%95%88%EB%82%B4%EC%84%9C
         title: 초보자 길라잡이
         description: 커뮤니티에서 관리하는 초보자 길라잡이

-      help:
-        title: 도움말 포럼
-        description: 오픈스트리트맵의 QnA 사이트에서 질문하거나 답변을 찾아보세요.
-      mailing_lists:
-        title: 메일링 리스트
-        description: 국소 또는 지역의 메일링 리스트의 넓은 범위에서 관심사에 대해 질문하거나 토론을 합니다.

       community:
         title: 공동체 포럼
         description: 오픈스트리트맵과 관련한 대화를 나누는 장소입니다.
       community:
         title: 공동체 포럼
         description: 오픈스트리트맵과 관련한 대화를 나누는 장소입니다.

+      mailing_lists:
+        title: 메일링 리스트
+        description: 국소 또는 지역의 메일링 리스트의 넓은 범위에서 관심사에 대해 질문하거나 토론을 합니다.

       irc:
         title: IRC
         description: 다양한 주제에서 많은 다른 언어로 된 대화형 채트입니다.
       irc:
         title: IRC
         description: 다양한 주제에서 많은 다른 언어로 된 대화형 채트입니다.


@@ -2813,7 +2808,6 @@ ko:
           other: 이 지점까지 %{count}미터 이내
       base:
         standard: 표준
           other: 이 지점까지 %{count}미터 이내
       base:
         standard: 표준

-        cyclosm: CyclOSM

         cycle_map: 사이클 지도
         transport_map: 교통 지도
         tracestracktop_topo: 트레이스트랙 토포
         cycle_map: 사이클 지도
         transport_map: 교통 지도
         tracestracktop_topo: 트레이스트랙 토포

diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 9094815635c9026071b21f16f1552b53296a0da4..315fd0dfd60e818b4aa878855d7c83433b5d219d 100644 (file)
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -221,7 +221,6 @@ ku-Latn:
   auth:
     providers:
       none: Ne yek
   auth:
     providers:
       none: Ne yek

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -1854,7 +1853,6 @@ ku-Latn:
       heading: Têkeve
       email or username: Adrêsa E-peyamê an jî Navê Bikarhêneriyêː
       password: 'Şîfre:'
       heading: Têkeve
       email or username: Adrêsa E-peyamê an jî Navê Bikarhêneriyêː
       password: 'Şîfre:'

-      openid_html: '%{logo} OpenID:'

       remember: Min bi bîr bîne
       lost password link: Te şîfreya xwe winda kir?
       login_button: Têkeve
       remember: Min bi bîr bîne
       lost password link: Te şîfreya xwe winda kir?
       login_button: Têkeve


@@ -2041,17 +2039,13 @@ ku-Latn:
       beginners_guide:
         title: Rêbera ji bo kesên ku nû dest pê kirine
         description: Civata me, ji bo kesên ku nû dest pê kirine rêbertî dike.
       beginners_guide:
         title: Rêbera ji bo kesên ku nû dest pê kirine
         description: Civata me, ji bo kesên ku nû dest pê kirine rêbertî dike.

-      help:
-        title: Foruma Alîkariyê
-        description: Pirsek bipirsin an binêrin cewabên li ser malpera OpenStreetMapê
-          ya pirs-û-bersivê.
+      community:
+        title: Foruma civatê
+        description: Cihê hevpar ji bo sohbetên di derbarê OpenStreetMapê de.

       mailing_lists:
         title: Lîsteya E-nameyan
         description: Di lîsteyên e-nameyan yên deverî an jî herêmî yên cur bi cur
           de hûn dikarin pirsan bipirsin an jî mijarên balkêş nîqaş bikin.
       mailing_lists:
         title: Lîsteya E-nameyan
         description: Di lîsteyên e-nameyan yên deverî an jî herêmî yên cur bi cur
           de hûn dikarin pirsan bipirsin an jî mijarên balkêş nîqaş bikin.

-      community:
-        title: Foruma civatê
-        description: Cihê hevpar ji bo sohbetên di derbarê OpenStreetMapê de.

       irc:
         title: IRC
         description: Sohbeta înteraktîv yê bi gelek zimanan û di gelek mijaran de.
       irc:
         title: IRC
         description: Sohbeta înteraktîv yê bi gelek zimanan û di gelek mijaran de.


@@ -2789,7 +2783,6 @@ ku-Latn:
           other: Tu di nava %{count} gavên vê nuqteyê de yî
       base:
         standard: Standard
           other: Tu di nava %{count} gavên vê nuqteyê de yî
       base:
         standard: Standard

-        cyclosm: CyclOSM

         cycle_map: Nexşeya bisiklête
         transport_map: Nexşeya transportê
         hot: Mirovatî
         cycle_map: Nexşeya bisiklête
         transport_map: Nexşeya transportê
         hot: Mirovatî

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 7b4e9c05d830aa81f7bc23b3470c1ffc372dc132..ad2c3ab5013d7921f34e2405178ff24e44ae3523 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -218,7 +218,6 @@ lb:
   auth:
     providers:
       none: Keng
   auth:
     providers:
       none: Keng

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub


@@ -1824,7 +1823,6 @@ lb:
       heading: Umellen
       email or username: E-Mail-Adress oder Benotzernumm
       password: Passwuert
       heading: Umellen
       email or username: E-Mail-Adress oder Benotzernumm
       password: Passwuert

-      openid_html: '%{logo} OpenID:'

       remember: Sech u mech erënneren
       lost password link: Hutt Dir Äert Passwuert vergiess?
       login_button: Umellen
       remember: Sech u mech erënneren
       lost password link: Hutt Dir Äert Passwuert vergiess?
       login_button: Umellen


@@ -1982,10 +1980,6 @@ lb:
         title: Wëllkomm bei OpenStreetMap
       beginners_guide:
         title: Guide fir nei Benotzer
         title: Wëllkomm bei OpenStreetMap
       beginners_guide:
         title: Guide fir nei Benotzer

-      help:
-        title: Hëllefs-Forum
-        description: Stellt eng Fro oder kuckt no Äntwerten um OpenStreetMap-Site
-          mat de Froen an Äntwerten.

       mailing_lists:
         title: Mailing-Lëschten
       irc:
       mailing_lists:
         title: Mailing-Lëschten
       irc:


@@ -2457,7 +2451,6 @@ lb:
           other: Dir sidd manner wéi %{count} Féiss vun dësem Punkt ewech
       base:
         standard: Standard
           other: Dir sidd manner wéi %{count} Féiss vun dësem Punkt ewech
       base:
         standard: Standard

-        cyclosm: CyclOSM

         cycle_map: Vëloskaart
         transport_map: Verkéierskaart
         hot: Humanitär
         cycle_map: Vëloskaart
         transport_map: Verkéierskaart
         hot: Humanitär

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 4a6f8ddae1e4dd4956560cfee3d611f99f796225..b31b07af7e878b8c89408bea9a97853b004fe60c 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -257,7 +257,6 @@ lt:
   auth:
     providers:
       none: Nei vienas
   auth:
     providers:
       none: Nei vienas

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub


@@ -1788,7 +1787,6 @@ lt:
       heading: Prisijungti
       email or username: 'E-pašto adresas arba naudotojo vardas:'
       password: 'Slaptažodis:'
       heading: Prisijungti
       email or username: 'E-pašto adresas arba naudotojo vardas:'
       password: 'Slaptažodis:'

-      openid_html: '%{logo} OpenID:'

       remember: Prisiminti prisijungimą
       lost password link: Pamiršote slaptažodį?
       login_button: Prisijungti
       remember: Prisiminti prisijungimą
       lost password link: Pamiršote slaptažodį?
       login_button: Prisijungti


@@ -1995,17 +1993,13 @@ lt:
         url: http://wiki.openstreetmap.org/wiki/Lt:Beginners%27_guide
         title: Pradedančiojo vadovas
         description: Bendruomenės palaikomas vadovas pradedantiesiems.
         url: http://wiki.openstreetmap.org/wiki/Lt:Beginners%27_guide
         title: Pradedančiojo vadovas
         description: Bendruomenės palaikomas vadovas pradedantiesiems.

-      help:
-        title: Pagalbos forumas
-        description: Užduokite klausimą arba ieškokite atsakymų OpenStreetMap klausimų-ir-atsakymų
-          svetainėje.
+      community:
+        title: Bendruomenės forumas
+        description: Bendra vieta pokalbiams apie OpenStreetMap.

       mailing_lists:
         title: El. pašto grupės
         description: Užduokite klausimą ar diskutuokite apie įdomius dalykus daugelyje
           teminių ar regioninių el. pašto grupių.
       mailing_lists:
         title: El. pašto grupės
         description: Užduokite klausimą ar diskutuokite apie įdomius dalykus daugelyje
           teminių ar regioninių el. pašto grupių.

-      community:
-        title: Bendruomenės forumas
-        description: Bendra vieta pokalbiams apie OpenStreetMap.

       irc:
         title: IRC
         description: Interaktyvūs pokalbiai daugeliu kalbų, daugeliu temų.
       irc:
         title: IRC
         description: Interaktyvūs pokalbiai daugeliu kalbų, daugeliu temų.


@@ -2752,7 +2746,6 @@ lt:
           other: Jūs esate %{count} pėdų atstumu nuo šio taško
       base:
         standard: Standartinis
           other: Jūs esate %{count} pėdų atstumu nuo šio taško
       base:
         standard: Standartinis

-        cyclosm: CyclOSM

         cycle_map: Dviračių žemėlapis
         transport_map: Transporto žemėlapis
         hot: Humanitarinis
         cycle_map: Dviračių žemėlapis
         transport_map: Transporto žemėlapis
         hot: Humanitarinis

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 82ecc03ef8345c707ed2623827ee1d96b547dfc8..b1dfcb6db472d238a1117b513faff48ad2f95904 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -173,7 +173,6 @@ lv:
   auth:
     providers:
       none: Nav
   auth:
     providers:
       none: Nav

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub


@@ -1466,7 +1465,6 @@ lv:
       heading: Pieslēgties
       email or username: 'E-pasta adrese vai lietotājvārds:'
       password: 'Parole:'
       heading: Pieslēgties
       email or username: 'E-pasta adrese vai lietotājvārds:'
       password: 'Parole:'

-      openid_html: '%{logo} OpenID:'

       remember: Atcerēties mani
       lost password link: Aizmirsi paroli?
       login_button: Pieslēgties
       remember: Atcerēties mani
       lost password link: Aizmirsi paroli?
       login_button: Pieslēgties


@@ -1644,17 +1642,12 @@ lv:
         url: http://wiki.openstreetmap.org/wiki/Lv:Beginners%27_guide
         title: Iesācēja Rokasgrāmata
         description: Lietotāju uzturēta pamācība priekš iesācējiem.
         url: http://wiki.openstreetmap.org/wiki/Lv:Beginners%27_guide
         title: Iesācēja Rokasgrāmata
         description: Lietotāju uzturēta pamācība priekš iesācējiem.

-      help:
-        url: http://forum.openstreetmap.org/viewforum.php?id=59
-        title: Palīdzības forums
-        description: Uzdod jautājumu vai atrodi atbildes iekš OSM jautājumu un atbilžu
-          lapas.
+      community:
+        title: Kopienas forums

       mailing_lists:
         title: Adresātu Saraksti
         description: Uzdodiet jautājumu vai apspriediet interesējošās tēmas par vispārējajiem
           vai reģionālajiem adresātu sarakstiem.
       mailing_lists:
         title: Adresātu Saraksti
         description: Uzdodiet jautājumu vai apspriediet interesējošās tēmas par vispārējajiem
           vai reģionālajiem adresātu sarakstiem.

-      community:
-        title: Kopienas forums

       irc:
         title: IRC
         description: Interaktīvais čats dažādās valodās par dažādām tēmām.
       irc:
         title: IRC
         description: Interaktīvais čats dažādās valodās par dažādām tēmām.


@@ -2238,7 +2231,6 @@ lv:
         title: Rādīt manu atrašanās vietu
       base:
         standard: Standarta
         title: Rādīt manu atrašanās vietu
       base:
         standard: Standarta

-        cyclosm: CyclOSM

         cycle_map: Velokarte
         transport_map: Transporta karte
         hot: Humanitārās
         cycle_map: Velokarte
         transport_map: Transporta karte
         hot: Humanitārās

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 365d1468e3d194576da4eb4f099f46d918e29fa8..f3f88c78dbb56b866b51eaa3483904252743c15d 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -222,7 +222,6 @@ mk:
   auth:
     providers:
       none: Нема
   auth:
     providers:
       none: Нема

-      openid: OpenID

       google: Google
       facebook: Фејсбук
       microsoft: Microsoft
       google: Google
       facebook: Фејсбук
       microsoft: Microsoft


@@ -1900,7 +1899,6 @@ mk:
       heading: Најава
       email or username: Е-пошта или корисничко име
       password: Лозинка
       heading: Најава
       email or username: Е-пошта или корисничко име
       password: Лозинка

-      openid_html: '%{logo} OpenID'

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


@@ -2257,17 +2255,13 @@ mk:
       beginners_guide:
         title: Почетен курс
         description: Напатствија за почетници, напишани од заедницата.
       beginners_guide:
         title: Почетен курс
         description: Напатствија за почетници, напишани од заедницата.

-      help:
-        title: Форум за помош
-        description: Поставете прашање или побарајте во одговорите на порталот за
-          прашања и одговори на OpenStreetMap.
+      community:
+        title: Форум за помош и заедница
+        description: Заедничко место за барање помош и разговори за OpenStreetMap.

       mailing_lists:
         title: Поштенски списоци
         description: Поставете прашање или разговарајте за интересни прашања на широк
           опсег на тематски и регионални поштенски списоци.
       mailing_lists:
         title: Поштенски списоци
         description: Поставете прашање или разговарајте за интересни прашања на широк
           опсег на тематски и регионални поштенски списоци.

-      community:
-        title: Форум на заедницата
-        description: Заедничко место за разговори за OpenStreetMap.

       irc:
         title: IRC
         description: Разговор во живо на најразлични јазици и на многу теми.
       irc:
         title: IRC
         description: Разговор во живо на најразлични јазици и на многу теми.


@@ -2642,6 +2636,7 @@ mk:
   oauth_clients:
     new:
       title: Пријавете нов прилог
   oauth_clients:
     new:
       title: Пријавете нов прилог

+      disabled: Пријавувањето на прилози OAuth 1 е оневозможено

     edit:
       title: Уредете го прилогот
     show:
     edit:
       title: Уредете го прилогот
     show:


@@ -2724,6 +2719,7 @@ mk:
       title: Мои овластени прилози
       application: Прилог
       permissions: Дозволи
       title: Мои овластени прилози
       application: Прилог
       permissions: Дозволи

+      last_authorized: Последно овластено

       no_applications_html: Сè уште немате овластено ниеден %{oauth2}-прилог.
     application:
       revoke: Одземи пристап
       no_applications_html: Сè уште немате овластено ниеден %{oauth2}-прилог.
     application:
       revoke: Одземи пристап


@@ -3138,7 +3134,6 @@ mk:
           other: Се наоѓате на %{count} стапки од оваа точка
       base:
         standard: Стандардна
           other: Се наоѓате на %{count} стапки од оваа точка
       base:
         standard: Стандардна

-        cyclosm: CyclOSM

         cycle_map: Велосипедска
         transport_map: Сообраќајна
         tracestracktop_topo: Tracestrack Топо
         cycle_map: Велосипедска
         transport_map: Сообраќајна
         tracestracktop_topo: Tracestrack Топо

diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index 35841b091f761f9a82ed72c1989933c61c7d4fdb..7d80d692334825b7da4a96b3998b9d6ead71ae71 100644 (file)
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -1123,10 +1123,6 @@ mr:
       welcome:
         url: /welcome
         title: ओएसएम वर स्वागत आहे
       welcome:
         url: /welcome
         title: ओएसएम वर स्वागत आहे

-      help:
-        title: help.openstreetmap.org
-        description: OSMच्या प्रश्नोत्तरासाठीच्या संकेतस्थळावर प्रश्न विचारा किंवा
-          उत्तरे शोधा.

       wiki:
         title: wiki.openstreetmap.org
         description: सखोल OSM प्रलेखनासाठी विकी वाचा.
       wiki:
         title: wiki.openstreetmap.org
         description: सखोल OSM प्रलेखनासाठी विकी वाचा.

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index b214e43fca23acc1d355f8794d8f2f9d52984340..56f2a4acac0f7a736d9b2a6ddc00ed919c1a723e 100644 (file)
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -198,7 +198,6 @@ ms:
   auth:
     providers:
       none: Tiada
   auth:
     providers:
       none: Tiada

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -1450,7 +1449,6 @@ ms:
       heading: Log masuk
       email or username: 'Alamat E-mel atau Nama Pengguna:'
       password: 'Kata laluan:'
       heading: Log masuk
       email or username: 'Alamat E-mel atau Nama Pengguna:'
       password: 'Kata laluan:'

-      openid_html: 'OpenID %{logo}:'

       remember: Ingati saya
       lost password link: Lupa kata laluan anda?
       login_button: Log masuk
       remember: Ingati saya
       lost password link: Lupa kata laluan anda?
       login_button: Log masuk


@@ -1655,13 +1653,10 @@ ms:
           OpenStreetMap.
       beginners_guide:
         title: Panduan Pemula
           OpenStreetMap.
       beginners_guide:
         title: Panduan Pemula

-      help:
-        title: help.openstreetmap.org
-        description: Tanyakan soalan atau cari jawapan di tapak soal jawab OSM.
-      mailing_lists:
-        title: Senarai Mel

       community:
         title: Forum masyarakat
       community:
         title: Forum masyarakat

+      mailing_lists:
+        title: Senarai Mel

       irc:
         title: IRC
         description: Chat interaktif dalam pelbagai bahasa dan pelbagai topik.
       irc:
         title: IRC
         description: Chat interaktif dalam pelbagai bahasa dan pelbagai topik.


@@ -2244,7 +2239,6 @@ ms:
         title: Paparkan Lokasi Saya
       base:
         standard: Piawai
         title: Paparkan Lokasi Saya
       base:
         standard: Piawai

-        cyclosm: CyclOSM

         cycle_map: Peta Basikal
         transport_map: Peta Pengangkutan
         hot: Kemanusiaan
         cycle_map: Peta Basikal
         transport_map: Peta Pengangkutan
         hot: Kemanusiaan

diff --git a/config/locales/my.yml b/config/locales/my.yml
index e3c4402847b8f7b2ab18289cf9b39f6f11c92759..00c5f1b4bd4b0c98ca1677f5ae6ca846c52e1b37 100644 (file)
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -605,7 +605,6 @@ my:
       heading: အကောင့်ထဲဝင်ရန်
       email or username: အီးမေးလ်လိပ်စာ သို့မဟုတ် အသုံးပြုသူအမည်
       password: စကားဝှက်
       heading: အကောင့်ထဲဝင်ရန်
       email or username: အီးမေးလ်လိပ်စာ သို့မဟုတ် အသုံးပြုသူအမည်
       password: စကားဝှက်

-      openid_html: '%{logo} OpenID:'

       remember: မိမိကို မှတ်မိပါ
       lost password link: စကားဝှက် မေ့နေသလား။
       login_button: အကောင့်ထဲဝင်ရန်
       remember: မိမိကို မှတ်မိပါ
       lost password link: စကားဝှက် မေ့နေသလား။
       login_button: အကောင့်ထဲဝင်ရန်


@@ -660,8 +659,6 @@ my:
       how_to_help:
         title: မည်ကဲ့သို့ ကူညီမည်
     help:
       how_to_help:
         title: မည်ကဲ့သို့ ကူညီမည်
     help:

-      help:
-        title: အကူညီဖိုရမ်

       welcomemat:
         title: အဖွဲ့အစည်းများအတွက်
       wiki:
       welcomemat:
         title: အဖွဲ့အစည်းများအတွက်
       wiki:

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 366cc3c17c421c6c8aca92e3392043ecc65f4bcc..e17b4732c8489efe8904cf547224972d96cf9142 100644 (file)
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -68,6 +68,11 @@ nb:
       messages:
         invalid_email_address: later ikke til å være en gyldig e-postadresse
         email_address_not_routable: kan ikke rutes
       messages:
         invalid_email_address: later ikke til å være en gyldig e-postadresse
         email_address_not_routable: kan ikke rutes

+        display_name_is_user_n: kan ikke være user_n med mindre n allerede er bruker-ID-en
+          din
+      models:
+        user_mute:
+          is_already_muted: er allerede dempet

     models:
       acl: Tilgangskontrolliste
       changeset: Endringssett
     models:
       acl: Tilgangskontrolliste
       changeset: Endringssett


@@ -235,7 +240,6 @@ nb:
   auth:
     providers:
       none: Ingen
   auth:
     providers:
       none: Ingen

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub


@@ -554,6 +558,13 @@ nb:
       comment: Kommentar
       newer_comments: Nyere kommentarer
       older_comments: Eldre kommentarer
       comment: Kommentar
       newer_comments: Nyere kommentarer
       older_comments: Eldre kommentarer

+  errors:
+    contact:
+      contact: kontakt
+    forbidden:
+      title: Forbudt
+    not_found:
+      title: Fil ikke funnet

   friendships:
     make_friend:
       heading: Legge til %{user} som venn?
   friendships:
     make_friend:
       heading: Legge til %{user} som venn?


@@ -651,6 +662,7 @@ nb:
           library: Bibliotek
           marketplace: Markedsplass
           monastery: Kloster
           library: Bibliotek
           marketplace: Markedsplass
           monastery: Kloster

+          money_transfer: Pengeoverføring

           motorcycle_parking: Motorsykkelparkering
           music_school: Musikkskole
           nightclub: Nattklubb
           motorcycle_parking: Motorsykkelparkering
           music_school: Musikkskole
           nightclub: Nattklubb


@@ -1028,22 +1040,27 @@ nb:
         office:
           accountant: Revisor
           administrative: Administrasjon
         office:
           accountant: Revisor
           administrative: Administrasjon

+          advertising_agency: Reklamebyrå

           architect: Arkitekt
           association: Forening
           company: Firma
           educational_institution: Utdanningsinstitusjon
           employment_agency: Bemanningsfirma
           estate_agent: Eiendomsmegler
           architect: Arkitekt
           association: Forening
           company: Firma
           educational_institution: Utdanningsinstitusjon
           employment_agency: Bemanningsfirma
           estate_agent: Eiendomsmegler

+          financial: Finanskontor

           government: Statlig kontor
           insurance: Forsikringskontor
           it: IT-kontor
           lawyer: Advokat
           government: Statlig kontor
           insurance: Forsikringskontor
           it: IT-kontor
           lawyer: Advokat

+          logistics: Logistikkontor
+          newspaper: Aviskontor

           ngo: Ikke-statlig kontor
           telecommunication: Telekommunikasjonskontor
           travel_agent: Reisebyrå
           "yes": Kontor
         place:
           allotments: Jordlapper
           ngo: Ikke-statlig kontor
           telecommunication: Telekommunikasjonskontor
           travel_agent: Reisebyrå
           "yes": Kontor
         place:
           allotments: Jordlapper

+          archipelago: Øygruppe

           city: By
           city_block: Bykvartal
           country: Land
           city: By
           city_block: Bykvartal
           country: Land


@@ -1058,6 +1075,7 @@ nb:
           locality: Plass
           municipality: Kommune
           neighbourhood: Naboskap
           locality: Plass
           municipality: Kommune
           neighbourhood: Naboskap

+          plot: Tomt

           postcode: Postnummer
           quarter: Kvartal
           region: Område
           postcode: Postnummer
           quarter: Kvartal
           region: Område


@@ -1262,9 +1280,11 @@ nb:
       status: Status
       reports: Rapporter
       last_updated: Sist oppdatert
       status: Status
       reports: Rapporter
       last_updated: Sist oppdatert

+      last_updated_time_ago_user_html: '%{time_ago} av %{user}'

       link_to_reports: Se på rapporter
       reports_count:
       link_to_reports: Se på rapporter
       reports_count:

-        other: 1 rapport
+        one: '%{count} rapport'
+        other: '%{count} rapporter'

       reported_item: Rapportert element
       states:
         ignored: Sett bort fra
       reported_item: Rapportert element
       states:
         ignored: Sett bort fra


@@ -1306,6 +1326,7 @@ nb:
   issue_comments:
     create:
       comment_created: Din kommentar ble feilfritt opprettet
   issue_comments:
     create:
       comment_created: Din kommentar ble feilfritt opprettet

+      issue_reassigned: Kommentaren din ble opprettet, og saken ble tildelt på nytt

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


@@ -1365,7 +1386,8 @@ nb:
     intro_text: OpenStreetMap er et kart over verden, skapt av mennesker som deg,
       og gratis å bruke under en åpen lisens.
     intro_2_create_account: Opprett en brukerkonto
     intro_text: OpenStreetMap er et kart over verden, skapt av mennesker som deg,
       og gratis å bruke under en åpen lisens.
     intro_2_create_account: Opprett en brukerkonto

-    hosting_partners_html: Hosting støttes av %{ucl}, %{bytemark}, og andre %{partners}.
+    hosting_partners_html: Hosting støttes av %{ucl}, %{fastly}, %{bytemark}, og andre
+      %{partners}.

     partners_ucl: UCL
     partners_bytemark: Bytemark Hosting
     partners_partners: partnere
     partners_ucl: UCL
     partners_bytemark: Bytemark Hosting
     partners_partners: partnere


@@ -1406,11 +1428,15 @@ nb:
       subject: '[OpenStreetMap] %{user} la deg til som en venn'
       had_added_you: '%{user} har lagt deg til som venn på OpenStreetMap.'
       see_their_profile: Du kan se profilen deres på %{userurl}.
       subject: '[OpenStreetMap] %{user} la deg til som en venn'
       had_added_you: '%{user} har lagt deg til som venn på OpenStreetMap.'
       see_their_profile: Du kan se profilen deres på %{userurl}.

+      see_their_profile_html: Du kan se profilen hens på %{userurl}.

       befriend_them: Du kan også legge dem til som venn på %{befriendurl}.
       befriend_them: Du kan også legge dem til som venn på %{befriendurl}.

+      befriend_them_html: Du kan også legge hen til som venn på %{befriendurl}.

     gpx_failure:
     gpx_failure:

+      hi: Hei, %{to_user},

       failed_to_import: 'klarte ikke importere. Her er feilen:'
       subject: '[OpenStreetMap] Feil under import av GPX'
     gpx_success:
       failed_to_import: 'klarte ikke importere. Her er feilen:'
       subject: '[OpenStreetMap] Feil under import av GPX'
     gpx_success:

+      hi: Hei, %{to_user},

       subject: '[OpenStreetMap] Vellykket import av GPX'
     signup_confirm:
       subject: '[OpenStreetMap] Velkommen til OpenStreetMap'
       subject: '[OpenStreetMap] Vellykket import av GPX'
     signup_confirm:
       subject: '[OpenStreetMap] Velkommen til OpenStreetMap'


@@ -1485,6 +1511,7 @@ nb:
       success: Kontoen din er bekreftet - takk for at du registrerte deg.
       already active: Denne kontoen har allerede blitt bekreftet.
       unknown token: Denne bekreftelseskoden finnes ikke eller har utløpt.
       success: Kontoen din er bekreftet - takk for at du registrerte deg.
       already active: Denne kontoen har allerede blitt bekreftet.
       unknown token: Denne bekreftelseskoden finnes ikke eller har utløpt.

+      click_here: trykk her

     confirm_resend:
       failure: Fant ikke brukeren %{name}.
     confirm_email:
     confirm_resend:
       failure: Fant ikke brukeren %{name}.
     confirm_email:


@@ -1512,11 +1539,13 @@ nb:
       to: Til
       subject: Emne
       date: Dato
       to: Til
       subject: Emne
       date: Dato

+      actions: Handlinger

     message_summary:
       unread_button: Marker som ulest
       read_button: Marker som lest
       reply_button: Svar
       destroy_button: Slett
     message_summary:
       unread_button: Marker som ulest
       read_button: Marker som lest
       reply_button: Svar
       destroy_button: Slett

+      unmute_button: Flytt til innboksen

     new:
       title: Send melding
       send_message_to_html: Send en ny melding til %{name}
     new:
       title: Send melding
       send_message_to_html: Send en ny melding til %{name}


@@ -1531,12 +1560,18 @@ nb:
       body: Det er ingen melding med den ID-en.
     outbox:
       title: Utboks
       body: Det er ingen melding med den ID-en.
     outbox:
       title: Utboks

+      actions: Handlinger

       messages:
         one: Du har %{count} sendt melding
         other: Du har %{count} sendte meldinger
       no_sent_messages_html: Du har ikke sendt noen meldinger ennå. Hvorfor ikke bli
         kjent med noen %{people_mapping_nearby_link}?
       people_mapping_nearby: folk i nærheten som lager kart
       messages:
         one: Du har %{count} sendt melding
         other: Du har %{count} sendte meldinger
       no_sent_messages_html: Du har ikke sendt noen meldinger ennå. Hvorfor ikke bli
         kjent med noen %{people_mapping_nearby_link}?
       people_mapping_nearby: folk i nærheten som lager kart

+    muted:
+      title: Dempede meldinger
+      messages:
+        one: '%{count} dempet melding'
+        other: Du har %{count} dempede meldinger

     reply:
       wrong_user: Du er logget inn som «%{user}», men meldingen du ønsker å svare
         på ble ikke sendt til den brukeren. Logg inn som korrekt bruker for å svare.
     reply:
       wrong_user: Du er logget inn som «%{user}», men meldingen du ønsker å svare
         på ble ikke sendt til den brukeren. Logg inn som korrekt bruker for å svare.


@@ -1552,16 +1587,21 @@ nb:
       destroy_button: Slett
     heading:
       my_inbox: Min innboks
       destroy_button: Slett
     heading:
       my_inbox: Min innboks

+      my_outbox: Min utboks
+      muted_messages: Dempede meldinger

     mark:
       as_read: Melding markert som lest
       as_unread: Melding markert som ulest
     mark:
       as_read: Melding markert som lest
       as_unread: Melding markert som ulest

+    unmute:
+      notice: Meldingen har blitt flyttet til innboksen
+      error: Meldingen kunne ikke flyttes til innboksen.

     destroy:
       destroyed: Melding slettet
   passwords:
     new:
       title: Glemt passord
       heading: Glemt passord?
     destroy:
       destroyed: Melding slettet
   passwords:
     new:
       title: Glemt passord
       heading: Glemt passord?

-      email address: 'E-postadresse:'
+      email address: E-postadresse

       new password button: Nullstill passord
       help_text: Skriv inn e-postadressen du brukte for å registrere deg, og vi vil
         sende deg ei lenke som du kan bruke til å nullstille passordet ditt.
       new password button: Nullstill passord
       help_text: Skriv inn e-postadressen du brukte for å registrere deg, og vi vil
         sende deg ei lenke som du kan bruke til å nullstille passordet ditt.


@@ -1578,14 +1618,22 @@ nb:
       flash changed: Ditt passord er endret.
   preferences:
     show:
       flash changed: Ditt passord er endret.
   preferences:
     show:

+      title: Mine innstillinger
+      preferred_editor: Foretrukket redigeringsverktøy

       preferred_languages: Foretrukne språk
       edit_preferences: Endre innstillinger
     edit:
       title: Endre innstillinger
       preferred_languages: Foretrukne språk
       edit_preferences: Endre innstillinger
     edit:
       title: Endre innstillinger

+      save: Oppdater innstillingene

       cancel: Avbryt
       cancel: Avbryt

+    update:
+      failure: Kunne ikke oppdatere innstillingene.
+    update_success_flash:
+      message: Innstillinger oppdatert.

   profiles:
     edit:
       title: Rediger profil
   profiles:
     edit:
       title: Rediger profil

+      save: Oppdater profil

       cancel: Avbryt
       image: Bilde
       gravatar:
       cancel: Avbryt
       image: Bilde
       gravatar:


@@ -1604,13 +1652,15 @@ nb:
       show: Vis
       delete: Slett
       undelete: Angre sletting
       show: Vis
       delete: Slett
       undelete: Angre sletting

+    update:
+      success: Profil oppdatert.
+      failure: Kunne ikke oppdatere profil.

   sessions:
     new:
       title: Logg inn
       heading: Logg inn
   sessions:
     new:
       title: Logg inn
       heading: Logg inn

-      email or username: 'E-postadresse eller brukernavn:'
-      password: 'Passord:'
-      openid_html: '%{logo} OpenID:'
+      email or username: E-postadresse eller brukernavn
+      password: Passord

       remember: Husk meg
       lost password link: Mistet passordet ditt?
       login_button: Logg inn
       remember: Husk meg
       lost password link: Mistet passordet ditt?
       login_button: Logg inn


@@ -1692,6 +1742,19 @@ nb:
         contributors_intro_html: 'Vi har tusenvis av individuelle bidragsytere. Vi
           inkluderer også åpne datasett fra nasjonale karttjenester og andre kilder,
           blant annet fra:'
         contributors_intro_html: 'Vi har tusenvis av individuelle bidragsytere. Vi
           inkluderer også åpne datasett fra nasjonale karttjenester og andre kilder,
           blant annet fra:'

+        contributors_at_austria: Østerrike
+        contributors_au_australia: Australia
+        contributors_ca_canada: Canada
+        contributors_cz_czechia: Tsjekkia
+        contributors_fi_finland: Finland
+        contributors_fr_france: Frankrike
+        contributors_nl_netherlands: Nederland
+        contributors_nz_new_zealand: New Zealand
+        contributors_rs_serbia: Serbia
+        contributors_si_slovenia: Slovenia
+        contributors_es_spain: Spania
+        contributors_za_south_africa: Sør-Afrika
+        contributors_gb_united_kingdom: Storbritannia

         contributors_footer_2_html: |2-
             Inkludering av data i OpenStreetMap innebærer ikke at den opprinnelige
             dataleverandøren støtter OpenStreetMap, gir noen garanti eller
         contributors_footer_2_html: |2-
             Inkludering av data i OpenStreetMap innebærer ikke at den opprinnelige
             dataleverandøren støtter OpenStreetMap, gir noen garanti eller


@@ -1769,10 +1832,6 @@ nb:
         url: http://wiki.openstreetmap.org/wiki/Nn:Beginners%27_guide
         title: Hjelp for nybegynnere
         description: Dugnadsbasert guide for nybegynnere.
         url: http://wiki.openstreetmap.org/wiki/Nn:Beginners%27_guide
         title: Hjelp for nybegynnere
         description: Dugnadsbasert guide for nybegynnere.

-      help:
-        title: Hjelpeforum
-        description: Still spørsmål eller sjekk svar på OpenStreetMaps spørsmål- og
-          svar-sider.

       mailing_lists:
         title: E-postlister
         description: Still et spørsmål eller diskuter interessante tema på en rekke
       mailing_lists:
         title: E-postlister
         description: Still et spørsmål eller diskuter interessante tema på en rekke


@@ -1831,6 +1890,8 @@ nb:
           taxiway: taksebane
           apron: terminal
           admin: Administrativ grense
           taxiway: taksebane
           apron: terminal
           admin: Administrativ grense

+          capital: Hovedstad
+          city: By

           forest: Skog
           wood: Ved
           golf: Golfbane
           forest: Skog
           wood: Ved
           golf: Golfbane


@@ -1843,27 +1904,36 @@ nb:
           heathland: Heilandskap
           lake: Innsjø
           reservoir: reservoar
           heathland: Heilandskap
           lake: Innsjø
           reservoir: reservoar

+          glacier: Isbre
+          reef: Rev
+          wetland: Våtmark

           farm: Gård
           brownfield: Tidligere industriområde
           cemetery: Gravplass
           allotments: Kolonihager
           pitch: Sportsarena
           centre: Sportssenter
           farm: Gård
           brownfield: Tidligere industriområde
           cemetery: Gravplass
           allotments: Kolonihager
           pitch: Sportsarena
           centre: Sportssenter

+          beach: Strand

           reserve: Naturreservat
           military: Militært område
           school: Skole
           reserve: Naturreservat
           military: Militært område
           school: Skole

-          university: universitet
+          university: Universitet
+          hospital: Sykehus

           building: Viktig bygning
           station: Jernbanestasjon
           summit: Topp
           building: Viktig bygning
           station: Jernbanestasjon
           summit: Topp

-          peak: fjelltopp
+          peak: Fjelltopp

           tunnel: Streket kant = tunnel
           bridge: Sort kant = bru
           private: Privat tilgang
           destination: Destinasjonstilgang
           construction: Veier under konstruksjon
           tunnel: Streket kant = tunnel
           bridge: Sort kant = bru
           private: Privat tilgang
           destination: Destinasjonstilgang
           construction: Veier under konstruksjon

+          bus_stop: Busstopp
+          stop: Stopp

           bicycle_shop: Sykkelbutikk
           bicycle_shop: Sykkelbutikk

+          bicycle_rental: Sykkelutleie

           bicycle_parking: Sykkelparkering
           bicycle_parking: Sykkelparkering

+          bicycle_parking_small: Liten sykkelparkering

           toilets: Toaletter
     welcome:
       title: Velkommen!
           toilets: Toaletter
     welcome:
       title: Velkommen!

diff --git a/config/locales/nds.yml b/config/locales/nds.yml
index 0fd29f799d82bdcbba5c967ec952a17b2ba0a2bb..3ed6f362433bf7e3a0bbf90d32c97e992ad0d221 100644 (file)
--- a/config/locales/nds.yml
+++ b/config/locales/nds.yml
@@ -70,7 +70,6 @@ nds:
       name: iD
   auth:
     providers:
       name: iD
   auth:
     providers:

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub

diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index a2422fcf4c4bdde8eeaa2102a8018d7d0dc110ea..a9e9c35ff25ba810617dc7a72f0ba31f4e796a98 100644 (file)
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -946,8 +946,6 @@ ne:
       beginners_guide:
         title: सुरुवातकर्ताहरूको लागि मार्गदर्शन
         description: सुरुवातकर्ताहरूको लागि समुदायद्वारा निर्मित निर्देशिका
       beginners_guide:
         title: सुरुवातकर्ताहरूको लागि मार्गदर्शन
         description: सुरुवातकर्ताहरूको लागि समुदायद्वारा निर्मित निर्देशिका

-      help:
-        title: help.openstreetmap.org

       mailing_lists:
         title: मेलिङ्ग सूचीहरू
       irc:
       mailing_lists:
         title: मेलिङ्ग सूचीहरू
       irc:

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index e7439283861f374ea7736befec6caaf8f2064589..6bde8c521500ec20a8e54b3aa609a97bbe33af45 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -39,6 +39,7 @@
 # Author: MatthiasS
 # Author: McDutchie
 # Author: MedShot
 # Author: MatthiasS
 # Author: McDutchie
 # Author: MedShot

+# Author: Mitsjol

 # Author: MrLeopold
 # Author: Mvexel
 # Author: Nickthijssen1994
 # Author: MrLeopold
 # Author: Mvexel
 # Author: Nickthijssen1994


@@ -270,7 +271,6 @@ nl:
   auth:
     providers:
       none: Geen
   auth:
     providers:
       none: Geen

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -1947,7 +1947,6 @@ nl:
       heading: Aanmelden
       email or username: 'E-mailadres of gebruikersnaam:'
       password: 'Wachtwoord:'
       heading: Aanmelden
       email or username: 'E-mailadres of gebruikersnaam:'
       password: 'Wachtwoord:'

-      openid_html: '%{logo} OpenID'

       remember: Aanmeldgegevens onthouden
       lost password link: Wachtwoord vergeten?
       login_button: Aanmelden
       remember: Aanmeldgegevens onthouden
       lost password link: Wachtwoord vergeten?
       login_button: Aanmelden


@@ -2315,17 +2314,14 @@ nl:
         url: https://wiki.openstreetmap.org/wiki/NL:Beginnershandleiding
         title: Handleiding voor beginners
         description: Handleiding voor beginners, onderhouden door de gemeenschap.
         url: https://wiki.openstreetmap.org/wiki/NL:Beginnershandleiding
         title: Handleiding voor beginners
         description: Handleiding voor beginners, onderhouden door de gemeenschap.

-      help:
-        title: Help Forum
-        description: Stel een vraag of zoek antwoorden op de vraag- en antwoordsite
-          van OpenStreetMap.
+      community:
+        title: Hulp- en gemeenschapsforum
+        description: Een gedeelde plek waar je hulp kunt zoeken en gesprekken kunt
+          voeren over OpenStreetMap.

       mailing_lists:
         title: Mailinglijsten
         description: Stel een vraag of bespreek interessante zaken op een hele reeks
           onderwerpsgebonden of regionale mailinglijsten.
       mailing_lists:
         title: Mailinglijsten
         description: Stel een vraag of bespreek interessante zaken op een hele reeks
           onderwerpsgebonden of regionale mailinglijsten.

-      community:
-        title: Gemeenschapsforum
-        description: Een gedeelde plek voor conversaties over OpenStreetMap.

       irc:
         title: IRC
         description: Interactieve chat in vele verschillende talen en over tal van
       irc:
         title: IRC
         description: Interactieve chat in vele verschillende talen en over tal van


@@ -2445,6 +2441,7 @@ nl:
           bus_stop: Bushalte
           stop: Halte
           bicycle_shop: Fietsenwinkel
           bus_stop: Bushalte
           stop: Halte
           bicycle_shop: Fietsenwinkel

+          bicycle_rental: Fietsverhuur

           bicycle_parking: Fietsenstalling
           toilets: Toiletten
     welcome:
           bicycle_parking: Fietsenstalling
           toilets: Toiletten
     welcome:


@@ -2688,6 +2685,7 @@ nl:
   oauth_clients:
     new:
       title: Nieuwe toepassing registreren
   oauth_clients:
     new:
       title: Nieuwe toepassing registreren

+      disabled: Registratie van OAuth 1 applicaties is uitgeschakeld

     edit:
       title: Uw toepassing bewerken
     show:
     edit:
       title: Uw toepassing bewerken
     show:


@@ -2771,6 +2769,7 @@ nl:
       title: Mijn geautoriseerde toepassingen
       application: Toepassing
       permissions: Rechten
       title: Mijn geautoriseerde toepassingen
       application: Toepassing
       permissions: Rechten

+      last_authorized: Laatst geautoriseerd

       no_applications_html: U heeft nog geen %{oauth2}-toepassingen geautoriseerd.
     application:
       revoke: Toegang intrekken
       no_applications_html: U heeft nog geen %{oauth2}-toepassingen geautoriseerd.
     application:
       revoke: Toegang intrekken


@@ -3150,7 +3149,6 @@ nl:
           other: U bevindt zich binnen %{count} voet van dit punt
       base:
         standard: Standaard
           other: U bevindt zich binnen %{count} voet van dit punt
       base:
         standard: Standaard

-        cyclosm: CyclOSM

         cycle_map: Fietskaart
         transport_map: Transportkaart
         tracestracktop_topo: Tracestrack Topo
         cycle_map: Fietskaart
         transport_map: Transportkaart
         tracestracktop_topo: Tracestrack Topo

diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 2cb252331bd0ab5c2602b793e6fc3e26bb96dbf4..f3b7c66100737c44468a18f50124ec0184443ce9 100644 (file)
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -203,7 +203,6 @@ nn:
   auth:
     providers:
       none: Ingen
   auth:
     providers:
       none: Ingen

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -1784,7 +1783,6 @@ nn:
       heading: Logg inn
       email or username: 'E-postadresse eller brukarnamn:'
       password: 'Passord:'
       heading: Logg inn
       email or username: 'E-postadresse eller brukarnamn:'
       password: 'Passord:'

-      openid_html: '%{logo} OpenID:'

       remember: Hugs meg
       lost password link: Mista passordet ditt?
       login_button: Logg inn
       remember: Hugs meg
       lost password link: Mista passordet ditt?
       login_button: Logg inn


@@ -2114,17 +2112,13 @@ nn:
         url: http://wiki.openstreetmap.org/wiki/Nn:Beginners%27_guide
         title: Hjelp for nybegynnarar
         description: Dugnadsbasert guide for nybegynnarar.
         url: http://wiki.openstreetmap.org/wiki/Nn:Beginners%27_guide
         title: Hjelp for nybegynnarar
         description: Dugnadsbasert guide for nybegynnarar.

-      help:
-        title: Hjelpeforum
-        description: Still spørsmål eller finn eit svar på spørsmål-og-svar-sidene
-          til OpenStreetMap.
+      community:
+        title: Fellesskapsforum
+        description: Ein stad for samtaler om OpenStreetMap.

       mailing_lists:
         title: E-postlister
         description: Spør eit spørsmål eller diskuter interessante tema på ei rekke
           av temabaserte eller regionale e-postlister.
       mailing_lists:
         title: E-postlister
         description: Spør eit spørsmål eller diskuter interessante tema på ei rekke
           av temabaserte eller regionale e-postlister.

-      community:
-        title: Fellesskapsforum
-        description: Ein stad for samtaler om OpenStreetMap.

       irc:
         title: IRC
       switch2osm:
       irc:
         title: IRC
       switch2osm:

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index cabe9924642def7e599f601fd73d9616f2b7dc87..985005bf1e4745da545c8d9f30988a2729376278 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -1351,7 +1351,6 @@ nqo:
       heading: ߌ ߜߊ߲߬ߞߎ߲߫
       email or username: 'ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߥߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ߬ ߕߐ߮:'
       password: 'ߕߊ߬ߡߌ߲߬ߞߊ߲:'
       heading: ߌ ߜߊ߲߬ߞߎ߲߫
       email or username: 'ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߥߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ߬ ߕߐ߮:'
       password: 'ߕߊ߬ߡߌ߲߬ߞߊ߲:'

-      openid_html: '%{logo} ߘߊߦߟߍߟߌ߫ ID:'

       remember: ߒ ߖߊ߲߭ߓߌ߬ߟߊ߬
       lost password link: ߌ ߓߘߊ߫ ߢߌ߬ߣߊ߬ ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߠߊ߫؟
       login_button: ߌ ߜߊ߲߬ߞߎ߲߫
       remember: ߒ ߖߊ߲߭ߓߌ߬ߟߊ߬
       lost password link: ߌ ߓߘߊ߫ ߢߌ߬ߣߊ߬ ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߠߊ߫؟
       login_button: ߌ ߜߊ߲߬ߞߎ߲߫


@@ -1476,10 +1475,6 @@ nqo:
       beginners_guide:
         title: ߘߊߡߌߣߊߟߌߟߊ ߟߎ߬ ߢߍߡߌߘߊ
         description: ߘߍ߬ߘߊ ߦߋ߫ ߢߍߡߌߘߊ ߘߏ߫ ߘߐߓߍ߲߬ ߠߊ߫ ߘߊߡߌߣߊߟߌߟߊ ߟߎ߬ ߦߋ߫.
       beginners_guide:
         title: ߘߊߡߌߣߊߟߌߟߊ ߟߎ߬ ߢߍߡߌߘߊ
         description: ߘߍ߬ߘߊ ߦߋ߫ ߢߍߡߌߘߊ ߘߏ߫ ߘߐߓߍ߲߬ ߠߊ߫ ߘߊߡߌߣߊߟߌߟߊ ߟߎ߬ ߦߋ߫.

-      help:
-        title: ߘߍ߬ߡߍ߲߬ߠߌ߲ ߟߐ߯ߓߊߟߐ
-        description: ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ ߘߏ߫ ߞߍ߫ ߤߊߡߊ߲ߕߍ߫ ߞߊ߬ ߖߋ߬ߓߌ ߘߏ߫ ߟߎ߫ ߡߊߝߟߍ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ
-          ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ-ߣߴߊ߬-ߖߋ߬ߓߌ ߞߍߦߙߐ ߞߊ߲߬.

       mailing_lists:
         title: ߢߎߡߍߙߋ߲ߦߊߟߌ ߛߙߍߘߍ ߟߎ߬
       welcomemat:
       mailing_lists:
         title: ߢߎߡߍߙߋ߲ߦߊߟߌ ߛߙߍߘߍ ߟߎ߬
       welcomemat:

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 2a02782d0b0714f97c7222df00a1ac0e37383685..6d2040a60341556add2b695c49c76459ad81dfcf 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -220,7 +220,6 @@ oc:
   auth:
     providers:
       none: Ges
   auth:
     providers:
       none: Ges

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -1792,7 +1791,6 @@ oc:
       heading: Connexion
       email or username: 'Adreça e-mail o nom d''utilizaire :'
       password: 'Senhal :'
       heading: Connexion
       email or username: 'Adreça e-mail o nom d''utilizaire :'
       password: 'Senhal :'

-      openid_html: '%{logo} OpenID :'

       remember: Se remembrar de ieu
       lost password link: Avètz perdut vòstre senhal ?
       login_button: Se connectar
       remember: Se remembrar de ieu
       lost password link: Avètz perdut vòstre senhal ?
       login_button: Se connectar


@@ -1953,16 +1951,12 @@ oc:
         url: https://wiki.openstreetmap.org/wiki/FR:Guide_du_d%C3%A9butant
         title: Guida per debutants
         description: Guida pels debutants mantengut per la comunautat.
         url: https://wiki.openstreetmap.org/wiki/FR:Guide_du_d%C3%A9butant
         title: Guida per debutants
         description: Guida pels debutants mantengut per la comunautat.

-      help:
-        title: 'Fòrum d’ajuda : help.openstreetmap.org'
-        description: Pausar una question o cercar de respònsas sus lo site questions-e-respònsas
-          d'OSM.
+      community:
+        title: Comunautat

       mailing_lists:
         title: Listas de difusion
         description: Pausar una question o discutir de questions interessantas sus
           un larg ventalh de tematicas o de listas de difusion regionalas.
       mailing_lists:
         title: Listas de difusion
         description: Pausar una question o discutir de questions interessantas sus
           un larg ventalh de tematicas o de listas de difusion regionalas.

-      community:
-        title: Comunautat

       irc:
         title: IRC
         description: Discussion interactiva dins de fòrça lengas diferentas e sus
       irc:
         title: IRC
         description: Discussion interactiva dins de fòrça lengas diferentas e sus

diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 6a25538e38b53aa14f76a33f715cabd995fa5b62..62853c12827e6bee3e6b7d337fc49cbccbbf6b02 100644 (file)
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -891,8 +891,6 @@ pa:
         title: ਓ.ਐੱਸ.ਐੱਮ. 'ਤੇ ਜੀ ਆਇਆਂ ਨੂੰ
       beginners_guide:
         title: ਸ਼ੁਰੂਆਤੀ ਗਾਈਡ
         title: ਓ.ਐੱਸ.ਐੱਮ. 'ਤੇ ਜੀ ਆਇਆਂ ਨੂੰ
       beginners_guide:
         title: ਸ਼ੁਰੂਆਤੀ ਗਾਈਡ

-      help:
-        title: help.openstreetmap.org

       irc:
         title: ਆਈ.ਆਰ.ਸੀ
       wiki:
       irc:
         title: ਆਈ.ਆਰ.ਸੀ
       wiki:

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 226cb4cf753f602125fdf2f6c337fa8c091d2709..d51e62246ae28161ff8d083bd12079f0e4840110 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -305,7 +305,6 @@ pl:
   auth:
     providers:
       none: Brak
   auth:
     providers:
       none: Brak

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -1956,7 +1955,6 @@ pl:
       heading: Logowanie
       email or username: Adres e-mail lub nazwa użytkownika
       password: Hasło
       heading: Logowanie
       email or username: Adres e-mail lub nazwa użytkownika
       password: Hasło

-      openid_html: '%{logo} OpenID:'

       remember: Zapamiętaj dane uwierzytelniające
       lost password link: Zapomniałeś hasła?
       login_button: Zaloguj się
       remember: Zapamiętaj dane uwierzytelniające
       lost password link: Zapomniałeś hasła?
       login_button: Zaloguj się


@@ -2258,17 +2256,13 @@ pl:
         url: https://wiki.openstreetmap.org/wiki/Pl:Przewodnik_dla_pocz%C4%85tkuj%C4%85cych
         title: Podręcznik dla początkujących
         description: Podręcznik dla początkujących tworzony przez społeczność.
         url: https://wiki.openstreetmap.org/wiki/Pl:Przewodnik_dla_pocz%C4%85tkuj%C4%85cych
         title: Podręcznik dla początkujących
         description: Podręcznik dla początkujących tworzony przez społeczność.

-      help:
-        title: Strona Pomocy OpenStreetMap
-        description: Zadaj pytanie lub odszukaj odpowiedzi na stronie pytań i odpowiedzi
-          OpenStreetMap.
+      community:
+        title: Forum (nowe)
+        description: Wspólne miejsce do rozmów na temat OpenStreetMap.

       mailing_lists:
         title: Listy dyskusyjne
         description: Zadaj pytanie lub przedyskutuj interesujący temat niezależnie
           od wybranego tematu lub lokalizacji.
       mailing_lists:
         title: Listy dyskusyjne
         description: Zadaj pytanie lub przedyskutuj interesujący temat niezależnie
           od wybranego tematu lub lokalizacji.

-      community:
-        title: Forum (nowe)
-        description: Wspólne miejsce do rozmów na temat OpenStreetMap.

       irc:
         title: IRC
         description: Interaktywny czat w różnych językach i na różne tematy.
       irc:
         title: IRC
         description: Interaktywny czat w różnych językach i na różne tematy.


@@ -2761,6 +2755,8 @@ pl:
       my_dashboard: Mój panel
       blocks on me: Otrzymane blokady
       blocks by me: Nałożone blokady
       my_dashboard: Mój panel
       blocks on me: Otrzymane blokady
       blocks by me: Nałożone blokady

+      create_mute: Wycisz tego użytkownika
+      destroy_mute: Odcisz tego użytkownika

       edit_profile: Edytuj profil
       send message: wyślij wiadomość
       diary: dziennik
       edit_profile: Edytuj profil
       send message: wyślij wiadomość
       diary: dziennik


@@ -3000,6 +2996,7 @@ pl:
       reactivate: Ponownie aktywuj
       comment_and_resolve: Skomentuj i rozwiąż
       comment: Dodaj komentarz
       reactivate: Ponownie aktywuj
       comment_and_resolve: Skomentuj i rozwiąż
       comment: Dodaj komentarz

+      log_in_to_comment: Zaloguj się, żeby skomentować tę uwagę

       report_link_html: Jeśli ta uwaga zawiera wrażliwe informacje, które należy usunąć,
         możesz %{link}.
       other_problems_resolve: W przypadku wszystkich innych problemów z tą uwagą,
       report_link_html: Jeśli ta uwaga zawiera wrażliwe informacje, które należy usunąć,
         możesz %{link}.
       other_problems_resolve: W przypadku wszystkich innych problemów z tą uwagą,


@@ -3063,7 +3060,6 @@ pl:
           other: Jesteś w promieniu %{count} stopy od tego punktu
       base:
         standard: Podstawowa
           other: Jesteś w promieniu %{count} stopy od tego punktu
       base:
         standard: Podstawowa

-        cyclosm: CyclOSM

         cycle_map: Rowerowa
         transport_map: Transportu publicznego
         tracestracktop_topo: Tracestrack Topo
         cycle_map: Rowerowa
         transport_map: Transportu publicznego
         tracestracktop_topo: Tracestrack Topo

diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml
index 137add5b9cc221b2c4ba47131225752b8865c1cb..11b6746fd2e59a71de2cb90fde9bb5ae0b4eb524 100644 (file)
--- a/config/locales/pnb.yml
+++ b/config/locales/pnb.yml
@@ -1445,7 +1445,6 @@ pnb:
       heading: لوگ‌این کرو
       email or username: 'ای‌میل دا پتہ یا ورتنوالے دا ناں:'
       password: 'پاس‌ورڈ:'
       heading: لوگ‌این کرو
       email or username: 'ای‌میل دا پتہ یا ورتنوالے دا ناں:'
       password: 'پاس‌ورڈ:'

-      openid_html: '%{logo} اوپن آئی‌ڈی:'

       remember: مینوں یاد رکھو
       lost password link: آپݨا پاس‌ورڈ گوا دتا؟
       login_button: لوگ‌این
       remember: مینوں یاد رکھو
       lost password link: آپݨا پاس‌ورڈ گوا دتا؟
       login_button: لوگ‌این


@@ -1594,14 +1593,11 @@ pnb:
       beginners_guide:
         title: شُرواتی لئی کتاب
         description: شرواتی لئی ایہہ لوک کم کردے اے۔
       beginners_guide:
         title: شُرواتی لئی کتاب
         description: شرواتی لئی ایہہ لوک کم کردے اے۔

-      help:
-        title: مدد گل بات
-        description: سوال کریو یا جواب لبھیو
-      mailing_lists:
-        title: میل دیاں لسٹاں

       community:
         title: حالاں فورم
         description: نقشے بارے گل بات لئی تھاں
       community:
         title: حالاں فورم
         description: نقشے بارے گل بات لئی تھاں

+      mailing_lists:
+        title: میل دیاں لسٹاں

       irc:
         title: آئی آر سی
         description: کئی بولیاں تے کئی چیزاں بارے وچ گل بات۔
       irc:
         title: آئی آر سی
         description: کئی بولیاں تے کئی چیزاں بارے وچ گل بات۔

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 684bbfdd3bbc66f4073b58e8e7a56ae442f5c5cd..1b4aec32278bad08772d529cdc93a35ece533fc7 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -256,7 +256,6 @@ pt-PT:
   auth:
     providers:
       none: Nenhuma
   auth:
     providers:
       none: Nenhuma

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -1943,7 +1942,6 @@ pt-PT:
       heading: Iniciar Sessão
       email or username: 'E-mail ou nome de utilizador:'
       password: 'Palavra-passe:'
       heading: Iniciar Sessão
       email or username: 'E-mail ou nome de utilizador:'
       password: 'Palavra-passe:'

-      openid_html: '%{logo} OpenID:'

       remember: Ficar autenticado entre sessões
       lost password link: Perdeste a tua palavra-passe?
       login_button: Iniciar sessão
       remember: Ficar autenticado entre sessões
       lost password link: Perdeste a tua palavra-passe?
       login_button: Iniciar sessão


@@ -2287,17 +2285,13 @@ pt-PT:
         url: https://wiki.openstreetmap.org/wiki/Pt:Beginners%27_guide
         title: Guia para Principiantes
         description: Guia para principiantes atualizado pela comunidade.
         url: https://wiki.openstreetmap.org/wiki/Pt:Beginners%27_guide
         title: Guia para Principiantes
         description: Guia para principiantes atualizado pela comunidade.

-      help:
-        title: Fórum de Ajuda
-        description: Faz uma pergunta ou procura respostas no fórum de perguntas e
-          respostas do OpenStreetMap.
+      community:
+        title: Fórum da comunidade
+        description: Um local partilhado para conversas sobre o OpenStreetMap.

       mailing_lists:
         title: Listas de E-mail
         description: Faz uma pergunta ou debate temas interessantes numa vasta gama
           de listas de e-mail temáticas ou regionais.
       mailing_lists:
         title: Listas de E-mail
         description: Faz uma pergunta ou debate temas interessantes numa vasta gama
           de listas de e-mail temáticas ou regionais.

-      community:
-        title: Fórum da comunidade
-        description: Um local partilhado para conversas sobre o OpenStreetMap.

       irc:
         title: IRC
         description: Sala de discussão IRC em várias línguas e sobre muitos tópicos.
       irc:
         title: IRC
         description: Sala de discussão IRC em várias línguas e sobre muitos tópicos.


@@ -3180,7 +3174,6 @@ pt-PT:
           other: Estás a menos de %{count} pés deste ponto
       base:
         standard: Mapa Padrão
           other: Estás a menos de %{count} pés deste ponto
       base:
         standard: Mapa Padrão

-        cyclosm: CyclOSM

         cycle_map: Mapa de Ciclismo
         transport_map: Transportes Públicos
         tracestracktop_topo: Tracestrack Topo
         cycle_map: Mapa de Ciclismo
         transport_map: Transportes Públicos
         tracestracktop_topo: Tracestrack Topo

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 329cabf9d09c22adc72921dfcbd4f237dc117841..b02ba30dc3cd2e30c5043aa548e1d066080aaf93 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -275,7 +275,6 @@ pt:
   auth:
     providers:
       none: Nenhum
   auth:
     providers:
       none: Nenhum

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -1952,7 +1951,6 @@ pt:
       heading: Entrar
       email or username: E-mail ou nome de usuário
       password: Senha
       heading: Entrar
       email or username: E-mail ou nome de usuário
       password: Senha

-      openid_html: '%{logo} OpenID'

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


@@ -2305,18 +2303,13 @@ pt:
         url: https://wiki.openstreetmap.org/wiki/Pt:Beginners%27_guide
         title: Introdução
         description: Guia para iniciantes mantido pela comunidade.
         url: https://wiki.openstreetmap.org/wiki/Pt:Beginners%27_guide
         title: Introdução
         description: Guia para iniciantes mantido pela comunidade.

-      help:
-        url: http://help.openstreetmap.org/
-        title: Fórum de ajuda
-        description: Faça uma pergunta ou procure por respostas no fórum de perguntas
-          e respostas do OpenStreetMap.
+      community:
+        title: Fórum da comunidade
+        description: Un lugar compartilhado para conversas sobre o OpenStreetMap.

       mailing_lists:
         title: Listas de E-mail
         description: Tire uma dúvida ou discuta assuntos interessantes em várias listas
           regionais ou por assunto.
       mailing_lists:
         title: Listas de E-mail
         description: Tire uma dúvida ou discuta assuntos interessantes em várias listas
           regionais ou por assunto.

-      community:
-        title: Fórum da comunidade
-        description: Un lugar compartilhado para conversas sobre o OpenStreetMap.

       irc:
         title: IRC
         description: Bate-papo interativo em vários idiomas e sobre vários assuntos.
       irc:
         title: IRC
         description: Bate-papo interativo em vários idiomas e sobre vários assuntos.


@@ -3172,7 +3165,6 @@ pt:
           other: Você está dentro %{count} pés deste ponto
       base:
         standard: Padrão
           other: Você está dentro %{count} pés deste ponto
       base:
         standard: Padrão

-        cyclosm: CyclOSM

         cycle_map: Ciclístico
         transport_map: Transporte Público
         tracestracktop_topo: Tracestrack Topo
         cycle_map: Ciclístico
         transport_map: Transporte Público
         tracestracktop_topo: Tracestrack Topo

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index e15fba92ebeefd24467641b57b398729bba504e5..0a00a3819c80405c2294c4da64246dde6dce3b59 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -241,7 +241,6 @@ ro:
   auth:
     providers:
       none: Fără
   auth:
     providers:
       none: Fără

-      openid: OpenID

       google: OpenID
       facebook: OpenID
       microsoft: Microsoft
       google: OpenID
       facebook: OpenID
       microsoft: Microsoft


@@ -1910,7 +1909,6 @@ ro:
       heading: Autentificare
       email or username: 'Adresa de e-mail sau numele de utilizator:'
       password: 'Parolă:'
       heading: Autentificare
       email or username: 'Adresa de e-mail sau numele de utilizator:'
       password: 'Parolă:'

-      openid_html: '%{logo} OpenID:'

       remember: Ține-mă minte
       lost password link: Parolă pierdută/uitată?
       login_button: Autentificare
       remember: Ține-mă minte
       lost password link: Parolă pierdută/uitată?
       login_button: Autentificare


@@ -2280,17 +2278,13 @@ ro:
         url: http://wiki.openstreetmap.org/wiki/Ro:Beginners%27_guide
         title: Ghidul începătorilor
         description: Ghid menținut de comunitate pentru începători.
         url: http://wiki.openstreetmap.org/wiki/Ro:Beginners%27_guide
         title: Ghidul începătorilor
         description: Ghid menținut de comunitate pentru începători.

-      help:
-        title: Ajutor Forum
-        description: Adresează o întrebare sau caută răspunsuri pe site-ul OpenStreetMap
-          de întrebări și răspunsuri.
+      community:
+        title: Forumul Comunității
+        description: Un loc comun pentru discuții despre OpenStreetMap.

       mailing_lists:
         title: Lista de e-mail-uri
         description: Adresați o întrebare sau discutați despre probleme interesante
           pe o gamă largă de liste de discuții de actualitate sau regionale.
       mailing_lists:
         title: Lista de e-mail-uri
         description: Adresați o întrebare sau discutați despre probleme interesante
           pe o gamă largă de liste de discuții de actualitate sau regionale.

-      community:
-        title: Forumul Comunității
-        description: Un loc comun pentru discuții despre OpenStreetMap.

       irc:
         title: IRC
         description: Chat interactiv în multe limbi diferite și pe mai multe subiecte.
       irc:
         title: IRC
         description: Chat interactiv în multe limbi diferite și pe mai multe subiecte.


@@ -3139,7 +3133,6 @@ ro:
           other: Sunteți la %{count} de picioare de acest punct
       base:
         standard: Standard
           other: Sunteți la %{count} de picioare de acest punct
       base:
         standard: Standard

-        cyclosm: CyclOSM

         cycle_map: Hartă de ciclism
         transport_map: Hartă de transport
         tracestracktop_topo: Tracestrack Topo
         cycle_map: Hartă de ciclism
         transport_map: Hartă de transport
         tracestracktop_topo: Tracestrack Topo

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 857b1ab78a902da8b7dbb3dfda0a7f3da87a9c77..bd700c7debce6c00f8a9e2c0c75206b739bcda28 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -329,7 +329,6 @@ ru:
   auth:
     providers:
       none: Отсутствует
   auth:
     providers:
       none: Отсутствует

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub


@@ -1955,7 +1954,6 @@ ru:
       heading: Представьтесь
       email or username: 'Эл. почта или имя пользователя:'
       password: Пароль
       heading: Представьтесь
       email or username: 'Эл. почта или имя пользователя:'
       password: Пароль

-      openid_html: '%{logo} OpenID'

       remember: Запомнить меня
       lost password link: Забыли пароль?
       login_button: Представиться
       remember: Запомнить меня
       lost password link: Забыли пароль?
       login_button: Представиться


@@ -2222,17 +2220,13 @@ ru:
         url: https://wiki.openstreetmap.org/wiki/RU:%D0%A0%D1%83%D0%BA%D0%BE%D0%B2%D0%BE%D0%B4%D1%81%D1%82%D0%B2%D0%BE_%D0%BD%D0%BE%D0%B2%D0%B8%D1%87%D0%BA%D0%B0
         title: Руководство для начинающих
         description: Сообщество поддерживает руководство для начинающих.
         url: https://wiki.openstreetmap.org/wiki/RU:%D0%A0%D1%83%D0%BA%D0%BE%D0%B2%D0%BE%D0%B4%D1%81%D1%82%D0%B2%D0%BE_%D0%BD%D0%BE%D0%B2%D0%B8%D1%87%D0%BA%D0%B0
         title: Руководство для начинающих
         description: Сообщество поддерживает руководство для начинающих.

-      help:
-        title: Справочный форум
-        description: Задайте вопрос или найдите ответы на сайте вопросов и ответов
-          OpenStreetMap.
+      community:
+        title: Форум сообщества
+        description: Общедоступное место для разговоров об OpenStreetMap.

       mailing_lists:
         title: Списки рассылок
         description: Задайте вопрос или обсудите насущные вопросы в списке рассылок
           (количество активных пользователей зависит от языка).
       mailing_lists:
         title: Списки рассылок
         description: Задайте вопрос или обсудите насущные вопросы в списке рассылок
           (количество активных пользователей зависит от языка).

-      community:
-        title: Форум сообщества
-        description: Общедоступное место для разговоров об OpenStreetMap.

       irc:
         title: IRC
         description: Интерактивный чат на разных языках и на разные темы.
       irc:
         title: IRC
         description: Интерактивный чат на разных языках и на разные темы.


@@ -3071,7 +3065,6 @@ ru:
           other: Вы находитесь в %{count} футах от этой точки
       base:
         standard: Стандартный
           other: Вы находитесь в %{count} футах от этой точки
       base:
         standard: Стандартный

-        cyclosm: CyclOSM

         cycle_map: Велосипедная карта
         transport_map: Карта транспорта
         hot: Гуманитарная
         cycle_map: Велосипедная карта
         transport_map: Карта транспорта
         hot: Гуманитарная

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index e40868efbf591d4f8071db4cb8d669bb585ee5e8..7e0159361be0c5e3117cc2b31bf15d0e36df4fb7 100644 (file)
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -113,7 +113,6 @@ sat:
   auth:
     providers:
       none: ᱚᱠᱟᱦᱚᱸ ᱵᱟᱝ
   auth:
     providers:
       none: ᱚᱠᱟᱦᱚᱸ ᱵᱟᱝ

-      openid: OpenID

       google: ᱜᱩᱜᱟᱹᱞ
       facebook: ᱯᱷᱮᱥᱵᱩᱠ
       github: ᱜᱤᱴᱦᱚᱵ
       google: ᱜᱩᱜᱟᱹᱞ
       facebook: ᱯᱷᱮᱥᱵᱩᱠ
       github: ᱜᱤᱴᱦᱚᱵ

diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 1dae73587029813edd27c65448af62c81d8e3147..b69c2a4f053a4dddca336b6228c6c1b616e32216 100644 (file)
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -218,7 +218,6 @@ sc:
   auth:
     providers:
       none: Niunu
   auth:
     providers:
       none: Niunu

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -1901,7 +1900,6 @@ sc:
       heading: Intra
       email or username: 'Indiritzu de posta o nùmene de utente:'
       password: 'Crae:'
       heading: Intra
       email or username: 'Indiritzu de posta o nùmene de utente:'
       password: 'Crae:'

-      openid_html: '%{logo} OpenID:'

       remember: Ammenta·ti de mene
       lost password link: Ais pèrdidu sa crae de intrada tua?
       login_button: Intra
       remember: Ammenta·ti de mene
       lost password link: Ais pèrdidu sa crae de intrada tua?
       login_button: Intra


@@ -2268,18 +2266,14 @@ sc:
       beginners_guide:
         title: Ghia pro printzipiantes
         description: Ghia pro printzipiante mantenta dae sa comunidade.
       beginners_guide:
         title: Ghia pro printzipiantes
         description: Ghia pro printzipiante mantenta dae sa comunidade.

-      help:
-        title: Fòrum de agiudu
-        description: Faghe una pregunta o chirca rispostas in sa pàgina de preguntas
-          e rispostas de OpenStreetMap.
+      community:
+        title: Forum de sa comunidade
+        description: Unu logu cumpartzidu pro sos arresonos subra de OpenStreetMap.

       mailing_lists:
         title: Listas de posta eletrònica
         description: Faghe una pregunta o piga parte a una dibata subra de chistiones
           de interessu in un'elencu mannu de listas de posta eletrònica temàticas
           e regionales.
       mailing_lists:
         title: Listas de posta eletrònica
         description: Faghe una pregunta o piga parte a una dibata subra de chistiones
           de interessu in un'elencu mannu de listas de posta eletrònica temàticas
           e regionales.

-      community:
-        title: Forum de sa comunidade
-        description: Unu logu cumpartzidu pro sos arresonos subra de OpenStreetMap.

       irc:
         title: IRC
         description: Tzarrada interativa in medas limbas diferentes e subra de temas
       irc:
         title: IRC
         description: Tzarrada interativa in medas limbas diferentes e subra de temas


@@ -3105,7 +3099,6 @@ sc:
           other: Ses a %{count} pees dae custu puntu
       base:
         standard: Istandard
           other: Ses a %{count} pees dae custu puntu
       base:
         standard: Istandard

-        cyclosm: CyclOSM

         cycle_map: Mapa tziclìstica
         transport_map: Mapa de sos trasportos
         tracestracktop_topo: Tracestrack Topo
         cycle_map: Mapa tziclìstica
         transport_map: Mapa de sos trasportos
         tracestracktop_topo: Tracestrack Topo

diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index 628687296d1309d9de40c783a9377a99d0147e2c..16870b4e739422064cf44d39a14dccda57cc4483 100644 (file)
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -160,7 +160,6 @@ scn:
   auth:
     providers:
       none: Nuddu
   auth:
     providers:
       none: Nuddu

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -1285,7 +1284,6 @@ scn:
       heading: Trasi
       email or username: 'Nnirizzu di posta elittrònica o nomu utenti:'
       password: 'Palora d''òrdini:'
       heading: Trasi
       email or username: 'Nnirizzu di posta elittrònica o nomu utenti:'
       password: 'Palora d''òrdini:'

-      openid_html: '%{logo} OpenID:'

       remember: Arricòrdati di mìa
       lost password link: Pirdisti la tò palora d'òrdini?
       login_button: Trasi
       remember: Arricòrdati di mìa
       lost password link: Pirdisti la tò palora d'òrdini?
       login_button: Trasi


@@ -1457,10 +1455,6 @@ scn:
         url: http://wiki.openstreetmap.org/wiki/IT:Beginners%27_guide
         title: Guida dî principianti
         description: Guida pî principianti mantinuta dâ cumunità.
         url: http://wiki.openstreetmap.org/wiki/IT:Beginners%27_guide
         title: Guida dî principianti
         description: Guida pî principianti mantinuta dâ cumunità.

-      help:
-        title: help.openstreetmap.org
-        description: Fai n'addumannata o cerca n'arrispunnuta ntô situ d'addumannati
-          e arrispunnuti d'OSM.

       mailing_lists:
         title: Mailing list
         description: Fai addumannati o discuti di quistioni ntirissanti nta na gamma
       mailing_lists:
         title: Mailing list
         description: Fai addumannati o discuti di quistioni ntirissanti nta na gamma


@@ -2031,7 +2025,6 @@ scn:
         title: Ammustra unni sugnu
       base:
         standard: Standard
         title: Ammustra unni sugnu
       base:
         standard: Standard

-        cyclosm: CyclOSM

         cycle_map: Cartina pî bicicletti
         transport_map: Mappa dî trasporti
         hot: Umanitaria
         cycle_map: Cartina pî bicicletti
         transport_map: Mappa dî trasporti
         hot: Umanitaria

diff --git a/config/locales/sh.yml b/config/locales/sh.yml
index 4a03f08279d1cf77cb956c77c385b02b046703f1..2644b50e08dd73c9fe31459b36e072ba96b94a45 100644 (file)
--- a/config/locales/sh.yml
+++ b/config/locales/sh.yml
@@ -159,7 +159,6 @@ sh:
   auth:
     providers:
       none: Nijedan
   auth:
     providers:
       none: Nijedan

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub


@@ -599,7 +598,6 @@ sh:
       heading: Prijava
       email or username: 'Imejl adresa ili korisničko ime:'
       password: 'Lozinka:'
       heading: Prijava
       email or username: 'Imejl adresa ili korisničko ime:'
       password: 'Lozinka:'

-      openid_html: '%{logo} OpenID:'

       remember: Zapamti me
       lost password link: Izgubili ste lozinku?
       login_button: Prijava
       remember: Zapamti me
       lost password link: Izgubili ste lozinku?
       login_button: Prijava

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index ddf3cdb762eeddd0fa7806b63fec6f596c4f4b90..e44e5c86ca84206495f7e578b29343cd9e7f34be 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -256,7 +256,6 @@ sk:
   auth:
     providers:
       none: Žiadna
   auth:
     providers:
       none: Žiadna

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub


@@ -1763,7 +1762,6 @@ sk:
       heading: Prihlásenie
       email or username: 'E-mailová adresa alebo prihlasovacie meno:'
       password: 'Heslo:'
       heading: Prihlásenie
       email or username: 'E-mailová adresa alebo prihlasovacie meno:'
       password: 'Heslo:'

-      openid_html: '%{logo} OpenID:'

       remember: Zapamätať
       lost password link: Stratili ste heslo?
       login_button: Prihlásiť
       remember: Zapamätať
       lost password link: Stratili ste heslo?
       login_button: Prihlásiť


@@ -2046,16 +2044,12 @@ sk:
         url: http://wiki.openstreetmap.org/wiki/Sk:Beginners%27_guide
         title: Sprievodca pre začiatočníkov
         description: Komunitou spravovaná príručka pre začiatočníkov.
         url: http://wiki.openstreetmap.org/wiki/Sk:Beginners%27_guide
         title: Sprievodca pre začiatočníkov
         description: Komunitou spravovaná príručka pre začiatočníkov.

-      help:
-        title: Fórum pomoci
-        description: Spýtajte sa otázku alebo vyhľadajte odpovede na stránke otázok
-          a odpovedí OpenStreetMap.
+      community:
+        title: Komunitné fórum

       mailing_lists:
         title: E-mailové konferencie
         description: Spýtajte sa otázku alebo diskutuje zaujímavé témy v tematických
           alebo regionálnych emailových diskusných skupinách.
       mailing_lists:
         title: E-mailové konferencie
         description: Spýtajte sa otázku alebo diskutuje zaujímavé témy v tematických
           alebo regionálnych emailových diskusných skupinách.

-      community:
-        title: Komunitné fórum

       irc:
         title: IRC
         description: Interaktívna diskusia v rôznych jazykoch na mnohé témy.
       irc:
         title: IRC
         description: Interaktívna diskusia v rôznych jazykoch na mnohé témy.


@@ -2729,7 +2723,6 @@ sk:
           other: Ste menej než %{count} stôp od tohto bodu
       base:
         standard: Štandardná
           other: Ste menej než %{count} stôp od tohto bodu
       base:
         standard: Štandardná

-        cyclosm: CyclOSM

         cycle_map: Cyklomapa
         transport_map: Dopravná mapa
         hot: Humanitárna
         cycle_map: Cyklomapa
         transport_map: Dopravná mapa
         hot: Humanitárna

diff --git a/config/locales/skr-arab.yml b/config/locales/skr-arab.yml
index 29f59ec9b680c0118e55fa40ab9bd196d90ad86d..10d7ccaf1d67fd2173d2ca1d7691ea4842390c43 100644 (file)
--- a/config/locales/skr-arab.yml
+++ b/config/locales/skr-arab.yml
@@ -1102,7 +1102,6 @@ skr-arab:
       heading: لاگ ان
       email or username: ای میل پتہ یا ورتݨ ناں
       password: پاس ورڈ
       heading: لاگ ان
       email or username: ای میل پتہ یا ورتݨ ناں
       password: پاس ورڈ

-      openid_html: '%{logo} اوپن آئی ڈی:'

       remember: میکوں یاد رکھو
       lost password link: پاسورڈ بھل ڳئے ہو؟
       login_button: لاگ ان
       remember: میکوں یاد رکھو
       lost password link: پاسورڈ بھل ڳئے ہو؟
       login_button: لاگ ان

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index ff11d9039b308de380700e5c6e94fe11d1217357..318ae10bf0a83475a9f203faaef3e7b24b0ea267 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -258,7 +258,6 @@ sl:
   auth:
     providers:
       none: Brez
   auth:
     providers:
       none: Brez

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -1971,7 +1970,6 @@ sl:
       heading: Prijava
       email or username: E-poštni naslov ali uporabniško ime
       password: Geslo
       heading: Prijava
       email or username: E-poštni naslov ali uporabniško ime
       password: Geslo

-      openid_html: '%{logo} OpenID'

       remember: Zapomni si me
       lost password link: Ste pozabili geslo?
       login_button: Prijava
       remember: Zapomni si me
       lost password link: Ste pozabili geslo?
       login_button: Prijava


@@ -2335,17 +2333,13 @@ sl:
         url: https://wiki.openstreetmap.org/wiki/Sl:Beginners%27_guide
         title: Vodnik za začetnike
         description: Vodnik za začetnike, ki ga vzdržuje skupnost.
         url: https://wiki.openstreetmap.org/wiki/Sl:Beginners%27_guide
         title: Vodnik za začetnike
         description: Vodnik za začetnike, ki ga vzdržuje skupnost.

-      help:
-        title: Forum za pomoč
-        description: Postavite vprašanje ali poiščite odgovore v zbirki vprašanj in
-          odgovorov OpenStreetMap.
+      community:
+        title: Forum skupnosti
+        description: Skupno mesto za pogovore o OpenStreetMap.

       mailing_lists:
         title: Dopisni seznami
         description: Postavite vprašanje ali razpravljajte o različnih krajevnih ali
           regionalnih temah v številnih dopisnih seznamih.
       mailing_lists:
         title: Dopisni seznami
         description: Postavite vprašanje ali razpravljajte o različnih krajevnih ali
           regionalnih temah v številnih dopisnih seznamih.

-      community:
-        title: Forum skupnosti
-        description: Skupno mesto za pogovore o OpenStreetMap.

       irc:
         title: IRC
         description: Interaktivni klepet v številnih različnih jezikih in o številnih
       irc:
         title: IRC
         description: Interaktivni klepet v številnih različnih jezikih in o številnih


@@ -3231,7 +3225,6 @@ sl:
           other: Ste znotraj %{count} čevljev od te točke
       base:
         standard: Privzeta karta
           other: Ste znotraj %{count} čevljev od te točke
       base:
         standard: Privzeta karta

-        cyclosm: CyclOSM

         cycle_map: Kolesarska karta
         transport_map: Prometna karta
         tracestracktop_topo: Tracestrack Topo
         cycle_map: Kolesarska karta
         transport_map: Prometna karta
         tracestracktop_topo: Tracestrack Topo

diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index ad01fd0c3b8d6cbf5bb74925d7d248c6c94475d9..e3f57238414ad95502b8091973a605d5bdbe6bcc 100644 (file)
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1146,10 +1146,6 @@ sq:
         url: http://wiki.openstreetmap.org/wiki/Sq:Beginners%27_guide
         title: Udhëzues për fillestarë.
         description: Një udhëzues për fillestarë që mirëmbahet nga komuniteti.
         url: http://wiki.openstreetmap.org/wiki/Sq:Beginners%27_guide
         title: Udhëzues për fillestarë.
         description: Një udhëzues për fillestarë që mirëmbahet nga komuniteti.

-      help:
-        title: Forumi i Ndihmës
-        description: Bëni një pyetje ose shikoni përgjigjet në faqen e pyetjeve dhe
-          përgjigjeve të OpenStreetMap.

       mailing_lists:
         title: Listat E Postimeve
         description: Bëni një pyetje ose diskutoni çështje interesante në një gamë
       mailing_lists:
         title: Listat E Postimeve
         description: Bëni një pyetje ose diskutoni çështje interesante në një gamë

diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 342f9f3c049b9e8e506d6febcbd129ef3192f1a5..763b5628e33d92c832194b29189798520e329dc2 100644 (file)
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -923,7 +923,6 @@ sr-Latn:
       heading: Prijava
       email or username: 'Imejl adresa ili korisničko ime:'
       password: 'Lozinka:'
       heading: Prijava
       email or username: 'Imejl adresa ili korisničko ime:'
       password: 'Lozinka:'

-      openid_html: '%{logo} OpenID:'

       remember: Zapamti me
       lost password link: Zaboravili ste lozinku?
       login_button: Prijavi me
       remember: Zapamti me
       lost password link: Zaboravili ste lozinku?
       login_button: Prijavi me

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 141fa13d9acf1ecf7ea6f83f00d7f761ad34c4eb..b4efc2241ebe09645197b50f7c405810f4e6882b 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -238,7 +238,6 @@ sr:
   auth:
     providers:
       none: Ниједан
   auth:
     providers:
       none: Ниједан

-      openid: OpenID

       google: Google
       facebook: Фејсбук
       github: GitHub
       google: Google
       facebook: Фејсбук
       github: GitHub


@@ -272,6 +271,7 @@ sr:
         title: Обришите мој налог
         warning: Упозорење! Брисање налога је неповратан процес.
         delete_account: Обриши налог
         title: Обришите мој налог
         warning: Упозорење! Брисање налога је неповратан процес.
         delete_account: Обриши налог

+        retain_edits: Ваше измене картографске базе (ако их има), биће задржане.

         retain_email: Ваша имејл адреса ће бити задржана.
         confirm_delete: Јесте ли сигурни?
         cancel: Откажи
         retain_email: Ваша имејл адреса ће бити задржана.
         confirm_delete: Јесте ли сигурни?
         cancel: Откажи


@@ -459,6 +459,7 @@ sr:
       nearby mapper: Оближњи картограф
       friend: Пријатељ
     show:
       nearby mapper: Оближњи картограф
       friend: Пријатељ
     show:

+      title: Tабла

       edit_your_profile: Уредите Ваш профил
       my friends: Моји пријатељи
       no friends: Нисте додали ниједног пријатеља.
       edit_your_profile: Уредите Ваш профил
       my friends: Моји пријатељи
       no friends: Нисте додали ниједног пријатеља.


@@ -540,7 +541,14 @@ sr:
       comment: Коментар
       newer_comments: Новији коментари
       older_comments: Старији коментари
       comment: Коментар
       newer_comments: Новији коментари
       older_comments: Старији коментари

+  doorkeeper:
+    scopes:
+      address: Види своју физичку адресу
+      email: Види своју имејл адресу
+      phone: Види своју број телефона

   errors:
   errors:

+    contact:
+      contact: контакт

     forbidden:
       title: Забрањено
     internal_server_error:
     forbidden:
       title: Забрањено
     internal_server_error:


@@ -675,6 +683,7 @@ sr:
           waste_basket: Корпа за отпатке
           waste_disposal: Контејнер
           waste_dump_site: Депонија
           waste_basket: Корпа за отпатке
           waste_disposal: Контејнер
           waste_dump_site: Депонија

+          weighbridge: Теретна вага

         boundary:
           administrative: Административна граница
           census: Пописна граница
         boundary:
           administrative: Административна граница
           census: Пописна граница


@@ -914,6 +923,7 @@ sr:
           chimney: Димњак
           communications_tower: Репетитор
           crane: Кран
           chimney: Димњак
           communications_tower: Репетитор
           crane: Кран

+          cross: Крст

           dyke: Насип
           embankment: Насип
           flagpole: Јарбол за заставу
           dyke: Насип
           embankment: Насип
           flagpole: Јарбол за заставу


@@ -930,6 +940,7 @@ sr:
           pipeline: Цевовод
           pumping_station: Црпна станица
           silo: Силос
           pipeline: Цевовод
           pumping_station: Црпна станица
           silo: Силос

+          street_cabinet: Улични орман

           surveillance: Присмотра
           telescope: Телескоп
           tower: Кула
           surveillance: Присмотра
           telescope: Телескоп
           tower: Кула


@@ -998,6 +1009,7 @@ sr:
           administrative: Администрација
           advertising_agency: Маркетиншка агенција
           architect: Архитекта
           administrative: Администрација
           advertising_agency: Маркетиншка агенција
           architect: Архитекта

+          association: Удружење

           company: Предузеће
           diplomatic: Дипломатска канцеларија
           educational_institution: Образовна установа
           company: Предузеће
           diplomatic: Дипломатска канцеларија
           educational_institution: Образовна установа


@@ -1161,6 +1173,7 @@ sr:
           vacant: Упражњен локал
           video: Видеотека
           video_games: Продавница видео-игара
           vacant: Упражњен локал
           video: Видеотека
           video_games: Продавница видео-игара

+          wholesale: Велепродаја

           wine: Винарија
           "yes": Продавница
         tourism:
           wine: Винарија
           "yes": Продавница
         tourism:


@@ -1280,6 +1293,8 @@ sr:
           personal_label: Ова напомена садржи личне податке
           abusive_label: Ова белешка је увредљива
           other_label: Друго
           personal_label: Ова напомена садржи личне податке
           abusive_label: Ова белешка је увредљива
           other_label: Друго

+    create:
+      provide_details: Молимо наведите потребне детаље

   layouts:
     logo:
       alt_text: Логотип OpenStreetMap-а
   layouts:
     logo:
       alt_text: Логотип OpenStreetMap-а


@@ -1304,8 +1319,10 @@ sr:
     intro_text: OpenStreetMap је мапа света коју су направили људи попут вас. Слободна
       је за коришћење под отвореном лиценцом.
     intro_2_create_account: Отворите кориснички налог
     intro_text: OpenStreetMap је мапа света коју су направили људи попут вас. Слободна
       је за коришћење под отвореном лиценцом.
     intro_2_create_account: Отворите кориснички налог

+    hosting_partners_html: Хостинг пружају %{ucl}, %{fastly}, %{bytemark}, и други
+      %{partners}.

     partners_ucl: UCL
     partners_ucl: UCL

-    partners_bytemark: хостинг Bytemark
+    partners_bytemark: Bytemark Hosting

     partners_partners: партнери
     tou: Услови коришћења
     osm_offline: База OpenStreetMap-а је тренутно недоступна док се не заврше неопходни
     partners_partners: партнери
     tou: Услови коришћења
     osm_offline: База OpenStreetMap-а је тренутно недоступна док се не заврше неопходни


@@ -1479,6 +1496,7 @@ sr:
       body: Нажалост, нема поруке с тим ИБ.
     outbox:
       title: Послате
       body: Нажалост, нема поруке с тим ИБ.
     outbox:
       title: Послате

+      actions: Радње

       messages:
         one: Имате %{count} послату поруку
         other: Имате %{count} послате поруке
       messages:
         one: Имате %{count} послату поруку
         other: Имате %{count} послате поруке


@@ -1503,6 +1521,7 @@ sr:
       destroy_button: Обриши
     heading:
       my_inbox: Примљене
       destroy_button: Обриши
     heading:
       my_inbox: Примљене

+      my_outbox: Послате

     mark:
       as_read: Порука је означена као прочитана
       as_unread: Порука је означена као непрочитана
     mark:
       as_read: Порука је означена као прочитана
       as_unread: Порука је означена као непрочитана


@@ -1529,8 +1548,15 @@ sr:
   preferences:
     show:
       title: Моја подешавања
   preferences:
     show:
       title: Моја подешавања

+      preferred_editor: Жељени уређивач
+      preferred_languages: Жељени језици
+      edit_preferences: Уреди подешавања

     edit:
     edit:

+      title: Моја подешавања
+      save: Сачувај подешавања

       cancel: Откажи
       cancel: Откажи

+    update_success_flash:
+      message: Подешавања сачувана.

   profiles:
     edit:
       title: Уреди профил
   profiles:
     edit:
       title: Уреди профил


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

-      openid_html: '%{logo} OpenID'

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


@@ -1603,9 +1628,12 @@ sr:
       support: подршка
   shared:
     markdown_help:
       support: подршка
   shared:
     markdown_help:

+      first: Прва ставка
+      second: Друга ставка

       link: Веза
       text: Текст
       image: Слика
       link: Веза
       text: Текст
       image: Слика

+      alt: Алтернативни текст

     richtext_field:
       edit: Уреди
       preview: Преглед
     richtext_field:
       edit: Уреди
       preview: Преглед


@@ -1622,6 +1650,7 @@ sr:
         користе снимке из ваздуха, GPS уређаје и обичне теренске мапе у циљу провере
         исправности и ажурности OSM-а.
       community_driven_title: Заједница је покретач
         користе снимке из ваздуха, GPS уређаје и обичне теренске мапе у циљу провере
         исправности и ажурности OSM-а.
       community_driven_title: Заједница је покретач

+      community_driven_osm_foundation: OSM фондација

       open_data_title: Отворени подаци
       legal_title: Правни аспекти
       legal_1_1_terms_of_use: Услови коришћења
       open_data_title: Отворени подаци
       legal_title: Правни аспекти
       legal_1_1_terms_of_use: Услови коришћења


@@ -1630,8 +1659,8 @@ sr:
     copyright:
       foreign:
         title: О овом преводу
     copyright:
       foreign:
         title: О овом преводу

-        html: У случају сукоба између преведене странице и %{english_original_link},
-          енглеÑ\81ка Ñ\81Ñ\82Ñ\80аниÑ\86а има пÑ\80едноÑ\81т
+        html: У случају неслагања између преведене странице и %{english_original_link},
+          енглеÑ\81ка Ñ\81Ñ\82Ñ\80аниÑ\86а има пÑ\80имат

         english_link: енглеског оригинала
       native:
         title: О овој страници
         english_link: енглеског оригинала
       native:
         title: О овој страници


@@ -1643,7 +1672,9 @@ sr:
       legal_babble:
         title_html: Ауторска права и лиценца
         introduction_2_legal_code: правни текст
       legal_babble:
         title_html: Ауторска права и лиценца
         introduction_2_legal_code: правни текст

-        credit_title_html: Како да именујете OpenStreetMap
+        introduction_3_creative_commons: Creative Commons Ауторство-Делити под истим
+          условима 2.0
+        credit_title_html: Како да наведете OpenStreetMap

         credit_1_html: 'Када користите податке са OpenStreetMap-а, захтевамо да урадите
           две ствари:'
         credit_3_attribution_guidelines: Смернице за приписивање
         credit_1_html: 'Када користите податке са OpenStreetMap-а, захтевамо да урадите
           две ствари:'
         credit_3_attribution_guidelines: Смернице за приписивање


@@ -1674,6 +1705,7 @@ sr:
         contributors_es_spain: Шпанија
         contributors_za_south_africa: Јужна Африка
         contributors_gb_united_kingdom: Уједињено Краљевство
         contributors_es_spain: Шпанија
         contributors_za_south_africa: Јужна Африка
         contributors_gb_united_kingdom: Уједињено Краљевство

+        contributors_2_contributors_page: доприносиоци

         contributors_footer_2_html: |2-
             Укључивање података у Опенстритмап не подразумева да изворни
             власник података прихвата Опенстритмап, обезбеђује било какву
         contributors_footer_2_html: |2-
             Укључивање података у Опенстритмап не подразумева да изворни
             власник података прихвата Опенстритмап, обезбеђује било какву


@@ -1683,6 +1715,7 @@ sr:
           из извора заштићених ауторским правима (нпр. Гугл карте или штампане карте)
           без изричите дозволе власника ауторских права.
         trademarks_title: Заштитни знаци
           из извора заштићених ауторским правима (нпр. Гугл карте или штампане карте)
           без изричите дозволе власника ауторских права.
         trademarks_title: Заштитни знаци

+        trademarks_1_1_trademark_policy: Робне марке

     index:
       js_1: Користите прегледач који не подржава јаваскрипт или сте га онемогућили.
       js_2: OpenStreetMap користи јаваскрипт за приказивање мапа.
     index:
       js_1: Користите прегледач који не подржава јаваскрипт или сте га онемогућили.
       js_2: OpenStreetMap користи јаваскрипт за приказивање мапа.


@@ -1749,10 +1782,8 @@ sr:
         url: http://wiki.openstreetmap.org/wiki/Sr:Beginners%27_guide
         title: Водич за почетничке
         description: Водич за почетнике
         url: http://wiki.openstreetmap.org/wiki/Sr:Beginners%27_guide
         title: Водич за почетничке
         description: Водич за почетнике

-      help:
-        title: Форум за помоћ
-        description: Постави питање или нађи одговор на OpenStreetMap страници за
-          питања и одговоре.
+      community:
+        title: Форум заједнице

       mailing_lists:
         title: Дописне листе
         description: Поставите питање или дискутујте о питањима од значаја која се
       mailing_lists:
         title: Дописне листе
         description: Поставите питање или дискутујте о питањима од значаја која се


@@ -1881,6 +1912,11 @@ sr:
         title: Немаш времена да уредиш? Додај белешку!
         para_1: Ако хоћеш нешто ситно да поправиш а немаш времена да се пријавиш или
           да научиш да уређујеш, једноставно додај белешку.
         title: Немаш времена да уредиш? Додај белешку!
         para_1: Ако хоћеш нешто ситно да поправиш а немаш времена да се пријавиш или
           да научиш да уређујеш, једноставно додај белешку.

+    communities:
+      local_chapters:
+        title: Локални огранци
+      other_groups:
+        title: Друге групе

   traces:
     visibility:
       private: Приватни (приказује се као анонимне, непоређане тачке)
   traces:
     visibility:
       private: Приватни (приказује се као анонимне, непоређане тачке)


@@ -1958,6 +1994,7 @@ sr:
       public_traces_from: Јавни GPS трагови корисника %{user}
       description: Претражите недавне аплоуде GPS путева
       tagged_with: ' означени са %{tags}'
       public_traces_from: Јавни GPS трагови корисника %{user}
       description: Претражите недавне аплоуде GPS путева
       tagged_with: ' означени са %{tags}'

+      empty_title: Нема ништа

       wiki_page: вики страница
       upload_trace: Отпреми траг
       my_traces: Моји трагови
       wiki_page: вики страница
       upload_trace: Отпреми траг
       my_traces: Моји трагови


@@ -2070,6 +2107,7 @@ sr:
     show:
       edit: Уреди
       delete: Обриши
     show:
       edit: Уреди
       delete: Обриши

+      permissions: Дозволе

   oauth2_authorizations:
     new:
       authorize: Одобри
   oauth2_authorizations:
     new:
       authorize: Одобри


@@ -2103,10 +2141,15 @@ sr:
     terms:
       title: Услови
       heading: Услови
     terms:
       title: Услови
       heading: Услови

+      read_ct: Прочитао сам и прихватам горе наведене услове

       read_tou: Прочитао сам и прихватам Услове коришћења
       consider_pd: Према горенаведеном, сматрам да моји доприноси припадају јавном
         власништву
       consider_pd_why: шта је ово?
       read_tou: Прочитао сам и прихватам Услове коришћења
       consider_pd: Према горенаведеном, сматрам да моји доприноси припадају јавном
         власништву
       consider_pd_why: шта је ово?

+      guidance_info_html: 'Информације за разумевање ових услова: a %{readable_summary_link}
+        и %{informal_translations_link}'
+      readable_summary: сумарум
+      informal_translations: неформални преводи

       continue: Настави
       declined: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=sr-ec
       decline: Одбаци
       continue: Настави
       declined: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=sr-ec
       decline: Одбаци


@@ -2134,8 +2177,10 @@ sr:
       my profile: Мој профил
       my settings: Моје поставке
       my comments: Моји коментари
       my profile: Мој профил
       my settings: Моје поставке
       my comments: Моји коментари

+      my_dashboard: Tабла

       blocks on me: Мени забрањено
       blocks by me: Моје забране
       blocks on me: Мени забрањено
       blocks by me: Моје забране

+      edit_profile: Уреди профил

       send message: Пошаљи поруку
       diary: Дневник
       edits: Измене
       send message: Пошаљи поруку
       diary: Дневник
       edits: Измене


@@ -2162,6 +2207,7 @@ sr:
           moderator: Опозови овлашћења уредника
       block_history: Активне блокаде
       moderator_history: Извршене блокаде
           moderator: Опозови овлашћења уредника
       block_history: Активне блокаде
       moderator_history: Извршене блокаде

+      revoke_all_blocks: Опозови све блокаде

       comments: Коментари
       create_block: Блокирај корисника
       activate_user: Активирај корисника
       comments: Коментари
       create_block: Блокирај корисника
       activate_user: Активирај корисника


@@ -2264,6 +2310,9 @@ sr:
       confirm: Желите ли да опозовете ову блокаду?
       revoke: Опозови
       flash: Ова блокада је опозвана.
       confirm: Желите ли да опозовете ову блокаду?
       revoke: Опозови
       flash: Ова блокада је опозвана.

+    revoke_all:
+      heading_html: Опозивање свих блокада на %{block_on}
+      flash: Све активне блокаде су опозване.

     helper:
       time_future_html: Завршава се у %{time}.
       until_login: Активно све док се корисник не пријави.
     helper:
       time_future_html: Завршава се у %{time}.
       until_login: Активно све док се корисник не пријави.


@@ -2310,11 +2359,19 @@ sr:
       showing_page: Страница %{page}
       next: Следеће »
       previous: « Претходно
       showing_page: Страница %{page}
       next: Следеће »
       previous: « Претходно

+  user_mutes:
+    index:
+      table:
+        thead:
+          actions: Радње
+        tbody:
+          send_message: Пошаљи поруку

   notes:
     index:
       title: Белешке послао или коментарисао %{user}
       heading: Белешке корисника %{user}
       subheading_html: Белешке послао или коментарисао %{user}
   notes:
     index:
       title: Белешке послао или коментарисао %{user}
       heading: Белешке корисника %{user}
       subheading_html: Белешке послао или коментарисао %{user}

+      no_notes: Нема белешки

       id: Id
       creator: Творац
       description: Опис
       id: Id
       creator: Творац
       description: Опис


@@ -2326,6 +2383,7 @@ sr:
       open_title: Нерешена белешка бр. %{note_name}
       closed_title: Решена белешка бр. %{note_name}
       hidden_title: Скривена белешка бр. %{note_name}
       open_title: Нерешена белешка бр. %{note_name}
       closed_title: Решена белешка бр. %{note_name}
       hidden_title: Скривена белешка бр. %{note_name}

+      event_opened_by_html: Направио %{user} %{time_ago}

       report: пријави ову белешку
       anonymous_warning: Ова белешка садржи коментаре анонимних корисника које би
         требало посебно проверити.
       report: пријави ову белешку
       anonymous_warning: Ова белешка садржи коментаре анонимних корисника које би
         требало посебно проверити.


@@ -2387,7 +2445,9 @@ sr:
         gps: Јавне GPS трасе
         overlays: Омогући преклапање за тражење грешака на карти
         title: Слојеви
         gps: Јавне GPS трасе
         overlays: Омогући преклапање за тражење грешака на карти
         title: Слојеви

+      openstreetmap_contributors: Творци OpenStreetMap

       make_a_donation: Донација
       make_a_donation: Донација

+      website_and_api_terms: Веб-сајт и API услови

     site:
       edit_tooltip: Уредите мапу
       edit_disabled_tooltip: Увећајте приказ да бисте уредили мапу
     site:
       edit_tooltip: Уредите мапу
       edit_disabled_tooltip: Увећајте приказ да бисте уредили мапу

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 618f6ee24f38305500501b6209b7a077d71502a8..6568473e718409940ce3c308111d6f88d30b0350 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -261,7 +261,6 @@ sv:
   auth:
     providers:
       none: Ingen
   auth:
     providers:
       none: Ingen

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -1921,7 +1920,6 @@ sv:
       heading: Logga in
       email or username: E-postadress eller Användarnamn
       password: Lösenord
       heading: Logga in
       email or username: E-postadress eller Användarnamn
       password: Lösenord

-      openid_html: '%{logo} OpenID'

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


@@ -2258,17 +2256,13 @@ sv:
         url: https://wiki.openstreetmap.org/wiki/Sv:Beginners%27_guide
         title: Guide för nybörjare
         description: Guide för nybörjare som underhålls av gemenskapen.
         url: https://wiki.openstreetmap.org/wiki/Sv:Beginners%27_guide
         title: Guide för nybörjare
         description: Guide för nybörjare som underhålls av gemenskapen.

-      help:
-        title: Hjälpforum
-        description: Ställ en fråga eller kolla upp svar på OpenStreetMaps sida med
-          svar på ofta förekommande frågor.
+      community:
+        title: Gemenskapsforum
+        description: En delad plats för konversationer om OpenStreetMap.

       mailing_lists:
         title: E-postlistor
         description: Ställ en fråga eller diskutera intressanta saker på ett brett
           utbud av lokala eller regionala e-postlistor.
       mailing_lists:
         title: E-postlistor
         description: Ställ en fråga eller diskutera intressanta saker på ett brett
           utbud av lokala eller regionala e-postlistor.

-      community:
-        title: Gemenskapsforum
-        description: En delad plats för konversationer om OpenStreetMap.

       irc:
         title: IRC
         description: Interaktiv chatt på flera olika språk rörande mängder av ämnen.
       irc:
         title: IRC
         description: Interaktiv chatt på flera olika språk rörande mängder av ämnen.


@@ -2335,6 +2329,7 @@ sv:
           train: Tåg
           subway: Tunnelbana
           ferry: Färja
           train: Tåg
           subway: Tunnelbana
           ferry: Färja

+          tram: Spårvagn

           bus: Buss
           cable_car: Linbana
           chair_lift: stollift
           bus: Buss
           cable_car: Linbana
           chair_lift: stollift


@@ -3107,7 +3102,6 @@ sv:
           other: Du är inom %{count} fot av denna punkt
       base:
         standard: Standard
           other: Du är inom %{count} fot av denna punkt
       base:
         standard: Standard

-        cyclosm: CyclOSM

         cycle_map: Cykelkarta
         transport_map: Transportkarta
         hot: Humanitärt
         cycle_map: Cykelkarta
         transport_map: Transportkarta
         hot: Humanitärt

diff --git a/config/locales/te.yml b/config/locales/te.yml
index 75751500c4c7d480d3ebe4ac6c5315c29100bd1c..986ecc828b569971f4cb3e94a89152dcc54beea9 100644 (file)
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -1763,7 +1763,6 @@ te:
       heading: ప్రవేశం
       email or username: 'ఈమెయిల్ చిరునామా లేదా వాడుకరిపేరు:'
       password: 'సంకేతపదం:'
       heading: ప్రవేశం
       email or username: 'ఈమెయిల్ చిరునామా లేదా వాడుకరిపేరు:'
       password: 'సంకేతపదం:'

-      openid_html: '%{logo} OpenID:'

       remember: నన్ను గుర్తుంచుకో
       lost password link: మీ సంకేతపదం పోయిందా?
       login_button: ప్రవేశించు
       remember: నన్ను గుర్తుంచుకో
       lost password link: మీ సంకేతపదం పోయిందా?
       login_button: ప్రవేశించు


@@ -1935,10 +1934,6 @@ te:
       beginners_guide:
         title: కొత్తవారికి మార్గదర్శిని
         description: కొత్తవారి కోసం సముదాయం నిర్వహించే మార్గదర్శిని.
       beginners_guide:
         title: కొత్తవారికి మార్గదర్శిని
         description: కొత్తవారి కోసం సముదాయం నిర్వహించే మార్గదర్శిని.

-      help:
-        title: సహాయ వేదిక
-        description: OpenStreetMap వారి ప్రశ్న-జవాబుల సైట్లో మీ ప్రశ్నలు అడగండి, లేదా
-          సమాధానాల కోసం చూడండి.

       mailing_lists:
         title: మెయిలింగు జాబితాలు
       irc:
       mailing_lists:
         title: మెయిలింగు జాబితాలు
       irc:


@@ -2465,7 +2460,6 @@ te:
           other: మీరు ఈ బిందువు నుండి %{count} అడుగుల దూరం లోపే ఉన్నారు
       base:
         standard: ప్రామాణికం
           other: మీరు ఈ బిందువు నుండి %{count} అడుగుల దూరం లోపే ఉన్నారు
       base:
         standard: ప్రామాణికం

-        cyclosm: CyclOSM

         cycle_map: సైకిలు మ్యాపు
         transport_map: రవాణా పటం
         hot: మానవత్వ
         cycle_map: సైకిలు మ్యాపు
         transport_map: రవాణా పటం
         hot: మానవత్వ

diff --git a/config/locales/th.yml b/config/locales/th.yml
index cc288592b282b0c8e8aab7182ed4a26e49a6994e..0fb6e583215bb65db1cc00fb4b0454faf6860976 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -209,7 +209,6 @@ th:
   auth:
     providers:
       none: ไม่มี
   auth:
     providers:
       none: ไม่มี

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub


@@ -1451,7 +1450,6 @@ th:
       heading: ลงชื่อเข้าใช้
       email or username: 'อีเมลหรือชื่อผู้ใช้:'
       password: 'รหัสผ่าน:'
       heading: ลงชื่อเข้าใช้
       email or username: 'อีเมลหรือชื่อผู้ใช้:'
       password: 'รหัสผ่าน:'

-      openid_html: 'โอเพนไอดีของ %{logo}:'

       remember: จดจำฉันไว้ในระบบ
       lost password link: ลืมรหัสผ่านหรือ?
       login_button: ลงชื่อเข้าใช้
       remember: จดจำฉันไว้ในระบบ
       lost password link: ลืมรหัสผ่านหรือ?
       login_button: ลงชื่อเข้าใช้

diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 31e307cc62e903defb1c8fc4930ae80526e97b0c..492d7eebfa6aa2407221ae02b8d89e11edf7c5d5 100644 (file)
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -199,7 +199,6 @@ tl:
   auth:
     providers:
       none: Wala
   auth:
     providers:
       none: Wala

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub


@@ -1475,7 +1474,6 @@ tl:
       heading: Lumagda
       email or username: 'Tirahan ng E-liham o Pangalan ng Tagagamit:'
       password: 'Password:'
       heading: Lumagda
       email or username: 'Tirahan ng E-liham o Pangalan ng Tagagamit:'
       password: 'Password:'

-      openid_html: '%{logo} OpenID:'

       remember: Tandaan ako
       lost password link: Nawala ang password mo?
       login_button: Lumagda
       remember: Tandaan ako
       lost password link: Nawala ang password mo?
       login_button: Lumagda


@@ -2196,7 +2194,6 @@ tl:
         title: Ipakita ang Aking Lokasyon
       base:
         standard: Pamantayan
         title: Ipakita ang Aking Lokasyon
       base:
         standard: Pamantayan

-        cyclosm: CyclOSM

         cycle_map: Mapa ng Pagbibisikleta
         transport_map: Mapa ng Transportasyon
       layers:
         cycle_map: Mapa ng Pagbibisikleta
         transport_map: Mapa ng Transportasyon
       layers:

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index f44a229729617f9e506d4f333b431ab04a9a99de..ac214659522d60bb71ae24fde4b84257f6bcb27a 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -264,7 +264,6 @@ tr:
   auth:
     providers:
       none: Hiçbiri
   auth:
     providers:
       none: Hiçbiri

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


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

-      openid_html: '%{logo} OpenID'

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


@@ -2311,17 +2309,14 @@ tr:
         url: https://wiki.openstreetmap.org/wiki/Tr:Beginners%27_guide
         title: Yeni Başlayanlar Kılavuzu
         description: Topluluk, yeni başlayanlar için rehberlik yapmaktadır.
         url: https://wiki.openstreetmap.org/wiki/Tr:Beginners%27_guide
         title: Yeni Başlayanlar Kılavuzu
         description: Topluluk, yeni başlayanlar için rehberlik yapmaktadır.

-      help:
-        title: Yardım Forumu
-        description: Bir soru sor veya OpenStreetMap'in soru-ve-cevap sitesinde yanıtları
-          ara.
+      community:
+        title: Yardım & Topluluk Forumu
+        description: Yardım istemek ve OpenStreetMap hakkında sohbet etmek için ortak
+          bir yer.

       mailing_lists:
         title: E-Posta Listeleri
         description: Oldukça geniş yerel veya bölgesel e-posta listelerinde soru sorabilir
           veya ilginç konuları tartışabilirsiniz.
       mailing_lists:
         title: E-Posta Listeleri
         description: Oldukça geniş yerel veya bölgesel e-posta listelerinde soru sorabilir
           veya ilginç konuları tartışabilirsiniz.

-      community:
-        title: Topluluk forumu
-        description: OpenStreetMap hakkında sohbet ortamı

       irc:
         title: IRC
         description: Birçok dilde ve birçok konuda interaktif sohbet.
       irc:
         title: IRC
         description: Birçok dilde ve birçok konuda interaktif sohbet.


@@ -2698,6 +2693,7 @@ tr:
   oauth_clients:
     new:
       title: Yeni bir uygulama kaydedin
   oauth_clients:
     new:
       title: Yeni bir uygulama kaydedin

+      disabled: OAuth 1 uygulamalarının kaydı devre dışı bırakıldı

     edit:
       title: Uygulamanızı düzenleyin
     show:
     edit:
       title: Uygulamanızı düzenleyin
     show:


@@ -2781,6 +2777,7 @@ tr:
       title: Yetkili uygulamalarım
       application: Uygulama
       permissions: İzinler
       title: Yetkili uygulamalarım
       application: Uygulama
       permissions: İzinler

+      last_authorized: Son Yetkili

       no_applications_html: Henüz hiçbir %{oauth2} uygulamasını yetkilendirmediniz.
     application:
       revoke: Erişimi İptal Et
       no_applications_html: Henüz hiçbir %{oauth2} uygulamasını yetkilendirmediniz.
     application:
       revoke: Erişimi İptal Et


@@ -3201,7 +3198,6 @@ tr:
           other: Bu noktanın %{count} adım içindesiniz
       base:
         standard: Standart
           other: Bu noktanın %{count} adım içindesiniz
       base:
         standard: Standart

-        cyclosm: CyclOSM

         cycle_map: Bisiklet Haritası
         transport_map: Ulaşım Haritası
         tracestracktop_topo: Tracestrack Topo
         cycle_map: Bisiklet Haritası
         transport_map: Ulaşım Haritası
         tracestracktop_topo: Tracestrack Topo


@@ -3247,14 +3243,14 @@ tr:
     directions:
       ascend: Yükselt
       engines:
     directions:
       ascend: Yükselt
       engines:

-        fossgis_osrm_bike: Bisiklet (OSRM)
-        fossgis_osrm_car: Araba (OSRM)
+        fossgis_osrm_bike: Bisikletle (OSRM)
+        fossgis_osrm_car: Arabayla (OSRM)

         fossgis_osrm_foot: Yürüyerek (OSRM)
         graphhopper_bicycle: Bisikletle (GraphHopper)
         graphhopper_car: Arabayla (GraphHopper)
         graphhopper_foot: Yürüyerek (GraphHopper)
         fossgis_osrm_foot: Yürüyerek (OSRM)
         graphhopper_bicycle: Bisikletle (GraphHopper)
         graphhopper_car: Arabayla (GraphHopper)
         graphhopper_foot: Yürüyerek (GraphHopper)

-        fossgis_valhalla_bicycle: Bisiklet (Valhalla)
-        fossgis_valhalla_car: Araba (Valhalla)
+        fossgis_valhalla_bicycle: Bisikletle (Valhalla)
+        fossgis_valhalla_car: Arabayla (Valhalla)

         fossgis_valhalla_foot: Yürüyerek (Valhalla)
       descend: İniş
       directions: İstikametler
         fossgis_valhalla_foot: Yürüyerek (Valhalla)
       descend: İniş
       directions: İstikametler

diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index 9b74fac90d0ba8fc256b840d4346cd11f23c0f83..5d49c14877819f6641103986ec04936fa33e406f 100644 (file)
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -215,7 +215,6 @@ tt:
   auth:
     providers:
       none: Юк
   auth:
     providers:
       none: Юк

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 9c2ad43d89022c5b1688e4c19f2a34e0f422f1f5..68b8fb29304c15a953fb2338c2bc3bee77ed4177 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -285,7 +285,6 @@ uk:
   auth:
     providers:
       none: Немає
   auth:
     providers:
       none: Немає

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -1985,7 +1984,6 @@ uk:
       heading: Ласкаво просимо
       email or username: 'Ел. пошта або прізвисько:'
       password: 'Пароль:'
       heading: Ласкаво просимо
       email or username: 'Ел. пошта або прізвисько:'
       password: 'Пароль:'

-      openid_html: '%{logo} OpenID:'

       remember: Запам’ятати мене
       lost password link: Забули пароль?
       login_button: Увійти
       remember: Запам’ятати мене
       lost password link: Забули пароль?
       login_button: Увійти


@@ -2334,17 +2332,13 @@ uk:
         url: http://wiki.openstreetmap.org/wiki/Uk:Beginners%27_guide
         title: Посібник новачка
         description: Посібник для новачків від спільноти.
         url: http://wiki.openstreetmap.org/wiki/Uk:Beginners%27_guide
         title: Посібник новачка
         description: Посібник для новачків від спільноти.

-      help:
-        title: Попросити про допомогу
-        description: Поставте запитання або знайдіть відповіді на сайті питань-відповідей
-          OpenStreetMap.
+      community:
+        title: Форум спільноти
+        description: Місце де можна поспілкуватись про OpenStreetMap.

       mailing_lists:
         title: Списки розсилки
         description: Поставте запитання або обговоріть цікаві речі у широкому виборі
           тематичних або регіональних списків розсилки.
       mailing_lists:
         title: Списки розсилки
         description: Поставте запитання або обговоріть цікаві речі у широкому виборі
           тематичних або регіональних списків розсилки.

-      community:
-        title: Форум спільноти
-        description: Місце де можна поспілкуватись про OpenStreetMap.

       irc:
         title: IRC
         description: Інтерактивний чат багатьма мовами на різні теми.
       irc:
         title: IRC
         description: Інтерактивний чат багатьма мовами на різні теми.

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 0f41aaf5e28afb30ed425c7ff98e3fee0d510a8b..d5f7d70be4d18418a70f178217274c40d6bbe410 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -219,7 +219,6 @@ vi:
   auth:
     providers:
       none: Không có
   auth:
     providers:
       none: Không có

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub


@@ -1721,7 +1720,6 @@ vi:
       heading: Đăng nhập
       email or username: 'Địa chỉ Thư điện tử hoặc Tên người dùng:'
       password: 'Mật khẩu:'
       heading: Đăng nhập
       email or username: 'Địa chỉ Thư điện tử hoặc Tên người dùng:'
       password: 'Mật khẩu:'

-      openid_html: '%{logo} OpenID:'

       remember: Nhớ tôi
       lost password link: Quên mất Mật khẩu?
       login_button: Đăng nhập
       remember: Nhớ tôi
       lost password link: Quên mất Mật khẩu?
       login_button: Đăng nhập


@@ -1944,17 +1942,13 @@ vi:
         url: https://wiki.openstreetmap.org/wiki/Vi:Beginners%27_guide
         title: Hướng dẫn Bắt đầu
         description: Hướng dẫn bắt đầu do cộng đồng biên tập.
         url: https://wiki.openstreetmap.org/wiki/Vi:Beginners%27_guide
         title: Hướng dẫn Bắt đầu
         description: Hướng dẫn bắt đầu do cộng đồng biên tập.

-      help:
-        title: Diễn đàn Trợ giúp
-        description: Hỏi hang hoặc tìm kiếm các câu trả lời tại trung tâm hỏi đáp
-          của OpenStreetMap.
+      community:
+        title: Diễn đàn cộng đồng
+        description: Trang thảo luận chung về OpenStreetMap.

       mailing_lists:
         title: Danh sách thư
         description: Hỏi han hoặc thảo luận về các chuyện quan trọng trên nhiều danh
           sách thư được sắp xếp theo chủ đề hoặc khu vực.
       mailing_lists:
         title: Danh sách thư
         description: Hỏi han hoặc thảo luận về các chuyện quan trọng trên nhiều danh
           sách thư được sắp xếp theo chủ đề hoặc khu vực.

-      community:
-        title: Diễn đàn cộng đồng
-        description: Trang thảo luận chung về OpenStreetMap.

       irc:
         title: IRC
         description: Trò chuyện tương tác trong nhiều ngôn ngữ về nhiều chủ đề.
       irc:
         title: IRC
         description: Trò chuyện tương tác trong nhiều ngôn ngữ về nhiều chủ đề.


@@ -2676,7 +2670,6 @@ vi:
           other: Bạn đang cách địa điểm này trong vòng %{count} bộ
       base:
         standard: Chuẩn
           other: Bạn đang cách địa điểm này trong vòng %{count} bộ
       base:
         standard: Chuẩn

-        cyclosm: CyclOSM

         cycle_map: Bản đồ Xe đạp
         transport_map: Bản đồ Giao thông
         hot: Nhân đạo Chủ nghĩa
         cycle_map: Bản đồ Xe đạp
         transport_map: Bản đồ Giao thông
         hot: Nhân đạo Chủ nghĩa

diff --git a/config/locales/xmf.yml b/config/locales/xmf.yml
index 86c4e27bcba0b8970a62132b7c7c0dc4351a3348..0a4ed84eb293f40546b559c8b07391d3ceef1758 100644 (file)
--- a/config/locales/xmf.yml
+++ b/config/locales/xmf.yml
@@ -206,7 +206,6 @@ xmf:
   auth:
     providers:
       none: აკა ვარი
   auth:
     providers:
       none: აკა ვარი

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub

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

-      openid_html: '%{logo} OpenID'

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


@@ -2156,15 +2155,12 @@ zh-CN:
         url: https://wiki.openstreetmap.org/wiki/Zh-hans:Beginners%27_guide
         title: 新手指南
         description: 社群维护的新手指南。
         url: https://wiki.openstreetmap.org/wiki/Zh-hans:Beginners%27_guide
         title: 新手指南
         description: 社群维护的新手指南。

-      help:
-        title: 帮助论坛
-        description: 在OpenStreetMap的问答网站提问或查找回答。
+      community:
+        title: 帮助和社区论坛
+        description: 用于寻求帮助和讨论 OpenStreetMap 的共享场所。

       mailing_lists:
         title: 邮件列表
         description: 询问问题或在广泛或局部的邮件列表中讨论有趣事件
       mailing_lists:
         title: 邮件列表
         description: 询问问题或在广泛或局部的邮件列表中讨论有趣事件

-      community:
-        title: 社区论坛
-        description: 用于讨论 OpenStreetMap 的共享场所。

       irc:
         title: IRC
         description: 在很多不同的语言和在很多话题间交互聊天。
       irc:
         title: IRC
         description: 在很多不同的语言和在很多话题间交互聊天。

diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 2c5518802683fb6d4db6b507d49feae309779e37..3e2ac86f7e6c33ac037a0dcfd8ea1a422d03bd8f 100644 (file)
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -207,7 +207,6 @@ zh-HK:
   auth:
     providers:
       none: 無
   auth:
     providers:
       none: 無

-      openid: OpenID

       google: Google
       facebook: Facebook
       github: GitHub
       google: Google
       facebook: Facebook
       github: GitHub


@@ -1111,8 +1110,6 @@ zh-HK:
     help:
       beginners_guide:
         description: 由社群編修的新手指南。
     help:
       beginners_guide:
         description: 由社群編修的新手指南。

-      help:
-        description: 在OpenStreetMap的問答網站上提問或搜尋答案。

       mailing_lists:
         description: 在有着各式各樣主題或地域分類的郵件列表中發問或討論有趣的事。
       irc:
       mailing_lists:
         description: 在有着各式各樣主題或地域分類的郵件列表中發問或討論有趣的事。
       irc:

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index f1efc5729c2313686f9847bc126f07bcde8b4378..010edccbb8178da2ddee91fdd5eef8247e419506 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -257,7 +257,6 @@ zh-TW:
   auth:
     providers:
       none: 無
   auth:
     providers:
       none: 無

-      openid: OpenID

       google: Google
       facebook: 臉書
       microsoft: 微軟
       google: Google
       facebook: 臉書
       microsoft: 微軟


@@ -1566,7 +1565,7 @@ zh-TW:
     user_diaries: 日記
     user_diaries_tooltip: 檢視日記
     edit_with: 以 %{editor} 編輯
     user_diaries: 日記
     user_diaries_tooltip: 檢視日記
     edit_with: 以 %{editor} 編輯

-    tag_line: 自由的 Wiki 世界地圖
+    tag_line: 自由的 wiki 世界地圖

     intro_header: 歡迎來到 OpenStreetMap！
     intro_text: OpenStreetMap 是一幅世界地圖，由像您這樣的人們所建立，在開放授權下可以自由使用。
     intro_2_create_account: 建立使用者帳號
     intro_header: 歡迎來到 OpenStreetMap！
     intro_text: OpenStreetMap 是一幅世界地圖，由像您這樣的人們所建立，在開放授權下可以自由使用。
     intro_2_create_account: 建立使用者帳號


@@ -1846,7 +1845,6 @@ zh-TW:
       heading: 登入
       email or username: 電子郵件地址或使用者名稱
       password: 密碼
       heading: 登入
       email or username: 電子郵件地址或使用者名稱
       password: 密碼

-      openid_html: '%{logo} OpenID'

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


@@ -2125,15 +2123,12 @@ zh-TW:
         url: https://wiki.openstreetmap.org/wiki/Zh-hant:Beginners%27_guide
         title: 新手指南
         description: 社群維護的新手指南
         url: https://wiki.openstreetmap.org/wiki/Zh-hant:Beginners%27_guide
         title: 新手指南
         description: 社群維護的新手指南

-      help:
-        title: å\8d\94å\8a©論壇
-        description: å\9c¨é\96\8bæ\94¾è¡\97å\9c\96ç\9a\84å\95\8fç­\94網ç«\99æ\8f\90å\87ºå\95\8fé¡\8cæ\88\96æ\90\9cå°\8bç­\94æ¡\88。
+      community:
+        title: 幫å\8a©è\88\87社群論壇
+        description: å°\8bæ±\82幫å\8a©è\88\87è¨\8eè«\96æ\9c\89é\97\9c OpenStreetMap ç\9a\84å\88\86äº«å ´æ\89\80。

       mailing_lists:
         title: 郵件論壇
         description: 在不同主題或是地區的郵件論壇問問題或是討論有趣的事物。
       mailing_lists:
         title: 郵件論壇
         description: 在不同主題或是地區的郵件論壇問問題或是討論有趣的事物。

-      community:
-        title: 社群論壇
-        description: 討論有關 OpenStreetMap 的分享場所。

       irc:
         title: IRC
         description: 使用各種不同語言在各種主題聊天互動。
       irc:
         title: IRC
         description: 使用各種不同語言在各種主題聊天互動。


@@ -2470,6 +2465,7 @@ zh-TW:
   oauth_clients:
     new:
       title: 註冊新的應用程式
   oauth_clients:
     new:
       title: 註冊新的應用程式

+      disabled: 已停用 OAuth 1 應用程式的註冊

     edit:
       title: 編輯您的應用程式
     show:
     edit:
       title: 編輯您的應用程式
     show:


@@ -2548,6 +2544,7 @@ zh-TW:
       title: 我的已授權應用程式
       application: 應用程式
       permissions: 權限
       title: 我的已授權應用程式
       application: 應用程式
       permissions: 權限

+      last_authorized: 最後授權

       no_applications_html: 您未授權任何 %{oauth2} 應用程式。
     application:
       revoke: 撤銷存取權限
       no_applications_html: 您未授權任何 %{oauth2} 應用程式。
     application:
       revoke: 撤銷存取權限


@@ -2595,7 +2592,7 @@ zh-TW:
         rest_of_world: 世界其他地區
     terms_declined_flash:
       terms_declined_html: 我們很遺憾你已決定不接受新的貢獻者條款。有關詳細資訊，請參閱 %{terms_declined_link}。
         rest_of_world: 世界其他地區
     terms_declined_flash:
       terms_declined_html: 我們很遺憾你已決定不接受新的貢獻者條款。有關詳細資訊，請參閱 %{terms_declined_link}。

-      terms_declined_link: 此 Wiki 頁面
+      terms_declined_link: 此 wiki 頁面

     no_such_user:
       title: 沒有這個使用者
       heading: 使用者 %{user} 不存在
     no_such_user:
       title: 沒有這個使用者
       heading: 使用者 %{user} 不存在


@@ -2921,7 +2918,6 @@ zh-TW:
           other: 您距離此地點在 %{count} 英尺內
       base:
         standard: 標準
           other: 您距離此地點在 %{count} 英尺內
       base:
         standard: 標準

-        cyclosm: CyclOSM

         cycle_map: 自行車地圖
         transport_map: 交通運輸地圖
         tracestracktop_topo: 蹤跡地圖地形
         cycle_map: 自行車地圖
         transport_map: 交通運輸地圖
         tracestracktop_topo: 蹤跡地圖地形