Localisation updates from https://translatewiki.net.

diff --git a/config/locales/af.yml b/config/locales/af.yml
index d3c6fc01b2da12ff174d812945c8c482c732e805..894ebe35d56486e2f3301018eaa9a86c09508be0 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -1524,16 +1524,18 @@ af:
     destroy:
       destroyed: Boodskap is verwyder
   passwords:
     destroy:
       destroyed: Boodskap is verwyder
   passwords:

-    lost_password:
+    new:

       title: Wagwoord verloor
       heading: Wagwoord vergeet?
       email address: 'E-posadres:'
       new password button: Herstel wagwoord
       title: Wagwoord verloor
       heading: Wagwoord vergeet?
       email address: 'E-posadres:'
       new password button: Herstel wagwoord

+    create:

       notice email cannot find: E-posadres is ongelukkig onverkrygbaar, jammer.
       notice email cannot find: E-posadres is ongelukkig onverkrygbaar, jammer.

-    reset_password:
+    edit:

       title: Herstel wagwoord
       heading: Herstel wagwoord vir %{user}
       reset: Herstel wagwoord
       title: Herstel wagwoord
       heading: Herstel wagwoord vir %{user}
       reset: Herstel wagwoord

+    update:

       flash changed: U wagwoord is gewysig.
   preferences:
     show:
       flash changed: U wagwoord is gewysig.
   preferences:
     show:


@@ -1719,9 +1721,6 @@ af:
           footway: Voetpad
           rail: Spoorweg
           subway: Ondergrondse spoorweg
           footway: Voetpad
           rail: Spoorweg
           subway: Ondergrondse spoorweg

-          tram:
-          - Ligte spoor
-          - trem

           cable:
           - Sweefspoor
           - stoelhyser
           cable:
           - Sweefspoor
           - stoelhyser


@@ -1732,14 +1731,15 @@ af:
           - Lughaweplatform
           - terminaal
           admin: Administratiewe grens
           - Lughaweplatform
           - terminaal
           admin: Administratiewe grens

-          forest: Woud
-          wood: Bos
+          forest:
+          - Woud
+          - Bos

           golf: Gholfbaan
           park: Park
           golf: Gholfbaan
           park: Park

-          resident: Woongebied

           common:
           - Gemeen
           - weiland
           common:
           - Gemeen
           - weiland

+          resident: Woongebied

           retail: Kleinhandel-gebied
           industrial: Nywerheidsgebied
           commercial: Handelsgebied
           retail: Kleinhandel-gebied
           industrial: Nywerheidsgebied
           commercial: Handelsgebied

diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index a367ef62eae643e5f809513b785aa5770323b316..5b0b5bcdbbf44d11bcfd04965e48c5df48bd8b63 100644 (file)
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -774,22 +774,24 @@ aln:
     destroy:
       destroyed: Mesazhi u fshi
   passwords:
     destroy:
       destroyed: Mesazhi u fshi
   passwords:

-    lost_password:
+    new:

       title: T'ka hup fjalkalimi
       heading: Ke harrue fjalkalimin?
       email address: 'Email Adresa:'
       new password button: Ndrysho fjalkalimin
       help_text: Shkrueje email adresen që je regjistrue me to, do t'ju deromi një
         lidhe rreth ksaj ku ju muni me ndrru fjalkalimin
       title: T'ka hup fjalkalimi
       heading: Ke harrue fjalkalimin?
       email address: 'Email Adresa:'
       new password button: Ndrysho fjalkalimin
       help_text: Shkrueje email adresen që je regjistrue me to, do t'ju deromi një
         lidhe rreth ksaj ku ju muni me ndrru fjalkalimin

+    create:

       notice email on way: Na vjen keq që e keni hup :-( po ni email ka me ju ardh
         së shpejti edhe muni me ricaktu.
       notice email cannot find: Smujtëm me gjet qat email adres, na vjen keq.
       notice email on way: Na vjen keq që e keni hup :-( po ni email ka me ju ardh
         së shpejti edhe muni me ricaktu.
       notice email cannot find: Smujtëm me gjet qat email adres, na vjen keq.

-    reset_password:
+    edit:

       title: Ricakto fjalëkalimin
       heading: Ricakto fjalëkalimin për %{user}
       reset: Ricakto Fjalëkalimin
       title: Ricakto fjalëkalimin
       heading: Ricakto fjalëkalimin për %{user}
       reset: Ricakto Fjalëkalimin

-      flash changed: Fjalëkalimi juaj u ndryshua.

       flash token bad: Sun e gjetëm qat token, kontrolloje URL?
       flash token bad: Sun e gjetëm qat token, kontrolloje URL?

+    update:
+      flash changed: Fjalëkalimi juaj u ndryshua.

   profiles:
     edit:
       image: 'Imazhi:'
   profiles:
     edit:
       image: 'Imazhi:'


@@ -910,9 +912,6 @@ aln:
           footway: Këmbësore
           rail: Hekurudhor
           subway: Metro
           footway: Këmbësore
           rail: Hekurudhor
           subway: Metro

-          tram:
-          - hekurudhor Lehta
-          - tramvaj

           cable:
           - teleferik
           - heqë karrige
           cable:
           - teleferik
           - heqë karrige


@@ -923,14 +922,15 @@ aln:
           - aeroportit Aeroporti
           - terminal
           admin: kufitare administrative
           - aeroportit Aeroporti
           - terminal
           admin: kufitare administrative

-          forest: Pyll
-          wood: Druri
+          forest:
+          - Pyll
+          - Druri

           golf: fushë e golfit
           park: Park
           golf: fushë e golfit
           park: Park

-          resident: Zonë Rezidenciale

           common:
           - I përbashkët
           - livadh
           common:
           - I përbashkët
           - livadh

+          resident: Zonë Rezidenciale

           retail: zonë me pakicë
           industrial: Zonë Industriale
           commercial: Zona Tregtare
           retail: zonë me pakicë
           industrial: Zonë Industriale
           commercial: Zona Tregtare

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 43196a2b5ef670de637c0fe9650fe22bb6cf2ffb..3ca038228a34ca453d65b7c4ddec66120a9c546a 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1813,22 +1813,24 @@ ar:
     destroy:
       destroyed: حُذِفت الرسالة
   passwords:
     destroy:
       destroyed: حُذِفت الرسالة
   passwords:

-    lost_password:
+    new:

       title: نسيان كلمة السر
       heading: أنسيت كلمة السر؟
       email address: 'عنوان البريد الإلكتروني:'
       new password button: أعد ضبط كلمة السر
       help_text: أدخل عنوان البريد الإلكتروني الذي استخدمته للتسجيل، وسوف نرسل عليه
         رابطا يمكنك استخدامه لإعادة تعيين كلمة المرور.
       title: نسيان كلمة السر
       heading: أنسيت كلمة السر؟
       email address: 'عنوان البريد الإلكتروني:'
       new password button: أعد ضبط كلمة السر
       help_text: أدخل عنوان البريد الإلكتروني الذي استخدمته للتسجيل، وسوف نرسل عليه
         رابطا يمكنك استخدامه لإعادة تعيين كلمة المرور.

+    create:

       notice email on way: نأسف لأنك أضعتها :-( ولكن هناك رسالة إلكترونية في طريقها
         إليك ستمكنك من إعادة تعيينها قريبًا.
       notice email cannot find: معذرةً، تعذر إيجاد عنوان البريد الإلكتروني.
       notice email on way: نأسف لأنك أضعتها :-( ولكن هناك رسالة إلكترونية في طريقها
         إليك ستمكنك من إعادة تعيينها قريبًا.
       notice email cannot find: معذرةً، تعذر إيجاد عنوان البريد الإلكتروني.

-    reset_password:
+    edit:

       title: إعادة ضبط كلمة السر
       heading: إعادة تعيين كلمة السر %{user}
       reset: أعد ضبط كلمة السر
       title: إعادة ضبط كلمة السر
       heading: إعادة تعيين كلمة السر %{user}
       reset: أعد ضبط كلمة السر

-      flash changed: كلمة مرورك قد تغيرت.

       flash token bad: لم نجد هذا النموذج، تحقق من المسار ربما؟
       flash token bad: لم نجد هذا النموذج، تحقق من المسار ربما؟

+    update:
+      flash changed: كلمة مرورك قد تغيرت.

   preferences:
     show:
       title: تفضيلاتي
   preferences:
     show:
       title: تفضيلاتي


@@ -2203,9 +2205,6 @@ ar:
           footway: طريق مشاة
           rail: سكة حديدية
           subway: قطار الأنفاق
           footway: طريق مشاة
           rail: سكة حديدية
           subway: قطار الأنفاق

-          tram:
-          - قطار خفيف
-          - ترام

           cable:
           - عربة أسلاك
           - تلفريك
           cable:
           - عربة أسلاك
           - تلفريك


@@ -2216,15 +2215,16 @@ ar:
           - ساحة مطار
           - صالة مطار
           admin: حدود إدارية
           - ساحة مطار
           - صالة مطار
           admin: حدود إدارية

-          forest: غابة
-          wood: غابة
+          forest:
+          - غابة
+          - غابة

           golf: ملعب غولف
           park: منتزه
           golf: ملعب غولف
           park: منتزه

-          resident: منطقة سكنية

           common:
           - شائع
           - مرج
           - حديقة
           common:
           - شائع
           - مرج
           - حديقة

+          resident: منطقة سكنية

           retail: منطقة بيع بالمفرق
           industrial: منطقة صناعية
           commercial: منطقة تجارية
           retail: منطقة بيع بالمفرق
           industrial: منطقة صناعية
           commercial: منطقة تجارية

diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index 762867a299808d8ae88a780ca4ab66d74192202f..a42394593d1ff63167152bf2cbc0d9dbbf4b34f8 100644 (file)
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -695,22 +695,24 @@ arz:
     destroy:
       destroyed: حُذفت الرسالة
   passwords:
     destroy:
       destroyed: حُذفت الرسالة
   passwords:

-    lost_password:
+    new:

       title: نسيان كلمه المرور
       heading: أنسيت كلمه المرور؟
       email address: 'عنوان البريد الإلكتروني:'
       new password button: إعاده ضبط كلمه المرور
       help_text: أدخل عنوان البريد الإلكترونى الذى استخدمته للتسجيل ، وسوف نرسل عليه
         رابط يمكنك استخدامه لإعاده تعيين كلمه المرور.
       title: نسيان كلمه المرور
       heading: أنسيت كلمه المرور؟
       email address: 'عنوان البريد الإلكتروني:'
       new password button: إعاده ضبط كلمه المرور
       help_text: أدخل عنوان البريد الإلكترونى الذى استخدمته للتسجيل ، وسوف نرسل عليه
         رابط يمكنك استخدامه لإعاده تعيين كلمه المرور.

+    create:

       notice email on way: نأسف لأنك أضعتها :-( ولكن هناك رساله إلكترونيه فى طريقها
         إليك ستمكنك من إعاده تعيينها قريبًا.
       notice email cannot find: تعذّر إيجاد عنوان البريد الإلكترونى، نحن آسفون.
       notice email on way: نأسف لأنك أضعتها :-( ولكن هناك رساله إلكترونيه فى طريقها
         إليك ستمكنك من إعاده تعيينها قريبًا.
       notice email cannot find: تعذّر إيجاد عنوان البريد الإلكترونى، نحن آسفون.

-    reset_password:
+    edit:

       title: إعاده ضبط كلمه المرور
       heading: إعاده تعيين كلمه المرور %{user}
       reset: إعاده ضبط كلمه المرور
       title: إعاده ضبط كلمه المرور
       heading: إعاده تعيين كلمه المرور %{user}
       reset: إعاده ضبط كلمه المرور

-      flash changed: كلمه المرور الخاصه بك قد تغيرت.

       flash token bad: لم تجد تلك المعلومات، تحقق من الرابط ربما؟
       flash token bad: لم تجد تلك المعلومات، تحقق من الرابط ربما؟

+    update:
+      flash changed: كلمه المرور الخاصه بك قد تغيرت.

   profiles:
     edit:
       home location: 'موقع المنزل:'
   profiles:
     edit:
       home location: 'موقع المنزل:'


@@ -778,9 +780,6 @@ arz:
           footway: طريق مشاة
           rail: سكه حديدية
           subway: قطار الأنفاق
           footway: طريق مشاة
           rail: سكه حديدية
           subway: قطار الأنفاق

-          tram:
-          - ترام
-          - ترام

           runway:
           - مدرج مطار للإقلاع/الهبوط
           - مدرج مطار لمناورات الطائرات
           runway:
           - مدرج مطار للإقلاع/الهبوط
           - مدرج مطار لمناورات الطائرات


@@ -788,14 +787,15 @@ arz:
           - ساحه مطار
           - صاله مطار
           admin: حدود إدارية
           - ساحه مطار
           - صاله مطار
           admin: حدود إدارية

-          forest: غابة
-          wood: غابة
+          forest:
+          - غابة
+          - غابة

           golf: ملعب غولف
           park: منتزه
           golf: ملعب غولف
           park: منتزه

-          resident: منطقه سكنية

           common:
           - شائع
           - مرج
           common:
           - شائع
           - مرج

+          resident: منطقه سكنية

           retail: منطقه بيع بالمفرق
           industrial: منطقه صناعية
           commercial: منطقه تجارية
           retail: منطقه بيع بالمفرق
           industrial: منطقه صناعية
           commercial: منطقه تجارية

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 730b482621667bd5f1ba77aba80de255cbc718e0..044c990c62317927d9ab70fa11cdeb999f7b109b 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -1420,22 +1420,24 @@ ast:
     destroy:
       destroyed: Mensaxe desaniciáu
   passwords:
     destroy:
       destroyed: Mensaxe desaniciáu
   passwords:

-    lost_password:
+    new:

       title: Contraseña perdida
       heading: ¿Escaecisti la contraseña?
       email address: 'Direición de corréu electrónicu:'
       new password button: Reestablecer contraseña
       help_text: Escribi les señes de corréu qu'usasti pa date d'alta, unviarémoste
         un enllaz que pues usar pa reestablecer la contraseña.
       title: Contraseña perdida
       heading: ¿Escaecisti la contraseña?
       email address: 'Direición de corréu electrónicu:'
       new password button: Reestablecer contraseña
       help_text: Escribi les señes de corréu qu'usasti pa date d'alta, unviarémoste
         un enllaz que pues usar pa reestablecer la contraseña.

+    create:

       notice email on way: Sentimos que la perdieres :-( pero hai un corréu en camín
         pa que puedas reaniciala ceo.
       notice email cannot find: Nun s'alcontró esa direición de corréu.
       notice email on way: Sentimos que la perdieres :-( pero hai un corréu en camín
         pa que puedas reaniciala ceo.
       notice email cannot find: Nun s'alcontró esa direición de corréu.

-    reset_password:
+    edit:

       title: Reestablecer contraseña
       heading: Reestablecer la contraseña de %{user}
       reset: Reaniciar contraseña
       title: Reestablecer contraseña
       heading: Reestablecer la contraseña de %{user}
       reset: Reaniciar contraseña

-      flash changed: Cambióse la contraseña

       flash token bad: Nun s'alcontró esi token, ¿tendríes de comprobar la URL, seique?
       flash token bad: Nun s'alcontró esi token, ¿tendríes de comprobar la URL, seique?

+    update:
+      flash changed: Cambióse la contraseña

   preferences:
     show:
       edit_preferences: Editar les preferencies
   preferences:
     show:
       edit_preferences: Editar les preferencies


@@ -1704,9 +1706,6 @@ ast:
           footway: Camín peatonal
           rail: Ferrocarril
           subway: Metro
           footway: Camín peatonal
           rail: Ferrocarril
           subway: Metro

-          tram:
-          - Ferrocarril llixeru
-          - tranvía

           cable:
           - Teleféricu
           - telesilla
           cable:
           - Teleféricu
           - telesilla


@@ -1717,14 +1716,15 @@ ast:
           - Aparcamientu d'aviones
           - terminal
           admin: Llende alministrativa
           - Aparcamientu d'aviones
           - terminal
           admin: Llende alministrativa

-          forest: Área forestal
-          wood: Viesca
+          forest:
+          - Área forestal
+          - Viesca

           golf: Campu de golf
           park: Parque
           golf: Campu de golf
           park: Parque

-          resident: Área residencial

           common:
           - Espaciu comunal
           - prau
           common:
           - Espaciu comunal
           - prau

+          resident: Área residencial

           retail: Área de tiendes
           industrial: Área industrial
           commercial: Área comercial
           retail: Área de tiendes
           industrial: Área industrial
           commercial: Área comercial

diff --git a/config/locales/az.yml b/config/locales/az.yml
index 8fc3dd0cc0b685d53a853379fc208ff3f3d35b3e..1005881ba42105833b28dcc7f2ca8c6e2d92f46d 100644 (file)
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -890,15 +890,16 @@ az:
     destroy:
       destroyed: Mesaj silindi
   passwords:
     destroy:
       destroyed: Mesaj silindi
   passwords:

-    lost_password:
+    new:

       title: İtirilmiş parol
       heading: Parolu unutmusan?
       email address: 'E-poçt ünvanları:'
       new password button: Parolu yenilə
       title: İtirilmiş parol
       heading: Parolu unutmusan?
       email address: 'E-poçt ünvanları:'
       new password button: Parolu yenilə

-    reset_password:
+    edit:

       title: Parolu yenilə
       heading: '%{user} üçün parolu yenilə'
       reset: Parolu Yenilə
       title: Parolu yenilə
       heading: '%{user} üçün parolu yenilə'
       reset: Parolu Yenilə

+    update:

       flash changed: Parolun indi dəyişildi.
   profiles:
     edit:
       flash changed: Parolun indi dəyişildi.
   profiles:
     edit:


@@ -985,18 +986,17 @@ az:
           footway: Piyada yolu
           rail: Dəmir yolu
           subway: Metro
           footway: Piyada yolu
           rail: Dəmir yolu
           subway: Metro

-          tram:
-            1: tramvay

           runway:
           - Aeroport uçuş-enmə zolağı
           apron:
             1: terminal
           admin: Administrativ sərhəd
           runway:
           - Aeroport uçuş-enmə zolağı
           apron:
             1: terminal
           admin: Administrativ sərhəd

-          forest: Meşə
+          forest:
+          - Meşə

           park: Park
           park: Park

-          resident: Yaşayış sahəsi

           common:
             1: çəmənlik
           common:
             1: çəmənlik

+          resident: Yaşayış sahəsi

           retail: Ticarət sahəsi
           industrial: Sənaye sahəsi
           commercial: Ticarət sahəsi
           retail: Ticarət sahəsi
           industrial: Sənaye sahəsi
           commercial: Ticarət sahəsi

diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index 7dafad6eff49fb103c38c5c18aaf673c132d75cc..e1f3cc62202564740087d3d8206639353a18d9e1 100644 (file)
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -1025,23 +1025,25 @@ be-Tarask:
     destroy:
       destroyed: Паведамленьне выдаленае
   passwords:
     destroy:
       destroyed: Паведамленьне выдаленае
   passwords:

-    lost_password:
+    new:

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

+    create:

       notice email on way: Шкада, што Вы яго згубілі, але электронны ліст ужо дасланы,
         таму Вы хутка зможаце яго зьмяніць.
       notice email cannot find: Прабачце, не атрымалася знайсьці такога адрасу электроннай
         пошты.
       notice email on way: Шкада, што Вы яго згубілі, але электронны ліст ужо дасланы,
         таму Вы хутка зможаце яго зьмяніць.
       notice email cannot find: Прабачце, не атрымалася знайсьці такога адрасу электроннай
         пошты.

-    reset_password:
+    edit:

       title: Ачысьціць пароль
       heading: Скінуць пароль для %{user}
       reset: Ачысьціць пароль
       title: Ачысьціць пароль
       heading: Скінуць пароль для %{user}
       reset: Ачысьціць пароль

-      flash changed: Ваш пароль быў зьменены.

       flash token bad: Немагчыма знайсьці такі ключ, можа праверце URL-адрас?
       flash token bad: Немагчыма знайсьці такі ключ, можа праверце URL-адрас?

+    update:
+      flash changed: Ваш пароль быў зьменены.

   profiles:
     edit:
       image: Выява
   profiles:
     edit:
       image: Выява


@@ -1167,9 +1169,6 @@ be-Tarask:
           footway: Пешаходная дарога
           rail: Чыгунка
           subway: Мэтро
           footway: Пешаходная дарога
           rail: Чыгунка
           subway: Мэтро

-          tram:
-          - Лінія для лёгкага чыгуначнага транспарту
-          - трамвай

           cable:
           - Канатная дарога
           - крэславы пад’ёмнік
           cable:
           - Канатная дарога
           - крэславы пад’ёмнік


@@ -1180,14 +1179,15 @@ be-Tarask:
           - Пэрон аэрапорта
           - тэрмінал
           admin: Адміністрацыйная мяжа
           - Пэрон аэрапорта
           - тэрмінал
           admin: Адміністрацыйная мяжа

-          forest: Лес
-          wood: Пушча
+          forest:
+          - Лес
+          - Пушча

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

-          resident: Жылы раён

           common:
           - Грамадзкая зямля
           - луг
           common:
           - Грамадзкая зямля
           - луг

+          resident: Жылы раён

           retail: Гандлёвы раён
           industrial: Прамысловы раён
           commercial: Камэрцыйны раён
           retail: Гандлёвы раён
           industrial: Прамысловы раён
           commercial: Камэрцыйны раён

diff --git a/config/locales/be.yml b/config/locales/be.yml
index ac84d783a84c79a02cf4cd9c19bc286ee80c2815..1ba5364c4fe3bc68c7cbb778973e40b11071db92 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1443,22 +1443,24 @@ be:
     destroy:
       destroyed: Паведамленне выдалена
   passwords:
     destroy:
       destroyed: Паведамленне выдалена
   passwords:

-    lost_password:
+    new:

       title: згублены пароль
       heading: Забылі пароль?
       email address: 'Паштовы адрас:'
       new password button: Выслаць мне новы пароль
       help_text: Увядзіце адрас электроннай пошты, які Вы выкарыстоўвалі пры рэгістрацыі,
         і мы вышлем Вам спасылку, якую Вы зможаце выкарыстаць для змены паролю.
       title: згублены пароль
       heading: Забылі пароль?
       email address: 'Паштовы адрас:'
       new password button: Выслаць мне новы пароль
       help_text: Увядзіце адрас электроннай пошты, які Вы выкарыстоўвалі пры рэгістрацыі,
         і мы вышлем Вам спасылку, якую Вы зможаце выкарыстаць для змены паролю.

+    create:

       notice email on way: Жаль, што вы яго згубілі :-( але ліст ужо адпраўлены, і
         вы хутка зможаце яго скінуць.
       notice email cannot find: Немагчыма знайсці гэтакі паштовы адрас, прабачце.
       notice email on way: Жаль, што вы яго згубілі :-( але ліст ужо адпраўлены, і
         вы хутка зможаце яго скінуць.
       notice email cannot find: Немагчыма знайсці гэтакі паштовы адрас, прабачце.

-    reset_password:
+    edit:

       title: скінуць пароль
       heading: Скінуць пароль для %{user}
       reset: 'Скінуць пароль:'
       title: скінуць пароль
       heading: Скінуць пароль для %{user}
       reset: 'Скінуць пароль:'

-      flash changed: Ваш пароль быў зменены.

       flash token bad: Не знайшоў такі токен, можа, праверце URL?
       flash token bad: Не знайшоў такі токен, можа, праверце URL?

+    update:
+      flash changed: Ваш пароль быў зменены.

   profiles:
     edit:
       image: 'Выява:'
   profiles:
     edit:
       image: 'Выява:'


@@ -1719,9 +1721,6 @@ be:
           footway: Пешаходная дарожка
           rail: Чыгунка
           subway: Метро
           footway: Пешаходная дарожка
           rail: Чыгунка
           subway: Метро

-          tram:
-          - Хуткасны трамвай
-          - трамвай

           cable:
           - Канатная дарога
           - Крэсельны пад'ёмнік
           cable:
           - Канатная дарога
           - Крэсельны пад'ёмнік


@@ -1732,14 +1731,15 @@ be:
           - Перон аэрапорта
           - тэрмінал
           admin: Адміністрацыйная мяжа
           - Перон аэрапорта
           - тэрмінал
           admin: Адміністрацыйная мяжа

-          forest: Лес
-          wood: Пушча
+          forest:
+          - Лес
+          - Пушча

           golf: Поле для гольфа
           park: Парк
           golf: Поле для гольфа
           park: Парк

-          resident: Жылы раён

           common:
           - Агульныя
           - луг
           common:
           - Агульныя
           - луг

+          resident: Жылы раён

           retail: Гандлевая плошча
           industrial: Прамысловая зона
           commercial: Камерцыйная зона
           retail: Гандлевая плошча
           industrial: Прамысловая зона
           commercial: Камерцыйная зона

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index e782ec22b0804f74c35f039c9c6d17f7cbd62651..4f6378fd47d79f17503a086dbbe82f121d7af67b 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1377,7 +1377,7 @@ bg:
     destroy:
       destroyed: Съобщението беше изтрито
   passwords:
     destroy:
       destroyed: Съобщението беше изтрито
   passwords:

-    lost_password:
+    new:

       title: Възстановяване на парола
       heading: Забравена парола?
       email address: 'Електронна поща:'
       title: Възстановяване на парола
       heading: Забравена парола?
       email address: 'Електронна поща:'


@@ -1385,11 +1385,13 @@ bg:
       help_text: Въведете имейл адреса, който сте използвали при регистрацията, и
         ние ще Ви изпратим връзка, която можете да използвате, за да промените паролата
         си.
       help_text: Въведете имейл адреса, който сте използвали при регистрацията, и
         ние ще Ви изпратим връзка, която можете да използвате, за да промените паролата
         си.

+    create:

       notice email cannot find: Съжаляваме, но този електронен адрес не е намерен.
       notice email cannot find: Съжаляваме, но този електронен адрес не е намерен.

-    reset_password:
+    edit:

       title: Възстановяване на парола
       heading: Смени Парола за %{user}
       reset: Нулиране на парола
       title: Възстановяване на парола
       heading: Смени Парола за %{user}
       reset: Нулиране на парола

+    update:

       flash changed: Паролата е променена успешно.
   preferences:
     show:
       flash changed: Паролата е променена успешно.
   preferences:
     show:


@@ -1657,9 +1659,6 @@ bg:
           footway: Пътека
           rail: Железен път
           subway: Метро
           footway: Пътека
           rail: Железен път
           subway: Метро

-          tram:
-          - Бърз трамвай
-          - трамвай

           cable:
           - Кабинков лифт
           - седалков лифт
           cable:
           - Кабинков лифт
           - седалков лифт


@@ -1670,14 +1669,15 @@ bg:
           - Летищен перон
           - терминал
           admin: Административна граница
           - Летищен перон
           - терминал
           admin: Административна граница

-          forest: Гора
-          wood: Дървета
+          forest:
+          - Гора
+          - Дървета

           golf: Игрище за голф
           park: Парк
           golf: Игрище за голф
           park: Парк

-          resident: Жилищна зона

           common:
           - Обща
           - ливада
           common:
           - Обща
           - ливада

+          resident: Жилищна зона

           retail: Търговска зона
           industrial: Промишлена зона
           commercial: Търговска зона
           retail: Търговска зона
           industrial: Промишлена зона
           commercial: Търговска зона

diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 6390710480c5bd6c3d08b1cf48c97d31d645e3f1..1095046e490f66888265d60c3dc48ebd952ae9fb 100644 (file)
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -1502,17 +1502,18 @@ bn:
     destroy:
       destroyed: বার্তা মোছা হয়েছে
   passwords:
     destroy:
       destroyed: বার্তা মোছা হয়েছে
   passwords:

-    lost_password:
+    new:

       title: পাসওয়ার্ড ভুলে গেছেন
       heading: পাসওয়ার্ড ভুলে গেছেন?
       email address: 'ইমেইল ঠিকানা:'
       new password button: পাসওয়ার্ড পুনঃনির্ধারণ
       help_text: নিবন্ধনের সময় ব্যবহৃত আপনার ইমেইল ঠিকানাটি লিখুন, ইমেইলের মাধ্যমে
         আমরা একটি লিঙ্ক পাঠাবো যার মাধ্যমে আপনি পাসওয়ার্ড পরিবর্তন করতে পারবেন।
       title: পাসওয়ার্ড ভুলে গেছেন
       heading: পাসওয়ার্ড ভুলে গেছেন?
       email address: 'ইমেইল ঠিকানা:'
       new password button: পাসওয়ার্ড পুনঃনির্ধারণ
       help_text: নিবন্ধনের সময় ব্যবহৃত আপনার ইমেইল ঠিকানাটি লিখুন, ইমেইলের মাধ্যমে
         আমরা একটি লিঙ্ক পাঠাবো যার মাধ্যমে আপনি পাসওয়ার্ড পরিবর্তন করতে পারবেন।

-    reset_password:
+    edit:

       title: পাসওয়ার্ড পুনঃনির্ধারণ
       heading: '%{user} এর পাসওয়ার্ড পুনর্বদল করুন'
       reset: পাসওয়ার্ড পুনঃনির্ধারণ
       title: পাসওয়ার্ড পুনঃনির্ধারণ
       heading: '%{user} এর পাসওয়ার্ড পুনর্বদল করুন'
       reset: পাসওয়ার্ড পুনঃনির্ধারণ

+    update:

       flash changed: আপনার পাসওয়ার্ড পরিবর্তন করা হয়েছে।
   preferences:
     show:
       flash changed: আপনার পাসওয়ার্ড পরিবর্তন করা হয়েছে।
   preferences:
     show:


@@ -1737,26 +1738,36 @@ bn:
           cycleway_local: স্থানীয় সাইকেলের রাস্তা
           footway: ফুটপাথ
           rail: রেলপথ
           cycleway_local: স্থানীয় সাইকেলের রাস্তা
           footway: ফুটপাথ
           rail: রেলপথ

+          train: রেলগাড়ি

           subway: ভূগর্ভস্থ পথ
           subway: ভূগর্ভস্থ পথ

-          tram:
-            1: ট্রাম
+          ferry: ফেরি
+          tram_only: ট্রাম
+          bus: বাস

           cable:
           - ক্যাবল কার
           apron:
             1: টার্মিনাল
           admin: প্রশাসনিক সীমানা
           cable:
           - ক্যাবল কার
           apron:
             1: টার্মিনাল
           admin: প্রশাসনিক সীমানা

-          forest: অরণ্য
-          wood: বন
+          orchard:
+          - ফলবাগিচা
+          forest:
+          - অরণ্য
+          - কাঠ
+          farmland: কৃষিজমি
+          grass:
+            1: তৃণভূমি
+          sand: বালু

           golf: গল্ফ মাঠ
           park: উদ্যান
           golf: গল্ফ মাঠ
           park: উদ্যান

-          resident: আবাসিক এলাকা

           common:
           - সাধারণ
           common:
           - সাধারণ

+          resident: আবাসিক এলাকা

           industrial: শিল্পাঞ্চল
           commercial: বাণিজ্যিক এলাকা
           lake:
           - হ্রদ
           - জলাধার
           industrial: শিল্পাঞ্চল
           commercial: বাণিজ্যিক এলাকা
           lake:
           - হ্রদ
           - জলাধার

+          glacier: হিমবাহ

           farm: খামার
           cemetery: কবরস্থান
           centre: ক্রীড়া কেন্দ্র
           farm: খামার
           cemetery: কবরস্থান
           centre: ক্রীড়া কেন্দ্র


@@ -1767,6 +1778,8 @@ bn:
           station: রেল স্টেশন
           summit:
             1: শৃঙ্গ
           station: রেল স্টেশন
           summit:
             1: শৃঙ্গ

+          bus_stop: বাস স্টপ
+          stop: স্টপ

           bicycle_shop: সাইকেলের দোকান
           bicycle_parking: সাইকেল পার্কিং
           toilets: পায়খানা
           bicycle_shop: সাইকেলের দোকান
           bicycle_parking: সাইকেল পার্কিং
           toilets: পায়খানা

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 1a313b0652d304447ab69d720c0ecfcc918c10db..5eb5192e5a12e10f25ab065d99752152dcccb987 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -15,6 +15,7 @@
 # Author: McDutchie
 # Author: Nemo bis
 # Author: Shirayuki
 # Author: McDutchie
 # Author: Nemo bis
 # Author: Shirayuki

+# Author: Troer56

 # Author: Y-M D
 ---
 br:
 # Author: Y-M D
 ---
 br:


@@ -1818,22 +1819,24 @@ br:
     destroy:
       destroyed: Kemennadenn dilamet
   passwords:
     destroy:
       destroyed: Kemennadenn dilamet
   passwords:

-    lost_password:
+    new:

       title: Ger-tremen kollet
       heading: Ankouaet hoc'h eus ho ker-tremen ?
       email address: 'Chomlec''h postel :'
       new password button: Adderaouekaat ar ger-tremen
       help_text: Ebarzhit ar chomlec'h postel ho poa implijet evit en em enskrivañ,
         kaset e vo deoc'h ul liamm a c'hallot implijout evit adderaouekaat ho ker-tremen.
       title: Ger-tremen kollet
       heading: Ankouaet hoc'h eus ho ker-tremen ?
       email address: 'Chomlec''h postel :'
       new password button: Adderaouekaat ar ger-tremen
       help_text: Ebarzhit ar chomlec'h postel ho poa implijet evit en em enskrivañ,
         kaset e vo deoc'h ul liamm a c'hallot implijout evit adderaouekaat ho ker-tremen.

+    create:

       notice email on way: Kaset ez eus bet ur postel deoc'h evit adderaouekaat ho
         ker-tremen.
       notice email cannot find: Ho tigarez, n'eo ket bet kavet ar chomlec'h postel-se.
       notice email on way: Kaset ez eus bet ur postel deoc'h evit adderaouekaat ho
         ker-tremen.
       notice email cannot find: Ho tigarez, n'eo ket bet kavet ar chomlec'h postel-se.

-    reset_password:
+    edit:

       title: Adderaouekaat ar ger-tremen
       heading: Adderaouekaat ar ger-tremen evit %{user}
       reset: Adderaouekaat ar ger-tremen
       title: Adderaouekaat ar ger-tremen
       heading: Adderaouekaat ar ger-tremen evit %{user}
       reset: Adderaouekaat ar ger-tremen

-      flash changed: Cheñchet eo bet ho ker-tremen.

       flash token bad: N'eo ket bet kavet ar jedouer-se, gwiriañ an URL marteze ?
       flash token bad: N'eo ket bet kavet ar jedouer-se, gwiriañ an URL marteze ?

+    update:
+      flash changed: Cheñchet eo bet ho ker-tremen.

   preferences:
     show:
       title: Ma fenndibaboù
   preferences:
     show:
       title: Ma fenndibaboù


@@ -2224,10 +2227,13 @@ br:
           cycleway_local: roudenn lec'hel evit an divrodegoù
           footway: Hent evit an dud war droad
           rail: Hent-houarn
           cycleway_local: roudenn lec'hel evit an divrodegoù
           footway: Hent evit an dud war droad
           rail: Hent-houarn

+          train: Tren

           subway: Linenn vetro
           subway: Linenn vetro

-          tram:
-          - tramgarr
-          - tramgarr
+          ferry: Karrlistri
+          light_rail: Metro skañv
+          tram_only: Tramgarr
+          trolleybus: Trollebus
+          bus: Karr-boutin

           cable:
           - Teleferik
           - fungador
           cable:
           - Teleferik
           - fungador


@@ -2238,22 +2244,35 @@ br:
           - Roudenn aerborzh
           - termenva
           admin: Bevenn velestradurel
           - Roudenn aerborzh
           - termenva
           admin: Bevenn velestradurel

-          forest: Koad
-          wood: Koad
+          orchard:
+          - Gwerje
+          - gwinieg
+          forest:
+          - Koad
+          - koad
+          farmland: Tachenn labour-douar
+          grass:
+          - Geot
+          - prad
+          bare_rock: Roc'h noazh
+          sand: Traezh

           golf: Tachenn golf
           park: Park
           golf: Tachenn golf
           park: Park

-          resident: Takad annez

           common:
           - prad
           - prad
           - liorzh
           common:
           - prad
           - prad
           - liorzh

+          built_up: Takad savet
+          resident: Takad annez

           retail: Takad kenwerzh
           industrial: Takad greantel
           commercial: Takad kenwerzhel
           heathland: Lanneier
           retail: Takad kenwerzh
           industrial: Takad greantel
           commercial: Takad kenwerzhel
           heathland: Lanneier

+          scrubland: Strouezheg

           lake:
           - Lenn
           - mirlec'h
           lake:
           - Lenn
           - mirlec'h

+          glacier: Skorneg

           farm: Ti-feurm
           brownfield: Takad greanterezh
           cemetery: Bered
           farm: Ti-feurm
           brownfield: Takad greanterezh
           cemetery: Bered


@@ -2275,6 +2294,8 @@ br:
           private: Moned prevez
           destination: Moned d'ar pal
           construction: Hentoù war ar stern
           private: Moned prevez
           destination: Moned d'ar pal
           construction: Hentoù war ar stern

+          bus_stop: Arsav karr-boutin
+          stop: Arsav

           bicycle_shop: Stal varc'hoù-houarn
           bicycle_parking: Parklec'h belioù
           toilets: Privezioù
           bicycle_shop: Stal varc'hoù-houarn
           bicycle_parking: Parklec'h belioù
           toilets: Privezioù


@@ -2285,6 +2306,10 @@ br:
         Setu amañ un nebeud displegadennoù diwar-benn an traoù pouezusañ da c'houzout.
       whats_on_the_map:
         title: Petra zo war ar gartenn
         Setu amañ un nebeud displegadennoù diwar-benn an traoù pouezusañ da c'houzout.
       whats_on_the_map:
         title: Petra zo war ar gartenn

+        on_the_map_html: |-
+          OpenStreetMap zo ul lec'h evit kartennaouiñ traoù %{real_and_current} war un dro
+          -
+          Ennañ ez eus milionoù a savadurioù, a hentoù, hag a vunudoù all diwar-benn lec'hioù. Gallout a rit kartennaouiñ forzh peseurt tra eus ar bed gwirion hag a zedenn ac'hanoc'h.

         real_and_current: gwir hag a-vremañ
         off_the_map_html: Ar pezh %{doesnt} avat eo ar roadennoù evit notennoù roet
           gant an dud, elfennoù istorel pe martezeüs, hag ar roadennoù a zo dindan
         real_and_current: gwir hag a-vremañ
         off_the_map_html: Ar pezh %{doesnt} avat eo ar roadennoù evit notennoù roet
           gant an dud, elfennoù istorel pe martezeüs, hag ar roadennoù a zo dindan


@@ -2659,6 +2684,7 @@ br:
       role:
         administrator: Ur merour eo an implijer-mañ
         moderator: Un habaskaer eo an implijer-mañ
       role:
         administrator: Ur merour eo an implijer-mañ
         moderator: Un habaskaer eo an implijer-mañ

+        importer: Un enporzhier/ez eo an implijer/ez-mañ

         grant:
           administrator: Reiñ ar moned merour
           moderator: Reiñ ar moned habaskaer
         grant:
           administrator: Reiñ ar moned merour
           moderator: Reiñ ar moned habaskaer

diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 9d3df0ec2ad599cb74be4a50b0f76f7020d9065e..c3bff741d75b876725a67fa035ebc6c41577840f 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1017,22 +1017,24 @@ bs:
     destroy:
       destroyed: Poruka izbrisana
   passwords:
     destroy:
       destroyed: Poruka izbrisana
   passwords:

-    lost_password:
+    new:

       title: Izgubljena lozinka
       heading: Zaboravljena lozinka?
       email address: 'Adresa e-pošte:'
       new password button: Ponovno postavljanje lozinke
       help_text: Unesite e-mail adresu koju ste koristili za otvaranje računa i poslaćemo
         Vam link kojim možete ponovo postaviti lozinku.
       title: Izgubljena lozinka
       heading: Zaboravljena lozinka?
       email address: 'Adresa e-pošte:'
       new password button: Ponovno postavljanje lozinke
       help_text: Unesite e-mail adresu koju ste koristili za otvaranje računa i poslaćemo
         Vam link kojim možete ponovo postaviti lozinku.

+    create:

       notice email on way: Žao mi je što ste je izgubili :-( ali e-mail je na putu
         tako da je možete pononvo postaviti uskoro.
       notice email cannot find: Ne možemo pronaći tu e-mail adresu, žao nam je.
       notice email on way: Žao mi je što ste je izgubili :-( ali e-mail je na putu
         tako da je možete pononvo postaviti uskoro.
       notice email cannot find: Ne možemo pronaći tu e-mail adresu, žao nam je.

-    reset_password:
+    edit:

       title: Ponovno postavljanje lozinke
       heading: Ponovno postavljanje lozinke za %{user}
       reset: Ponovno postavljanje lozinke
       title: Ponovno postavljanje lozinke
       heading: Ponovno postavljanje lozinke za %{user}
       reset: Ponovno postavljanje lozinke

-      flash changed: Vaša lozinka je promjenjena.

       flash token bad: Niste pronašli tz značku, možda da provjerite URL?
       flash token bad: Niste pronašli tz značku, možda da provjerite URL?

+    update:
+      flash changed: Vaša lozinka je promjenjena.

   profiles:
     edit:
       image: 'Slika:'
   profiles:
     edit:
       image: 'Slika:'


@@ -1194,9 +1196,6 @@ bs:
           footway: Pješačka staza
           rail: Željeznica
           subway: Podzemna željeznica
           footway: Pješačka staza
           rail: Željeznica
           subway: Podzemna željeznica

-          tram:
-          - Lahka željeznica
-          - tramvaj

           cable:
           - Kabinska žičara
           - Uspinjača sa naslonjačem
           cable:
           - Kabinska žičara
           - Uspinjača sa naslonjačem


@@ -1207,14 +1206,15 @@ bs:
           - Parking za avione
           - terminal
           admin: Administrativna granica
           - Parking za avione
           - terminal
           admin: Administrativna granica

-          forest: Šume (održavane, od šumarije)
-          wood: Šume (prirodne, neodržavane)
+          forest:
+          - Šume (održavane, od šumarije)
+          - Šume (prirodne, neodržavane)

           golf: Golf teren
           park: Park
           golf: Golf teren
           park: Park

-          resident: Stambeno područje

           common:
           - Travnjaci
           - Livada
           common:
           - Travnjaci
           - Livada

+          resident: Stambeno područje

           retail: Maloprodajno područje
           industrial: Industrijsko područje
           commercial: Poslovno područje
           retail: Maloprodajno područje
           industrial: Industrijsko područje
           commercial: Poslovno područje

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 03219768c1a4603b6add84c00bf9da5386fb4231..a2e56911158f2382994b323dda771be5c1d1613b 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1825,22 +1825,24 @@ ca:
     destroy:
       destroyed: Missatge suprimit
   passwords:
     destroy:
       destroyed: Missatge suprimit
   passwords:

-    lost_password:
+    new:

       title: Contrasenya perduda
       heading: Heu oblidat la contrasenya?
       email address: 'Adreça de correu electrònic:'
       new password button: Restableix la contrasenya
       help_text: Introduïu l'adreça de correu electrònic que vau utilitzar per registrar-vos;
         us hi enviarem un enllaç per a restablir la contrasenya.
       title: Contrasenya perduda
       heading: Heu oblidat la contrasenya?
       email address: 'Adreça de correu electrònic:'
       new password button: Restableix la contrasenya
       help_text: Introduïu l'adreça de correu electrònic que vau utilitzar per registrar-vos;
         us hi enviarem un enllaç per a restablir la contrasenya.

+    create:

       notice email on way: Lamentem que l'hàgiu perdut :-( però ja us hem enviat un
         correu i la podreu restablir ben aviat.
       notice email cannot find: No s'ha trobat aquesta adreça de correu.
       notice email on way: Lamentem que l'hàgiu perdut :-( però ja us hem enviat un
         correu i la podreu restablir ben aviat.
       notice email cannot find: No s'ha trobat aquesta adreça de correu.

-    reset_password:
+    edit:

       title: Restableix la contrasenya
       heading: Restableix la contrasenya per a %{user}
       reset: Restableix la contrasenya
       title: Restableix la contrasenya
       heading: Restableix la contrasenya per a %{user}
       reset: Restableix la contrasenya

-      flash changed: S'ha canviat la contrasenya.

       flash token bad: No s'ha trobat el testimoni. Comproveu l'URL.
       flash token bad: No s'ha trobat el testimoni. Comproveu l'URL.

+    update:
+      flash changed: S'ha canviat la contrasenya.

   preferences:
     show:
       title: Les meves preferències
   preferences:
     show:
       title: Les meves preferències


@@ -2288,9 +2290,6 @@ ca:
           footway: Via de vianants
           rail: Ferrocarril
           subway: Metro
           footway: Via de vianants
           rail: Ferrocarril
           subway: Metro

-          tram:
-          - Tren lleuger
-          - tramvia

           cable:
           - Telefèric
           - telecadira
           cable:
           - Telefèric
           - telecadira


@@ -2301,15 +2300,16 @@ ca:
           - Estacionament d'avions
           - terminal
           admin: Límit administratiu
           - Estacionament d'avions
           - terminal
           admin: Límit administratiu

-          forest: Bosc
-          wood: Fusta
+          forest:
+          - Bosc
+          - Fusta

           golf: Camp de golf
           park: Parc
           golf: Camp de golf
           park: Parc

-          resident: Zona residencial

           common:
           - Àrea comunal
           - prat
           - jardí
           common:
           - Àrea comunal
           - prat
           - jardí

+          resident: Zona residencial

           retail: Àrea comercial
           industrial: Zona industrial
           commercial: Zona comercial
           retail: Àrea comercial
           industrial: Zona industrial
           commercial: Zona comercial

diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index 7073f6b085dd74096b9d9c91b0dd8cbf795d7d80..b8f68465f2b769595306c283906a486dbfa92bfd 100644 (file)
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -760,15 +760,16 @@ ce:
     sent_message_summary:
       destroy_button: ДӀайаккха
   passwords:
     sent_message_summary:
       destroy_button: ДӀайаккха
   passwords:

-    lost_password:
+    new:

       title: Пароль меттахӀоттор
       heading: Йицйелла пароль?
       email address: 'Электронан поштан адрес:'
       new password button: Керла пароль кхосса соьга
       title: Пароль меттахӀоттор
       heading: Йицйелла пароль?
       email address: 'Электронан поштан адрес:'
       new password button: Керла пароль кхосса соьга

-    reset_password:
+    edit:

       title: Йуха а йазйе пароль
       heading: Йуха а йазйе пароль %{user}
       reset: ХӀоттайе пароль
       title: Йуха а йазйе пароль
       heading: Йуха а йазйе пароль %{user}
       reset: ХӀоттайе пароль

+    update:

       flash changed: Хьан пароль хийцина.
   profiles:
     edit:
       flash changed: Хьан пароль хийцина.
   profiles:
     edit:

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 5323b908973dbe96c698163b185c22672132c4b9..fc61154623c3e56e88bbef45ce3c3cf6244036a7 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -883,7 +883,7 @@ cs:
           "yes": Most
         building:
           apartment: Apartmán
           "yes": Most
         building:
           apartment: Apartmán

-          apartments: Apartmány
+          apartments: Bytový dům

           barn: Stodola
           bungalow: Bungalov
           cabin: Chatka
           barn: Stodola
           bungalow: Bungalov
           cabin: Chatka


@@ -1896,22 +1896,24 @@ cs:
     destroy:
       destroyed: Zpráva smazána
   passwords:
     destroy:
       destroyed: Zpráva smazána
   passwords:

-    lost_password:
+    new:

       title: Ztracené heslo
       heading: Zapomněli jste heslo?
       email address: 'E-mailová adresa:'
       new password button: Resetovat heslo
       help_text: Zadejte e-mailovou adresu, pod kterou jste se zaregistrovali, my
         vám na ni pošleme odkaz, pomocí kterého si nastavíte nové heslo.
       title: Ztracené heslo
       heading: Zapomněli jste heslo?
       email address: 'E-mailová adresa:'
       new password button: Resetovat heslo
       help_text: Zadejte e-mailovou adresu, pod kterou jste se zaregistrovali, my
         vám na ni pošleme odkaz, pomocí kterého si nastavíte nové heslo.

+    create:

       notice email on way: Škoda zapomenutého hesla :-( e-mail už je na cestě, takže
         si budete brzy moci zvolit nové.
       notice email cannot find: Je mi líto, ale nemohu najít tuto e-mailovou adresu.
       notice email on way: Škoda zapomenutého hesla :-( e-mail už je na cestě, takže
         si budete brzy moci zvolit nové.
       notice email cannot find: Je mi líto, ale nemohu najít tuto e-mailovou adresu.

-    reset_password:
+    edit:

       title: Obnovit heslo
       heading: Resetovat heslo pro %{user}
       reset: Resetovat heslo
       title: Obnovit heslo
       heading: Resetovat heslo pro %{user}
       reset: Resetovat heslo

-      flash changed: Vaše heslo bylo změněno.

       flash token bad: Odpovídající kód nebyl nalezen, možná zkontrolujte URL?
       flash token bad: Odpovídající kód nebyl nalezen, možná zkontrolujte URL?

+    update:
+      flash changed: Vaše heslo bylo změněno.

   preferences:
     show:
       title: Moje preference
   preferences:
     show:
       title: Moje preference


@@ -2393,9 +2395,6 @@ cs:
           footway: Pěší cesta
           rail: Železnice
           subway: Metro
           footway: Pěší cesta
           rail: Železnice
           subway: Metro

-          tram:
-          - Rychlodráha
-          - tramvaj

           cable:
           - Lanovka
           - sedačková lanovka
           cable:
           - Lanovka
           - sedačková lanovka


@@ -2406,15 +2405,16 @@ cs:
           - Letištní odbavovací plocha
           - terminál
           admin: Administrativní hranice
           - Letištní odbavovací plocha
           - terminál
           admin: Administrativní hranice

-          forest: Les
-          wood: Les
+          forest:
+          - Les
+          - Les

           golf: Golfové hřiště
           park: Park
           golf: Golfové hřiště
           park: Park

-          resident: Obytná oblast

           common:
           - Pastvina
           - louka
           - zahrada
           common:
           - Pastvina
           - louka
           - zahrada

+          resident: Obytná oblast

           retail: Nákupní oblast
           industrial: Průmyslová oblast
           commercial: Kancelářská oblast
           retail: Nákupní oblast
           industrial: Průmyslová oblast
           commercial: Kancelářská oblast

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index aa673f8315f443f783e7f25072e09668fb928c03..bef5eccd6de3ef51753a30f884a495305eed1109 100644 (file)
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1605,16 +1605,18 @@ cy:
     destroy:
       destroyed: Neges wedi'i dileu
   passwords:
     destroy:
       destroyed: Neges wedi'i dileu
   passwords:

-    lost_password:
+    new:

       title: Ailosod cyfrinair
       heading: Wedi anghofio'ch cyfrinair?
       email address: 'Cyfeiriad e-bost:'
       new password button: Ailosod cyfrinair
       title: Ailosod cyfrinair
       heading: Wedi anghofio'ch cyfrinair?
       email address: 'Cyfeiriad e-bost:'
       new password button: Ailosod cyfrinair

+    create:

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

-    reset_password:
+    edit:

       title: Ailosod cyfrinair
       heading: Ailosod cyfrinair ar gyfer %{user}
       reset: Ailosod cyfrinair
       title: Ailosod cyfrinair
       heading: Ailosod cyfrinair ar gyfer %{user}
       reset: Ailosod cyfrinair

+    update:

       flash changed: Mae eich cyfrinair wedi'i newid.
   preferences:
     show:
       flash changed: Mae eich cyfrinair wedi'i newid.
   preferences:
     show:


@@ -1925,9 +1927,6 @@ cy:
           footway: Troedffordd
           rail: Rheilffordd
           subway: Trenau tanddaear
           footway: Troedffordd
           rail: Rheilffordd
           subway: Trenau tanddaear

-          tram:
-          - Rheilffordd ysgafn
-          - dram

           cable:
           - Car cebl
           - lifft cadair
           cable:
           - Car cebl
           - lifft cadair


@@ -1938,15 +1937,16 @@ cy:
           - Llain
           - therminws maes awyr
           admin: Ffin gweinyddol
           - Llain
           - therminws maes awyr
           admin: Ffin gweinyddol

-          forest: Coedwig
-          wood: Coedlan
+          forest:
+          - Coedwig
+          - Coedlan

           golf: Maes golff
           park: Parc
           golf: Maes golff
           park: Parc

-          resident: Ardal breswyl

           common:
           - Comin
           - gwaun
           - gardd
           common:
           - Comin
           - gwaun
           - gardd

+          resident: Ardal breswyl

           retail: Ardal adwerthu
           industrial: Ardal ddiwydiannol
           commercial: Ardal fasnachol
           retail: Ardal adwerthu
           industrial: Ardal ddiwydiannol
           commercial: Ardal fasnachol

diff --git a/config/locales/da.yml b/config/locales/da.yml
index bc01d8f6e0ffdda8980e5c76b521bdf3927029d3..a1e1c4524f89d2b1d17b0b4ed6b156f43f827be5 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1839,22 +1839,24 @@ da:
     destroy:
       destroyed: Besked slettet
   passwords:
     destroy:
       destroyed: Besked slettet
   passwords:

-    lost_password:
+    new:

       title: Glemt adgangskode
       heading: Glemt adgangskode?
       email address: 'E-mailadresse:'
       new password button: Nulstil adgangskode
       help_text: Indtast e-mailadressen du brugte da du oprettede kontoen. Vi sender
         et link til den som du kan bruge til at nulstille din adgangskode.
       title: Glemt adgangskode
       heading: Glemt adgangskode?
       email address: 'E-mailadresse:'
       new password button: Nulstil adgangskode
       help_text: Indtast e-mailadressen du brugte da du oprettede kontoen. Vi sender
         et link til den som du kan bruge til at nulstille din adgangskode.

+    create:

       notice email on way: Synd du har glemt den, men en e-mail er på vej så du kan
         snart indstille en ny.
       notice email cannot find: Kunne ikke finde den e-mailadresse, beklager.
       notice email on way: Synd du har glemt den, men en e-mail er på vej så du kan
         snart indstille en ny.
       notice email cannot find: Kunne ikke finde den e-mailadresse, beklager.

-    reset_password:
+    edit:

       title: Nulstil adgangskode
       heading: Nulstil adgangskode for %{user}
       reset: Nulstil adgangskode
       title: Nulstil adgangskode
       heading: Nulstil adgangskode for %{user}
       reset: Nulstil adgangskode

-      flash changed: Din adgangskode er ændret.

       flash token bad: Kunne ikke finde denne nøgle, prøv at kontrollere URL'en?
       flash token bad: Kunne ikke finde denne nøgle, prøv at kontrollere URL'en?

+    update:
+      flash changed: Din adgangskode er ændret.

   preferences:
     show:
       title: Mine præferencer
   preferences:
     show:
       title: Mine præferencer


@@ -2330,10 +2332,11 @@ da:
           cycleway_local: Lokal cykelsti
           footway: Gangsti
           rail: Jernbane
           cycleway_local: Lokal cykelsti
           footway: Gangsti
           rail: Jernbane

+          train: Tog

           subway: Undergrundsbane
           subway: Undergrundsbane

-          tram:
-          - Letbane
-          - sporvogn
+          ferry: Færge
+          light_rail: Letbane
+          bus: Bus

           cable:
           - Kabelvogn
           - stolelift
           cable:
           - Kabelvogn
           - stolelift


@@ -2344,15 +2347,16 @@ da:
           - Lufthavnsforplads
           - terminal
           admin: Administrativ grænse
           - Lufthavnsforplads
           - terminal
           admin: Administrativ grænse

-          forest: Skov
-          wood: Skov
+          forest:
+          - Skov
+          - Skov

           golf: Golfbane
           park: Park
           golf: Golfbane
           park: Park

-          resident: Boligområde

           common:
           - Fælled
           - eng
           - have
           common:
           - Fælled
           - eng
           - have

+          resident: Boligområde

           retail: Detailhandelsområde
           industrial: Industriområde
           commercial: Erhvervsområde
           retail: Detailhandelsområde
           industrial: Industriområde
           commercial: Erhvervsområde


@@ -2381,6 +2385,8 @@ da:
           private: Privat adgang
           destination: Ærindekørsel tilladt
           construction: Veje under konstruktion
           private: Privat adgang
           destination: Ærindekørsel tilladt
           construction: Veje under konstruktion

+          bus_stop: Busstop
+          stop: Stop

           bicycle_shop: Cykelhandler
           bicycle_parking: Cykelparkering
           toilets: Toiletter
           bicycle_shop: Cykelhandler
           bicycle_parking: Cykelparkering
           toilets: Toiletter

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 7dbbc0465bf86443eb8eb370cdf65938f58d3012..771077d16ad0edfa8645f99a4015d73df8d9d773 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -96,6 +96,7 @@
 # Author: The Evil IP address
 # Author: ThePiscin
 # Author: Thomas Bohn
 # Author: The Evil IP address
 # Author: ThePiscin
 # Author: Thomas Bohn

+# Author: Til

 # Author: Timonade
 # Author: Umherirrender
 # Author: Unkn0wnCat
 # Author: Timonade
 # Author: Umherirrender
 # Author: Unkn0wnCat


@@ -1916,7 +1917,7 @@ de:
     destroy:
       destroyed: Nachricht gelöscht
   passwords:
     destroy:
       destroyed: Nachricht gelöscht
   passwords:

-    lost_password:
+    new:

       title: Passwort vergessen
       heading: Passwort vergessen?
       email address: 'E-Mail-Adresse:'
       title: Passwort vergessen
       heading: Passwort vergessen?
       email address: 'E-Mail-Adresse:'


@@ -1924,17 +1925,19 @@ de:
       help_text: Bitte gib deine E-Mail-Adresse ein, mit der du dich angemeldet hast.
         Wir werden dir dann einen Link schicken, mit dem du dein Passwort zurücksetzen
         kannst.
       help_text: Bitte gib deine E-Mail-Adresse ein, mit der du dich angemeldet hast.
         Wir werden dir dann einen Link schicken, mit dem du dein Passwort zurücksetzen
         kannst.

+    create:

       notice email on way: Eine E-Mail mit Hinweisen zum Zurücksetzen des Passworts
         wurde an dich versandt.
       notice email cannot find: Wir konnten die E-Mail-Adresse nicht finden. Du hast
         dich möglicherweise vertippt oder mit einer anderen E-Mail-Adresse angemeldet.
       notice email on way: Eine E-Mail mit Hinweisen zum Zurücksetzen des Passworts
         wurde an dich versandt.
       notice email cannot find: Wir konnten die E-Mail-Adresse nicht finden. Du hast
         dich möglicherweise vertippt oder mit einer anderen E-Mail-Adresse angemeldet.

-    reset_password:
+    edit:

       title: Passwort zurücksetzen
       heading: Passwort für %{user} zurücksetzen
       reset: Passwort zurücksetzen
       title: Passwort zurücksetzen
       heading: Passwort für %{user} zurücksetzen
       reset: Passwort zurücksetzen

-      flash changed: Dein Passwort wurde geändert.

       flash token bad: Wir konnten dieses Kürzel leider nicht finden. Du hast dich
         möglicherweise vertippt oder du bist einem ungültigem Link gefolgt.
       flash token bad: Wir konnten dieses Kürzel leider nicht finden. Du hast dich
         möglicherweise vertippt oder du bist einem ungültigem Link gefolgt.

+    update:
+      flash changed: Dein Passwort wurde geändert.

   preferences:
     show:
       title: Benutzereinstellungen
   preferences:
     show:
       title: Benutzereinstellungen


@@ -2409,9 +2412,6 @@ de:
           footway: Fußweg
           rail: Eisenbahn
           subway: U-Bahn
           footway: Fußweg
           rail: Eisenbahn
           subway: U-Bahn

-          tram:
-          - Stadtbahn
-          - Straßenbahn

           cable:
           - Seilbahn
           - Sessellift
           cable:
           - Seilbahn
           - Sessellift


@@ -2422,15 +2422,16 @@ de:
           - Flughafenvorfeld
           - Terminal
           admin: Landesgrenzen, sonstige Grenzen
           - Flughafenvorfeld
           - Terminal
           admin: Landesgrenzen, sonstige Grenzen

-          forest: Wald
-          wood: Wald
+          forest:
+          - Wald
+          - Wald

           golf: Golfplatz
           park: Park
           golf: Golfplatz
           park: Park

-          resident: Wohngebiet

           common:
           - öffentliche Grünfläche (brit.)
           - Wiese
           - Garten
           common:
           - öffentliche Grünfläche (brit.)
           - Wiese
           - Garten

+          resident: Wohngebiet

           retail: Einkaufszentrum
           industrial: Industriegebiet
           commercial: Gewerbegebiet
           retail: Einkaufszentrum
           industrial: Industriegebiet
           commercial: Gewerbegebiet


@@ -2809,9 +2810,9 @@ de:
       title: Bedingungen
       heading: Bedingungen
       heading_ct: Bedingungen für Mitwirkende
       title: Bedingungen
       heading: Bedingungen
       heading_ct: Bedingungen für Mitwirkende

-      read and accept with tou: Lese bitte die Bedingungen für Mitwirkende, wie auch
-        unsere Nutzngsbedingungen und bestätige dies jeweils mit einem Häkchen und
-        klicke dann auf den "Weiter"-Knopf.
+      read and accept with tou: Lies bitte die Bedingungen für Mitwirkende und die
+        Nutzungsbedingungen, bestätige dies jeweils mit einem Häkchen und klicke dann
+        auf den "Weiter"-Knopf.

       contributor_terms_explain: Diese Vereinbarung definiert die Bedingungen für
         deine bestehenden und zukünftigen Beiträge.
       read_ct: Ich habe obige Bedingungen für Mitwirkende gelesen und stimme ihnen
       contributor_terms_explain: Diese Vereinbarung definiert die Bedingungen für
         deine bestehenden und zukünftigen Beiträge.
       read_ct: Ich habe obige Bedingungen für Mitwirkende gelesen und stimme ihnen

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 0081b009abf0a2cb306d4c25da02ac42f2126dcf..cb0df309e1a53cd1fc9d0454bd6e89ace60f6b6e 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -827,12 +827,12 @@ diq:
     sent_message_summary:
       destroy_button: Bestere
   passwords:
     sent_message_summary:
       destroy_button: Bestere
   passwords:

-    lost_password:
+    new:

       title: Parolaya vınibyayi
       heading: To parola ke xo vira?
       email address: 'Adresa e-postey:'
       new password button: Parola reset ke
       title: Parolaya vınibyayi
       heading: To parola ke xo vira?
       email address: 'Adresa e-postey:'
       new password button: Parola reset ke

-    reset_password:
+    edit:

       title: Parola reset ke
       heading: Parolay %{user} reset ke
       reset: Parola reset ke
       title: Parola reset ke
       heading: Parolay %{user} reset ke
       reset: Parola reset ke


@@ -912,8 +912,9 @@ diq:
           cycleway: Raya Bisiklet
           apron:
             1: terminal
           cycleway: Raya Bisiklet
           apron:
             1: terminal

-          forest: Mêşe
-          wood: Meşe
+          forest:
+          - Mêşe
+          - Meşe

           golf: Saxay Golfi
           park: Perk
           common:
           golf: Saxay Golfi
           park: Perk
           common:

diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index 6c054f3383b3b4bf4ca0e863794b7156f366bb9a..cecb54c52abf7e6aa94b995457c18c0c45665d77 100644 (file)
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -1058,22 +1058,24 @@ dsb:
     destroy:
       destroyed: Powěsć wulašowana
   passwords:
     destroy:
       destroyed: Powěsć wulašowana
   passwords:

-    lost_password:
+    new:

       title: Zabyte gronidło
       heading: Sy gronidło zabył?
       email address: 'E-mailowa adresa:'
       new password button: Gronidło slědk stajiś
       help_text: Zapódaj e-mailowu adresu, kótaruž sy za registrěrowanje wužył, pósćelomy
         wótkaz na nju, kótaryž móžoš wužywaś, aby swójo gronidło slědk stajił.
       title: Zabyte gronidło
       heading: Sy gronidło zabył?
       email address: 'E-mailowa adresa:'
       new password button: Gronidło slědk stajiś
       help_text: Zapódaj e-mailowu adresu, kótaruž sy za registrěrowanje wužył, pósćelomy
         wótkaz na nju, kótaryž móžoš wužywaś, aby swójo gronidło slědk stajił.

+    create:

       notice email on way: Bóžko sy jo zabył :-(, ale e-mail jo k tebje ducy, tak
         až móžoš jo skóro slědk stajiś.
       notice email cannot find: Bóžko ta e-mailowa adresa njejo se namakała.
       notice email on way: Bóžko sy jo zabył :-(, ale e-mail jo k tebje ducy, tak
         až móžoš jo skóro slědk stajiś.
       notice email cannot find: Bóžko ta e-mailowa adresa njejo se namakała.

-    reset_password:
+    edit:

       title: Gronidło slědk stajiś
       heading: Gronidło za %{user} slědk stajiś
       reset: Gronidło slědk stajiś
       title: Gronidło slědk stajiś
       heading: Gronidło za %{user} slědk stajiś
       reset: Gronidło slědk stajiś

-      flash changed: Twójo gronidło jo se změniło.

       flash token bad: Njejo móžno było ten token namakaś, pšosym pśekontrolěruj URL.
       flash token bad: Njejo móžno było ten token namakaś, pšosym pśekontrolěruj URL.

+    update:
+      flash changed: Twójo gronidło jo se změniło.

   profiles:
     edit:
       image: 'Wobraz:'
   profiles:
     edit:
       image: 'Wobraz:'


@@ -1265,9 +1267,6 @@ dsb:
           footway: Drožka
           rail: Zeleznica
           subway: Pódzemska
           footway: Drožka
           rail: Zeleznica
           subway: Pódzemska

-          tram:
-          - Měsćańska zeleznica
-          - elektriska

           cable:
           - Kablowa elektriska
           - sedłowy lift
           cable:
           - Kablowa elektriska
           - sedłowy lift


@@ -1278,14 +1277,15 @@ dsb:
           - Pśedpólo lětanišća
           - terminal
           admin: Zastojnstwowa granica
           - Pśedpólo lětanišća
           - terminal
           admin: Zastojnstwowa granica

-          forest: Góla
-          wood: Lěs
+          forest:
+          - Góla
+          - Lěs

           golf: Golfowišćo
           park: Park
           golf: Golfowišćo
           park: Park

-          resident: Bydleński wobcerk

           common:
           - Powšykny
           - łuka
           common:
           - Powšykny
           - łuka

+          resident: Bydleński wobcerk

           retail: Nakupowanišćo
           industrial: Industrijowy wobcerk
           commercial: Źěłarstwowy wobcerk
           retail: Nakupowanišćo
           industrial: Industrijowy wobcerk
           commercial: Źěłarstwowy wobcerk

diff --git a/config/locales/el.yml b/config/locales/el.yml
index ea8f011e9ebbffc12f63a38e33a716e8b8f0f6d7..b69b339dee1bab5fb5f31305a7e05513f1ccdb88 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -201,7 +201,7 @@ el:
           γι' αυτό προσπαθήστε να χρησιμοποιήσετε απλούς και κατανοητούς όρους.
         needs_view: Πρέπει ο χρήστης να συνδεθεί προτού εκκαθαριστεί αυτή η φραγή;
       user:
           γι' αυτό προσπαθήστε να χρησιμοποιήσετε απλούς και κατανοητούς όρους.
         needs_view: Πρέπει ο χρήστης να συνδεθεί προτού εκκαθαριστεί αυτή η φραγή;
       user:

-        new_email: (να μην εμφανίζεται ποτέ δημόσια)
+        new_email: (δεν εμφανίζεται ποτέ δημόσια)

   datetime:
     distance_in_words_ago:
       about_x_hours:
   datetime:
     distance_in_words_ago:
       about_x_hours:


@@ -499,7 +499,7 @@ el:
       area: Περιοχή
     index:
       title: Αλλαγές
       area: Περιοχή
     index:
       title: Αλλαγές

-      title_user: Αλλαγές από τον %{user}
+      title_user: Αλλαγές από %{user}

       title_user_link_html: Ομάδες αλλαγών από %{user_link}
       title_friend: Αλλαγές από τους φίλους μου
       title_nearby: Αλλαγές από κοντινούς χρήστες
       title_user_link_html: Ομάδες αλλαγών από %{user_link}
       title_friend: Αλλαγές από τους φίλους μου
       title_nearby: Αλλαγές από κοντινούς χρήστες


@@ -558,7 +558,7 @@ el:
       title: Ημερολόγια χρηστών
       title_friends: Ημερολόγια φίλων
       title_nearby: Ημερολόγια κοντινών χρηστών
       title: Ημερολόγια χρηστών
       title_friends: Ημερολόγια φίλων
       title_nearby: Ημερολόγια κοντινών χρηστών

-      user_title: Ημερολόγιο του/των %{user}
+      user_title: Ημερολόγιο του χρήστη %{user}

       in_language_title: Καταχωρήσεις ημερολογίων στα %{language}
       new: Νέα καταχώρηση ημερολογίου
       new_title: Σύνταξη νέας καταχώρησης στο ημερολόγιό μου
       in_language_title: Καταχωρήσεις ημερολογίων στα %{language}
       new: Νέα καταχώρηση ημερολογίου
       new_title: Σύνταξη νέας καταχώρησης στο ημερολόγιό μου


@@ -571,8 +571,8 @@ el:
       title: Επεξεργασία καταχώρισης ημερολογίου
       marker_text: Τοποθεσία καταχώρησης ημερολογίου
     show:
       title: Επεξεργασία καταχώρισης ημερολογίου
       marker_text: Τοποθεσία καταχώρησης ημερολογίου
     show:

-      title: το ημερολόγιο του %{user} | %{title}
-      user_title: το ημερολόγιο του %{user}
+      title: Ημερολόγιο του χρήστη %{user} | %{title}
+      user_title: Ημερολόγιο του χρήστη %{user}

       leave_a_comment: Αφήστε σχόλιο
       login_to_leave_a_comment_html: '%{login_link} για να αφήσετε ένα σχόλιο'
       login: Συνδεθείτε
       leave_a_comment: Αφήστε σχόλιο
       login_to_leave_a_comment_html: '%{login_link} για να αφήσετε ένα σχόλιο'
       login: Συνδεθείτε


@@ -583,7 +583,8 @@ el:
         %{id}. Είναι πιθανό να υπάρχουν ορθογραφικά λάθη ή να είναι λάθος ο σύνδεσμος
         μέσω του οποίου φτάσατε σε αυτήν την σελίδα.
     diary_entry:
         %{id}. Είναι πιθανό να υπάρχουν ορθογραφικά λάθη ή να είναι λάθος ο σύνδεσμος
         μέσω του οποίου φτάσατε σε αυτήν την σελίδα.
     diary_entry:

-      posted_by_html: Δημοσιεύτηκε από τον %{link_user} στις %{created} στα %{language_link}.
+      posted_by_html: Δημοσιεύτηκε από τον χρήστη %{link_user} στις %{created} στα
+        %{language_link}.

       updated_at_html: Τελευταία ενημέρωση στις %{updated}.
       comment_link: Σχολιάστε την καταχώρηση
       reply_link: Αποστολή μηνύματος στον συγγραφέα
       updated_at_html: Τελευταία ενημέρωση στις %{updated}.
       comment_link: Σχολιάστε την καταχώρηση
       reply_link: Αποστολή μηνύματος στον συγγραφέα


@@ -597,7 +598,7 @@ el:
       confirm: Επιβεβαίωση
       report: Αναφορά καταχώρησης
     diary_comment:
       confirm: Επιβεβαίωση
       report: Αναφορά καταχώρησης
     diary_comment:

-      comment_from_html: Σχόλιο από τον %{link_user} στις %{comment_created_at}
+      comment_from_html: Σχόλιο από τον χρήστη %{link_user} στις %{comment_created_at}

       hide_link: Απόκρυψη σχολίου
       unhide_link: Επανεμφάνιση σχολίου
       confirm: Επιβεβαίωση
       hide_link: Απόκρυψη σχολίου
       unhide_link: Επανεμφάνιση σχολίου
       confirm: Επιβεβαίωση


@@ -618,9 +619,9 @@ el:
         title: Καταχωρήσεις ημερολογίου OpenStreetMap
         description: Πρόσφατες καταχωρήσεις ημερολογίου από χρήστες του OpenStreetMap
     comments:
         title: Καταχωρήσεις ημερολογίου OpenStreetMap
         description: Πρόσφατες καταχωρήσεις ημερολογίου από χρήστες του OpenStreetMap
     comments:

-      title: Î Ï\81οÏ\83Ï\84έθηκαν Ï\83Ï\87Ï\8cλια ημεÏ\81ολογίοÏ\85 από τον χρήστη %{user}
+      title: ΣÏ\87Ï\8cλια ημεÏ\81ολογίοÏ\85 Ï\80οÏ\85 Ï\80Ï\81οÏ\83Ï\84έθηκαν από τον χρήστη %{user}

       heading: Σχόλια Ημερολογίου %{user}
       heading: Σχόλια Ημερολογίου %{user}

-      subheading_html: Î Ï\81οÏ\83Ï\84έθηκαν Ï\83Ï\87Ï\8cλια ημεÏ\81ολογίοÏ\85 από τον χρήστη %{user}
+      subheading_html: ΣÏ\87Ï\8cλια ημεÏ\81ολογίοÏ\85 Ï\80οÏ\85 Ï\80Ï\81οÏ\83Ï\84έθηκαν από τον χρήστη %{user}

       no_comments: Χωρίς σχόλια ημερολογίου
       post: Καταχώρηση
       when: Πότε
       no_comments: Χωρίς σχόλια ημερολογίου
       post: Καταχώρηση
       when: Πότε


@@ -1872,7 +1873,7 @@ el:
     destroy:
       destroyed: Το μήνυμα διαγράφηκε
   passwords:
     destroy:
       destroyed: Το μήνυμα διαγράφηκε
   passwords:

-    lost_password:
+    new:

       title: Χάσατε το συνθηματικό σας
       heading: Ξεχάσατε το συνθηματικό σας;
       email address: 'Διεύθυνση ηλεκτρονικού ταχυδρομείου:'
       title: Χάσατε το συνθηματικό σας
       heading: Ξεχάσατε το συνθηματικό σας;
       email address: 'Διεύθυνση ηλεκτρονικού ταχυδρομείου:'


@@ -1880,16 +1881,18 @@ el:
       help_text: Πληκτρολογήστε τη διεύθυνση ηλεκτρονικού ταχυδρομείου που χρησιμοποιήσατε
         για να εγγραφείτε. Θα στείλουμε έναν σύνδεσμο τον οποίον μπορείτε να χρησιμοποιήσετε
         για να επαναφέρετε το συνθηματικό σας.
       help_text: Πληκτρολογήστε τη διεύθυνση ηλεκτρονικού ταχυδρομείου που χρησιμοποιήσατε
         για να εγγραφείτε. Θα στείλουμε έναν σύνδεσμο τον οποίον μπορείτε να χρησιμοποιήσετε
         για να επαναφέρετε το συνθηματικό σας.

+    create:

       notice email on way: Λυπούμαστε που το χάσατε :-(, αλλά ένα μήνυμα ηλεκτρονικού
         ταχυδρομείου εστάλη, ώστε να μπορέσετε να το επαναφέρετε σύντομα.
       notice email cannot find: Λυπούμαστε, δεν βρέθηκε αυτή η διεύθυνση ηλεκτρονικού
         ταχυδρομείου.
       notice email on way: Λυπούμαστε που το χάσατε :-(, αλλά ένα μήνυμα ηλεκτρονικού
         ταχυδρομείου εστάλη, ώστε να μπορέσετε να το επαναφέρετε σύντομα.
       notice email cannot find: Λυπούμαστε, δεν βρέθηκε αυτή η διεύθυνση ηλεκτρονικού
         ταχυδρομείου.

-    reset_password:
+    edit:

       title: Επαναφορά συνθηματικού
       heading: Επαναφορά συνθηματικού για τον χρήστη %{user}
       reset: Επαναφορά συνθηματικού
       title: Επαναφορά συνθηματικού
       heading: Επαναφορά συνθηματικού για τον χρήστη %{user}
       reset: Επαναφορά συνθηματικού

-      flash changed: Το συνθηματικό σας άλλαξε!

       flash token bad: Δεν βρήκατε αυτό το κομμάτι, μήπως πρέπει να ελέγξετε το URL;
       flash token bad: Δεν βρήκατε αυτό το κομμάτι, μήπως πρέπει να ελέγξετε το URL;

+    update:
+      flash changed: Το συνθηματικό σας άλλαξε!

   preferences:
     show:
       title: Οι προτιμήσεις μου
   preferences:
     show:
       title: Οι προτιμήσεις μου


@@ -1982,9 +1985,9 @@ el:
       support: υποστήριξη
   shared:
     markdown_help:
       support: υποστήριξη
   shared:
     markdown_help:

-      heading_html: Î\91ναλÏ\8dθηκε με %{kramdown_link}
+      heading_html: Î\91ναλÏ\85μμένο με %{kramdown_link}

       headings: Επικεφαλίδες
       headings: Επικεφαλίδες

-      heading: Î\9aαφαλίδα
+      heading: Î\9aεφαλίδα

       subheading: Υποκεφαλίδα
       unordered: Αταξινόμητη λίστα
       ordered: Ταξινομημένη λίστα
       subheading: Υποκεφαλίδα
       unordered: Αταξινόμητη λίστα
       ordered: Ταξινομημένη λίστα


@@ -2337,9 +2340,6 @@ el:
           footway: Μονοπάτι
           rail: Σιδηρόδρομος
           subway: Υπόγειος Σιδηρόδρομος
           footway: Μονοπάτι
           rail: Σιδηρόδρομος
           subway: Υπόγειος Σιδηρόδρομος

-          tram:
-          - Προαστιακός
-          - τραμ

           cable:
           - Τελεφερίκ
           - τελεφερίκ με καθίσματα
           cable:
           - Τελεφερίκ
           - τελεφερίκ με καθίσματα


@@ -2350,15 +2350,16 @@ el:
           - Πίστα προσγείωσης αεροδρομίου
           - τερματικός σταθμός
           admin: Διοικητικό όριο
           - Πίστα προσγείωσης αεροδρομίου
           - τερματικός σταθμός
           admin: Διοικητικό όριο

-          forest: Δάσος
-          wood: Φυσικό δάσος
+          forest:
+          - Δάσος
+          - Φυσικό δάσος

           golf: Γήπεδο γκολφ
           park: Πάρκο
           golf: Γήπεδο γκολφ
           park: Πάρκο

-          resident: Κατοικημένη περιοχή

           common:
           - Κοινόχρηστο
           - λιβάδι
           - κήπος
           common:
           - Κοινόχρηστο
           - λιβάδι
           - κήπος

+          resident: Κατοικημένη περιοχή

           retail: Περιοχή λιανικού εμπορίου
           industrial: Βιομηχανική περιοχή
           commercial: Εμπορική περιοχή
           retail: Περιοχή λιανικού εμπορίου
           industrial: Βιομηχανική περιοχή
           commercial: Εμπορική περιοχή


@@ -2542,7 +2543,7 @@ el:
       my_gps_traces: Τα ίχνη GPS μου
       public_traces_from: Δημόσια ίχνη GPS από τον %{user}
       description: Προβολή πρόσφατων μεταφορτωμένων ιχνών GPS
       my_gps_traces: Τα ίχνη GPS μου
       public_traces_from: Δημόσια ίχνη GPS από τον %{user}
       description: Προβολή πρόσφατων μεταφορτωμένων ιχνών GPS

-      tagged_with: χαρακτηρίστηκαν με %{tags}
+      tagged_with: ' με ετικέτα %{tags}'

       empty_title: Τίποτα εδώ ακόμα
       empty_upload_html: '%{upload_link} ή μάθετε περισσότερα για την ανίχνευση GPS
         στο %{wiki_link}.'
       empty_title: Τίποτα εδώ ακόμα
       empty_upload_html: '%{upload_link} ή μάθετε περισσότερα για την ανίχνευση GPS
         στο %{wiki_link}.'


@@ -2717,7 +2718,7 @@ el:
   oauth2_authorized_applications:
     index:
       title: Οι Εξουσιοδοτημένες Εφαρμογές μου
   oauth2_authorized_applications:
     index:
       title: Οι Εξουσιοδοτημένες Εφαρμογές μου

-      application: Î\95Ï\86αÏ\81μογέÏ\82
+      application: Î\95Ï\86αÏ\81μογή

       permissions: Άδειες
       no_applications_html: Δεν έχετε εξουσιοδοτήσει ακόμη %{oauth2} εφαρμογές.
     application:
       permissions: Άδειες
       no_applications_html: Δεν έχετε εξουσιοδοτήσει ακόμη %{oauth2} εφαρμογές.
     application:


@@ -3010,9 +3011,9 @@ el:
       previous: « Προηγούμενη
   notes:
     index:
       previous: « Προηγούμενη
   notes:
     index:

-      title: Σημειώσεις που υποβλήθηκαν ή σχολιάστηκαν από τον %{user}
-      heading: σημειώσεις του %{user}
-      subheading_html: Σημειώσεις που %{submitted} ή %{commented} από τον %{user}
+      title: Σημειώσεις που υποβλήθηκαν ή σχολιάστηκαν από τον χρήστη %{user}
+      heading: Σημειώσεις του χρήστη %{user}
+      subheading_html: Σημειώσεις που %{submitted} ή %{commented} από τον χρήστη %{user}

       subheading_submitted: υποβλήθηκε
       subheading_commented: σχολιάστηκε
       no_notes: Χωρίς σημειώσεις
       subheading_submitted: υποβλήθηκε
       subheading_commented: σχολιάστηκε
       no_notes: Χωρίς σημειώσεις

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 5858dd57c7aa018d2760f847d7d9f9721f00da4e..cf783e60b76c2bc8954bb3999719343afca05c9d 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -5,6 +5,7 @@
 # Author: Alefar
 # Author: Andibing
 # Author: BEANS
 # Author: Alefar
 # Author: Andibing
 # Author: BEANS

+# Author: Back ache

 # Author: Bjh21
 # Author: Bpfhjquevaps
 # Author: Bruce89
 # Author: Bjh21
 # Author: Bpfhjquevaps
 # Author: Bruce89


@@ -507,6 +508,14 @@ en-GB:
       comment: Comment
       newer_comments: Newer Comments
       older_comments: Older Comments
       comment: Comment
       newer_comments: Newer Comments
       older_comments: Older Comments

+  doorkeeper:
+    errors:
+      messages:
+        account_selection_required: The authorisation server requires end-user account
+          selection
+        consent_required: The authorisation server requires end-user consent
+        interaction_required: The authorisation server requires end-user interaction
+        login_required: The authorisation server requires end-user authentication

   friendships:
     make_friend:
       heading: Add %{user} as a friend?
   friendships:
     make_friend:
       heading: Add %{user} as a friend?


@@ -1328,22 +1337,24 @@ en-GB:
     destroy:
       destroyed: Message deleted
   passwords:
     destroy:
       destroyed: Message deleted
   passwords:

-    lost_password:
+    new:

       title: Lost password
       heading: Forgotten Password?
       email address: E-mail address
       new password button: Reset password
       help_text: Enter the e-mail address you used to sign up, we will send a link
         to it that you can use to reset your password.
       title: Lost password
       heading: Forgotten Password?
       email address: E-mail address
       new password button: Reset password
       help_text: Enter the e-mail address you used to sign up, we will send a link
         to it that you can use to reset your password.

+    create:

       notice email on way: Sorry you lost it :-( but an email is on its way so you
         can reset it soon.
       notice email cannot find: Could not find that email address, sorry.
       notice email on way: Sorry you lost it :-( but an email is on its way so you
         can reset it soon.
       notice email cannot find: Could not find that email address, sorry.

-    reset_password:
+    edit:

       title: Reset password
       heading: Reset Password for %{user}
       reset: Reset Password
       title: Reset password
       heading: Reset Password for %{user}
       reset: Reset Password

-      flash changed: Your password has been changed.

       flash token bad: Did not find that token, check the URL maybe?
       flash token bad: Did not find that token, check the URL maybe?

+    update:
+      flash changed: Your password has been changed.

   profiles:
     edit:
       image: Image
   profiles:
     edit:
       image: Image


@@ -1584,9 +1595,6 @@ en-GB:
           footway: Footway
           rail: Railway
           subway: Subway
           footway: Footway
           rail: Railway
           subway: Subway

-          tram:
-          - Light rail
-          - tram

           cable:
           - Cable car
           - chairlift
           cable:
           - Cable car
           - chairlift


@@ -1597,14 +1605,15 @@ en-GB:
           - Airport apron
           - terminal
           admin: Administrative boundary
           - Airport apron
           - terminal
           admin: Administrative boundary

-          forest: Forest
-          wood: Wood
+          forest:
+          - Forest
+          - Wood

           golf: Golf course
           park: Park
           golf: Golf course
           park: Park

-          resident: Residential area

           common:
           - Common
           - meadow
           common:
           - Common
           - meadow

+          resident: Residential area

           retail: Retail area
           industrial: Industrial area
           commercial: Commercial area
           retail: Retail area
           industrial: Industrial area
           commercial: Commercial area

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index b9b108e17592edb8e9ded772e000064a6b1fc995..85e621e84c89b5a59fede85f0a155e8353f15f05 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1811,22 +1811,25 @@ eo:
     destroy:
       destroyed: Mesaĝo forigita
   passwords:
     destroy:
       destroyed: Mesaĝo forigita
   passwords:

-    lost_password:
+    new:

       title: Perdita pasvorto
       heading: Forgesis vian pasvorton ?
       email address: 'Retpoŝtadreso:'
       new password button: Nuligi pasvorton
       help_text: Entajpu la retpoŝtan adreson kiun vi uzis por ensaluto, ni sendos
         al vi ligilon, kiun vi povos uzi por restarigi vian pasvorton.
       title: Perdita pasvorto
       heading: Forgesis vian pasvorton ?
       email address: 'Retpoŝtadreso:'
       new password button: Nuligi pasvorton
       help_text: Entajpu la retpoŝtan adreson kiun vi uzis por ensaluto, ni sendos
         al vi ligilon, kiun vi povos uzi por restarigi vian pasvorton.

+    create:

       notice email on way: Bedaŭras, ke vi perdis ĝin :-( sed baldaŭ vi ricevos retleteron,
         kiun vi uzos por restarigi ĝin.
       notice email cannot find: Bedaŭrinde, tiu retadreso ne troveblas.
       notice email on way: Bedaŭras, ke vi perdis ĝin :-( sed baldaŭ vi ricevos retleteron,
         kiun vi uzos por restarigi ĝin.
       notice email cannot find: Bedaŭrinde, tiu retadreso ne troveblas.

-    reset_password:
+    edit:

       title: Nuligi pasvorton
       heading: Nuligi Pasvorton por %{user}
       reset: Nuligi pasvorton
       title: Nuligi pasvorton
       heading: Nuligi Pasvorton por %{user}
       reset: Nuligi pasvorton

-      flash changed: Via pasvorto estis ŝanĝita.

       flash token bad: Netrovebla ĵetono, bonvolu kontroli la URLon.
       flash token bad: Netrovebla ĵetono, bonvolu kontroli la URLon.

+    update:
+      flash changed: Via pasvorto estis ŝanĝita.
+      flash token bad: Ne povas trovi ĵetonon. Provu kontroli la retadreson.

   preferences:
     show:
       title: Miaj preferoj
   preferences:
     show:
       title: Miaj preferoj


@@ -2303,10 +2306,13 @@ eo:
           cycleway_local: Bicikla vojo loka
           footway: Trotuaro
           rail: Fervojo
           cycleway_local: Bicikla vojo loka
           footway: Trotuaro
           rail: Fervojo

+          train: Vagonaro

           subway: Metroo
           subway: Metroo

-          tram:
-          - Fervojo malpeza
-          - tramo
+          ferry: Pramo
+          light_rail: Malpeza vagonaro
+          tram_only: Tramo
+          trolleybus: Trolebuso
+          bus: Aŭtobuso

           cable:
           - Kablovojo
           - seĝtelfero
           cable:
           - Kablovojo
           - seĝtelfero


@@ -2317,22 +2323,35 @@ eo:
           - Aviadil-parkumejo
           - flugstacio
           admin: Administra limo
           - Aviadil-parkumejo
           - flugstacio
           admin: Administra limo

-          forest: Kultiv-arbaro
-          wood: Arbaro
+          orchard:
+          - Fruktoĝardeno
+          - vinberĝardeno
+          forest:
+          - Kultiv-arbaro
+          - arbaro
+          farmland: Agrokultura tereno
+          grass:
+          - Herbotapiŝo
+          - herbejo
+          bare_rock: Roka areo
+          sand: Sabla tereno

           golf: Golfejo
           park: Parko
           golf: Golfejo
           park: Parko

-          resident: Privatdoma tereno

           common:
           - Publika ripoza tereno
           - herbejo
           - ĝardeno
           common:
           - Publika ripoza tereno
           - herbejo
           - ĝardeno

+          built_up: Konstruaĵ-kovrita tereno
+          resident: Privatdoma tereno

           retail: Komercejo
           industrial: Industria areo
           commercial: Oficeja tereno
           heathland: Erikejo
           retail: Komercejo
           industrial: Industria areo
           commercial: Oficeja tereno
           heathland: Erikejo

+          scrubland: Arbustaro

           lake:
           - Lago
           - akvorezervujo
           lake:
           - Lago
           - akvorezervujo

+          glacier: Glacirivero

           farm: Farmobieno
           brownfield: Antaŭ-konstruejo (post-malkonstruado)
           cemetery: Tombejo
           farm: Farmobieno
           brownfield: Antaŭ-konstruejo (post-malkonstruado)
           cemetery: Tombejo


@@ -2354,6 +2373,8 @@ eo:
           private: Privata aliro
           destination: Aliro nur al celo
           construction: Vojoj konstruataj
           private: Privata aliro
           destination: Aliro nur al celo
           construction: Vojoj konstruataj

+          bus_stop: Haltejo aŭtobusa
+          stop: Haltejo

           bicycle_shop: Bicikl-vendejo
           bicycle_parking: Parkumejo bicikla
           toilets: Necesejo
           bicycle_shop: Bicikl-vendejo
           bicycle_parking: Parkumejo bicikla
           toilets: Necesejo

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 95905c01bb8a2e25c864fd27fc27c227cc6bae21..70e74fe1e415853f8657ce43360be60c5489f7c4 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1915,7 +1915,7 @@ es:
     destroy:
       destroyed: Mensaje eliminado
   passwords:
     destroy:
       destroyed: Mensaje eliminado
   passwords:

-    lost_password:
+    new:

       title: Contraseña perdida
       heading: ¿Contraseña olvidada?
       email address: 'Dirección de correo electrónico:'
       title: Contraseña perdida
       heading: ¿Contraseña olvidada?
       email address: 'Dirección de correo electrónico:'


@@ -1923,18 +1923,20 @@ es:
       help_text: Escribe la dirección de correo electrónico con la que te registraste,
         te enviaremos un enlace a esa dirección que podrás utilizar para restablecer
         tu contraseña.
       help_text: Escribe la dirección de correo electrónico con la que te registraste,
         te enviaremos un enlace a esa dirección que podrás utilizar para restablecer
         tu contraseña.

+    create:

       notice email on way: Sentimos que la hayas perdido :-( pero ya va de camino
         un mensaje de correo electrónico que te servirá para restablecer tu contraseña
         enseguida.
       notice email cannot find: Lo sentimos, no se pudo encontrar esa dirección de
         correo electrónico.
       notice email on way: Sentimos que la hayas perdido :-( pero ya va de camino
         un mensaje de correo electrónico que te servirá para restablecer tu contraseña
         enseguida.
       notice email cannot find: Lo sentimos, no se pudo encontrar esa dirección de
         correo electrónico.

-    reset_password:
+    edit:

       title: Restablecer contraseña
       heading: Restablecer contraseña para %{user}
       reset: Restablecer contraseña
       title: Restablecer contraseña
       heading: Restablecer contraseña para %{user}
       reset: Restablecer contraseña

-      flash changed: Tu contraseña ha sido cambiada.

       flash token bad: No se ha encontrado este token, ¿Quizá deberías comprobar la
         URL?
       flash token bad: No se ha encontrado este token, ¿Quizá deberías comprobar la
         URL?

+    update:
+      flash changed: Tu contraseña ha sido cambiada.

   preferences:
     show:
       title: Mis preferencias
   preferences:
     show:
       title: Mis preferencias


@@ -2434,9 +2436,6 @@ es:
           footway: Vía peatonal
           rail: Ferrocarril
           subway: Metro
           footway: Vía peatonal
           rail: Ferrocarril
           subway: Metro

-          tram:
-          - Metro ligero
-          - tranvía

           cable:
           - Telecabina
           - Telesilla
           cable:
           - Telecabina
           - Telesilla


@@ -2447,15 +2446,16 @@ es:
           - Rampa aeroportuaria
           - terminal
           admin: Límite administrativo
           - Rampa aeroportuaria
           - terminal
           admin: Límite administrativo

-          forest: Bosque
-          wood: Bosque
+          forest:
+          - Bosque
+          - Bosque

           golf: Campo de golf
           park: Parque
           golf: Campo de golf
           park: Parque

-          resident: Zona residencial

           common:
           - Común
           - pradera
           - jardín
           common:
           - Común
           - pradera
           - jardín

+          resident: Zona residencial

           retail: Zona de comercios
           industrial: Zona industrial
           commercial: Zona comercial
           retail: Zona de comercios
           industrial: Zona industrial
           commercial: Zona comercial

diff --git a/config/locales/et.yml b/config/locales/et.yml
index 59866c7a166f0248ce3bd08dd1971e628f4ca15f..1b8935965a11d4d56532aa8ddfa3fbf0325d7cbd 100644 (file)
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1325,22 +1325,24 @@ et:
     destroy:
       destroyed: Sõnum kustutatud.
   passwords:
     destroy:
       destroyed: Sõnum kustutatud.
   passwords:

-    lost_password:
+    new:

       title: Unustatud parool
       heading: Parool ununenud?
       email address: 'E-posti aadress:'
       new password button: Lähtesta parool
       help_text: Sisesta e-posti aadress, mida kasutasid registreerumisel. Saadame
         sinna lingi, mida saad kasutada parooli lähtestamiseks.
       title: Unustatud parool
       heading: Parool ununenud?
       email address: 'E-posti aadress:'
       new password button: Lähtesta parool
       help_text: Sisesta e-posti aadress, mida kasutasid registreerumisel. Saadame
         sinna lingi, mida saad kasutada parooli lähtestamiseks.

+    create:

       notice email on way: Kahju, et parooli kaotasid, kuid ära muretse. Peagi saad
         e-kirja, mille abil saad parooli lähtestada.
       notice email cannot find: Seda e-posti aadressi ei leitud.
       notice email on way: Kahju, et parooli kaotasid, kuid ära muretse. Peagi saad
         e-kirja, mille abil saad parooli lähtestada.
       notice email cannot find: Seda e-posti aadressi ei leitud.

-    reset_password:
+    edit:

       title: Lähtesta parool
       heading: Kasutaja %{user} parooli lähtestamine
       reset: Lähtesta parool
       title: Lähtesta parool
       heading: Kasutaja %{user} parooli lähtestamine
       reset: Lähtesta parool

-      flash changed: Sinu parool on muudetud.

       flash token bad: Ei leitud sellist kinnituskoodi. Kontrolli URL-i.
       flash token bad: Ei leitud sellist kinnituskoodi. Kontrolli URL-i.

+    update:
+      flash changed: Sinu parool on muudetud.

   preferences:
     show:
       title: Minu eelistused
   preferences:
     show:
       title: Minu eelistused


@@ -1805,9 +1807,6 @@ et:
           footway: Jalgtee
           rail: Raudtee
           subway: Metroo
           footway: Jalgtee
           rail: Raudtee
           subway: Metroo

-          tram:
-          - Trammitee
-          - tramm

           cable:
           - Köisraudtee
           - toolilift
           cable:
           - Köisraudtee
           - toolilift


@@ -1818,14 +1817,15 @@ et:
           - Lennujaama perroon
           - terminal
           admin: Halduspiir
           - Lennujaama perroon
           - terminal
           admin: Halduspiir

-          forest: Tulundusmets
-          wood: Mets
+          forest:
+          - Tulundusmets
+          - Mets

           golf: Golfiväljak
           park: Park
           golf: Golfiväljak
           park: Park

-          resident: Elamurajoon

           common:
           - Heinamaa
           - luht
           common:
           - Heinamaa
           - luht

+          resident: Elamurajoon

           retail: Kaubanduspiirkond
           industrial: Tööstuspiirkond
           commercial: Äripiirkond
           retail: Kaubanduspiirkond
           industrial: Tööstuspiirkond
           commercial: Äripiirkond

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index a626cb41d0b2eabc06b3be35f9ce964712606f90..11babb2456dabc41b6aa3e6c1b881c2df1c863c4 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1794,22 +1794,24 @@ eu:
     destroy:
       destroyed: Mezua ezabatuta
   passwords:
     destroy:
       destroyed: Mezua ezabatuta
   passwords:

-    lost_password:
+    new:

       title: Ahaztutako pasahitza
       heading: Pasahitza ahaztuta?
       email address: 'Eposta helbidea:'
       new password button: Pasahitza berrezarri
       help_text: Sartu saioa hastean erabiltzen zenuen helbide elektronikoa, zure
         pasahitza berrezarri ahal izateko erabil dezakezu bidaliko dizugun esteka.
       title: Ahaztutako pasahitza
       heading: Pasahitza ahaztuta?
       email address: 'Eposta helbidea:'
       new password button: Pasahitza berrezarri
       help_text: Sartu saioa hastean erabiltzen zenuen helbide elektronikoa, zure
         pasahitza berrezarri ahal izateko erabil dezakezu bidaliko dizugun esteka.

+    create:

       notice email on way: Sentitzen duzu hau galdu izatea :-( baina posta elektronikoa
         bidaltzen ari zaizu laster berrabiarazi dezakezun.
       notice email cannot find: Eposta helbide hori ezin izan dugu aurkitu, barkatu.
       notice email on way: Sentitzen duzu hau galdu izatea :-( baina posta elektronikoa
         bidaltzen ari zaizu laster berrabiarazi dezakezun.
       notice email cannot find: Eposta helbide hori ezin izan dugu aurkitu, barkatu.

-    reset_password:
+    edit:

       title: Pasahitza berrezarri
       heading: '%{user}-ren pasahitza berrezarri'
       reset: Pasahitza berrezarri
       title: Pasahitza berrezarri
       heading: '%{user}-ren pasahitza berrezarri'
       reset: Pasahitza berrezarri

-      flash changed: Zure pasahitza aldatu da.

       flash token bad: Token hori ez da aurkitu, URL egiaztatu beharbada?
       flash token bad: Token hori ez da aurkitu, URL egiaztatu beharbada?

+    update:
+      flash changed: Zure pasahitza aldatu da.

   preferences:
     show:
       title: Nire hobespenak
   preferences:
     show:
       title: Nire hobespenak


@@ -2206,9 +2208,6 @@ eu:
           footway: Oinezkoen bidea
           rail: Trenbidea
           subway: Metroa
           footway: Oinezkoen bidea
           rail: Trenbidea
           subway: Metroa

-          tram:
-          - Tren arina
-          - tranbia

           cable:
           - Funikularra
           - teleaulkia
           cable:
           - Funikularra
           - teleaulkia


@@ -2219,15 +2218,16 @@ eu:
           - Aireportu plataforma
           - terminala
           admin: Muga administratiboa
           - Aireportu plataforma
           - terminala
           admin: Muga administratiboa

-          forest: Baso
-          wood: Basoa
+          forest:
+          - Baso
+          - Basoa

           golf: Golf-zelai
           park: Parke
           golf: Golf-zelai
           park: Parke

-          resident: Etxebizitza ingurua

           common:
           - Arrunta
           - belardia
           - lorategia
           common:
           - Arrunta
           - belardia
           - lorategia

+          resident: Etxebizitza ingurua

           retail: Txikizkako azalera
           industrial: Industrialdea
           commercial: Merkataritza eremua
           retail: Txikizkako azalera
           industrial: Industrialdea
           commercial: Merkataritza eremua

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index b37387776de8d1af4fd9fb6925352d90587c9ae4..065950d0129d7340265d9137fb447a931d7e9aca 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1762,22 +1762,24 @@ fa:
     destroy:
       destroyed: پیام حذف شد
   passwords:
     destroy:
       destroyed: پیام حذف شد
   passwords:

-    lost_password:
+    new:

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

+    create:

       notice email on way: متأسفیم که آن را گم کرده‌اید :-( اما رایانامه‌ای در راه
         است که می‌توانید به‌زودی آن را مجدد تنظیم کنید.
       notice email cannot find: چنین رایانامه‌ای پیدا نشد، متأسفیم.
       notice email on way: متأسفیم که آن را گم کرده‌اید :-( اما رایانامه‌ای در راه
         است که می‌توانید به‌زودی آن را مجدد تنظیم کنید.
       notice email cannot find: چنین رایانامه‌ای پیدا نشد، متأسفیم.

-    reset_password:
+    edit:

       title: بازنشانی رمز عبور
       heading: بازنشانی رمز عبور برای %{user}
       reset: بازنشانی رمز عبور
       title: بازنشانی رمز عبور
       heading: بازنشانی رمز عبور برای %{user}
       reset: بازنشانی رمز عبور

-      flash changed: رمز عبورتان عوض شد.

       flash token bad: توکن را نیافتید؟ نشانی را بررسی کنید شاید بیابید.
       flash token bad: توکن را نیافتید؟ نشانی را بررسی کنید شاید بیابید.

+    update:
+      flash changed: رمز عبورتان عوض شد.

   preferences:
     show:
       title: ترجیحات من
   preferences:
     show:
       title: ترجیحات من


@@ -2096,9 +2098,6 @@ fa:
           footway: راه پیاده
           rail: راه‌آهن
           subway: مترو
           footway: راه پیاده
           rail: راه‌آهن
           subway: مترو

-          tram:
-          - راه‌آهن سبک
-          - قطار برقی

           cable:
           - تله‌فریک
           - صندلی بالابر
           cable:
           - تله‌فریک
           - صندلی بالابر


@@ -2109,14 +2108,15 @@ fa:
           - پیشگاه فرودگاه
           - پایانه
           admin: مرز اداری
           - پیشگاه فرودگاه
           - پایانه
           admin: مرز اداری

-          forest: جنگل
-          wood: چوب
+          forest:
+          - جنگل
+          - چوب

           golf: زمین گلف
           park: پارک
           golf: زمین گلف
           park: پارک

-          resident: منطقهٔ مسکونی

           common:
           - مشاع
           - علفزار
           common:
           - مشاع
           - علفزار

+          resident: منطقهٔ مسکونی

           retail: منطقه خرده فروشی
           industrial: منطقه صنعتی
           commercial: منطقه تجاری
           retail: منطقه خرده فروشی
           industrial: منطقه صنعتی
           commercial: منطقه تجاری

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 21b1bf5f60f632119866a7870b8a236a3ae2ebc6..ab0dcfb1ecd67b9cd524b1887e9e454c5c06c4b8 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1774,21 +1774,23 @@ fi:
     destroy:
       destroyed: Viesti on poistettu.
   passwords:
     destroy:
       destroyed: Viesti on poistettu.
   passwords:

-    lost_password:
+    new:

       title: Unohtunut salasana
       heading: Unohditko salasanasi?
       email address: 'Sähköpostiosoite:'
       new password button: Lähetä salasanan palautusohjeet
       help_text: Kirjoita alapuolelle kirjautumissähköpostiosoitteesi. Osoitteeseen
         lähetetään salasanan palautusohjeet.
       title: Unohtunut salasana
       heading: Unohditko salasanasi?
       email address: 'Sähköpostiosoite:'
       new password button: Lähetä salasanan palautusohjeet
       help_text: Kirjoita alapuolelle kirjautumissähköpostiosoitteesi. Osoitteeseen
         lähetetään salasanan palautusohjeet.

+    create:

       notice email on way: Salasanan palautusohjeet on lähetetty annettuun sähköpostiosoitteeseen.
       notice email cannot find: Annettu sähköpostiosoite ei ole käytössä.
       notice email on way: Salasanan palautusohjeet on lähetetty annettuun sähköpostiosoitteeseen.
       notice email cannot find: Annettu sähköpostiosoite ei ole käytössä.

-    reset_password:
+    edit:

       title: Salasanan vaihto
       heading: Vaihda käyttäjän %{user} salasana
       reset: Vaihda salasana
       title: Salasanan vaihto
       heading: Vaihda käyttäjän %{user} salasana
       reset: Vaihda salasana

-      flash changed: Salasanasi on vaihdettu.

       flash token bad: Tuntematon tunniste. Tarkista että URL on sama kuin postissasi.
       flash token bad: Tuntematon tunniste. Tarkista että URL on sama kuin postissasi.

+    update:
+      flash changed: Salasanasi on vaihdettu.

   preferences:
     show:
       title: Asetukset
   preferences:
     show:
       title: Asetukset


@@ -2205,9 +2207,6 @@ fi:
           footway: Jalkakäytävä
           rail: Junarata
           subway: Metro
           footway: Jalkakäytävä
           rail: Junarata
           subway: Metro

-          tram:
-          - Pikaraitiotie
-          - raitiotie

           cable:
           - Köysirata
           - tuolihissi
           cable:
           - Köysirata
           - tuolihissi


@@ -2218,15 +2217,16 @@ fi:
           - Lentokentän asemataso
           - terminaali
           admin: Hallinnollinen raja
           - Lentokentän asemataso
           - terminaali
           admin: Hallinnollinen raja

-          forest: Talousmetsä
-          wood: Metsä
+          forest:
+          - Talousmetsä
+          - Metsä

           golf: Golfkenttä
           park: Puisto
           golf: Golfkenttä
           park: Puisto

-          resident: Asuinalue

           common:
           - Niitty
           - keto
           - puutarha
           common:
           - Niitty
           - keto
           - puutarha

+          resident: Asuinalue

           retail: Kaupallinen alue
           industrial: Teollisuusalue
           commercial: Toimistoalue
           retail: Kaupallinen alue
           industrial: Teollisuusalue
           commercial: Toimistoalue

diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index ba2382b3428922ae38b920fb9b0f2716801a2f58..3a023d23fd959cb6ea10ed24bb3bc20e27b7edc4 100644 (file)
--- a/config/locales/fit.yml
+++ b/config/locales/fit.yml
@@ -694,7 +694,7 @@ fit:
     destroy:
       destroyed: Viesti otettu poies
   passwords:
     destroy:
       destroyed: Viesti otettu poies
   passwords:

-    lost_password:
+    new:

       title: Unohtunut salasana
       heading: Unohditko salasanasi?
       email address: 'E-postiatressi:'
       title: Unohtunut salasana
       heading: Unohditko salasanasi?
       email address: 'E-postiatressi:'

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 8e8ac8620d24c9fe1c26f12a3975ed7b8c91439b..55a25b5cc50607ef04af8394cc6a3349f954d79a 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -32,6 +32,7 @@
 # Author: Frigory
 # Author: Fylip22
 # Author: Gaspard
 # Author: Frigory
 # Author: Fylip22
 # Author: Gaspard

+# Author: GeorgeKaplan

 # Author: Gileri
 # Author: Gomoko
 # Author: Gravitystorm
 # Author: Gileri
 # Author: Gomoko
 # Author: Gravitystorm


@@ -1124,7 +1125,7 @@ fr:
           military: Zone militaire
           mine: Mine
           orchard: Verger
           military: Zone militaire
           mine: Mine
           orchard: Verger

-          plant_nursery: Crèche d’usine
+          plant_nursery: Pépinière

           quarry: Carrière
           railway: Voie ferrée
           recreation_ground: Aire de jeux
           quarry: Carrière
           railway: Voie ferrée
           recreation_ground: Aire de jeux


@@ -1940,7 +1941,7 @@ fr:
     destroy:
       destroyed: Message supprimé
   passwords:
     destroy:
       destroyed: Message supprimé
   passwords:

-    lost_password:
+    new:

       title: Mot de passe perdu
       heading: Vous avez perdu votre mot de passe ?
       email address: 'Adresse de courriel :'
       title: Mot de passe perdu
       heading: Vous avez perdu votre mot de passe ?
       email address: 'Adresse de courriel :'


@@ -1948,13 +1949,16 @@ fr:
       help_text: Entrez l’adresse de courriel que vous avez utilisée à votre inscription,
         nous enverrons à cette adresse un lien que vous pourrez utiliser pour réinitialiser
         votre mot de passe.
       help_text: Entrez l’adresse de courriel que vous avez utilisée à votre inscription,
         nous enverrons à cette adresse un lien que vous pourrez utiliser pour réinitialiser
         votre mot de passe.

+    create:

       notice email on way: Désolé que vous ayez perdu votre mot de passe :-( Un courriel
         vous a été envoyé pour que vous puissiez vite le réinitialiser.
       notice email cannot find: Cette adresse de courriel est introuvable, désolé.
       notice email on way: Désolé que vous ayez perdu votre mot de passe :-( Un courriel
         vous a été envoyé pour que vous puissiez vite le réinitialiser.
       notice email cannot find: Cette adresse de courriel est introuvable, désolé.

-    reset_password:
+    edit:

       title: Réinitialiser le mot de passe
       heading: Réinitialiser le mot de passe de %{user}
       reset: Réinitialiser le mot de passe
       title: Réinitialiser le mot de passe
       heading: Réinitialiser le mot de passe de %{user}
       reset: Réinitialiser le mot de passe

+      flash token bad: Ce jeton est introuvable, veuillez vérifier l’URL.
+    update:

       flash changed: Votre mot de passe a été modifié.
       flash token bad: Ce jeton est introuvable, veuillez vérifier l’URL.
   preferences:
       flash changed: Votre mot de passe a été modifié.
       flash token bad: Ce jeton est introuvable, veuillez vérifier l’URL.
   preferences:


@@ -2474,10 +2478,12 @@ fr:
           cycleway_local: Itinéraire cyclable local
           footway: Chemin piéton
           rail: Voie de chemin de fer
           cycleway_local: Itinéraire cyclable local
           footway: Chemin piéton
           rail: Voie de chemin de fer

+          train: Train

           subway: Ligne de métro
           subway: Ligne de métro

-          tram:
-          - Voie ferrée légère
-          - tramway
+          ferry: Ferry
+          tram_only: Tramway
+          trolleybus: Trolleybus
+          bus: Bus

           cable:
           - Téléphérique
           - télésiège
           cable:
           - Téléphérique
           - télésiège


@@ -2488,15 +2494,26 @@ fr:
           - Stationnement d’avions
           - terminal
           admin: Limite administrative
           - Stationnement d’avions
           - terminal
           admin: Limite administrative

-          forest: Forêt
-          wood: Bois
+          orchard:
+          - Verger
+          - vignoble
+          forest:
+          - Forêt
+          - bois
+          farmland: Terres agricoles
+          grass:
+          - Pelouse
+          - prairie
+          bare_rock: Roche nue
+          sand: Sable

           golf: Parcours de golf
           park: Parc
           golf: Parcours de golf
           park: Parc

-          resident: Zone résidentielle

           common:
           - Espace commun
           - prairie
           - jardin
           common:
           - Espace commun
           - prairie
           - jardin

+          built_up: Zone bâtie
+          resident: Zone résidentielle

           retail: Zone de commerce
           industrial: Zone industrielle
           commercial: Zone tertiaire
           retail: Zone de commerce
           industrial: Zone industrielle
           commercial: Zone tertiaire


@@ -2504,6 +2521,7 @@ fr:
           lake:
           - Lac
           - bassin de retenue
           lake:
           - Lac
           - bassin de retenue

+          glacier: Glacier

           farm: Zone agricole
           brownfield: Zone de démolition
           cemetery: Cimetière
           farm: Zone agricole
           brownfield: Zone de démolition
           cemetery: Cimetière


@@ -2525,6 +2543,7 @@ fr:
           private: Accès privé
           destination: Accès réservé aux riverains
           construction: Routes en construction
           private: Accès privé
           destination: Accès réservé aux riverains
           construction: Routes en construction

+          bus_stop: Arrêt de bus

           bicycle_shop: Magasin de vélos
           bicycle_parking: Parking à vélos
           toilets: Toilettes
           bicycle_shop: Magasin de vélos
           bicycle_parking: Parking à vélos
           toilets: Toilettes

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index e29af0f601a575d73bf9452461a790f54b92bced..a5b35ef01365c0718fc15429a977cbb1548b9fd9 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -1055,18 +1055,20 @@ fur:
     destroy:
       destroyed: Messaç eliminât
   passwords:
     destroy:
       destroyed: Messaç eliminât
   passwords:

-    lost_password:
+    new:

       title: Password pierdude
       heading: Âstu pierdût la password?
       email address: 'Direzion di pueste:'
       new password button: Azere la password
       help_text: Scrîf la direzion di pueste eletroniche che tu âs doprât par iscrivîti
         e ti mandarin un leam par tornâ a impuestâ la tô password.
       title: Password pierdude
       heading: Âstu pierdût la password?
       email address: 'Direzion di pueste:'
       new password button: Azere la password
       help_text: Scrîf la direzion di pueste eletroniche che tu âs doprât par iscrivîti
         e ti mandarin un leam par tornâ a impuestâ la tô password.

+    create:

       notice email cannot find: No vin podût cjatâ la tô direzion di pueste, nus displâs.
       notice email cannot find: No vin podût cjatâ la tô direzion di pueste, nus displâs.

-    reset_password:
+    edit:

       title: Azere la password
       heading: Azere la password par %{user}
       reset: Azere la password
       title: Azere la password
       heading: Azere la password par %{user}
       reset: Azere la password

+    update:

       flash changed: La tô password e je stade cambiade.
   preferences:
     show:
       flash changed: La tô password e je stade cambiade.
   preferences:
     show:


@@ -1268,21 +1270,19 @@ fur:
           unclassified: Strade no classificade
           rail: Ferade
           subway: Metropolitane
           unclassified: Strade no classificade
           rail: Ferade
           subway: Metropolitane

-          tram:
-          - Metropolitana leggera
-          - tram

           runway:
           - Piste dal aeropuart
           apron:
             1: terminâl
           admin: Confin aministratîf
           runway:
           - Piste dal aeropuart
           apron:
             1: terminâl
           admin: Confin aministratîf

-          forest: Bosc
+          forest:
+          - Bosc

           golf: Troi di golf
           park: Parc
           golf: Troi di golf
           park: Parc

-          resident: Zone residenziâl

           common:
           - Comugnâi
           - prâts
           common:
           - Comugnâi
           - prâts

+          resident: Zone residenziâl

           retail: Zone di buteghis
           industrial: Zone industriâl
           commercial: Aree comerciâl
           retail: Zone di buteghis
           industrial: Zone industriâl
           commercial: Aree comerciâl

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 00a26d0db6a477e9189aebcd55d7845877f4a37e..b071a2976f520207643fa467a52d67a7db27fe2b 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1723,7 +1723,7 @@ fy:
     destroy:
       destroyed: Berjocht wiske
   passwords:
     destroy:
       destroyed: Berjocht wiske
   passwords:

-    lost_password:
+    new:

       title: Wachtwurd kwyt
       heading: Wachtwurd fergetten?
       email address: 'E-mailadres:'
       title: Wachtwurd kwyt
       heading: Wachtwurd fergetten?
       email address: 'E-mailadres:'


@@ -1731,15 +1731,17 @@ fy:
       help_text: Folje it e-mailadres yn dat jo by it ynskriuwen brûkt hawwe. Wy stjoere
         der dan in keppeling hinne dy't jo brûke kinne om jo wachtwurd op 'e nij yn
         te stellen.
       help_text: Folje it e-mailadres yn dat jo by it ynskriuwen brûkt hawwe. Wy stjoere
         der dan in keppeling hinne dy't jo brûke kinne om jo wachtwurd op 'e nij yn
         te stellen.

+    create:

       notice email on way: Spitich dat jo 'm kwyt binne :-( mar in e-mail is ûnderweis,
         dat jo kinne gau in nijenien ynstelle.
       notice email cannot find: Koe dat e-mailadres net fine, spitich.
       notice email on way: Spitich dat jo 'm kwyt binne :-( mar in e-mail is ûnderweis,
         dat jo kinne gau in nijenien ynstelle.
       notice email cannot find: Koe dat e-mailadres net fine, spitich.

-    reset_password:
+    edit:

       title: Nij wachtwurd
       heading: Wachtwurd op 'e nij ynstelle foar %{user}
       reset: Nij wachtwurd
       title: Nij wachtwurd
       heading: Wachtwurd op 'e nij ynstelle foar %{user}
       reset: Nij wachtwurd

-      flash changed: Jo wachtwurd is feroare.

       flash token bad: Haw dy kaai net fûn, de URL efkes neisjen?
       flash token bad: Haw dy kaai net fûn, de URL efkes neisjen?

+    update:
+      flash changed: Jo wachtwurd is feroare.

   preferences:
     show:
       title: Myn foarkarren
   preferences:
     show:
       title: Myn foarkarren


@@ -2034,9 +2036,6 @@ fy:
           footway: Fuotpaad
           rail: Spoarwei
           subway: Metrospoar
           footway: Fuotpaad
           rail: Spoarwei
           subway: Metrospoar

-          tram:
-          - Sneltrem
-          - trem

           cable:
           - Kabelbaan
           - stuoltsjelift
           cable:
           - Kabelbaan
           - stuoltsjelift


@@ -2047,15 +2046,16 @@ fy:
           - Platfoarm
           - passazjiershal lofth.
           admin: Bestjoerlike grins
           - Platfoarm
           - passazjiershal lofth.
           admin: Bestjoerlike grins

-          forest: Bosk
-          wood: Wâld
+          forest:
+          - Bosk
+          - Wâld

           golf: Golfbaan
           park: Park
           golf: Golfbaan
           park: Park

-          resident: Wengebiet

           common:
           - Miente
           - greide
           - tún
           common:
           - Miente
           - greide
           - tún

+          resident: Wengebiet

           retail: Winkelgebiet
           industrial: Yndustrygebiet
           commercial: Kommersjeel gebiet
           retail: Winkelgebiet
           industrial: Yndustrygebiet
           commercial: Kommersjeel gebiet

diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 7b89a21798b2bb92eac6787c3c4faa34bf4e0167..307ff82ce7549845ec6189819f12c33d76f9c93e 100644 (file)
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -1294,24 +1294,26 @@ ga:
     destroy:
       destroyed: Teachtaireacht scriosta
   passwords:
     destroy:
       destroyed: Teachtaireacht scriosta
   passwords:

-    lost_password:
+    new:

       title: Focal faire caillte
       heading: Focal Faire Caillte?
       email address: 'Seoladh ríomhphoist:'
       new password button: Athshocraigh an focal faire
       help_text: Iontráil an seoladh ríomhphoist a d'úsáid tú le clárú, agus seolfaimid
         nasc chugat a bheidh tú in ann a úsáid chun do phasfhocal a athshocrú.
       title: Focal faire caillte
       heading: Focal Faire Caillte?
       email address: 'Seoladh ríomhphoist:'
       new password button: Athshocraigh an focal faire
       help_text: Iontráil an seoladh ríomhphoist a d'úsáid tú le clárú, agus seolfaimid
         nasc chugat a bheidh tú in ann a úsáid chun do phasfhocal a athshocrú.

+    create:

       notice email on way: Is oth linn gur chaill tú é :-( ach tá ríomhphost ar an
         mbealach chugat le go mbeidh tú in ann é a athshocrú go luath.
       notice email cannot find: Níorbh fhéidir an seoladh ríomhphoist sin a aimsiú,
         ár leithscéil faoi sin.
       notice email on way: Is oth linn gur chaill tú é :-( ach tá ríomhphost ar an
         mbealach chugat le go mbeidh tú in ann é a athshocrú go luath.
       notice email cannot find: Níorbh fhéidir an seoladh ríomhphoist sin a aimsiú,
         ár leithscéil faoi sin.

-    reset_password:
+    edit:

       title: Focal faire a athshocrú
       heading: Focal Faire le haghaidh %{user} a Athshocrú
       reset: Athshocraigh an Focal Faire
       title: Focal faire a athshocrú
       heading: Focal Faire le haghaidh %{user} a Athshocrú
       reset: Athshocraigh an Focal Faire

-      flash changed: Athraíodh d'fhocal faire.

       flash token bad: Níor aimsíodh an ceadchomhartha sin, seiceáil an bhfuil an
         URL cruinn?
       flash token bad: Níor aimsíodh an ceadchomhartha sin, seiceáil an bhfuil an
         URL cruinn?

+    update:
+      flash changed: Athraíodh d'fhocal faire.

   profiles:
     edit:
       image: Íomhá
   profiles:
     edit:
       image: Íomhá


@@ -1541,9 +1543,6 @@ ga:
           footway: Cosán
           rail: Iarnród
           subway: Meitreo
           footway: Cosán
           rail: Iarnród
           subway: Meitreo

-          tram:
-          - Iarnród Éadrom
-          - tram

           cable:
           - Carr cábla
           - cathaoir chábla
           cable:
           - Carr cábla
           - cathaoir chábla


@@ -1554,14 +1553,15 @@ ga:
           - Naprún Aerfoirt
           - críochfort
           admin: Teorainn riaracháin
           - Naprún Aerfoirt
           - críochfort
           admin: Teorainn riaracháin

-          forest: Foraois
-          wood: Coill
+          forest:
+          - Foraois
+          - Coill

           golf: Galfchúrsa
           park: Páirc
           golf: Galfchúrsa
           park: Páirc

-          resident: Ceantar cónaithe

           common:
           - Coimín
           - móinéar
           common:
           - Coimín
           - móinéar

+          resident: Ceantar cónaithe

           retail: Limistéar miondíola
           industrial: Limistéar tionsclaíoch
           commercial: Limistéar tráchtála
           retail: Limistéar miondíola
           industrial: Limistéar tionsclaíoch
           commercial: Limistéar tráchtála

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index 0d026348379bcf9a79bf1d12e0aaf1e014dcbfad..af5e6d0887f96aaf093bfb67a25fb40eadcb7636 100644 (file)
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -108,7 +108,7 @@ gcf:
         imél aw.
       button: Konfirmé
   passwords:
         imél aw.
       button: Konfirmé
   passwords:

-    lost_password:
+    new:

       heading: Ou pèd kòd aw?
       email address: 'Adres imél aw :'
       new password button: Voyé on nouvo kòd
       heading: Ou pèd kòd aw?
       email address: 'Adres imél aw :'
       new password button: Voyé on nouvo kòd

diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index eb6f77f98d952026eb8857be828c6a8aebf22883..54f892df1d44ff86b47650f9c84613baf77b1304 100644 (file)
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1131,7 +1131,7 @@ gd:
     destroy:
       destroyed: Chaidh an teachdaireachd a sguabadh às
   passwords:
     destroy:
       destroyed: Chaidh an teachdaireachd a sguabadh às
   passwords:

-    lost_password:
+    new:

       title: Facal-faire air chall
       heading: Na chaill thu am facal-faire agad?
       email address: 'Seòladh puist-d:'
       title: Facal-faire air chall
       heading: Na chaill thu am facal-faire agad?
       email address: 'Seòladh puist-d:'


@@ -1139,17 +1139,19 @@ gd:
       help_text: Cuir a-steach an seòladh puist-d a chleachd thu gus an cunntas agad
         a chlàradh agus cuiridh sinn post-d dha as urrainn dhut cleachdadh gus am
         facal-faire agad ath-shuidheachadh.
       help_text: Cuir a-steach an seòladh puist-d a chleachd thu gus an cunntas agad
         a chlàradh agus cuiridh sinn post-d dha as urrainn dhut cleachdadh gus am
         facal-faire agad ath-shuidheachadh.

+    create:

       notice email on way: Tha sinn duilich gun do chaill thu e :-( ach tha post-d
         gu bhith tighinn thugad ach an urrainn dhut ath-shuidheachadh a dh'aithghearr.
       notice email cannot find: Duilich ach cha do rinn sinn lorg air an t-seòladh
         puist-d ud.
       notice email on way: Tha sinn duilich gun do chaill thu e :-( ach tha post-d
         gu bhith tighinn thugad ach an urrainn dhut ath-shuidheachadh a dh'aithghearr.
       notice email cannot find: Duilich ach cha do rinn sinn lorg air an t-seòladh
         puist-d ud.

-    reset_password:
+    edit:

       title: Ath-shuidhich am facal-faire
       heading: Ath-shuidhich am facal-faire aig %{user}
       reset: Ath-shuidhich am facal-faire
       title: Ath-shuidhich am facal-faire
       heading: Ath-shuidhich am facal-faire aig %{user}
       reset: Ath-shuidhich am facal-faire

-      flash changed: Chaidh am facal-faire agad atharrachadh.

       flash token bad: Cha do rinn sinn lorg air an tòcan ud, an toir thu sùil air
         an URL?
       flash token bad: Cha do rinn sinn lorg air an tòcan ud, an toir thu sùil air
         an URL?

+    update:
+      flash changed: Chaidh am facal-faire agad atharrachadh.

   profiles:
     edit:
       image: 'Dealbh:'
   profiles:
     edit:
       image: 'Dealbh:'


@@ -1395,9 +1397,6 @@ gd:
           footway: Àrainn-choisichean
           rail: Rèile
           subway: Meatro
           footway: Àrainn-choisichean
           rail: Rèile
           subway: Meatro

-          tram:
-          - Rèile aotrom
-          - Trama

           cable:
           - Carbad-càbaill
           - Lioft-sèitheir
           cable:
           - Carbad-càbaill
           - Lioft-sèitheir


@@ -1408,14 +1407,15 @@ gd:
           - Aparan puirt-adhair
           - Tèirmineal
           admin: Crìoch rianachd
           - Aparan puirt-adhair
           - Tèirmineal
           admin: Crìoch rianachd

-          forest: Coille
-          wood: Coille
+          forest:
+          - Coille
+          - Coille

           golf: Raon goilf
           park: Pàirc
           golf: Raon goilf
           park: Pàirc

-          resident: Raon-còmhnaidh

           common:
           - Coitcheann
           - Faiche
           common:
           - Coitcheann
           - Faiche

+          resident: Raon-còmhnaidh

           retail: Raon bhuitean
           industrial: Raon gnìomhachais
           commercial: Raon malairt
           retail: Raon bhuitean
           industrial: Raon gnìomhachais
           commercial: Raon malairt

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index dd0a9b2f5fe4766de74c33d40d60286ef404a59a..e897fa70b4705ff0abcdc04ceab4357a824a25f6 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1832,7 +1832,7 @@ gl:
     destroy:
       destroyed: Mensaxe eliminada
   passwords:
     destroy:
       destroyed: Mensaxe eliminada
   passwords:

-    lost_password:
+    new:

       title: Contrasinal perdido
       heading: Esqueciches o contrasinal?
       email address: 'Enderezo de correo electrónico:'
       title: Contrasinal perdido
       heading: Esqueciches o contrasinal?
       email address: 'Enderezo de correo electrónico:'


@@ -1840,16 +1840,20 @@ gl:
       help_text: Escribe o enderezo de correo electrónico que empregaches para te
         rexistrares. Enviarémosche unha ligazón que poderás empregar para restablecer
         o teu contrasinal.
       help_text: Escribe o enderezo de correo electrónico que empregaches para te
         rexistrares. Enviarémosche unha ligazón que poderás empregar para restablecer
         o teu contrasinal.

+    create:

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

-    reset_password:
+    edit:

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

-      flash changed: Mudouse o teu contrasinal.

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

+    update:
+      flash changed: Mudouse o teu contrasinal.
+      flash token bad: Non se atopou o pase. Quizais deberías comprobar o enderezo
+        URL.

   preferences:
     show:
       title: As miñas preferencias
   preferences:
     show:
       title: As miñas preferencias


@@ -2356,10 +2360,13 @@ gl:
           cycleway_local: Carril bici local
           footway: Senda peonil
           rail: Ferrocarril
           cycleway_local: Carril bici local
           footway: Senda peonil
           rail: Ferrocarril

+          train: Tren

           subway: Metro
           subway: Metro

-          tram:
-          - Metro lixeiro
-          - tranvía
+          ferry: Transbordador
+          light_rail: Metro lixeiro
+          tram_only: Tranvía
+          trolleybus: Trolebús
+          bus: Autobús

           cable:
           - Teleférico
           - telecadeira
           cable:
           - Teleférico
           - telecadeira


@@ -2370,15 +2377,16 @@ gl:
           - Plataforma do aeroporto
           - terminal
           admin: Límite administrativo
           - Plataforma do aeroporto
           - terminal
           admin: Límite administrativo

-          forest: Bosque
-          wood: Bosque
+          forest:
+          - Bosque
+          - Bosque

           golf: Campo de golf
           park: Parque
           golf: Campo de golf
           park: Parque

-          resident: Zona residencial

           common:
           - Espazo común
           - pradaría
           - xardín
           common:
           - Espazo común
           - pradaría
           - xardín

+          resident: Zona residencial

           retail: Zona comercial
           industrial: Zona industrial
           commercial: Zona de oficinas
           retail: Zona comercial
           industrial: Zona industrial
           commercial: Zona de oficinas


@@ -2407,6 +2415,8 @@ gl:
           private: Acceso privado
           destination: Acceso a destino
           construction: Estradas baixo construción
           private: Acceso privado
           destination: Acceso a destino
           construction: Estradas baixo construción

+          bus_stop: Parada de bus
+          stop: Parada

           bicycle_shop: Tenda de bicicletas
           bicycle_parking: Aparcadoiro de bicicletas
           toilets: Servizos
           bicycle_shop: Tenda de bicicletas
           bicycle_parking: Aparcadoiro de bicicletas
           toilets: Servizos


@@ -2656,7 +2666,7 @@ gl:
       title: Detalles OAuth para %{app_name}
       key: 'Chave ou clave do consumidor:'
       secret: 'Pregunta secreta do consumidor:'
       title: Detalles OAuth para %{app_name}
       key: 'Chave ou clave do consumidor:'
       secret: 'Pregunta secreta do consumidor:'

-      url: 'Solicitar unha URL de pase:'
+      url: 'URL do pase da solicitude:'

       access_url: 'Acceder á URL do pase:'
       authorize_url: 'Autorizar a URL:'
       support_notice: Soportamos HMAC-SHA1 (recomendado) e sinaturas RSA-SHA1.
       access_url: 'Acceder á URL do pase:'
       authorize_url: 'Autorizar a URL:'
       support_notice: Soportamos HMAC-SHA1 (recomendado) e sinaturas RSA-SHA1.

diff --git a/config/locales/gsw.yml b/config/locales/gsw.yml
index ac44d7f59f06954676e245ce86cdd2b3d234d444..c5475f3d654894a6606d44b895d6828e014234b7 100644 (file)
--- a/config/locales/gsw.yml
+++ b/config/locales/gsw.yml
@@ -185,12 +185,13 @@ gsw:
       success: Dyy E-Mail-Adräss isch bstetigt wore, dankschen fir s Regischtriere!
       failure: E E-Mail-Adräss isch scho mit däm Link bstetigt wore.
   passwords:
       success: Dyy E-Mail-Adräss isch bstetigt wore, dankschen fir s Regischtriere!
       failure: E E-Mail-Adräss isch scho mit däm Link bstetigt wore.
   passwords:

-    reset_password:
+    edit:

       title: Passwort zrucksetze
       heading: Passwort fir %{user} zrucksetze
       reset: Passwort zrucksetze
       title: Passwort zrucksetze
       heading: Passwort fir %{user} zrucksetze
       reset: Passwort zrucksetze

-      flash changed: Dyy Passwort isch gänderet wore.

       flash token bad: Mir hän des Chirzel leider nit chenne finde. Iberprief d URL.
       flash token bad: Mir hän des Chirzel leider nit chenne finde. Iberprief d URL.

+    update:
+      flash changed: Dyy Passwort isch gänderet wore.

   traces:
     visibility:
       private: Privat (nume as anonymi, nit sortierti Pinkt ohni Zytstämpfel aazeigt)
   traces:
     visibility:
       private: Privat (nume as anonymi, nit sortierti Pinkt ohni Zytstämpfel aazeigt)

diff --git a/config/locales/he.yml b/config/locales/he.yml
index e5a7c2e03574ec61278d829a37d93e5372d8a646..11cc0416f798b0ad1e3b17dc1a8b15fd8e1b6fb2 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -266,7 +266,7 @@ he:
       description: iD (עורך בתוך הדפדפן)
     remote:
       name: שליטה מרחוק
       description: iD (עורך בתוך הדפדפן)
     remote:
       name: שליטה מרחוק

-      description: שליטה מרחוק (JOSM, Potlatch או Merkaartor)
+      description: שליטה מרחוק (JOSM,‏ Potlatch או Merkaartor)

   auth:
     providers:
       none: ללא
   auth:
     providers:
       none: ללא


@@ -361,8 +361,8 @@ he:
         כברירת מחדל.
       make_edits_public_button: להפוך את כל עריכותיי לציבוריות
     update:
         כברירת מחדל.
       make_edits_public_button: להפוך את כל עריכותיי לציבוריות
     update:

-      success_confirm_needed: מידע על המשתמש עודכן בהצלחה. נא לבדוק את תיבת הדוא"ל
-        כדי לאמת את הדוא"ל החדש.
+      success_confirm_needed: מידע על המשתמש עודכן בהצלחה. נא לבדוק את תיבת הדוא״ל
+        כדי לאמת את הדוא״ל החדש.

       success: פרטי המשתמש עודכנו בהצלחה.
     destroy:
       success: חשבון נמחק.
       success: פרטי המשתמש עודכנו בהצלחה.
     destroy:
       success: חשבון נמחק.


@@ -1764,7 +1764,7 @@ he:
       success: חשבונך אושר, תודה שנרשמת!
       already active: החשבון הזה כבר אושר.
       unknown token: נראה שקוד האישור הזה פג או שאינו קיים.
       success: חשבונך אושר, תודה שנרשמת!
       already active: החשבון הזה כבר אושר.
       unknown token: נראה שקוד האישור הזה פג או שאינו קיים.

-      resend_html: אם צריך שנשלח לך שוב את דוא"ל האישור, %{reconfirm_link}.
+      resend_html: אם צריך שנשלח לך שוב את דוא״ל האישור, %{reconfirm_link}.

       click_here: נא ללחוץ כאן
     confirm_resend:
       failure: משתמש %{name} לא נמצא.
       click_here: נא ללחוץ כאן
     confirm_resend:
       failure: משתמש %{name} לא נמצא.


@@ -1845,22 +1845,25 @@ he:
     destroy:
       destroyed: ההודעה נמחקה
   passwords:
     destroy:
       destroyed: ההודעה נמחקה
   passwords:

-    lost_password:
+    new:

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

+    create:

       notice email on way: אנו מצטערים לשמוע שאיבדת אותה :-( אבל נשלח לדואר האלקטרוני
         שלך מכתב שבאמצעותו אפשר לאפס אותה.
       notice email cannot find: סליחה, הכתובת הזאת לא נמצאה.
       notice email on way: אנו מצטערים לשמוע שאיבדת אותה :-( אבל נשלח לדואר האלקטרוני
         שלך מכתב שבאמצעותו אפשר לאפס אותה.
       notice email cannot find: סליחה, הכתובת הזאת לא נמצאה.

-    reset_password:
+    edit:

       title: איפוס סיסמה
       heading: איפוס הסיסמה עבור %{user}
       reset: איפוס הסיסמה
       title: איפוס סיסמה
       heading: איפוס הסיסמה עבור %{user}
       reset: איפוס הסיסמה

-      flash changed: סיסמתך שונתה.

       flash token bad: לא מצאנו את האסימון ההוא, אולי בדיקת הכתובת תעזור?
       flash token bad: לא מצאנו את האסימון ההוא, אולי בדיקת הכתובת תעזור?

+    update:
+      flash changed: סיסמתך שונתה.
+      flash token bad: האסימון לא נמצא, אולי משהו עם הכתובת?

   preferences:
     show:
       title: ההעדפות שלי
   preferences:
     show:
       title: ההעדפות שלי


@@ -2062,9 +2065,9 @@ he:
         credit_3_attribution_guidelines: הנחיות ייחוס
         credit_4_1_html: |-
           כדי להבהיר שהנתונים זמינים לפי תנאי רישיון מסד הנתונים הפתוח, באפשרותך לקשר ל%{this_copyright_page_link}.
         credit_3_attribution_guidelines: הנחיות ייחוס
         credit_4_1_html: |-
           כדי להבהיר שהנתונים זמינים לפי תנאי רישיון מסד הנתונים הפתוח, באפשרותך לקשר ל%{this_copyright_page_link}.

-          ×\9c×\97×\9c×\95פ×\99×\9f, ×\95×\9b×\93ר×\99ש×\94 ×\90×\9d OSM ×\9e×\95פץ ×¢×\9cÖ¾×\99×\93×\99×\9a ×\91צ×\95רת × ×ª×\95× ×\99×\9d, ×\91×\90פשר×\95ת×\9a ×\9cתת שם ולקשר ישירות לרישיון (או רישיונות). באמצעי אחסון שבהם קישורים אינם אפשריים (למשל עבודות מודפסות), אנו מציעים לך להפנות את הקוראים שלך לאתר openstreetmap.org (אולי על‏‏־ידי הרחבת
-          "OpenStreetMap" לכתובת המלאה הזאת) ולאתר opendatacommons.org.
-          ×\91×\93×\95×\92×\9e×\94 ×\94×\96×\90ת, ×\94קר×\93×\99×\98 ×\9e×\95פ×\99×¢ בפינת המפה.
+          ×\9c×\97×\9c×\95פ×\99×\9f, ×\95×\9b×\93ר×\99ש×\94 ×\90×\9d OSM ×\9e×\95פץ ×¢×\9cÖ¾×\99×\93×\99×\9a ×\91צ×\95רת × ×ª×\95× ×\99×\9d, ×\90פשר ×\9cספק שם ולקשר ישירות לרישיון (או רישיונות). באמצעי אחסון שבהם קישורים אינם אפשריים (למשל עבודות מודפסות), אנו מציעים לך להפנות את הקוראים שלך לאתר openstreetmap.org (אולי על‏‏־ידי הרחבת
+          ‚OpenStreetMap’ לכתובת המלאה הזאת) ולאתר opendatacommons.org.
+          ×\91×\93×\95×\92×\9e×\94 ×\94×\96×\90ת, ×\94ת×\95×\93×\95ת ×\9e×\95פ×\99×¢×\95ת בפינת המפה.

         credit_4_1_this_copyright_page: דף זכויות היוצרים הזה
         attribution_example:
           alt: דוגמה לצורה הנכונה לתת ייחוס ל־OpenStreetMap באתר האינטרנט
         credit_4_1_this_copyright_page: דף זכויות היוצרים הזה
         attribution_example:
           alt: דוגמה לצורה הנכונה לתת ייחוס ל־OpenStreetMap באתר האינטרנט


@@ -2350,10 +2353,13 @@ he:
           cycleway_local: מסלול אופניים מקומי
           footway: שביל להולכי רגל
           rail: מסילת ברזל
           cycleway_local: מסלול אופניים מקומי
           footway: שביל להולכי רגל
           rail: מסילת ברזל

+          train: רכבת

           subway: רכבת תחתית
           subway: רכבת תחתית

-          tram:
-          - רכבת קלה
-          - חשמלית
+          ferry: מעבורת
+          light_rail: רכבת קלה
+          tram_only: חשמלית
+          trolleybus: טרוליבוס
+          bus: אוטובוס

           cable:
           - רכבל
           - מעלית סקי
           cable:
           - רכבל
           - מעלית סקי


@@ -2364,15 +2370,16 @@ he:
           - רחבת חניה למטוסים
           - מסוף
           admin: גבול שטח שיפוט
           - רחבת חניה למטוסים
           - מסוף
           admin: גבול שטח שיפוט

-          forest: יער
-          wood: חורשה
+          forest:
+          - יער
+          - חורשה

           golf: מסלול גולף
           park: פארק
           golf: מסלול גולף
           park: פארק

-          resident: אזור מגורים

           common:
           - מרעה
           - מרעה
           - גן
           common:
           - מרעה
           - מרעה
           - גן

+          resident: אזור מגורים

           retail: אזור קמעונאי
           industrial: אזור תעשייה
           commercial: אזור מסחרי
           retail: אזור קמעונאי
           industrial: אזור תעשייה
           commercial: אזור מסחרי


@@ -2401,6 +2408,8 @@ he:
           private: גישה פרטית
           destination: גישה ליעד
           construction: דרכים בבנייה
           private: גישה פרטית
           destination: גישה ליעד
           construction: דרכים בבנייה

+          bus_stop: תחנת אוטובוס
+          stop: עצירה

           bicycle_shop: חנות אופניים
           bicycle_parking: חניית אופניים
           toilets: שירותים
           bicycle_shop: חנות אופניים
           bicycle_parking: חניית אופניים
           toilets: שירותים


@@ -2730,7 +2739,7 @@ he:
       display name description: שם המשתמש שלך, שמוצג בפומבי. אפשר לשנות את זה בהעדפות
         שלך.
       external auth: 'אימות עם צד שלישי:'
       display name description: שם המשתמש שלך, שמוצג בפומבי. אפשר לשנות את זה בהעדפות
         שלך.
       external auth: 'אימות עם צד שלישי:'

-      use external auth: '×\9c×\97×\9c×\95פ×\99×\9f, ×\94שת×\9eש×\95 ×\91צד שלישי כדי להיכנס:'
+      use external auth: '×\9c×\97×\9c×\95פ×\99×\9f, ×\90פשר ×\9c×\94שת×\9eש ×\91×\92×\95ר×\9e×\99 צד שלישי כדי להיכנס:'

       auth no password: עם אימות צד שלישי אין צורך בסיסמה, אבל כלים נוספים או שרת
         יכולים להזדקק לכזה.
       continue: הרשמה
       auth no password: עם אימות צד שלישי אין צורך בסיסמה, אבל כלים נוספים או שרת
         יכולים להזדקק לכזה.
       continue: הרשמה


@@ -2738,7 +2747,7 @@ he:
       email_confirmation_help_html: הכתובת שלך אינה מוצגת בפומבי, ר' את %{privacy_policy_link}
         שלנו למידע נוסף.
       privacy_policy: מדיניות הפרטיות
       email_confirmation_help_html: הכתובת שלך אינה מוצגת בפומבי, ר' את %{privacy_policy_link}
         שלנו למידע נוסף.
       privacy_policy: מדיניות הפרטיות

-      privacy_policy_title: מדיניות הפרטיות של OSMF כולל סעיף על כתובות דוא"ל
+      privacy_policy_title: מדיניות הפרטיות של OSMF כוללת סעיף על כתובות דוא״ל

     terms:
       title: תנאים
       heading: תנאים
     terms:
       title: תנאים
       heading: תנאים


@@ -3113,10 +3122,10 @@ he:
       edit_disabled_tooltip: להתקרב כדי לערוך את המפה
       createnote_tooltip: הוספת הערה למפה
       createnote_disabled_tooltip: נא להתקרב כדי להוסיף הערה למפה
       edit_disabled_tooltip: להתקרב כדי לערוך את המפה
       createnote_tooltip: הוספת הערה למפה
       createnote_disabled_tooltip: נא להתקרב כדי להוסיף הערה למפה

-      map_notes_zoom_in_tooltip: ×\94תקר×\91×\95ת כדי לראות הערות על המפה
-      map_data_zoom_in_tooltip: ×\99ש ×\9cקר×\91 ×\90ת ×\94×\9eפ×\94 כדי לראות נתוני מפה
+      map_notes_zoom_in_tooltip: ×\99ש ×\9c×\94תקר×\91 כדי לראות הערות על המפה
+      map_data_zoom_in_tooltip: ×\99ש ×\9c×\94תקר×\91 כדי לראות נתוני מפה

       queryfeature_tooltip: שאילתת ישויות
       queryfeature_tooltip: שאילתת ישויות

-      queryfeature_disabled_tooltip: תקר×\99ב כדי להריץ שאילתת ישויות
+      queryfeature_disabled_tooltip: ×\99ש ×\9c×\94תקרב כדי להריץ שאילתת ישויות

       embed_html_disabled: הטבעת HTML אינה זמינה בשכבת המפה הזאת
     changesets:
       show:
       embed_html_disabled: הטבעת HTML אינה זמינה בשכבת המפה הזאת
     changesets:
       show:

diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index b9ade646979523abb22ba43f2e5d78d29a48399c..1187b377b955e79985316779fcebab4cd3e3c81a 100644 (file)
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -930,10 +930,10 @@ hi:
     destroy:
       destroyed: संदेश खात्मा
   passwords:
     destroy:
       destroyed: संदेश खात्मा
   passwords:

-    lost_password:
+    new:

       title: lost password
       new password button: Send me a new password
       title: lost password
       new password button: Send me a new password

-    reset_password:
+    edit:

       title: reset password
   profiles:
     edit:
       title: reset password
   profiles:
     edit:


@@ -987,8 +987,12 @@ hi:
           - केबल कार
           runway:
           - एयरपोर्ट रनवे
           - केबल कार
           runway:
           - एयरपोर्ट रनवे

-          forest: वन
-          wood: लकड़ी
+          forest:
+          - वन
+          - लकड़ी
+          grass:
+          - घास
+          sand: रेत

           golf: गोल्फ मैदान
           park: पार्क
           resident: रिहायशी क्षेत्र
           golf: गोल्फ मैदान
           park: पार्क
           resident: रिहायशी क्षेत्र


@@ -1003,6 +1007,7 @@ hi:
           - विश्वविद्यालय
           building: महत्वपूर्ण भवन
           station: रेलवे स्टेशन
           - विश्वविद्यालय
           building: महत्वपूर्ण भवन
           station: रेलवे स्टेशन

+          stop: रोकें

   traces:
     new:
       visibility_help: इसका क्या मतलब है?
   traces:
     new:
       visibility_help: इसका क्या मतलब है?

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index c497084f0e8d5f29a851742ffc712ad825663c4a..85cb4a1c3eb6c1140b5172b12d8e52fe392231f7 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1198,22 +1198,24 @@ hr:
     destroy:
       destroyed: Poruka obrisana
   passwords:
     destroy:
       destroyed: Poruka obrisana
   passwords:

-    lost_password:
+    new:

       title: Izgubljena zaporka
       heading: Zaboravljena zaporka?
       email address: 'Email adresa:'
       new password button: Reset lozinke
       help_text: Unesite email adresu koju ste koristili za otvaranje računa i poslati
         ćemo vam poveznicu kojom možete resetirati zaporku.
       title: Izgubljena zaporka
       heading: Zaboravljena zaporka?
       email address: 'Email adresa:'
       new password button: Reset lozinke
       help_text: Unesite email adresu koju ste koristili za otvaranje računa i poslati
         ćemo vam poveznicu kojom možete resetirati zaporku.

+    create:

       notice email on way: Žao mi je što ste je izgubili :-( ali email je na putu
         tako da je možete resetirati uskoro.
       notice email cannot find: Ne mogu pronaći email adresu.
       notice email on way: Žao mi je što ste je izgubili :-( ali email je na putu
         tako da je možete resetirati uskoro.
       notice email cannot find: Ne mogu pronaći email adresu.

-    reset_password:
+    edit:

       title: Reset lozinke
       heading: Reset lozinke za %{user}
       reset: Reset lozinke
       title: Reset lozinke
       heading: Reset lozinke za %{user}
       reset: Reset lozinke

-      flash changed: Vaša lozinka je promjenjena.

       flash token bad: Nije pronađen takav token, provjeri URL?
       flash token bad: Nije pronađen takav token, provjeri URL?

+    update:
+      flash changed: Vaša lozinka je promjenjena.

   profiles:
     edit:
       image: 'Slika:'
   profiles:
     edit:
       image: 'Slika:'


@@ -1423,9 +1425,6 @@ hr:
           footway: Pješačka staza
           rail: Željeznica
           subway: Podzemna željeznica
           footway: Pješačka staza
           rail: Željeznica
           subway: Podzemna željeznica

-          tram:
-          - Laka željeznica
-          - tramvaj

           cable:
           - Kabinska žičara
           - sedežnica
           cable:
           - Kabinska žičara
           - sedežnica


@@ -1436,14 +1435,15 @@ hr:
           - Parking za avione (apron)
           - terminal
           admin: Administrativna granica
           - Parking za avione (apron)
           - terminal
           admin: Administrativna granica

-          forest: Šuma (održavane, od šumarije)
-          wood: Šume (prirodne, neodržavane)
+          forest:
+          - Šuma (održavane, od šumarije)
+          - Šume (prirodne, neodržavane)

           golf: Golf teren
           park: Park
           golf: Golf teren
           park: Park

-          resident: Stambeno područje

           common:
           - Travnjaci
           - livade
           common:
           - Travnjaci
           - livade

+          resident: Stambeno područje

           retail: Maloprodajno područje
           industrial: Industrijsko područje
           commercial: Poslovno područje
           retail: Maloprodajno područje
           industrial: Industrijsko područje
           commercial: Poslovno područje

diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index caa9f52768c988c3cc57f2478e08e3d24f772215..a1fb987f8cbdca12a9bd3e5f8e2b0c88948edccf 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -1705,22 +1705,24 @@ hsb:
     destroy:
       destroyed: Powěsć wotstronjena
   passwords:
     destroy:
       destroyed: Powěsć wotstronjena
   passwords:

-    lost_password:
+    new:

       title: Hesło zabyte
       heading: Sy hesło zabył?
       email address: 'E-mejlowa adresa:'
       new password button: Hesło wróćo stajić
       help_text: Zapódaj mejlowu adresu, kotruž sy za registrowanje wužił, pósćelemy
         wotkaz na nju, kotryž móžeš za wróćostajenje hesła wužić.
       title: Hesło zabyte
       heading: Sy hesło zabył?
       email address: 'E-mejlowa adresa:'
       new password button: Hesło wróćo stajić
       help_text: Zapódaj mejlowu adresu, kotruž sy za registrowanje wužił, pósćelemy
         wotkaz na nju, kotryž móžeš za wróćostajenje hesła wužić.

+    create:

       notice email on way: Sy jo zabył :-(, ale e-mejl je po puću, zo by móhł jo borze
         wróćo stajić.
       notice email cannot find: Wodaj, ale njemóžachmy tutu e-mejlowu adresu namakać.
       notice email on way: Sy jo zabył :-(, ale e-mejl je po puću, zo by móhł jo borze
         wróćo stajić.
       notice email cannot find: Wodaj, ale njemóžachmy tutu e-mejlowu adresu namakać.

-    reset_password:
+    edit:

       title: Hesło wróćo stajić
       heading: Hesło za wužiwarja %{user} wróćo stajić
       reset: Hesło wróćo stajić
       title: Hesło wróćo stajić
       heading: Hesło za wužiwarja %{user} wróćo stajić
       reset: Hesło wróćo stajić

-      flash changed: Twoje hesło je so změniło.

       flash token bad: Njemóžachmy tutón kod namakać, prošu přepruwuj URL.
       flash token bad: Njemóžachmy tutón kod namakać, prošu přepruwuj URL.

+    update:
+      flash changed: Twoje hesło je so změniło.

   preferences:
     show:
       title: Moje nastajenja
   preferences:
     show:
       title: Moje nastajenja


@@ -2007,9 +2009,6 @@ hsb:
           footway: Chódnik
           rail: Železnica
           subway: Podzemska železnica
           footway: Chódnik
           rail: Železnica
           subway: Podzemska železnica

-          tram:
-          - Měšćanska železnica
-          - nadróžna

           cable:
           - Kablowa nadróžna
           - sydłowy lift
           cable:
           - Kablowa nadróžna
           - sydłowy lift


@@ -2020,14 +2019,15 @@ hsb:
           - Lětanišćowe předpolo
           - terminal
           admin: Zarjadniska hranica
           - Lětanišćowe předpolo
           - terminal
           admin: Zarjadniska hranica

-          forest: Hajina
-          wood: Lěs
+          forest:
+          - Hajina
+          - Lěs

           golf: Golfownišćo
           park: Park
           golf: Golfownišćo
           park: Park

-          resident: Bydlenski wobwod

           common:
           - Powšitkowny
           - łuka
           common:
           - Powšitkowny
           - łuka

+          resident: Bydlenski wobwod

           retail: Nakupowanišćo
           industrial: Industrijowa kónčina
           commercial: Přemysłowa kónčina
           retail: Nakupowanišćo
           industrial: Industrijowa kónčina
           commercial: Přemysłowa kónčina

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index c87f3904f0fef872e4d8d78c00fbc2097e8eb9c7..270d9cb426557ffe386a58c9d85c6d58cdc72905 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1812,22 +1812,24 @@ hu:
     destroy:
       destroyed: Üzenet törölve
   passwords:
     destroy:
       destroyed: Üzenet törölve
   passwords:

-    lost_password:
+    new:

       title: Elvesztett jelszó
       heading: Elfelejtetted jelszavad?
       email address: 'E-mail-cím:'
       new password button: Jelszó alaphelyzetbe állítása
       help_text: Add meg az e-mail-címed, amellyel regisztráltál. Küldeni fogunk egy
         hivatkozást, amellyel visszaállíthatod a jelszavad.
       title: Elvesztett jelszó
       heading: Elfelejtetted jelszavad?
       email address: 'E-mail-cím:'
       new password button: Jelszó alaphelyzetbe állítása
       help_text: Add meg az e-mail-címed, amellyel regisztráltál. Küldeni fogunk egy
         hivatkozást, amellyel visszaállíthatod a jelszavad.

+    create:

       notice email on way: Sajnáljuk, hogy elvesztetted :-( de már úton van egy e-mail,
         így nemsokára alaphelyzetbe állíthatod.
       notice email cannot find: Sajnáljuk, az e-mail-cím nem található.
       notice email on way: Sajnáljuk, hogy elvesztetted :-( de már úton van egy e-mail,
         így nemsokára alaphelyzetbe állíthatod.
       notice email cannot find: Sajnáljuk, az e-mail-cím nem található.

-    reset_password:
+    edit:

       title: Jelszó alaphelyzetbe állítása
       heading: '%{user} jelszavának alaphelyzetbe állítása'
       reset: Jelszó alaphelyzetbe állítása
       title: Jelszó alaphelyzetbe állítása
       heading: '%{user} jelszavának alaphelyzetbe állítása'
       reset: Jelszó alaphelyzetbe állítása

-      flash changed: Jelszavad megváltozott.

       flash token bad: Nem találtad meg a tokent? Esetleg ellenőrizd az URL-t.
       flash token bad: Nem találtad meg a tokent? Esetleg ellenőrizd az URL-t.

+    update:
+      flash changed: Jelszavad megváltozott.

   preferences:
     show:
       title: Megjelenési beállítások
   preferences:
     show:
       title: Megjelenési beállítások


@@ -2074,6 +2076,7 @@ hu:
           ne adjanak hozzá adatokat egyetlen szerzői jogvédett forrásból se (pl. Google
           Térkép vagy nyomtatott térképek) a szerzői jog tulajdonosának kifejezett
           engedélye nélkül.
           ne adjanak hozzá adatokat egyetlen szerzői jogvédett forrásból se (pl. Google
           Térkép vagy nyomtatott térképek) a szerzői jog tulajdonosának kifejezett
           engedélye nélkül.

+        trademarks_title: Védjegyek

     index:
       js_1: Vagy egy olyan böngészőt használsz, amely nem támogatja a JavaScriptet,
         vagy letiltottad a JavaScriptet.
     index:
       js_1: Vagy egy olyan böngészőt használsz, amely nem támogatja a JavaScriptet,
         vagy letiltottad a JavaScriptet.


@@ -2149,6 +2152,7 @@ hu:
             és kijavítod az adatot saját magad.
       other_concerns:
         title: Egyéb aggályok
             és kijavítod az adatot saját magad.
       other_concerns:
         title: Egyéb aggályok

+        copyright: szerzői jogi oldal

     help:
       title: Segítségkérés
       introduction: Az OpenStreetMap számos anyagot kínál fel ahhoz, hogy ismerkedj
     help:
       title: Segítségkérés
       introduction: Az OpenStreetMap számos anyagot kínál fel ahhoz, hogy ismerkedj


@@ -2230,9 +2234,11 @@ hu:
           footway: Gyalogút
           rail: Vasút
           subway: Metró
           footway: Gyalogút
           rail: Vasút
           subway: Metró

-          tram:
-          - HÉV
-          - villamos
+          ferry: Komp
+          light_rail: HÉV
+          tram_only: Villamos
+          trolleybus: Trolibusz
+          bus: Busz

           cable:
           - Nagykabinos felvonó
           - függőszékes felvonó
           cable:
           - Nagykabinos felvonó
           - függőszékes felvonó


@@ -2243,15 +2249,26 @@ hu:
           - Forgalmi előtér
           - utasterminál
           admin: Közigazgatási határ
           - Forgalmi előtér
           - utasterminál
           admin: Közigazgatási határ

-          forest: Erdő
-          wood: Erdő
+          orchard:
+          - Gyümölcsös
+          - szőlő
+          forest:
+          - Erdő
+          - erdő
+          farmland: Mezőgazdasági terület
+          grass:
+          - Fű
+          - rét
+          bare_rock: Csupasz szikla
+          sand: Homok

           golf: Golfpálya
           park: Park
           golf: Golfpálya
           park: Park

-          resident: Gyalogos övezet

           common:
           - Füves terület
           - rét
           - kert
           common:
           - Füves terület
           - rét
           - kert

+          built_up: Beépített terület
+          resident: Gyalogos övezet

           retail: Kereskedelmi terület
           industrial: Ipari terület
           commercial: Kereskedelmi terület
           retail: Kereskedelmi terület
           industrial: Ipari terület
           commercial: Kereskedelmi terület


@@ -2259,6 +2276,7 @@ hu:
           lake:
           - Tó
           - víztározó
           lake:
           - Tó
           - víztározó

+          glacier: Gleccser

           farm: Tanya
           brownfield: Bontási terület
           cemetery: Temető
           farm: Tanya
           brownfield: Bontási terület
           cemetery: Temető


@@ -2280,6 +2298,7 @@ hu:
           private: Behajtás csak engedéllyel
           destination: Csak célforgalom
           construction: Épülő utak
           private: Behajtás csak engedéllyel
           destination: Csak célforgalom
           construction: Épülő utak

+          bus_stop: Buszmegálló

           bicycle_shop: Kerékpárbolt
           bicycle_parking: Kerékpártároló
           toilets: WC
           bicycle_shop: Kerékpárbolt
           bicycle_parking: Kerékpártároló
           toilets: WC


@@ -2323,6 +2342,7 @@ hu:
         imports: Importálások
         automated_edits: automatizált szerkesztések
       start_mapping: Térképezés indítása
         imports: Importálások
         automated_edits: automatizált szerkesztések
       start_mapping: Térképezés indítása

+      continue_authorization: Engedélyezés folytatása

       add_a_note:
         title: Nincs időd szerkeszteni? Küldj be jegyzetet!
         para_1: Ha valami apróságot szeretnél kijavíttatni és nincs időd regisztrálni
       add_a_note:
         title: Nincs időd szerkeszteni? Küldj be jegyzetet!
         para_1: Ha valami apróságot szeretnél kijavíttatni és nincs időd regisztrálni

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 5281dd4ab9db1be483e675ea68119b7e147866af..23b7aedc209c1e1f32d609ec56a9dd379a5de3fa 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -1824,20 +1824,23 @@ ia:
     destroy:
       destroyed: Message delite
   passwords:
     destroy:
       destroyed: Message delite
   passwords:

-    lost_password:
+    new:

       title: Contrasigno perdite
       heading: Contrasigno oblidate?
       email address: 'Adresse de e-mail:'
       new password button: Reinitialisar contrasigno
       help_text: Entra le adresse de e-mail que tu usava pro inscriber te, e nos te
         inviara un ligamine que tu pote usar pro reinitialisar tu contrasigno.
       title: Contrasigno perdite
       heading: Contrasigno oblidate?
       email address: 'Adresse de e-mail:'
       new password button: Reinitialisar contrasigno
       help_text: Entra le adresse de e-mail que tu usava pro inscriber te, e nos te
         inviara un ligamine que tu pote usar pro reinitialisar tu contrasigno.

+    create:

       notice email on way: Es infortunate que tu lo perdeva :-( ma nos te ha inviate
         un e-mail que te permittera de reinitialisar lo.
       notice email cannot find: Non poteva trovar iste adresse de e-mail, pardono.
       notice email on way: Es infortunate que tu lo perdeva :-( ma nos te ha inviate
         un e-mail que te permittera de reinitialisar lo.
       notice email cannot find: Non poteva trovar iste adresse de e-mail, pardono.

-    reset_password:
+    edit:

       title: Reinitialisar contrasigno
       heading: Reinitialisar le contrasigno de %{user}
       reset: Reinitialisar contrasigno
       title: Reinitialisar contrasigno
       heading: Reinitialisar le contrasigno de %{user}
       reset: Reinitialisar contrasigno

+      flash token bad: Token non trovate. Verifica le URL.
+    update:

       flash changed: Tu contrasigno ha essite cambiate.
       flash token bad: Token non trovate. Verifica le URL.
   preferences:
       flash changed: Tu contrasigno ha essite cambiate.
       flash token bad: Token non trovate. Verifica le URL.
   preferences:


@@ -2330,10 +2333,13 @@ ia:
           cycleway_local: Pista cyclabile local
           footway: Sentiero pro pedones
           rail: Ferrovia
           cycleway_local: Pista cyclabile local
           footway: Sentiero pro pedones
           rail: Ferrovia

+          train: Traino

           subway: Metro
           subway: Metro

-          tram:
-          - Ferrovia legier
-          - tram
+          ferry: Ferry-boat
+          light_rail: Ferrovia legier
+          tram_only: Tram
+          trolleybus: Trolleybus
+          bus: Autobus

           cable:
           - Telepherico
           - Telesedia
           cable:
           - Telepherico
           - Telesedia


@@ -2344,22 +2350,38 @@ ia:
           - Platteforma pro aviones
           - terminal
           admin: Limite administrative
           - Platteforma pro aviones
           - terminal
           admin: Limite administrative

-          forest: Foreste
-          wood: Bosco
+          orchard:
+          - Verdiero
+          - vinia
+          forest:
+          - Foreste
+          - bosco
+          farmland: Terra agricole
+          grass:
+          - Herba
+          - prato
+          bare_rock: Rocca nude
+          sand: Sablo

           golf: Percurso de golf
           park: Parco
           golf: Percurso de golf
           park: Parco

-          resident: Area residential

           common:
           - Commun
           - prato
           - jardin
           common:
           - Commun
           - prato
           - jardin

+          built_up: Area edificate
+          resident: Area residential

           retail: Zona de commercio al detalio
           industrial: Area industrial
           commercial: Area commercial
           heathland: Landa
           retail: Zona de commercio al detalio
           industrial: Area industrial
           commercial: Area commercial
           heathland: Landa

+          scrubland: Terreno de brossas

           lake:
           - Laco
           - bassino
           lake:
           - Laco
           - bassino

+          intermittent_water: Massa de aqua intermittente
+          glacier: Glaciero
+          reef: Scolio
+          wetland: Terra humide

           farm: Ferma
           brownfield: Terra in reposo
           cemetery: Cemeterio
           farm: Ferma
           brownfield: Terra in reposo
           cemetery: Cemeterio


@@ -2371,6 +2393,7 @@ ia:
           school:
           - Schola
           - universitate
           school:
           - Schola
           - universitate

+          - hospital

           building: Edificio significante
           station: Station ferroviari
           summit:
           building: Edificio significante
           station: Station ferroviari
           summit:


@@ -2381,6 +2404,8 @@ ia:
           private: Accesso private
           destination: Traffico local
           construction: Vias in construction
           private: Accesso private
           destination: Traffico local
           construction: Vias in construction

+          bus_stop: Halto de autobus
+          stop: Halto

           bicycle_shop: Magazin de bicyclettas
           bicycle_parking: Parcamento de bicyclettas
           toilets: Toilettes
           bicycle_shop: Magazin de bicyclettas
           bicycle_parking: Parcamento de bicyclettas
           toilets: Toilettes


@@ -2424,6 +2449,7 @@ ia:
         imports: Importationes
         automated_edits: Modificationes automatisate
       start_mapping: comenciar le cartographia
         imports: Importationes
         automated_edits: Modificationes automatisate
       start_mapping: comenciar le cartographia

+      continue_authorization: Continuar autorisation

       add_a_note:
         title: Non ha tempore pro modificar? Adde un nota!
         para_1: Si tu vole meliorar un micre cosa e non ha le tempore pro crear un
       add_a_note:
         title: Non ha tempore pro modificar? Adde un nota!
         para_1: Si tu vole meliorar un micre cosa e non ha le tempore pro crear un


@@ -3117,6 +3143,8 @@ ia:
       map_data_zoom_in_tooltip: Face zoom avante pro vider le datos del carta
       queryfeature_tooltip: Cercar objectos
       queryfeature_disabled_tooltip: Face zoom avante pro cercar objectos
       map_data_zoom_in_tooltip: Face zoom avante pro vider le datos del carta
       queryfeature_tooltip: Cercar objectos
       queryfeature_disabled_tooltip: Face zoom avante pro cercar objectos

+      embed_html_disabled: Le incastration de HTML non es disponibile pro iste strato
+        cartographic

     changesets:
       show:
         comment: Commento
     changesets:
       show:
         comment: Commento

diff --git a/config/locales/id.yml b/config/locales/id.yml
index 14b3308371ffc257cba9afc2d441ba7782ed9b0b..f784789791b8344efc42d6d098b7ee82e3e35ae6 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1809,7 +1809,7 @@ id:
     destroy:
       destroyed: Pesan dihapus
   passwords:
     destroy:
       destroyed: Pesan dihapus
   passwords:

-    lost_password:
+    new:

       title: Kehilangan kata sandi
       heading: Lupa Kata Sandi?
       email address: 'Alamat Email:'
       title: Kehilangan kata sandi
       heading: Lupa Kata Sandi?
       email address: 'Alamat Email:'


@@ -1817,15 +1817,17 @@ id:
       help_text: Masukkan alamat email yang Anda gunakan untuk mendaftar, kami akan
         mengirim link ke alamat tersebut yang dapat Anda gunakan untuk menyetel ulang
         kata sandi Anda.
       help_text: Masukkan alamat email yang Anda gunakan untuk mendaftar, kami akan
         mengirim link ke alamat tersebut yang dapat Anda gunakan untuk menyetel ulang
         kata sandi Anda.

+    create:

       notice email on way: Maaf sudah hilang :-( namun sebuah email telah dikirimkan
         agar Anda dapat segera mengatur ulang.
       notice email cannot find: Tidak dapat menemukan alamat email tersebut, maaf.
       notice email on way: Maaf sudah hilang :-( namun sebuah email telah dikirimkan
         agar Anda dapat segera mengatur ulang.
       notice email cannot find: Tidak dapat menemukan alamat email tersebut, maaf.

-    reset_password:
+    edit:

       title: Setel ulang kata sandi
       heading: Setel ulang kata sandi untuk %{user}
       reset: Setel Ulang Kata Sandi
       title: Setel ulang kata sandi
       heading: Setel ulang kata sandi untuk %{user}
       reset: Setel Ulang Kata Sandi

-      flash changed: Kata sandi Anda telah diubah.

       flash token bad: Tidak dapat menemukan token tersebut, cek URL nya mungkin?
       flash token bad: Tidak dapat menemukan token tersebut, cek URL nya mungkin?

+    update:
+      flash changed: Kata sandi Anda telah diubah.

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


@@ -2291,9 +2293,6 @@ id:
           footway: Jalan Setapak
           rail: Rel Kereta
           subway: Kereta bawah tanah
           footway: Jalan Setapak
           rail: Rel Kereta
           subway: Kereta bawah tanah

-          tram:
-          - Kereta listrik
-          - trem

           cable:
           - Kereta Kabel
           - Kereta Gantung
           cable:
           - Kereta Kabel
           - Kereta Gantung


@@ -2304,15 +2303,16 @@ id:
           - Tempat Parkir Pesawat
           - terminal
           admin: Batas administrasi
           - Tempat Parkir Pesawat
           - terminal
           admin: Batas administrasi

-          forest: Hutan
-          wood: Kayu
+          forest:
+          - Hutan
+          - Kayu

           golf: Lapangan Golf
           park: Taman
           golf: Lapangan Golf
           park: Taman

-          resident: Area Permukiman

           common:
           - Umum
           - Padang rumput
           - kebun
           common:
           - Umum
           - Padang rumput
           - kebun

+          resident: Area Permukiman

           retail: Area pertokoan
           industrial: Kawasan industri
           commercial: Area komersial
           retail: Area pertokoan
           industrial: Kawasan industri
           commercial: Area komersial

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 638a1e31b74b4a9b447a5e50b097278334b32023..ff41ede59e4264aeb10ee2770914b33592add9fd 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1817,21 +1817,23 @@ is:
     destroy:
       destroyed: Skilaboðunum var eytt
   passwords:
     destroy:
       destroyed: Skilaboðunum var eytt
   passwords:

-    lost_password:
+    new:

       title: Glatað lykilorð
       heading: Gleymt lykilorð?
       email address: 'Tölvupóstfang:'
       new password button: Endurstilla lykilorð
       help_text: Sláðu inn netfangið sem þú skráðir þig með, við munum senda tengil
         á það sem þú getur notað til að breyta lykilorðinu þínu.
       title: Glatað lykilorð
       heading: Gleymt lykilorð?
       email address: 'Tölvupóstfang:'
       new password button: Endurstilla lykilorð
       help_text: Sláðu inn netfangið sem þú skráðir þig með, við munum senda tengil
         á það sem þú getur notað til að breyta lykilorðinu þínu.

+    create:

       notice email on way: Nýtt lykilorð er á leiðinni í innhólfið þitt.
       notice email cannot find: Þetta netfang fannst ekki.
       notice email on way: Nýtt lykilorð er á leiðinni í innhólfið þitt.
       notice email cannot find: Þetta netfang fannst ekki.

-    reset_password:
+    edit:

       title: Endurstilla lykilorð
       heading: Endurstilla lykilorð fyrir %{user}
       reset: Endurstilla lykilorð
       title: Endurstilla lykilorð
       heading: Endurstilla lykilorð fyrir %{user}
       reset: Endurstilla lykilorð

-      flash changed: Lykilorðinu þínu hefur verið breytt

       flash token bad: Þessi leynistrengur fannst ekki, kannski er slóðin röng?
       flash token bad: Þessi leynistrengur fannst ekki, kannski er slóðin röng?

+    update:
+      flash changed: Lykilorðinu þínu hefur verið breytt

   preferences:
     show:
       title: Kjörstillingar
   preferences:
     show:
       title: Kjörstillingar


@@ -2367,9 +2369,6 @@ is:
           footway: Gönguleið
           rail: Lestarteinar
           subway: Neðanjarðarlest
           footway: Gönguleið
           rail: Lestarteinar
           subway: Neðanjarðarlest

-          tram:
-          - Léttlest
-          - sporvagn

           cable:
           - Kláflyfta
           - stólalyfta
           cable:
           - Kláflyfta
           - stólalyfta


@@ -2380,15 +2379,16 @@ is:
           - Flughlað
           - flugstöð
           admin: Stjórnsýslumörk
           - Flughlað
           - flugstöð
           admin: Stjórnsýslumörk

-          forest: Ræktaður skógur
-          wood: Náttúrulegur skógur
+          forest:
+          - Ræktaður skógur
+          - Náttúrulegur skógur

           golf: Golfvöllur
           park: Almenningsgarður
           golf: Golfvöllur
           park: Almenningsgarður

-          resident: Íbúðasvæði

           common:
           - Almenningur
           - lundur
           - garður
           common:
           - Almenningur
           - lundur
           - garður

+          resident: Íbúðasvæði

           retail: Smásölusvæði
           industrial: Iðnaðarsvæði
           commercial: Verslunarsvæði
           retail: Smásölusvæði
           industrial: Iðnaðarsvæði
           commercial: Verslunarsvæði

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 049a556ab362ed9a1a818fa6466b9aee6204e1b7..f37d1cd40f5b0799e84091566f16203d0d3d131b 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1876,7 +1876,7 @@ it:
     destroy:
       destroyed: Messaggio eliminato
   passwords:
     destroy:
       destroyed: Messaggio eliminato
   passwords:

-    lost_password:
+    new:

       title: password persa
       heading: Password dimenticata?
       email address: 'Indirizzo email:'
       title: password persa
       heading: Password dimenticata?
       email address: 'Indirizzo email:'


@@ -1884,17 +1884,20 @@ it:
       help_text: Inserire l'indirizzo email che si è utilizzato per l'iscrizione,
         a cui verrà inviato un collegamento che permetterà la reimpostazione della
         propria password.
       help_text: Inserire l'indirizzo email che si è utilizzato per l'iscrizione,
         a cui verrà inviato un collegamento che permetterà la reimpostazione della
         propria password.

+    create:

       notice email on way: Siamo spiacenti che tu l'abbia persa :-( ma una email ti
         è stata spedita in modo che tu la possa presto reimpostare.
       notice email cannot find: Spiacenti, ma non è possibile trovare l'indirizzo
         email.
       notice email on way: Siamo spiacenti che tu l'abbia persa :-( ma una email ti
         è stata spedita in modo che tu la possa presto reimpostare.
       notice email cannot find: Spiacenti, ma non è possibile trovare l'indirizzo
         email.

-    reset_password:
+    edit:

       title: Reimposta password
       heading: Reimposta password per %{user}
       reset: Reimposta password
       title: Reimposta password
       heading: Reimposta password per %{user}
       reset: Reimposta password

-      flash changed: La propria password è stata modificata.

       flash token bad: Non è stato possibile trovare il codice. Controllare l'indirizzo
         URL.
       flash token bad: Non è stato possibile trovare il codice. Controllare l'indirizzo
         URL.

+    update:
+      flash changed: La propria password è stata modificata.
+      flash token bad: Non è stato trovato quel token, controlla l'URL forse?

   preferences:
     show:
       title: Preferenze
   preferences:
     show:
       title: Preferenze


@@ -2375,10 +2378,10 @@ it:
           cycleway_local: Pista ciclabile locale
           footway: Percorso pedonale
           rail: Ferrovia
           cycleway_local: Pista ciclabile locale
           footway: Percorso pedonale
           rail: Ferrovia

+          train: Treno

           subway: Metropolitana
           subway: Metropolitana

-          tram:
-          - Metropolitana leggera
-          - tram
+          tram_only: Tram
+          bus: Autobus

           cable:
           - Funivia
           - seggiovia
           cable:
           - Funivia
           - seggiovia


@@ -2389,15 +2392,16 @@ it:
           - Area di parcheggio aeroportuale
           - terminal
           admin: Confine amministrativo
           - Area di parcheggio aeroportuale
           - terminal
           admin: Confine amministrativo

-          forest: Foresta
-          wood: Bosco
+          forest:
+          - Foresta
+          - bosco

           golf: Campo da golf
           park: Parco
           golf: Campo da golf
           park: Parco

-          resident: Zona residenziale

           common:
           - Area comune
           - prato
           - giardino
           common:
           - Area comune
           - prato
           - giardino

+          resident: Zona residenziale

           retail: Zona con negozi
           industrial: Zona industriale
           commercial: Zona di uffici
           retail: Zona con negozi
           industrial: Zona industriale
           commercial: Zona di uffici


@@ -2405,6 +2409,7 @@ it:
           lake:
           - Lago
           - riserva d'acqua
           lake:
           - Lago
           - riserva d'acqua

+          glacier: Ghiacciaio

           farm: Azienda agricola
           brownfield: Area soggetta ad interventi di ridestinazione d'uso
           cemetery: Cimitero
           farm: Azienda agricola
           brownfield: Area soggetta ad interventi di ridestinazione d'uso
           cemetery: Cimitero


@@ -2426,6 +2431,7 @@ it:
           private: Accesso privato
           destination: Servitù di passaggio
           construction: Strade in costruzione
           private: Accesso privato
           destination: Servitù di passaggio
           construction: Strade in costruzione

+          stop: Fermata

           bicycle_shop: Negozio di biciclette
           bicycle_parking: Parcheggio per biciclette
           toilets: Bagni pubblici
           bicycle_shop: Negozio di biciclette
           bicycle_parking: Parcheggio per biciclette
           toilets: Bagni pubblici


@@ -3172,6 +3178,8 @@ it:
       map_data_zoom_in_tooltip: Zooma per vedere i dati della mappa
       queryfeature_tooltip: Ricerca di elementi
       queryfeature_disabled_tooltip: Ingrandisci per ricercare elementi
       map_data_zoom_in_tooltip: Zooma per vedere i dati della mappa
       queryfeature_tooltip: Ricerca di elementi
       queryfeature_disabled_tooltip: Ingrandisci per ricercare elementi

+      embed_html_disabled: L'incorporamento HTML non è disponibile per questo livello
+        mappa

     changesets:
       show:
         comment: Commenta
     changesets:
       show:
         comment: Commenta

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 71b055ca0e22950351bc80b97f660a09f8ec096d..59c333407036e35120ee1ff305d1c119b6b1cbfe 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1703,20 +1703,22 @@ ja:
     destroy:
       destroyed: メッセージを削除しました
   passwords:
     destroy:
       destroyed: メッセージを削除しました
   passwords:

-    lost_password:
+    new:

       title: パスワードを忘れた
       heading: パスワードを忘れた場合はこちら
       email address: 'メール アドレス:'
       new password button: パスワードを再設定
       help_text: ユーザー登録に使用したメール アドレスを入力してください。そのアドレス宛に、パスワードを再設定するためのリンクをお送りします。
       title: パスワードを忘れた
       heading: パスワードを忘れた場合はこちら
       email address: 'メール アドレス:'
       new password button: パスワードを再設定
       help_text: ユーザー登録に使用したメール アドレスを入力してください。そのアドレス宛に、パスワードを再設定するためのリンクをお送りします。

+    create:

       notice email on way: すみません。紛失してしまいました :-( しかし、メールをお送りしたので、すぐにリセットできるでしょう。
       notice email cannot find: 申し訳ありませんが、このメール アドレスは見つかりません。
       notice email on way: すみません。紛失してしまいました :-( しかし、メールをお送りしたので、すぐにリセットできるでしょう。
       notice email cannot find: 申し訳ありませんが、このメール アドレスは見つかりません。

-    reset_password:
+    edit:

       title: パスワードの再設定
       heading: '%{user} のパスワードのリセット'
       reset: パスワードを初期化
       title: パスワードの再設定
       heading: '%{user} のパスワードのリセット'
       reset: パスワードを初期化

-      flash changed: あなたのパスワードは変更されました。

       flash token bad: キーワードが見つかりません。URL を確認してください。
       flash token bad: キーワードが見つかりません。URL を確認してください。

+    update:
+      flash changed: あなたのパスワードは変更されました。

   preferences:
     show:
       title: 個人設定
   preferences:
     show:
       title: 個人設定


@@ -2017,9 +2019,6 @@ ja:
           footway: 歩道
           rail: 鉄道
           subway: 地下鉄
           footway: 歩道
           rail: 鉄道
           subway: 地下鉄

-          tram:
-          - 軽便鉄道
-          - 路面電車

           cable:
           - 交走式ロープウェイ
           - チェアリフト
           cable:
           - 交走式ロープウェイ
           - チェアリフト


@@ -2030,15 +2029,16 @@ ja:
           - 空港ビル
           - 空港ターミナル
           admin: 行政境界
           - 空港ビル
           - 空港ターミナル
           admin: 行政境界

-          forest: 森
-          wood: 森林
+          forest:
+          - 森
+          - 森林

           golf: ゴルフ場
           park: 公園
           golf: ゴルフ場
           park: 公園

-          resident: 住宅地

           common:
           - 共有地
           - 牧草地
           - 庭園
           common:
           - 共有地
           - 牧草地
           - 庭園

+          resident: 住宅地

           retail: 小売業地域
           industrial: 工業地域
           commercial: オフィス地域
           retail: 小売業地域
           industrial: 工業地域
           commercial: オフィス地域

diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index da1e87d99bf5897f33517e7df1cb294bcda352fc..ddfda10d3cf0d660e50c31180c61e32721b25c8e 100644 (file)
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -856,11 +856,11 @@ ka:
     destroy:
       destroyed: შეტყობინება წაშლილია
   passwords:
     destroy:
       destroyed: შეტყობინება წაშლილია
   passwords:

-    lost_password:
+    new:

       title: პაროლის აღდგენა
       heading: დაგავიწყდათ პაროლი?
       email address: 'ელ. ფოსტის მისამართი:'
       title: პაროლის აღდგენა
       heading: დაგავიწყდათ პაროლი?
       email address: 'ელ. ფოსტის მისამართი:'

-    reset_password:
+    update:

       flash changed: თქვენი პაროლი შეიცვალა.
   profiles:
     edit:
       flash changed: თქვენი პაროლი შეიცვალა.
   profiles:
     edit:


@@ -942,8 +942,6 @@ ka:
           footway: საფეხმავლო გზა
           rail: რკინიგზა
           subway: მეტრო
           footway: საფეხმავლო გზა
           rail: რკინიგზა
           subway: მეტრო

-          tram:
-            1: ტრამვაი

           cable:
           - საბაგირო გზა
           runway:
           cable:
           - საბაგირო გზა
           runway:


@@ -951,8 +949,9 @@ ka:
           apron:
             1: ტერმინალი
           admin: ადმინისტრაციული საზღვარი
           apron:
             1: ტერმინალი
           admin: ადმინისტრაციული საზღვარი

-          forest: ტყე
-          wood: ტყე
+          forest:
+          - ტყე
+          - ტყე

           golf: გოლფის მოედანი
           park: პარკი
           resident: საცხოვრებელი ტერიტორია
           golf: გოლფის მოედანი
           park: პარკი
           resident: საცხოვრებელი ტერიტორია

diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 434ed18f3bc1e14e6cd6abede0cbd1235052ca2f..fb427ed07b79958753c1d3b01d8141d9b092ed39 100644 (file)
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -940,17 +940,18 @@ kab:
     destroy:
       destroyed: Izen yettwakkes
   passwords:
     destroy:
       destroyed: Izen yettwakkes
   passwords:

-    lost_password:
+    new:

       title: Awal uffir iṛuḥ
       heading: Tettuḍ awal uffir?
       email address: 'Tansa imayl:'
       new password button: Ales awennez n wawal uffir
       title: Awal uffir iṛuḥ
       heading: Tettuḍ awal uffir?
       email address: 'Tansa imayl:'
       new password button: Ales awennez n wawal uffir

-    reset_password:
+    edit:

       title: Ales awennez n wawal uffir
       heading: Ales awennez n wawal uffir i %{user}
       reset: Ales awennez n wawal uffir
       title: Ales awennez n wawal uffir
       heading: Ales awennez n wawal uffir i %{user}
       reset: Ales awennez n wawal uffir

-      flash changed: Awal-ik uffir ibeddel.

       flash token bad: Ajiṭun-agi ulac-it, ahat tuccḍa di tansa URL?
       flash token bad: Ajiṭun-agi ulac-it, ahat tuccḍa di tansa URL?

+    update:
+      flash changed: Awal-ik uffir ibeddel.

   profiles:
     edit:
       image: 'Tugna:'
   profiles:
     edit:
       image: 'Tugna:'


@@ -1119,7 +1120,8 @@ kab:
     key:
       table:
         entry:
     key:
       table:
         entry:

-          forest: Tiẓgi
+          forest:
+          - Tiẓgi

           lake:
           - Amdun
           school:
           lake:
           - Amdun
           school:

diff --git a/config/locales/kk-cyrl.yml b/config/locales/kk-cyrl.yml
index 9a7569784c77e2777ff004e2f75389aa42836543..70ce2e561f950c41f80c211a8bf19460cc6bf137 100644 (file)
--- a/config/locales/kk-cyrl.yml
+++ b/config/locales/kk-cyrl.yml
@@ -866,10 +866,11 @@ kk-cyrl:
     sent_message_summary:
       destroy_button: Жою
   passwords:
     sent_message_summary:
       destroy_button: Жою
   passwords:

-    lost_password:
+    new:

       email address: 'Е-пошта мекенжайы:'
       email address: 'Е-пошта мекенжайы:'

-    reset_password:
+    edit:

       title: Құпиясөзді арылту
       title: Құпиясөзді арылту

+    update:

       flash changed: Құпия сөзіңіз өзгертілді.
   preferences:
     show:
       flash changed: Құпия сөзіңіз өзгертілді.
   preferences:
     show:


@@ -971,19 +972,18 @@ kk-cyrl:
           unclassified: Жергілікті жол
           rail: Темір жол
           subway: Метро
           unclassified: Жергілікті жол
           rail: Темір жол
           subway: Метро

-          tram:
-          - Жеңіл рельсті көлік

           apron:
           - Әуежай перроны
           - терминал
           admin: Әкімшілік шекара
           apron:
           - Әуежай перроны
           - терминал
           admin: Әкімшілік шекара

-          forest: Орман
+          forest:
+          - Орман

           golf: Гольф алаңы
           park: Саябақ
           golf: Гольф алаңы
           park: Саябақ

-          resident: Тұрғын аудан

           common:
             1: шабындық
             2: бақ
           common:
             1: шабындық
             2: бақ

+          resident: Тұрғын аудан

           retail: Сауда аймағы
           industrial: Өнеркәсіп аймағы
           lake:
           retail: Сауда аймағы
           industrial: Өнеркәсіп аймағы
           lake:

diff --git a/config/locales/km.yml b/config/locales/km.yml
index d32001d7b5675f6a0fd5b3549671c8291e2ad8eb..20e594ff773324602d67d7be083976e17c6adf7d 100644 (file)
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -726,10 +726,9 @@ km:
           cycleway_local: ផ្លូវទោចក្រយានតំបន់
           rail: ផ្លូវដែក
           subway: ផ្លូវដែកក្រោមដី
           cycleway_local: ផ្លូវទោចក្រយានតំបន់
           rail: ផ្លូវដែក
           subway: ផ្លូវដែកក្រោមដី

-          tram:
-          - ផ្លូវដែកធុនស្រាល

           admin: ព្រំដែនរដ្ឋបាល
           admin: ព្រំដែនរដ្ឋបាល

-          forest: ព្រៃឈើ​
+          forest:
+          - ព្រៃឈើ​

           park: ឧទ្យាន​
           industrial: តំបន់ឧស្សាហកម្ម​
           farm: កសិដ្ឋាន​
           park: ឧទ្យាន​
           industrial: តំបន់ឧស្សាហកម្ម​
           farm: កសិដ្ឋាន​

diff --git a/config/locales/kn.yml b/config/locales/kn.yml
index 21f4cd062a1c6894919d0344f3d2eb8154539990..8b680fc668524ce768ca8d8bad7342cef2e95f6f 100644 (file)
--- a/config/locales/kn.yml
+++ b/config/locales/kn.yml
@@ -747,9 +747,9 @@ kn:
     destroy:
       destroyed: ಸಂದೇಶವನ್ನು ಅಳಿಸಿ ಹಾಕಲಾಗಿದೆ
   passwords:
     destroy:
       destroyed: ಸಂದೇಶವನ್ನು ಅಳಿಸಿ ಹಾಕಲಾಗಿದೆ
   passwords:

-    lost_password:
+    new:

       email address: 'ಮಿಂಚಂಚೆ ವಿಳಾಸ:'
       email address: 'ಮಿಂಚಂಚೆ ವಿಳಾಸ:'

-    reset_password:
+    update:

       flash changed: ನಿಮ್ಮ ಪ್ರವೇಶಪದವನ್ನು ಬದಲಾಯಿಸಲಾಗಿದೆ.
   preferences:
     show:
       flash changed: ನಿಮ್ಮ ಪ್ರವೇಶಪದವನ್ನು ಬದಲಾಯಿಸಲಾಗಿದೆ.
   preferences:
     show:


@@ -870,7 +870,8 @@ kn:
       table:
         entry:
           main_road: ಮುಖ್ಯ ರಸ್ತೆ
       table:
         entry:
           main_road: ಮುಖ್ಯ ರಸ್ತೆ

-          forest: ಅರಣ್ಯ
+          forest:
+          - ಅರಣ್ಯ

           park: ಉದ್ಯಾನ
           resident: ವಾಸ ಮಾಡುವ ಸ್ಥಳ
           lake:
           park: ಉದ್ಯಾನ
           resident: ವಾಸ ಮಾಡುವ ಸ್ಥಳ
           lake:

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 62ccce407c1555db3954adc4220207735cf05ff1..fe86617634d85c48dde9ecb91f30e527c088a814 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1712,20 +1712,22 @@ ko:
     destroy:
       destroyed: 메시지가 삭제됨
   passwords:
     destroy:
       destroyed: 메시지가 삭제됨
   passwords:

-    lost_password:
+    new:

       title: 잊어버린 비밀번호
       heading: 비밀번호를 잊으셨나요?
       email address: '이메일 주소:'
       new password button: 비밀번호 재설정
       help_text: 가입할 때 사용한 이메일 주소를 입력하세요, 비밀번호를 재설정하여 사용할 수 있는 링크를 보내드립니다.
       title: 잊어버린 비밀번호
       heading: 비밀번호를 잊으셨나요?
       email address: '이메일 주소:'
       new password button: 비밀번호 재설정
       help_text: 가입할 때 사용한 이메일 주소를 입력하세요, 비밀번호를 재설정하여 사용할 수 있는 링크를 보내드립니다.

+    create:

       notice email on way: 비밀번호를 잊었다니, 안타깝습니다 :-( 비밀번호 재설정을 할 수 있도록 이메일이 발송되었습니다.
       notice email cannot find: 이메일 주소를 찾지 못해 죄송합니다.
       notice email on way: 비밀번호를 잊었다니, 안타깝습니다 :-( 비밀번호 재설정을 할 수 있도록 이메일이 발송되었습니다.
       notice email cannot find: 이메일 주소를 찾지 못해 죄송합니다.

-    reset_password:
+    edit:

       title: 비밀번호 재설정
       heading: '%{user}의 비밀번호 재설정'
       reset: 비밀번호 재설정
       title: 비밀번호 재설정
       heading: '%{user}의 비밀번호 재설정'
       reset: 비밀번호 재설정

-      flash changed: 비밀번호가 바뀌었습니다.

       flash token bad: 토큰을 찾지 못했습니다. URL을 확인했습니까?
       flash token bad: 토큰을 찾지 못했습니다. URL을 확인했습니까?

+    update:
+      flash changed: 비밀번호가 바뀌었습니다.

   preferences:
     show:
       title: 내 환경 설정
   preferences:
     show:
       title: 내 환경 설정


@@ -2155,9 +2157,6 @@ ko:
           footway: 보도
           rail: 철도
           subway: 지하철
           footway: 보도
           rail: 철도
           subway: 지하철

-          tram:
-          - 경전철
-          - 노면 전차

           cable:
           - 케이블 카
           - 체어 리프트
           cable:
           - 케이블 카
           - 체어 리프트


@@ -2168,15 +2167,16 @@ ko:
           - 공항 계류장
           - 터미널
           admin: 행정 구역 경계
           - 공항 계류장
           - 터미널
           admin: 행정 구역 경계

-          forest: 숲
-          wood: 산림
+          forest:
+          - 숲
+          - 산림

           golf: 골프장
           park: 공원
           golf: 골프장
           park: 공원

-          resident: 주거 지역

           common:
           - 공유지
           - 목초지
           - 정원
           common:
           - 공유지
           - 목초지
           - 정원

+          resident: 주거 지역

           retail: 소매 지역
           industrial: 산업 지역
           commercial: 상업/관공서 지역
           retail: 소매 지역
           industrial: 산업 지역
           commercial: 상업/관공서 지역

diff --git a/config/locales/ksh.yml b/config/locales/ksh.yml
index 3cf67f7b5c98e144885fc98c11d752d0b49ce011..7a66b3b7381908a2b9d08d4ed584c73668912671 100644 (file)
--- a/config/locales/ksh.yml
+++ b/config/locales/ksh.yml
@@ -204,14 +204,15 @@ ksh:
     sent_message_summary:
       destroy_button: Fottschmiiße
   passwords:
     sent_message_summary:
       destroy_button: Fottschmiiße
   passwords:

-    lost_password:
+    new:

       title: Verloore Paßwoot
       heading: Paßwoot verjäße?
       email address: 'De Adräß för de e-mail:'
       new password button: Paßwoot neu säze
       title: Verloore Paßwoot
       heading: Paßwoot verjäße?
       email address: 'De Adräß för de e-mail:'
       new password button: Paßwoot neu säze

-    reset_password:
+    edit:

       title: Paßwoot neu säze
       reset: Paßwoot neu säze
       title: Paßwoot neu säze
       reset: Paßwoot neu säze

+    update:

       flash changed: Ding Paßwoot es jeändert.
   sessions:
     new:
       flash changed: Ding Paßwoot es jeändert.
   sessions:
     new:


@@ -277,9 +278,6 @@ ksh:
           footway: Fohßwääsch udder Päddsche
           rail: Eiserbahn
           subway: U-Bahn
           footway: Fohßwääsch udder Päddsche
           rail: Eiserbahn
           subway: U-Bahn

-          tram:
-          - Klëijnbahn
-          - Strohßebahn

           cable:
           - Seilbahn
           - Sässelbahn
           cable:
           - Seilbahn
           - Sässelbahn


@@ -290,14 +288,15 @@ ksh:
           - Halldepläz om Fluchveäld
           - Terminal em Fluchhaaven
           admin: Verwalldongsjränz
           - Halldepläz om Fluchveäld
           - Terminal em Fluchhaaven
           admin: Verwalldongsjränz

-          forest: Wald, Bösch
-          wood: Urwald
+          forest:
+          - Wald, Bösch
+          - Urwald

           golf: Jolfplaz
           park: Park
           golf: Jolfplaz
           park: Park

-          resident: Wohnjebeet

           common:
           - öffentlesch Land
           - Wiß
           common:
           - öffentlesch Land
           - Wiß

+          resident: Wohnjebeet

           retail: Einkaufszentrum
           industrial: Industriejebeet
           commercial: Jewerbejebeet
           retail: Einkaufszentrum
           industrial: Industriejebeet
           commercial: Jewerbejebeet

diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 5e53c06d12798c83c4ed63b72948ec307a45ecab..f57f04e549d59807cf3d822c1e3abd74a12a3f68 100644 (file)
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -1781,23 +1781,25 @@ ku-Latn:
     destroy:
       destroyed: Payam hate jêbirin
   passwords:
     destroy:
       destroyed: Payam hate jêbirin
   passwords:

-    lost_password:
+    new:

       title: Şîfreya wenda
       heading: Te şîfreya xwe ji bîr kir?
       email address: 'Navnîşana E-peyamê:'
       new password button: Şîfreyê nû bike
       help_text: E-peyama ku te pê xwe qeydkiribû binivîse, em ê ji te re lînkek bişînin
         tu yê bi wê lînkê bikaribî şîfreya xwe nû bikî.
       title: Şîfreya wenda
       heading: Te şîfreya xwe ji bîr kir?
       email address: 'Navnîşana E-peyamê:'
       new password button: Şîfreyê nû bike
       help_text: E-peyama ku te pê xwe qeydkiribû binivîse, em ê ji te re lînkek bişînin
         tu yê bi wê lînkê bikaribî şîfreya xwe nû bikî.

+    create:

       notice email on way: Bibore, te wê wenda kir :-( lê belê e-peyamekî nû di rê
         de ye. Lewma tu dikarî di nêz de wê nû bikî.
       notice email cannot find: Bibore, ev adrêsa e-peyamê nehate dîtin.
       notice email on way: Bibore, te wê wenda kir :-( lê belê e-peyamekî nû di rê
         de ye. Lewma tu dikarî di nêz de wê nû bikî.
       notice email cannot find: Bibore, ev adrêsa e-peyamê nehate dîtin.

-    reset_password:
+    edit:

       title: Şîfreyê nû bike
       heading: Şîfreyê nû bike ji bo %{user}
       reset: Şîfreyê nû bike
       title: Şîfreyê nû bike
       heading: Şîfreyê nû bike ji bo %{user}
       reset: Şîfreyê nû bike

-      flash changed: Şîfreya te hate guhartin.

       flash token bad: Eger te vê sembolê nedîtibe, belkî jî divê tu URLyê kontrol
         bikî?
       flash token bad: Eger te vê sembolê nedîtibe, belkî jî divê tu URLyê kontrol
         bikî?

+    update:
+      flash changed: Şîfreya te hate guhartin.

   preferences:
     show:
       title: Tercîhên min
   preferences:
     show:
       title: Tercîhên min


@@ -2110,9 +2112,6 @@ ku-Latn:
           footway: Rêya peyayan
           rail: Rêhesin
           subway: Metro
           footway: Rêya peyayan
           rail: Rêhesin
           subway: Metro

-          tram:
-          - Rêya trênê yê bi xeta teng
-          - tramway

           cable:
           - Teleferîk
           - teleferîk
           cable:
           - Teleferîk
           - teleferîk


@@ -2123,15 +2122,16 @@ ku-Latn:
           - Aprona balafirgehê
           - termînal
           admin: Sînorê îdarî
           - Aprona balafirgehê
           - termînal
           admin: Sînorê îdarî

-          forest: Daristan
-          wood: Daristan
+          forest:
+          - Daristan
+          - Daristan

           golf: Cihê golfê
           park: Park
           golf: Cihê golfê
           park: Park

-          resident: Cihê îkametê

           common:
           - Erda mişterek
           - mêrg
           - bexçe
           common:
           - Erda mişterek
           - mêrg
           - bexçe

+          resident: Cihê îkametê

           retail: Saheya Perakendeyê (Maxazayan)
           industrial: Cihê endustriyê
           commercial: Herêma bazirganiyê
           retail: Saheya Perakendeyê (Maxazayan)
           industrial: Cihê endustriyê
           commercial: Herêma bazirganiyê

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index e23c73132b2c1cf1b5f6bdc036a509968105fa25..6c94d0318edb806d64287c377f6632a929ccf041 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -1757,7 +1757,7 @@ lb:
     destroy:
       destroyed: Message geläscht
   passwords:
     destroy:
       destroyed: Message geläscht
   passwords:

-    lost_password:
+    new:

       title: Passwuert vergiess
       heading: Passwuert vergiess?
       email address: 'E-Mail-Adress:'
       title: Passwuert vergiess
       heading: Passwuert vergiess?
       email address: 'E-Mail-Adress:'


@@ -1765,16 +1765,18 @@ lb:
       help_text: Wannechgelift gëff deng E-Mail-Adress an, mat däers du dech ugemellt
         has. Mir wäerten dir dann e Link schécken, mat dems du däi Passwuert zerécksetze
         kanns.
       help_text: Wannechgelift gëff deng E-Mail-Adress an, mat däers du dech ugemellt
         has. Mir wäerten dir dann e Link schécken, mat dems du däi Passwuert zerécksetze
         kanns.

+    create:

       notice email on way: Eng E-Mail mat Hiweiser fir d'Zerécksetze vum Passwuert
         gouf un dech versent.
       notice email cannot find: Déi E-Mail-Adress konnt net fonnt ginn, pardon.
       notice email on way: Eng E-Mail mat Hiweiser fir d'Zerécksetze vum Passwuert
         gouf un dech versent.
       notice email cannot find: Déi E-Mail-Adress konnt net fonnt ginn, pardon.

-    reset_password:
+    edit:

       title: Passwuert zrécksetzen
       heading: Passwuert fir %{user} zrécksetzen
       reset: Passwuert zrécksetzen
       title: Passwuert zrécksetzen
       heading: Passwuert fir %{user} zrécksetzen
       reset: Passwuert zrécksetzen

-      flash changed: Äert Passwuert gouf geännert.

       flash token bad: Mir konnten dëst Kierzel leider net fannen. Du hues dech méiglecherweis
         vertippt oder du hues en ongëltege Link opgemaach.
       flash token bad: Mir konnten dëst Kierzel leider net fannen. Du hues dech méiglecherweis
         vertippt oder du hues en ongëltege Link opgemaach.

+    update:
+      flash changed: Äert Passwuert gouf geännert.

   preferences:
     show:
       title: Meng Benotzerastellungen
   preferences:
     show:
       title: Meng Benotzerastellungen


@@ -2031,9 +2033,11 @@ lb:
           cycleway_local: Lokale Vëloswee
           footway: Fousswee
           rail: Eisebunn
           cycleway_local: Lokale Vëloswee
           footway: Fousswee
           rail: Eisebunn

+          train: Zuch

           subway: Metro
           subway: Metro

-          tram:
-            1: Tram
+          ferry: Fär
+          tram_only: Tram
+          bus: Bus

           cable:
           - Seelbunn
           - Sessellift
           cable:
           - Seelbunn
           - Sessellift


@@ -2043,8 +2047,15 @@ lb:
           apron:
             1: Terminal
           admin: Verwaltungsgrenz
           apron:
             1: Terminal
           admin: Verwaltungsgrenz

-          forest: Bësch
-          wood: Bësch
+          orchard:
+          - Bongert
+          - Wéngert
+          forest:
+          - Bësch
+          - Bësch
+          grass:
+          - Wiss
+          sand: Sand

           golf: Golfterrain
           park: Park
           common:
           golf: Golfterrain
           park: Park
           common:


@@ -2057,6 +2068,7 @@ lb:
           heathland: Heed
           lake:
           - Séi
           heathland: Heed
           lake:
           - Séi

+          glacier: Gletscher

           farm: Bauerenhaff
           brownfield: Broochland
           cemetery: Kierfecht
           farm: Bauerenhaff
           brownfield: Broochland
           cemetery: Kierfecht


@@ -2068,6 +2080,7 @@ lb:
           school:
           - Schoul
           - Universitéit
           school:
           - Schoul
           - Universitéit

+          - Spidol

           building: Bedeitend Gebai
           station: Gare (Eisebunn)
           summit:
           building: Bedeitend Gebai
           station: Gare (Eisebunn)
           summit:


@@ -2075,6 +2088,7 @@ lb:
           private: Privaten Terrain
           destination: Nëmme fir Leit mat Uleies
           construction: Stroossen am Bau
           private: Privaten Terrain
           destination: Nëmme fir Leit mat Uleies
           construction: Stroossen am Bau

+          bus_stop: Busarrêt

           bicycle_shop: Vëlosgeschäft
           bicycle_parking: Vëlosparking
           toilets: Toiletten
           bicycle_shop: Vëlosgeschäft
           bicycle_parking: Vëlosparking
           toilets: Toiletten

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index a47ba27dbc52669cd9c3c5207c7c0969f7e1048b..67ee66150ef2663f4570799c4e2c7df3c9ae34bc 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1725,7 +1725,7 @@ lt:
     destroy:
       destroyed: Pranešimas ištrintas
   passwords:
     destroy:
       destroyed: Pranešimas ištrintas
   passwords:

-    lost_password:
+    new:

       title: Pamiršau slaptažodį
       heading: Pamiršote slaptažodį?
       email address: 'E-pašto adresas:'
       title: Pamiršau slaptažodį
       heading: Pamiršote slaptažodį?
       email address: 'E-pašto adresas:'


@@ -1733,15 +1733,17 @@ lt:
       help_text: Įveskite elektroninio pašto adresą, kurį naudojote užsiregistruodami.
         Mes atsiųsime nuorodą į elektroninį paštą, kurią galėsite naudoti norėdami
         iš naujo nustatyti slaptažodį.
       help_text: Įveskite elektroninio pašto adresą, kurį naudojote užsiregistruodami.
         Mes atsiųsime nuorodą į elektroninį paštą, kurią galėsite naudoti norėdami
         iš naujo nustatyti slaptažodį.

+    create:

       notice email on way: Apgailestaujame, kad praradote slaptažodį :-( bet elektroninis
         laiškas jau išsiųstas, tad greitai slaptažodį atstatysite.
       notice email cannot find: Gaila, bet toks e-pašto adresas nerastas.
       notice email on way: Apgailestaujame, kad praradote slaptažodį :-( bet elektroninis
         laiškas jau išsiųstas, tad greitai slaptažodį atstatysite.
       notice email cannot find: Gaila, bet toks e-pašto adresas nerastas.

-    reset_password:
+    edit:

       title: Iš naujo nustatyti slaptažodį
       heading: Iš naujo nustatyti naudotojo %{user} slaptažodį
       reset: Iš naujo nustatyti slaptažodį
       title: Iš naujo nustatyti slaptažodį
       heading: Iš naujo nustatyti naudotojo %{user} slaptažodį
       reset: Iš naujo nustatyti slaptažodį

-      flash changed: Jūsų slaptažodis sėkmingai pakeistas.

       flash token bad: Ženklas nerastas, galbūt bloga nuoroda?
       flash token bad: Ženklas nerastas, galbūt bloga nuoroda?

+    update:
+      flash changed: Jūsų slaptažodis sėkmingai pakeistas.

   preferences:
     show:
       title: Mano parinktys
   preferences:
     show:
       title: Mano parinktys


@@ -2078,9 +2080,6 @@ lt:
           footway: Pėsčiųjų takas
           rail: Geležinkelis
           subway: Metropoliteno linija
           footway: Pėsčiųjų takas
           rail: Geležinkelis
           subway: Metropoliteno linija

-          tram:
-          - Lengvasis geležinkelis
-          - tramvajus

           cable:
           - Lyno keltuvas
           - keltuvas
           cable:
           - Lyno keltuvas
           - keltuvas


@@ -2091,14 +2090,15 @@ lt:
           - Oro uosto lėktuvų aikštelė
           - terminalas
           admin: Administracinės ribos
           - Oro uosto lėktuvų aikštelė
           - terminalas
           admin: Administracinės ribos

-          forest: Miškas
-          wood: Medžių teritorija
+          forest:
+          - Miškas
+          - Medžių teritorija

           golf: Golfo laukas
           park: Parkas
           golf: Golfo laukas
           park: Parkas

-          resident: Gyvenamoji zona

           common:
           - Bendras
           - pieva
           common:
           - Bendras
           - pieva

+          resident: Gyvenamoji zona

           retail: Mažmeninis rajonas
           industrial: Pramoninė zona
           commercial: Komericinis plotas
           retail: Mažmeninis rajonas
           industrial: Pramoninė zona
           commercial: Komericinis plotas

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 62e4fa3df569cb6b08de656162cfb286620e8eae..d6888259615de419e4850a0fbd6258c73c4dd59e 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1401,22 +1401,24 @@ lv:
     destroy:
       destroyed: Ziņa izdzēsta
   passwords:
     destroy:
       destroyed: Ziņa izdzēsta
   passwords:

-    lost_password:
+    new:

       title: Aizmirsāt paroli
       heading: Aizmirsi paroli?
       email address: 'E-pasta adrese:'
       new password button: Atiestatīt paroli
       help_text: Ievadiet e-pasta adresi, kuru izmantojāt, lai reģistrētos, mēs Jums
         nosūtīsim saiti uz to, lai Jūs varētu atjaunot savu paroli.
       title: Aizmirsāt paroli
       heading: Aizmirsi paroli?
       email address: 'E-pasta adrese:'
       new password button: Atiestatīt paroli
       help_text: Ievadiet e-pasta adresi, kuru izmantojāt, lai reģistrētos, mēs Jums
         nosūtīsim saiti uz to, lai Jūs varētu atjaunot savu paroli.

+    create:

       notice email on way: Atvaino, tu to pazaudēji :-( , bet e-pasts jau ir ceļā,
         lai tu viņu drīz varētu atjaunot.
       notice email cannot find: Atvaino, nevaru atrast šo epasta adresi.
       notice email on way: Atvaino, tu to pazaudēji :-( , bet e-pasts jau ir ceļā,
         lai tu viņu drīz varētu atjaunot.
       notice email cannot find: Atvaino, nevaru atrast šo epasta adresi.

-    reset_password:
+    edit:

       title: Atiestatīt paroli
       heading: Atcelt %{user} paroli
       reset: Atcelt paroli
       title: Atiestatīt paroli
       heading: Atcelt %{user} paroli
       reset: Atcelt paroli

-      flash changed: Jūsu parole ir nomainīta.

       flash token bad: Neatradu to pilnvaru, varbūt pārbaudi URL?
       flash token bad: Neatradu to pilnvaru, varbūt pārbaudi URL?

+    update:
+      flash changed: Jūsu parole ir nomainīta.

   preferences:
     show:
       title: Mani uzstādījumi
   preferences:
     show:
       title: Mani uzstādījumi


@@ -1710,9 +1712,6 @@ lv:
           footway: Gājēju ceļš
           rail: Dzelzceļš
           subway: Metro
           footway: Gājēju ceļš
           rail: Dzelzceļš
           subway: Metro

-          tram:
-          - Tramvaja sliedes
-          - Tramvajs

           cable:
           - Trošu ceļš
           - krēslu pacēlājs
           cable:
           - Trošu ceļš
           - krēslu pacēlājs


@@ -1723,15 +1722,16 @@ lv:
           - Lidostas rampa
           - termināls
           admin: Administratīvā robeža
           - Lidostas rampa
           - termināls
           admin: Administratīvā robeža

-          forest: Mežs
-          wood: Pirmatnējs mežs
+          forest:
+          - Mežs
+          - Pirmatnējs mežs

           golf: Golfa laukums
           park: Parks
           golf: Golfa laukums
           park: Parks

-          resident: Dzīvojamā zona

           common:
           - Koplietošanas zeme
           - Pļava
           - dārzs
           common:
           - Koplietošanas zeme
           - Pļava
           - dārzs

+          resident: Dzīvojamā zona

           retail: Mazumtirdzniecības zona
           industrial: Rūpniecības zona
           commercial: Tirdzniecības zona
           retail: Mazumtirdzniecības zona
           industrial: Rūpniecības zona
           commercial: Tirdzniecības zona

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index a54ed02ab92d77e3adb6a6dbe301e282576675fc..e6ef55920bb246549898ab28ee527012efa21bdf 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -1162,7 +1162,7 @@ mk:
           valley: Долина
           volcano: Вулкан
           water: Вода
           valley: Долина
           volcano: Вулкан
           water: Вода

-          wetland: Мочуриште
+          wetland: Моклиште

           wood: Шума
           "yes": Природен елемент
         office:
           wood: Шума
           "yes": Природен елемент
         office:


@@ -1808,20 +1808,23 @@ mk:
     destroy:
       destroyed: Пораката е избришана
   passwords:
     destroy:
       destroyed: Пораката е избришана
   passwords:

-    lost_password:
+    new:

       title: Загубена лозинка
       heading: Ја заборавивте лозинката?
       email address: 'Е-пошта:'
       new password button: Смени лозинка
       help_text: Внесете ја е-поштенската адреса со која се зачленивте, и ќе ви пратиме
         врска каде ќе наведете нова лозинка.
       title: Загубена лозинка
       heading: Ја заборавивте лозинката?
       email address: 'Е-пошта:'
       new password button: Смени лозинка
       help_text: Внесете ја е-поштенската адреса со која се зачленивте, и ќе ви пратиме
         врска каде ќе наведете нова лозинка.

+    create:

       notice email on way: Жалиме, ова истече :-( но ви пративме нова порака на е-пошта,
         па наскоро повторно ќе можете да ја смените.
       notice email cannot find: Жалам, не можев да ја пронајдам таа адреса
       notice email on way: Жалиме, ова истече :-( но ви пративме нова порака на е-пошта,
         па наскоро повторно ќе можете да ја смените.
       notice email cannot find: Жалам, не можев да ја пронајдам таа адреса

-    reset_password:
+    edit:

       title: Смени лозинка
       heading: Смени лозинка за %{user}
       reset: Смени лозинка
       title: Смени лозинка
       heading: Смени лозинка за %{user}
       reset: Смени лозинка

+      flash token bad: Не ја пронајдов таа шифра. Проверете ја URL-адресата.
+    update:

       flash changed: Лозинката ви е сменета.
       flash token bad: Не ја пронајдов таа шифра. Проверете ја URL-адресата.
   preferences:
       flash changed: Лозинката ви е сменета.
       flash token bad: Не ја пронајдов таа шифра. Проверете ја URL-адресата.
   preferences:


@@ -2316,10 +2319,13 @@ mk:
           cycleway_local: Месна велосипедска патека
           footway: Пешачка патека
           rail: Железница
           cycleway_local: Месна велосипедска патека
           footway: Пешачка патека
           rail: Железница

+          train: Воз

           subway: Метро
           subway: Метро

-          tram:
-          - Лека железница
-          - трамвај
+          ferry: Траект
+          light_rail: Лека железница
+          tram_only: Трамвај
+          trolleybus: Тролејбус
+          bus: Автобус

           cable:
           - Клупна жичница
           - клупна жичница
           cable:
           - Клупна жичница
           - клупна жичница


@@ -2330,22 +2336,38 @@ mk:
           - Аеродромска платформа
           - терминал
           admin: Административна граница
           - Аеродромска платформа
           - терминал
           admin: Административна граница

-          forest: Шума
-          wood: Шумичка
+          orchard:
+          - Овоштарник
+          - лозје
+          forest:
+          - Шума
+          - шума
+          farmland: Земјоделско земјиште
+          grass:
+          - Трева
+          - ливада
+          bare_rock: Гола карпа
+          sand: Песок

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

-          resident: Станбено подрачје

           common:
           - Општествена земја
           - ливада
           - градина
           common:
           - Општествена земја
           - ливада
           - градина

+          built_up: Изградено подрачје
+          resident: Станбено подрачје

           retail: Трговско подрачје
           industrial: Индустриско подрачје
           commercial: Комерцијално подрачје
           heathland: Вресиште
           retail: Трговско подрачје
           industrial: Индустриско подрачје
           commercial: Комерцијално подрачје
           heathland: Вресиште

+          scrubland: Шикара

           lake:
           - Езеро
           - резервоар
           lake:
           - Езеро
           - резервоар

+          intermittent_water: Повремена водна површина
+          glacier: Ледник
+          reef: Гребен
+          wetland: Моклиште

           farm: Фарма
           brownfield: Запуштено подрачје
           cemetery: Гробишта
           farm: Фарма
           brownfield: Запуштено подрачје
           cemetery: Гробишта


@@ -2357,6 +2379,7 @@ mk:
           school:
           - Училиште
           - универзитет
           school:
           - Училиште
           - универзитет

+          - болница

           building: Значајно здание
           station: Железничка станица
           summit:
           building: Значајно здание
           station: Железничка станица
           summit:


@@ -2367,6 +2390,8 @@ mk:
           private: Доверлив пристап
           destination: Пристап до одредницата
           construction: Патишта во изградба
           private: Доверлив пристап
           destination: Пристап до одредницата
           construction: Патишта во изградба

+          bus_stop: Автобуска постојка
+          stop: Постојка

           bicycle_shop: Точкар
           bicycle_parking: Паркирање велосипеди
           toilets: Тоалет
           bicycle_shop: Точкар
           bicycle_parking: Паркирање велосипеди
           toilets: Тоалет

diff --git a/config/locales/mo.yml b/config/locales/mo.yml
index b8183b232ddf858878525ed3809b19a262c83b66..59955c5c6181b5caa5eecae123305518bbe52710 100644 (file)
--- a/config/locales/mo.yml
+++ b/config/locales/mo.yml
@@ -546,7 +546,7 @@ mo:
     learn_more: Афлаць май мулте
     more: Май мулте
   passwords:
     learn_more: Афлаць май мулте
     more: Май мулте
   passwords:

-    lost_password:
+    new:

       title: Рестабилиря паролей
       heading: Аць уйтат парола?
       email address: 'Адреса де поштэ електроникэ:'
       title: Рестабилиря паролей
       heading: Аць уйтат парола?
       email address: 'Адреса де поштэ електроникэ:'

diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index d59950796cc26b66512004688c0a472f516cffea..cc9dbf375dd7c7278111ef9486e04bfd067f61be 100644 (file)
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -988,14 +988,15 @@ mr:
     destroy:
       destroyed: संदेश वगळला
   passwords:
     destroy:
       destroyed: संदेश वगळला
   passwords:

-    lost_password:
+    new:

       heading: परवलीचा शब्द विसरला?
       email address: 'विपत्र पत्ता:'
       new password button: परवलीचा शब्द पुनर्स्थापित करा
       heading: परवलीचा शब्द विसरला?
       email address: 'विपत्र पत्ता:'
       new password button: परवलीचा शब्द पुनर्स्थापित करा

-    reset_password:
+    edit:

       title: परवलीचा शब्द पुनर्स्थापित करा
       heading: '%{user}साठी परवलीचा शब्द पुनर्स्थापित करा'
       reset: परवलीचा शब्द पुनर्स्थापित करा
       title: परवलीचा शब्द पुनर्स्थापित करा
       heading: '%{user}साठी परवलीचा शब्द पुनर्स्थापित करा'
       reset: परवलीचा शब्द पुनर्स्थापित करा

+    update:

       flash changed: आपला परवलीचा शब्द बदलण्यात आला आहे.
   preferences:
     show:
       flash changed: आपला परवलीचा शब्द बदलण्यात आला आहे.
   preferences:
     show:


@@ -1171,9 +1172,6 @@ mr:
           footway: पदपथ
           rail: लोहमार्ग
           subway: मेट्रो
           footway: पदपथ
           rail: लोहमार्ग
           subway: मेट्रो

-          tram:
-          - हलकी रेल्वे
-          - ट्राम

           cable:
           - रज्जुमार्ग
           - खुर्ची उद्वाहन
           cable:
           - रज्जुमार्ग
           - खुर्ची उद्वाहन


@@ -1184,14 +1182,15 @@ mr:
           - विमानतळावरील भरणतळ
           - अग्र
           admin: प्रशासकीय सीमा
           - विमानतळावरील भरणतळ
           - अग्र
           admin: प्रशासकीय सीमा

-          forest: वन
-          wood: जंगल
+          forest:
+          - वन
+          - जंगल

           golf: गोल्फ कोर्स
           park: उद्यान
           golf: गोल्फ कोर्स
           park: उद्यान

-          resident: निवासी क्षेत्र

           common:
           - सार्वजनिक जमीन
           - कुरण
           common:
           - सार्वजनिक जमीन
           - कुरण

+          resident: निवासी क्षेत्र

           retail: विक्री क्षेत्र
           industrial: औद्योगिक क्षेत्र
           commercial: वाणिज्यिक क्षेत्र
           retail: विक्री क्षेत्र
           industrial: औद्योगिक क्षेत्र
           commercial: वाणिज्यिक क्षेत्र

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 170a239775921418d01df83e6993d34b62d91913..acae71ce5e321c72c68134bbb5d4121abd504b93 100644 (file)
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1394,23 +1394,25 @@ ms:
     destroy:
       destroyed: Pesanan dihapuskan
   passwords:
     destroy:
       destroyed: Pesanan dihapuskan
   passwords:

-    lost_password:
+    new:

       title: Terlupa kata laluan
       heading: Lupa Kata Laluan?
       email address: 'Alamat E-mel:'
       new password button: Set semula kata laluan
       help_text: Isikan alamat e-mel yang anda gunakan untuk mendaftar. Kami akan
         menge-melkan pautan untuk anda mengeset semula kata laluan anda.
       title: Terlupa kata laluan
       heading: Lupa Kata Laluan?
       email address: 'Alamat E-mel:'
       new password button: Set semula kata laluan
       help_text: Isikan alamat e-mel yang anda gunakan untuk mendaftar. Kami akan
         menge-melkan pautan untuk anda mengeset semula kata laluan anda.

+    create:

       notice email on way: Kesiannya anda sudah terlupa kata laluan :-( tetapi kami
         akan menghantar satu pesanan e-mel untuk anda mengesetnya semula tidak lama
         lagi.
       notice email cannot find: Maaf, alamat e-mel itu tidak dapat dijumpai.
       notice email on way: Kesiannya anda sudah terlupa kata laluan :-( tetapi kami
         akan menghantar satu pesanan e-mel untuk anda mengesetnya semula tidak lama
         lagi.
       notice email cannot find: Maaf, alamat e-mel itu tidak dapat dijumpai.

-    reset_password:
+    edit:

       title: Set semula kata laluan
       heading: Set Semula Kata Laluan untuk %{user}
       reset: Set Semula Kata Laluan
       title: Set semula kata laluan
       heading: Set Semula Kata Laluan untuk %{user}
       reset: Set Semula Kata Laluan

-      flash changed: Kata laluan anda telah ditukar.

       flash token bad: Token itu tidak dijumpai; sila semak URL-nya.
       flash token bad: Token itu tidak dijumpai; sila semak URL-nya.

+    update:
+      flash changed: Kata laluan anda telah ditukar.

   preferences:
     show:
       title: Keutamaan Saya
   preferences:
     show:
       title: Keutamaan Saya


@@ -1722,9 +1724,6 @@ ms:
           footway: Laluan pejalan kaki
           rail: Landasan keretapi
           subway: Landasan bawah tanah
           footway: Laluan pejalan kaki
           rail: Landasan keretapi
           subway: Landasan bawah tanah

-          tram:
-          - Rel ringan
-          - tram

           cable:
           - Kereta kabel
           - lif kerusi
           cable:
           - Kereta kabel
           - lif kerusi


@@ -1735,14 +1734,15 @@ ms:
           - Kawasan gerak lapangan terbang
           - terminal
           admin: Sempadan pentadbiran
           - Kawasan gerak lapangan terbang
           - terminal
           admin: Sempadan pentadbiran

-          forest: Hutan
-          wood: Hutan kecil
+          forest:
+          - Hutan
+          - Hutan kecil

           golf: Padang golf
           park: Taman
           golf: Padang golf
           park: Taman

-          resident: Kawasan perumahan

           common:
           - Tanah awam
           - padang rumput
           common:
           - Tanah awam
           - padang rumput

+          resident: Kawasan perumahan

           retail: Kawasan peruncitan
           industrial: Kawasan perindustrian
           commercial: Kawasan perdagangan
           retail: Kawasan peruncitan
           industrial: Kawasan perindustrian
           commercial: Kawasan perdagangan

diff --git a/config/locales/my.yml b/config/locales/my.yml
index 4e978e7c96aacf47836e2e48fb79e52de0fb668e..de20deee8d97e50646273135a889d4e211867488 100644 (file)
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -589,15 +589,16 @@ my:
     sent_message_summary:
       destroy_button: ဖျက်​ပါ​
   passwords:
     sent_message_summary:
       destroy_button: ဖျက်​ပါ​
   passwords:

-    lost_password:
+    new:

       title: စကားဝှက် ပျောက်ဆုံးသွား
       heading: စကားဝှက် မေ့နေပါသလား
       email address: 'အီးမေး လိပ်စာ :'
       new password button: စကားဝှက်ကို ပြန်ချိန်ရန်
       title: စကားဝှက် ပျောက်ဆုံးသွား
       heading: စကားဝှက် မေ့နေပါသလား
       email address: 'အီးမေး လိပ်စာ :'
       new password button: စကားဝှက်ကို ပြန်ချိန်ရန်

-    reset_password:
+    edit:

       title: စကားဝှက်ကို ပြန်ချိန်ရန်
       heading: '%{user} အတွက် စကားဝှက်ကို ပြန်ချိန်ရန်'
       reset: စကားဝှက်ကို ပြန်ချိန်ရန်
       title: စကားဝှက်ကို ပြန်ချိန်ရန်
       heading: '%{user} အတွက် စကားဝှက်ကို ပြန်ချိန်ရန်'
       reset: စကားဝှက်ကို ပြန်ချိန်ရန်

+    update:

       flash changed: သင့်စကားဝှက်ကို ပြောင်းလဲပြီးပါပြီ
   sessions:
     new:
       flash changed: သင့်စကားဝှက်ကို ပြောင်းလဲပြီးပါပြီ
   sessions:
     new:


@@ -691,7 +692,8 @@ my:
           rail: ရထားလမ်း
           runway:
           - လေယာဉ်ကွင်းပြေးလမ်း
           rail: ရထားလမ်း
           runway:
           - လေယာဉ်ကွင်းပြေးလမ်း

-          forest: သစ်တော
+          forest:
+          - သစ်တော

           park: ပန်းခြံ
           lake:
           - ရေကန်
           park: ပန်းခြံ
           lake:
           - ရေကန်

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 5f079b028c537bfb8a920fbd04413e161a94cedd..6343448f9d5b4fe78c660c317bb98026d4193241 100644 (file)
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -1559,22 +1559,24 @@ nb:
     destroy:
       destroyed: Melding slettet
   passwords:
     destroy:
       destroyed: Melding slettet
   passwords:

-    lost_password:
+    new:

       title: Glemt passord
       heading: Glemt passord?
       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.
       title: Glemt passord
       heading: Glemt passord?
       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.

+    create:

       notice email on way: Synd at du mistet det, men en e-post er på vei slik at
         du kan tilbakestille det snart.
       notice email cannot find: Klarte ikke finne den e-postadressen. Beklager.
       notice email on way: Synd at du mistet det, men en e-post er på vei slik at
         du kan tilbakestille det snart.
       notice email cannot find: Klarte ikke finne den e-postadressen. Beklager.

-    reset_password:
+    edit:

       title: Nullstill passord
       heading: Nullstill passord for %{user}
       reset: Nullstill passord
       title: Nullstill passord
       heading: Nullstill passord for %{user}
       reset: Nullstill passord

-      flash changed: Ditt passord er endret.

       flash token bad: Kunne ikke finne den nøkkelen. Sjekke URLen kanskje?
       flash token bad: Kunne ikke finne den nøkkelen. Sjekke URLen kanskje?

+    update:
+      flash changed: Ditt passord er endret.

   preferences:
     show:
       preferred_languages: Foretrukne språk
   preferences:
     show:
       preferred_languages: Foretrukne språk


@@ -1840,9 +1842,6 @@ nb:
           footway: Gangvei
           rail: Jernbane
           subway: Undergrunnsbane
           footway: Gangvei
           rail: Jernbane
           subway: Undergrunnsbane

-          tram:
-          - Bybane
-          - trikk

           cable:
           - Kabelvogn
           - stolheis
           cable:
           - Kabelvogn
           - stolheis


@@ -1853,14 +1852,15 @@ nb:
           - terminal
           - terminal
           admin: Administrativ grense
           - terminal
           - terminal
           admin: Administrativ grense

-          forest: Skog
-          wood: Ved
+          forest:
+          - Skog
+          - Ved

           golf: Golfbane
           park: Park
           golf: Golfbane
           park: Park

-          resident: Boligområde

           common:
           - Vanlig
           - eng
           common:
           - Vanlig
           - eng

+          resident: Boligområde

           retail: Detaljsalgområde
           industrial: Industriområde
           commercial: Kommersielt område
           retail: Detaljsalgområde
           industrial: Industriområde
           commercial: Kommersielt område

diff --git a/config/locales/nds.yml b/config/locales/nds.yml
index 0a465ab790eb30b73f678d101702fd7977c8d9f1..5bd26d17f56ff2f08caa429a597015a5bcf1744b 100644 (file)
--- a/config/locales/nds.yml
+++ b/config/locales/nds.yml
@@ -455,15 +455,16 @@ nds:
     destroy:
       destroyed: Naricht wegdaan
   passwords:
     destroy:
       destroyed: Naricht wegdaan
   passwords:

-    lost_password:
+    new:

       title: Passwoord vergeten
       heading: Passwoord vergeten?
       email address: 'E-Mail-Adress:'
       new password button: Passwoord trüchsetten
       title: Passwoord vergeten
       heading: Passwoord vergeten?
       email address: 'E-Mail-Adress:'
       new password button: Passwoord trüchsetten

-    reset_password:
+    edit:

       title: Passwoord trüchsetten
       heading: Passwoord för %{user} trüchsetten
       reset: Passwoord trüchsetten
       title: Passwoord trüchsetten
       heading: Passwoord för %{user} trüchsetten
       reset: Passwoord trüchsetten

+    update:

       flash changed: Dien Passwoord is nu ännert.
   profiles:
     edit:
       flash changed: Dien Passwoord is nu ännert.
   profiles:
     edit:


@@ -519,9 +520,6 @@ nds:
           footway: Footpadd
           rail: Iesenbahn
           subway: U-Bahn
           footway: Footpadd
           rail: Iesenbahn
           subway: U-Bahn

-          tram:
-          - Stadtbahn
-          - Stratenbahn

           cable:
           - Kavelbahn
           - Skilift
           cable:
           - Kavelbahn
           - Skilift


@@ -532,14 +530,15 @@ nds:
           - Terminal
           - Terminal
           admin: Grenz
           - Terminal
           - Terminal
           admin: Grenz

-          forest: Forst
-          wood: Woold
+          forest:
+          - Forst
+          - Woold

           golf: Golfplatz
           park: Park
           golf: Golfplatz
           park: Park

-          resident: Wahnrebeed

           common:
           - Wisch
           - Wisch
           common:
           - Wisch
           - Wisch

+          resident: Wahnrebeed

           retail: Ladenrebeed
           industrial: Industrierebeed
           commercial: Hannelsrebeed
           retail: Ladenrebeed
           industrial: Industrierebeed
           commercial: Hannelsrebeed

diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 68536eaf8d71e889dd052d659d2975fac97b01d6..1fa1733b8a01b7aa8989bee431669f4ae5746ffe 100644 (file)
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -856,15 +856,16 @@ ne:
     destroy:
       destroyed: सन्देश मेटियो
   passwords:
     destroy:
       destroyed: सन्देश मेटियो
   passwords:

-    lost_password:
+    new:

       title: पासवर्ड बिर्सियो
       heading: पासवर्ड बिर्सिनुभयो ?
       email address: 'इमेल ठेगाना:'
       new password button: प्रवेस शब्द परिवर्तन गर्ने
       title: पासवर्ड बिर्सियो
       heading: पासवर्ड बिर्सिनुभयो ?
       email address: 'इमेल ठेगाना:'
       new password button: प्रवेस शब्द परिवर्तन गर्ने

-    reset_password:
+    edit:

       title: प्रवेस शब्द परिवर्तन गर्ने
       heading: '%{user}को लागि प्रवेस शब्द परिवर्तन गर्ने'
       reset: नयाँ प्रवेशशव्द
       title: प्रवेस शब्द परिवर्तन गर्ने
       heading: '%{user}को लागि प्रवेस शब्द परिवर्तन गर्ने'
       reset: नयाँ प्रवेशशव्द

+    update:

       flash changed: तपाईंको प्रवेश शब्द परिवर्तन गरिएको छ।
   profiles:
     edit:
       flash changed: तपाईंको प्रवेश शब्द परिवर्तन गरिएको छ।
   profiles:
     edit:


@@ -993,8 +994,9 @@ ne:
           cable:
           - केबल कार
           - कुर्सी लिफ्ट
           cable:
           - केबल कार
           - कुर्सी लिफ्ट

-          forest: वन
-          wood: कुञ्ज
+          forest:
+          - वन
+          - कुञ्ज

           golf: गल्फ कोर्स
           park: उद्यान
           resident: आवासीय क्षेत्र
           golf: गल्फ कोर्स
           park: उद्यान
           resident: आवासीय क्षेत्र

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 2b66ed4173b420d1b82e2dfb27eca681470e6c53..7e062e4db71d276bcb3f6e0b2a58ea050f868a6b 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -191,7 +191,7 @@ nl:
         details: Geef wat meer details over het probleem (verplicht).
       user:
         auth_provider: Authenticatiedienst
         details: Geef wat meer details over het probleem (verplicht).
       user:
         auth_provider: Authenticatiedienst

-        auth_uid: Authenticatie UID
+        auth_uid: Authenticatie-UID

         email: E-mail
         email_confirmation: E-mailbevestiging
         new_email: Nieuw e-mailadres
         email: E-mail
         email_confirmation: E-mailbevestiging
         new_email: Nieuw e-mailadres


@@ -206,8 +206,9 @@ nl:
         pass_crypt_confirmation: Wachtwoord bevestigen
     help:
       doorkeeper/application:
         pass_crypt_confirmation: Wachtwoord bevestigen
     help:
       doorkeeper/application:

-        confidential: Toepassing wordt gebruikt waar het clientgeheim vertrouwelijk
-          kan worden gehouden (native mobiele apps en éénpagina-apps zijn niet vertrouwelijk)
+        confidential: De applicatie wordt gebruikt waar het clientgeheim vertrouwelijk
+          kan worden gehouden (voor mobiele apparaten ontworpen apps en éénpagina-apps
+          zijn niet vertrouwelijk)

         redirect_uri: Gebruik één regel per URI
       trace:
         tagstring: kommagescheiden
         redirect_uri: Gebruik één regel per URI
       trace:
         tagstring: kommagescheiden


@@ -1881,7 +1882,7 @@ nl:
     destroy:
       destroyed: Het bericht is verwijderd
   passwords:
     destroy:
       destroyed: Het bericht is verwijderd
   passwords:

-    lost_password:
+    new:

       title: Wachtwoord vergeten
       heading: Wachtwoord vergeten?
       email address: 'E-mailadres:'
       title: Wachtwoord vergeten
       heading: Wachtwoord vergeten?
       email address: 'E-mailadres:'


@@ -1889,13 +1890,16 @@ nl:
       help_text: Voer het e-mailadres in dat u hebt opgegeven bij uw registratie.
         We sturen u dan een webkoppeling die u kunt gebruiken om uw wachtwoord opnieuw
         in te stellen.
       help_text: Voer het e-mailadres in dat u hebt opgegeven bij uw registratie.
         We sturen u dan een webkoppeling die u kunt gebruiken om uw wachtwoord opnieuw
         in te stellen.

+    create:

       notice email on way: Spijtig om te horen dat u het vergeten bent, maar er is
         een e-mail onderweg zodat u uw wachtwoord opnieuw kunt instellen.
       notice email cannot find: Dat e-mailadres kon helaas niet worden gevonden.
       notice email on way: Spijtig om te horen dat u het vergeten bent, maar er is
         een e-mail onderweg zodat u uw wachtwoord opnieuw kunt instellen.
       notice email cannot find: Dat e-mailadres kon helaas niet worden gevonden.

-    reset_password:
+    edit:

       title: Wachtwoord opnieuw instellen
       heading: Wachtwoord voor %{user} opnieuw instellen
       reset: Wachtwoord opnieuw instellen
       title: Wachtwoord opnieuw instellen
       heading: Wachtwoord voor %{user} opnieuw instellen
       reset: Wachtwoord opnieuw instellen

+      flash token bad: Het token kon niet gevonden worden. Controleer de URL.
+    update:

       flash changed: Uw wachtwoord is gewijzigd.
       flash token bad: Het token kon niet gevonden worden. Controleer de URL.
   preferences:
       flash changed: Uw wachtwoord is gewijzigd.
       flash token bad: Het token kon niet gevonden worden. Controleer de URL.
   preferences:


@@ -2402,10 +2406,13 @@ nl:
           cycleway_local: Lokale fietsroute
           footway: Voetpad
           rail: Spoorweg
           cycleway_local: Lokale fietsroute
           footway: Voetpad
           rail: Spoorweg

+          train: Trein

           subway: Metro
           subway: Metro

-          tram:
-          - Lightrail
-          - tram
+          ferry: Veerboot
+          light_rail: Lightrail
+          tram_only: Tram
+          trolleybus: Trolleybus
+          bus: Bus

           cable:
           - Kabelbaan
           - stoeltjeslift
           cable:
           - Kabelbaan
           - stoeltjeslift


@@ -2416,22 +2423,35 @@ nl:
           - Luchthavenplatform
           - terminal
           admin: Bestuurlijke grens
           - Luchthavenplatform
           - terminal
           admin: Bestuurlijke grens

-          forest: Bos
-          wood: Bos
+          orchard:
+          - Boomgaard
+          - wijngaard
+          forest:
+          - Bos
+          - bos
+          farmland: Landbouwgrond
+          grass:
+          - Gras
+          - weide
+          bare_rock: Kale rots
+          sand: Zand

           golf: Golfbaan
           park: Park
           golf: Golfbaan
           park: Park

-          resident: Woongebied

           common:
           - Gemene grond
           - weide
           - tuin
           common:
           - Gemene grond
           - weide
           - tuin

+          built_up: Bebouwde kom
+          resident: Woongebied

           retail: Winkelgebied
           industrial: Industriegebied
           commercial: Commercieel gebied
           heathland: Heide
           retail: Winkelgebied
           industrial: Industriegebied
           commercial: Commercieel gebied
           heathland: Heide

+          scrubland: Struikgewas

           lake:
           - Meer
           - reservoir
           lake:
           - Meer
           - reservoir

+          glacier: Gletsjer

           farm: Boerderij
           brownfield: Braakliggend terrein
           cemetery: Begraafplaats
           farm: Boerderij
           brownfield: Braakliggend terrein
           cemetery: Begraafplaats


@@ -2453,6 +2473,8 @@ nl:
           private: Privétoegang
           destination: Bestemmingsverkeer
           construction: Weg in aanleg
           private: Privétoegang
           destination: Bestemmingsverkeer
           construction: Weg in aanleg

+          bus_stop: Bushalte
+          stop: Halte

           bicycle_shop: Fietsenwinkel
           bicycle_parking: Fietsenstalling
           toilets: Toiletten
           bicycle_shop: Fietsenwinkel
           bicycle_parking: Fietsenstalling
           toilets: Toiletten


@@ -2498,6 +2520,7 @@ nl:
         imports: Importeringen
         automated_edits: Geautomatiseerde bewerkingen
       start_mapping: Beginnen met kaarten maken
         imports: Importeringen
         automated_edits: Geautomatiseerde bewerkingen
       start_mapping: Beginnen met kaarten maken

+      continue_authorization: Doorgaan met autoriseren

       add_a_note:
         title: Geen tijd om te bewerken? Voeg een opmerking toe!
         para_1: Als u gewoon iets kleins wilt verbeteren en niet de tijd hebt om u
       add_a_note:
         title: Geen tijd om te bewerken? Voeg een opmerking toe!
         para_1: Als u gewoon iets kleins wilt verbeteren en niet de tijd hebt om u

diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 2f022d90896470c0774e426cda8967308526a6e0..cfe6c6e73efa06cc371afac7288fd00db79683b2 100644 (file)
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1722,22 +1722,24 @@ nn:
     destroy:
       destroyed: Melding sletta
   passwords:
     destroy:
       destroyed: Melding sletta
   passwords:

-    lost_password:
+    new:

       title: Gløymt passord
       heading: Gløymt passord?
       email address: 'E-postadresse:'
       new password button: Nullstill passord
       help_text: Skriv inn e-postadressa du brukte for å registrere deg, og me vil
         sende deg ei lenkje som du kan bruke til å nullstille passordet ditt.
       title: Gløymt passord
       heading: Gløymt passord?
       email address: 'E-postadresse:'
       new password button: Nullstill passord
       help_text: Skriv inn e-postadressa du brukte for å registrere deg, og me vil
         sende deg ei lenkje som du kan bruke til å nullstille passordet ditt.

+    create:

       notice email on way: Synd at du mista det, men ein e-post er på veg slik at
         du kan tilbakestille det snart.
       notice email cannot find: Klarte ikkje finne den e-postadressa. Beklagar.
       notice email on way: Synd at du mista det, men ein e-post er på veg slik at
         du kan tilbakestille det snart.
       notice email cannot find: Klarte ikkje finne den e-postadressa. Beklagar.

-    reset_password:
+    edit:

       title: Nullstill passord
       heading: Nullstill passord for %{user}
       reset: Nullstill passord
       title: Nullstill passord
       heading: Nullstill passord for %{user}
       reset: Nullstill passord

-      flash changed: Passordet ditt er endra.

       flash token bad: Kunne ikkje finne den nøkkelen. Sjekke URLen kanskje?
       flash token bad: Kunne ikkje finne den nøkkelen. Sjekke URLen kanskje?

+    update:
+      flash changed: Passordet ditt er endra.

   preferences:
     show:
       title: Innstillingar
   preferences:
     show:
       title: Innstillingar


@@ -2178,9 +2180,6 @@ nn:
           footway: Gangveg
           rail: Jernbane
           subway: Undergrunnsbane
           footway: Gangveg
           rail: Jernbane
           subway: Undergrunnsbane

-          tram:
-          - Bybane
-          - trikk

           cable:
           - Kabelvogn
           - stolheis
           cable:
           - Kabelvogn
           - stolheis


@@ -2191,14 +2190,15 @@ nn:
           - terminal
           - terminal
           admin: Administrativ grense
           - terminal
           - terminal
           admin: Administrativ grense

-          forest: Skog
-          wood: Ved
+          forest:
+          - Skog
+          - Ved

           golf: Golfbane
           park: Park
           golf: Golfbane
           park: Park

-          resident: Boligområde

           common:
           - Vanleg
           - snever
           common:
           - Vanleg
           - snever

+          resident: Boligområde

           retail: Detaljsalgområde
           industrial: Industriområde
           commercial: Kommersielt område
           retail: Detaljsalgområde
           industrial: Industriområde
           commercial: Kommersielt område

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 846b4375e54e2c7b714412c5f8b6ca0c81ddf7ff..0e76724ef64c54adfeb5d01cc729a733f104370e 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -1292,22 +1292,24 @@ nqo:
     destroy:
       destroyed: ߗߋߛߓߍ ߓߘߊ߫ ߖߏ߬ߛߌ߫
   passwords:
     destroy:
       destroyed: ߗߋߛߓߍ ߓߘߊ߫ ߖߏ߬ߛߌ߫
   passwords:

-    lost_password:
+    new:

       title: ߓߣߐ߬ ߓߘߊ߫ ߞߍ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߘߐ߫
       heading: ߌ ߓߘߊ߫ ߢߌ߬ߣߊ߬ ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߠߊ߫؟
       email address: 'ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮:'
       new password button: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߬
       help_text: ߢ:ߞߏ߲ߘߏ ߟߊߘߏ߲߬ ߌ ߞߊ߬ ߡߍ߲ ߠߊߓߊ߯ߙߊ߫ ߞߵߌ ߜߊ߲߬ߞߎ߲߫߸ ߊ߲ ߘߌ߫ ߛߘߌ߬ߜߋ߲ ߗߴߌ
         ߡߵߊ߬ ߟߊ߫ ߌ ߘߴߏ߬ ߟߊߓߊ߯ߙߊ߫ ߞߵߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߫.
       title: ߓߣߐ߬ ߓߘߊ߫ ߞߍ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߘߐ߫
       heading: ߌ ߓߘߊ߫ ߢߌ߬ߣߊ߬ ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߠߊ߫؟
       email address: 'ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮:'
       new password button: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߬
       help_text: ߢ:ߞߏ߲ߘߏ ߟߊߘߏ߲߬ ߌ ߞߊ߬ ߡߍ߲ ߠߊߓߊ߯ߙߊ߫ ߞߵߌ ߜߊ߲߬ߞߎ߲߫߸ ߊ߲ ߘߌ߫ ߛߘߌ߬ߜߋ߲ ߗߴߌ
         ߡߵߊ߬ ߟߊ߫ ߌ ߘߴߏ߬ ߟߊߓߊ߯ߙߊ߫ ߞߵߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߫.

+    create:

       notice email on way: ߤߊߞߍ߬ߕߏ߫ ߌ ߓߘߊ߫ ߓߐߣߵߊ߬ ߘߐ߫:-(ߒ߬ߞߊ߬ ߗߋߛߓߍ ߘߏ߫ ߦߴߊ߬ ߞߣߐ߫
         ߏ߬ ߘߐ߫ ߌ ߘߌ߫ ߛߴߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫ ߠߊ߫ ߖߏߣߊ߫.
       notice email cannot find: ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߏ߬ ߕߴߛߋ߫ ߢߌߣߌ߲߫ ߠߊ߫߸ ߤߊߞߍ߬ߕߏ߫.
       notice email on way: ߤߊߞߍ߬ߕߏ߫ ߌ ߓߘߊ߫ ߓߐߣߵߊ߬ ߘߐ߫:-(ߒ߬ߞߊ߬ ߗߋߛߓߍ ߘߏ߫ ߦߴߊ߬ ߞߣߐ߫
         ߏ߬ ߘߐ߫ ߌ ߘߌ߫ ߛߴߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫ ߠߊ߫ ߖߏߣߊ߫.
       notice email cannot find: ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߏ߬ ߕߴߛߋ߫ ߢߌߣߌ߲߫ ߠߊ߫߸ ߤߊߞߍ߬ߕߏ߫.

-    reset_password:
+    edit:

       title: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߬
       heading: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߫ %{user} ߦߋ߫
       reset: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߬
       title: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߬
       heading: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߫ %{user} ߦߋ߫
       reset: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߬

-      flash changed: ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߓߘߊ߫ ߓߊ߲߫ ߡߊߝߊ߬ߟߋ߲߬ ߠߊ߫.

       flash token bad: ߌ ߞߊߣߊ߬ ߖߐߟߐ߲ߞߐ ߏ߬ ߢߌߣߌ߲߫߸ URL ߡߊߝߟߍ߫ ߕߎ߬ߡߊ߬ߘߐ߫؟
       flash token bad: ߌ ߞߊߣߊ߬ ߖߐߟߐ߲ߞߐ ߏ߬ ߢߌߣߌ߲߫߸ URL ߡߊߝߟߍ߫ ߕߎ߬ߡߊ߬ߘߐ߫؟

+    update:
+      flash changed: ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߓߘߊ߫ ߓߊ߲߫ ߡߊߝߊ߬ߟߋ߲߬ ߠߊ߫.

   preferences:
     show:
       title: ߒ ߠߊ߫ ߦߟߌߡߊߛߙߋ ߟߎ߬
   preferences:
     show:
       title: ߒ ߠߊ߫ ߦߟߌߡߊߛߙߋ ߟߎ߬


@@ -1526,11 +1528,12 @@ nqo:
           - ߛߊ߲ߡߊߘߊ߲ ߓߏ߬ߙߌ߬ ߛߌߟߊ
           - ߥߊߟߌߥߊߟߌ ߫ ߛߌߟߊ
           admin: ߓߐߕߏ߲߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ߬ߞߊ
           - ߛߊ߲ߡߊߘߊ߲ ߓߏ߬ߙߌ߬ ߛߌߟߊ
           - ߥߊߟߌߥߊߟߌ ߫ ߛߌߟߊ
           admin: ߓߐߕߏ߲߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ߬ߞߊ

-          forest: ߕߎ
-          wood: ߦߙߌ
-          resident: ߡߐ߰ߘߐ߬ ߛߌߟߊ
+          forest:
+          - ߕߎ
+          - ߦߙߌ

           common:
           - ߘߍ߬ߒ߬ߡߊ߬ ߞߣߍ
           common:
           - ߘߍ߬ߒ߬ߡߊ߬ ߞߣߍ

+          resident: ߡߐ߰ߘߐ߬ ߛߌߟߊ

           retail: ߖߎ߬ߟߦߊ߬ ߞߣߍ
           industrial: ߘߍ߲߰ߦߊ߬ߟߌ ߕߌ߲߬ߞߎߘߎ߲
           commercial: ߖߊ߬ߥߏ ߘߌ߲߬ߞߌߙߊ
           retail: ߖߎ߬ߟߦߊ߬ ߞߣߍ
           industrial: ߘߍ߲߰ߦߊ߬ߟߌ ߕߌ߲߬ߞߎߘߎ߲
           commercial: ߖߊ߬ߥߏ ߘߌ߲߬ߞߌߙߊ

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 4e5604c500fd9ef859dff3c40b3c30e97325ab3a..2d5c09e6c3a533498ae6c964e8c21563c14e96d2 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -1733,20 +1733,22 @@ oc:
     destroy:
       destroyed: Messatge suprimit
   passwords:
     destroy:
       destroyed: Messatge suprimit
   passwords:

-    lost_password:
+    new:

       title: Senhal perdut
       heading: Avètz perdut vòstre senhal ?
       email address: 'Adreça de corrièr electronic :'
       new password button: Mandar un senhal novèl
       title: Senhal perdut
       heading: Avètz perdut vòstre senhal ?
       email address: 'Adreça de corrièr electronic :'
       new password button: Mandar un senhal novèl

+    create:

       notice email on way: Un e-mail vos es estat mandat per reïnicializar vòstre
         senhal.
       notice email cannot find: Adreça email introbabla, o planhèm.
       notice email on way: Un e-mail vos es estat mandat per reïnicializar vòstre
         senhal.
       notice email cannot find: Adreça email introbabla, o planhèm.

-    reset_password:
+    edit:

       title: Reïnicializar lo senhal
       heading: Reïnicializar lo senhal de %{user}
       reset: Reïnicializar lo senhal
       title: Reïnicializar lo senhal
       heading: Reïnicializar lo senhal de %{user}
       reset: Reïnicializar lo senhal

-      flash changed: Vòstre senhal es estat modificat.

       flash token bad: Avètz pas trobat aqueste geton, avètz verificat l'URL ?
       flash token bad: Avètz pas trobat aqueste geton, avètz verificat l'URL ?

+    update:
+      flash changed: Vòstre senhal es estat modificat.

   preferences:
     show:
       title: Preferéncias
   preferences:
     show:
       title: Preferéncias


@@ -2026,9 +2028,6 @@ oc:
           footway: Via pietonièra
           rail: Via ferrada
           subway: Linha de mètro
           footway: Via pietonièra
           rail: Via ferrada
           subway: Linha de mètro

-          tram:
-          - Pichona via ferrada
-          - tram

           cable:
           - Teleferic
           - telesèti
           cable:
           - Teleferic
           - telesèti


@@ -2039,15 +2038,16 @@ oc:
           - Estacionament d'avions
           - terminal
           admin: Limit administratiu
           - Estacionament d'avions
           - terminal
           admin: Limit administratiu

-          forest: Sèuva
-          wood: Bòsc
+          forest:
+          - Sèuva
+          - Bòsc

           golf: Percors de gòlf
           park: Pargue
           golf: Percors de gòlf
           park: Pargue

-          resident: Zòna residenciala

           common:
           - Espaci comun
           - prada
           - Jardin
           common:
           - Espaci comun
           - prada
           - Jardin

+          resident: Zòna residenciala

           retail: Zòna de comèrci
           industrial: Zòna industriala
           commercial: Zòna terciària
           retail: Zòna de comèrci
           industrial: Zòna industriala
           commercial: Zòna terciària

diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 74e807cdcdd191ad57c73278d9e8333b67119ddb..d9d5014a1f4b197bb8beee8f1179ea735ed0bc09 100644 (file)
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -806,14 +806,15 @@ pa:
     destroy:
       destroyed: ਸੁਨੇਹਾ ਮਿਟਾਇਆ ਗਿਆ
   passwords:
     destroy:
       destroyed: ਸੁਨੇਹਾ ਮਿਟਾਇਆ ਗਿਆ
   passwords:

-    lost_password:
+    new:

       title: ਪਛਾਣ ਸ਼ਬਦ ਗੁੰਮ ਗਿਆ
       heading: ਪਛਾਣ ਸ਼ਬਦ ਭੁੱਲ ਗਿਆ?
       email address: 'ਈਮੇਲ ਪਤਾ:'
       new password button: ਪਛਾਣ ਸ਼ਬਦ ਮੁੜ-ਸੈੱਟ ਕਰੋ
       title: ਪਛਾਣ ਸ਼ਬਦ ਗੁੰਮ ਗਿਆ
       heading: ਪਛਾਣ ਸ਼ਬਦ ਭੁੱਲ ਗਿਆ?
       email address: 'ਈਮੇਲ ਪਤਾ:'
       new password button: ਪਛਾਣ ਸ਼ਬਦ ਮੁੜ-ਸੈੱਟ ਕਰੋ

-    reset_password:
+    edit:

       title: ਪਛਾਣ ਸ਼ਬਦ ਮੁੜ-ਸੈੱਟ ਕਰੋ
       reset: ਪਛਾਣ ਸ਼ਬਦ ਮੁੜ-ਸੈੱਟ ਕਰੋ
       title: ਪਛਾਣ ਸ਼ਬਦ ਮੁੜ-ਸੈੱਟ ਕਰੋ
       reset: ਪਛਾਣ ਸ਼ਬਦ ਮੁੜ-ਸੈੱਟ ਕਰੋ

+    update:

       flash changed: ਤੁਹਾਡਾ ਪਛਾਣ ਸ਼ਬਦ ਬਦਲਿਆ ਜਾ ਚੁੱਕਾ ਹੈ।
   profiles:
     edit:
       flash changed: ਤੁਹਾਡਾ ਪਛਾਣ ਸ਼ਬਦ ਬਦਲਿਆ ਜਾ ਚੁੱਕਾ ਹੈ।
   profiles:
     edit:


@@ -933,9 +934,6 @@ pa:
           footway: ਪੈਦਲ ਰਾਹ
           rail: ਰੇਲਵੇ
           subway: ਸਬ-ਵੇਅ
           footway: ਪੈਦਲ ਰਾਹ
           rail: ਰੇਲਵੇ
           subway: ਸਬ-ਵੇਅ

-          tram:
-          - ਹਲਕੀ ਰੇਲ
-          - ਟਰਾਮ

           cable:
           - ਕੇਬਲ ਕਾਰ
           - ਕੁਰਸੀ ਲਿਫ਼ਟ
           cable:
           - ਕੇਬਲ ਕਾਰ
           - ਕੁਰਸੀ ਲਿਫ਼ਟ


@@ -946,14 +944,15 @@ pa:
           - ਹਵਾਈ ਅੱਡੇ ਦਾ ਐਪਰਨ
           - ਟਰਮੀਨਲ
           admin: ਪ੍ਰਸ਼ਾਸਕੀ ਸਰਹੱਦ
           - ਹਵਾਈ ਅੱਡੇ ਦਾ ਐਪਰਨ
           - ਟਰਮੀਨਲ
           admin: ਪ੍ਰਸ਼ਾਸਕੀ ਸਰਹੱਦ

-          forest: ਜੰਗਲ
-          wood: ਜੰਗਲ
+          forest:
+          - ਜੰਗਲ
+          - ਜੰਗਲ

           golf: ਗੋਲਫ਼ ਮੈਦਾਨ
           park: ਪਾਰਕ
           golf: ਗੋਲਫ਼ ਮੈਦਾਨ
           park: ਪਾਰਕ

-          resident: ਰਿਹਾਇਸ਼ੀ ਇਲਾਕਾ

           common:
           - ਸ਼ਾਮਲਾਟ
           - ਚਰਗਾਹ
           common:
           - ਸ਼ਾਮਲਾਟ
           - ਚਰਗਾਹ

+          resident: ਰਿਹਾਇਸ਼ੀ ਇਲਾਕਾ

           retail: ਪਰਚੂਨ ਖੇਤਰ
           industrial: ਉਦਯੋਗਿਕ ਖੇਤਰ
           commercial: ਵਪਾਰਕ ਖੇਤਰ
           retail: ਪਰਚੂਨ ਖੇਤਰ
           industrial: ਉਦਯੋਗਿਕ ਖੇਤਰ
           commercial: ਵਪਾਰਕ ਖੇਤਰ

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index a75907e90bfff660a010bd256593ef2cf29af9f2..323b1f642c450a9adddf40e06eec4ae99262b5af 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1889,22 +1889,24 @@ pl:
     destroy:
       destroyed: Wiadomość usunięta
   passwords:
     destroy:
       destroyed: Wiadomość usunięta
   passwords:

-    lost_password:
+    new:

       title: Zgubione hasło
       heading: Zapomniałeś hasła?
       email address: 'Adres e-mail:'
       new password button: Wyczyść hasło
       help_text: Proszę wprowadzić adres e-mail używany do logowania. Zostanie wysłany
         na niego odnośnik służący do wyczyszczenia hasła.
       title: Zgubione hasło
       heading: Zapomniałeś hasła?
       email address: 'Adres e-mail:'
       new password button: Wyczyść hasło
       help_text: Proszę wprowadzić adres e-mail używany do logowania. Zostanie wysłany
         na niego odnośnik służący do wyczyszczenia hasła.

+    create:

       notice email on way: Przykro nam z powodu utraty hasła. Wiadomość, która umożliwi
         jego wyczyszczenie, jest już w drodze.
       notice email cannot find: Niestety, nie odnaleziono tego adresu e-mail.
       notice email on way: Przykro nam z powodu utraty hasła. Wiadomość, która umożliwi
         jego wyczyszczenie, jest już w drodze.
       notice email cannot find: Niestety, nie odnaleziono tego adresu e-mail.

-    reset_password:
+    edit:

       title: Wyczyść hasło
       heading: Czyszczenie hasła użytkownika %{user}
       reset: Wyczyść hasło
       title: Wyczyść hasło
       heading: Czyszczenie hasła użytkownika %{user}
       reset: Wyczyść hasło

-      flash changed: Hasło zostało zmienione.

       flash token bad: Nie znaleziono tokenu, sprawdź URL
       flash token bad: Nie znaleziono tokenu, sprawdź URL

+    update:
+      flash changed: Hasło zostało zmienione.

   preferences:
     show:
       title: Preferencje
   preferences:
     show:
       title: Preferencje


@@ -2119,6 +2121,7 @@ pl:
           (© Department of Natural Resources Canada), CanVec (© Department
           of Natural Resources Canada) i StatCan (Geography Division, Statistics Canada).'
         contributors_ca_canada: Kanada
           (© Department of Natural Resources Canada), CanVec (© Department
           of Natural Resources Canada) i StatCan (Geography Division, Statistics Canada).'
         contributors_ca_canada: Kanada

+        contributors_cz_czechia: Czechy

         contributors_fi_credit_html: '%{finland}: Zawiera dane z National Land Survey
           of Finland''s Topographic Database i innych zbiorów danych, na podstawie
           %{nlsfi_license_link}.'
         contributors_fi_credit_html: '%{finland}: Zawiera dane z National Land Survey
           of Finland''s Topographic Database i innych zbiorów danych, na podstawie
           %{nlsfi_license_link}.'


@@ -2330,10 +2333,13 @@ pl:
           cycleway_local: Droga rowerowa znaczenia lokalnego
           footway: Droga dla pieszych
           rail: Tor kolejowy
           cycleway_local: Droga rowerowa znaczenia lokalnego
           footway: Droga dla pieszych
           rail: Tor kolejowy

+          train: Kolej

           subway: Metro
           subway: Metro

-          tram:
-          - Kolej miejska
-          - tramwaj
+          ferry: Prom
+          light_rail: Kolej miejska
+          tram_only: Tramwaj
+          trolleybus: Trolejbus
+          bus: Autobus

           cable:
           - Kolej linowa
           - wyciąg krzesełkowy
           cable:
           - Kolej linowa
           - wyciąg krzesełkowy


@@ -2344,15 +2350,16 @@ pl:
           - Płyta lotniska
           - terminal
           admin: Granica
           - Płyta lotniska
           - terminal
           admin: Granica

-          forest: Las
-          wood: Drzewa
+          forest:
+          - Las
+          - Drzewa

           golf: Pole golfowe
           park: Park
           golf: Pole golfowe
           park: Park

-          resident: Teren mieszkalny

           common:
           - Pole
           - łąka
           - ogród
           common:
           - Pole
           - łąka
           - ogród

+          resident: Teren mieszkalny

           retail: Zabudowa handlowo-usługowa
           industrial: Teren przemysłowy
           commercial: Teren komercyjny
           retail: Zabudowa handlowo-usługowa
           industrial: Teren przemysłowy
           commercial: Teren komercyjny


@@ -2360,6 +2367,7 @@ pl:
           lake:
           - Jezioro
           - zbiornik
           lake:
           - Jezioro
           - zbiornik

+          glacier: Lodowiec

           farm: Gospodarstwo rolne
           brownfield: Teren powyburzeniowy
           cemetery: Cmentarz
           farm: Gospodarstwo rolne
           brownfield: Teren powyburzeniowy
           cemetery: Cmentarz


@@ -2381,6 +2389,7 @@ pl:
           private: Dostęp za zezwoleniem
           destination: Dostęp tylko do punktu docelowego
           construction: Drogi w budowie
           private: Dostęp za zezwoleniem
           destination: Dostęp tylko do punktu docelowego
           construction: Drogi w budowie

+          bus_stop: Przystanek autobusowy

           bicycle_shop: Sklep rowerowy
           bicycle_parking: Parking dla rowerów
           toilets: Toalety
           bicycle_shop: Sklep rowerowy
           bicycle_parking: Parking dla rowerów
           toilets: Toalety


@@ -3110,6 +3119,7 @@ pl:
       map_data_zoom_in_tooltip: Przybliż mapę, aby zobaczyć jej dane
       queryfeature_tooltip: Pobierz i wyświetl obiekty
       queryfeature_disabled_tooltip: Przybliż mapę, aby obejrzeć dane obiektów
       map_data_zoom_in_tooltip: Przybliż mapę, aby zobaczyć jej dane
       queryfeature_tooltip: Pobierz i wyświetl obiekty
       queryfeature_disabled_tooltip: Przybliż mapę, aby obejrzeć dane obiektów

+      embed_html_disabled: Osadzanie HTML nie jest dostępne dla tej warstwy mapy

     changesets:
       show:
         comment: Komentarz
     changesets:
       show:
         comment: Komentarz

diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml
index 848871cf658541e323c7a1f43261636ae05db87f..2dd6866a5ab553ce6e1d679de9b5f302a98adf67 100644 (file)
--- a/config/locales/pnb.yml
+++ b/config/locales/pnb.yml
@@ -1392,19 +1392,21 @@ pnb:
     destroy:
       destroyed: سُنیہا مٹائا گیا
   passwords:
     destroy:
       destroyed: سُنیہا مٹائا گیا
   passwords:

-    lost_password:
+    new:

       title: پاس‌ورڈ گُم گیا
       heading: پچھاݨ شبد بھّل گیا؟
       email address: 'ای‌میل پتہ:'
       new password button: پاس‌ورڈ فیر بݨایو
       help_text: تہاڈے ای‌میل دا پتہ جو پاس‌ورڈ فیر بݨاؤݨ دی کڑی بھیج سکاں‌گی اے۔
       title: پاس‌ورڈ گُم گیا
       heading: پچھاݨ شبد بھّل گیا؟
       email address: 'ای‌میل پتہ:'
       new password button: پاس‌ورڈ فیر بݨایو
       help_text: تہاڈے ای‌میل دا پتہ جو پاس‌ورڈ فیر بݨاؤݨ دی کڑی بھیج سکاں‌گی اے۔

+    create:

       notice email on way: اچھا، ای‌میل تے مدد دی کڑی بھیجاں‌گی اے
       notice email cannot find: افسوس، اوہ ای‌میل دا پتہ نہیں لبھ سکیا
       notice email on way: اچھا، ای‌میل تے مدد دی کڑی بھیجاں‌گی اے
       notice email cannot find: افسوس، اوہ ای‌میل دا پتہ نہیں لبھ سکیا

-    reset_password:
+    edit:

       title: پاس‌ورڈ فیر بݨایو
       reset: پاس‌ورڈ فیر بݨایو
       title: پاس‌ورڈ فیر بݨایو
       reset: پاس‌ورڈ فیر بݨایو

-      flash changed: تہاڈے پاس‌ورڈ تبدیلی کیتی گئی سی۔

       flash token bad: ٹوکن نہیں لبھیا، خبر کڑی دا پتہ ویکھیو؟
       flash token bad: ٹوکن نہیں لبھیا، خبر کڑی دا پتہ ویکھیو؟

+    update:
+      flash changed: تہاڈے پاس‌ورڈ تبدیلی کیتی گئی سی۔

   preferences:
     show:
       title: ترجیحاں
   preferences:
     show:
       title: ترجیحاں


@@ -1657,9 +1659,6 @@ pnb:
           footway: فُت‌وے
           rail: ریلوے
           subway: سبوے
           footway: فُت‌وے
           rail: ریلوے
           subway: سبوے

-          tram:
-          - ہلکی ریلوے
-          - ٹرام‌وے

           cable:
           - کیبل کار
           - کُرسی لِفٹ
           cable:
           - کیبل کار
           - کُرسی لِفٹ


@@ -1670,15 +1669,16 @@ pnb:
           - ہوائی اڈے دا ایپرن
           - ٹرمینل
           admin: پرشاسکی سرحد
           - ہوائی اڈے دا ایپرن
           - ٹرمینل
           admin: پرشاسکی سرحد

-          forest: رکھّ
-          wood: جنگل
+          forest:
+          - رکھّ
+          - جنگل

           golf: گولف مَیدان
           park: پارک
           golf: گولف مَیدان
           park: پارک

-          resident: رہائشی کھیتر

           common:
           - شاملاٹ
           - چرگاہ
           - باغ
           common:
           - شاملاٹ
           - چرگاہ
           - باغ

+          resident: رہائشی کھیتر

           retail: پرچون کھیتر
           industrial: سناتی کھیتر
           commercial: وپارک کھیتر
           retail: پرچون کھیتر
           industrial: سناتی کھیتر
           commercial: وپارک کھیتر

diff --git a/config/locales/ps.yml b/config/locales/ps.yml
index 1ef959f570bd0d8e639492aaeba8efae0830aff2..fb766e366c9de8e78b3b8c9078b7488d3c751264 100644 (file)
--- a/config/locales/ps.yml
+++ b/config/locales/ps.yml
@@ -325,7 +325,7 @@ ps:
     sent_message_summary:
       destroy_button: ړنگول
   passwords:
     sent_message_summary:
       destroy_button: ړنگول
   passwords:

-    lost_password:
+    new:

       heading: آيا پټنوم مو هېر شوی؟
       email address: 'برېښليک پته:'
   profiles:
       heading: آيا پټنوم مو هېر شوی؟
       email address: 'برېښليک پته:'
   profiles:


@@ -370,7 +370,8 @@ ps:
     key:
       table:
         entry:
     key:
       table:
         entry:

-          forest: ځنگل
+          forest:
+          - ځنگل

           park: پارک
           lake:
           - ډنډ
           park: پارک
           lake:
           - ډنډ

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 7d7f84ab700a70b7a6ca7045be831ee4cdbec572..3c55aa9147205b1f1b5c01f8bea579e15a8f12f2 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1860,23 +1860,26 @@ pt-PT:
     destroy:
       destroyed: Mensagem eliminada
   passwords:
     destroy:
       destroyed: Mensagem eliminada
   passwords:

-    lost_password:
+    new:

       title: Palavra-passe esquecida
       heading: Esqueceste a palavra-passe?
       email address: 'Endereço eletrónico:'
       new password button: Repor palavra-passe
       help_text: Introduz o endereço de correio eletrónico que usaste para criar a
         conta. Enviar-te-emos uma ligação que poderás usar para repor a palavra-passe.
       title: Palavra-passe esquecida
       heading: Esqueceste a palavra-passe?
       email address: 'Endereço eletrónico:'
       new password button: Repor palavra-passe
       help_text: Introduz o endereço de correio eletrónico que usaste para criar a
         conta. Enviar-te-emos uma ligação que poderás usar para repor a palavra-passe.

+    create:

       notice email on way: Lamentamos que a tenhas perdido :-( mas já te enviámos
         um e-mail para que possas repô-la em breve.
       notice email cannot find: Lamentamos, mas não foi possível encontrar esse endereço
         eletrónico.
       notice email on way: Lamentamos que a tenhas perdido :-( mas já te enviámos
         um e-mail para que possas repô-la em breve.
       notice email cannot find: Lamentamos, mas não foi possível encontrar esse endereço
         eletrónico.

-    reset_password:
+    edit:

       title: Repor palavra-passe
       heading: Repor palavra-passe para %{user}
       reset: Repor palavra-passe
       title: Repor palavra-passe
       heading: Repor palavra-passe para %{user}
       reset: Repor palavra-passe

-      flash changed: A tua palavra-passe foi alterada.

       flash token bad: Não encontrámos esse token. Confere o URL, por favor.
       flash token bad: Não encontrámos esse token. Confere o URL, por favor.

+    update:
+      flash changed: A tua palavra-passe foi alterada.
+      flash token bad: O token não foi encontrado. Talvez devas conferir o URL?

   preferences:
     show:
       title: Preferências
   preferences:
     show:
       title: Preferências


@@ -2354,10 +2357,13 @@ pt-PT:
           cycleway_local: Ciclovia local
           footway: Via pedonal
           rail: Ferrovia
           cycleway_local: Ciclovia local
           footway: Via pedonal
           rail: Ferrovia

+          train: Comboio

           subway: Metropolitano
           subway: Metropolitano

-          tram:
-          - Metropolitano de superfície
-          - elétrico
+          ferry: Ferry
+          light_rail: Comboio ligeiro
+          tram_only: Elétrico
+          trolleybus: Troleicarro
+          bus: Autocarro

           cable:
           - Teleférico
           - telecadeira
           cable:
           - Teleférico
           - telecadeira


@@ -2368,15 +2374,16 @@ pt-PT:
           - Estacionamento de aviões
           - terminal de aeroporto
           admin: Fronteira administrativa
           - Estacionamento de aviões
           - terminal de aeroporto
           admin: Fronteira administrativa

-          forest: Floresta gerida
-          wood: Bosque
+          forest:
+          - Floresta gerida
+          - Bosque

           golf: Campo de golfe
           park: Parque público
           golf: Campo de golfe
           park: Parque público

-          resident: Área residencial

           common:
           - Terrenos comunitários
           - prado
           - Jardim
           common:
           - Terrenos comunitários
           - prado
           - Jardim

+          resident: Área residencial

           retail: Área de retalho
           industrial: Área industrial
           commercial: Área comercial
           retail: Área de retalho
           industrial: Área industrial
           commercial: Área comercial


@@ -2405,6 +2412,8 @@ pt-PT:
           private: Acesso privado
           destination: Acesso explícito ao local
           construction: Estradas em construção
           private: Acesso privado
           destination: Acesso explícito ao local
           construction: Estradas em construção

+          bus_stop: Paragem de autocarro
+          stop: Paragem

           bicycle_shop: Loja de bicicletas
           bicycle_parking: Estacionamento de bicicletas
           toilets: Casas de banho
           bicycle_shop: Loja de bicicletas
           bicycle_parking: Estacionamento de bicicletas
           toilets: Casas de banho

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index cc27269ba33d1793b68c4c373c87e4cf041edad9..bfe33da70d976e86a22687111dcc34bb02ac4e24 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -1868,22 +1868,24 @@ pt:
     destroy:
       destroyed: Mensagem apagada
   passwords:
     destroy:
       destroyed: Mensagem apagada
   passwords:

-    lost_password:
+    new:

       title: Senha esquecida
       heading: Esqueceu sua senha?
       email address: 'Endereço de E-mail:'
       new password button: Redefinir senha
       help_text: Digite o endereço de e-mail que você usou para se conectar e enviaremos
         um link que você poderá usar para redefinir a sua senha.
       title: Senha esquecida
       heading: Esqueceu sua senha?
       email address: 'Endereço de E-mail:'
       new password button: Redefinir senha
       help_text: Digite o endereço de e-mail que você usou para se conectar e enviaremos
         um link que você poderá usar para redefinir a sua senha.

+    create:

       notice email on way: Um e-mail foi enviado para que você possa escolher outra
         senha.
       notice email cannot find: Não foi possível encontrar esse endereço de e-mail.
       notice email on way: Um e-mail foi enviado para que você possa escolher outra
         senha.
       notice email cannot find: Não foi possível encontrar esse endereço de e-mail.

-    reset_password:
+    edit:

       title: Redefinir senha
       heading: Redefinir Senha de %{user}
       reset: Redefinir Senha
       title: Redefinir senha
       heading: Redefinir Senha de %{user}
       reset: Redefinir Senha

-      flash changed: Sua senha foi alterada.

       flash token bad: O código não confere, verifique a URL.
       flash token bad: O código não confere, verifique a URL.

+    update:
+      flash changed: Sua senha foi alterada.

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


@@ -2375,9 +2377,6 @@ pt:
           footway: Caminho de pedestre
           rail: Ferrovia
           subway: Metrô
           footway: Caminho de pedestre
           rail: Ferrovia
           subway: Metrô

-          tram:
-          - Ferrovia metropolitana
-          - bonde

           cable:
           - Bonde aéreo
           - telecadeira
           cable:
           - Bonde aéreo
           - telecadeira


@@ -2388,15 +2387,16 @@ pt:
           - Pátio de aeródromo
           - terminal
           admin: Limite administrativo
           - Pátio de aeródromo
           - terminal
           admin: Limite administrativo

-          forest: Floresta manejada
-          wood: Bosque nativo
+          forest:
+          - Floresta manejada
+          - Bosque nativo

           golf: Campo de golfe
           park: Parque
           golf: Campo de golfe
           park: Parque

-          resident: Área residencial

           common:
           - Baldio comunitário
           - prado
           - Jardim
           common:
           - Baldio comunitário
           - prado
           - Jardim

+          resident: Área residencial

           retail: Área de varejo
           industrial: Área industrial
           commercial: Área de negócios
           retail: Área de varejo
           industrial: Área industrial
           commercial: Área de negócios

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 4dd7a9bbf0240a5a7f067646134d39a52415f42c..59464b3d0ea9801e08ea4f034fe43f114f91a64e 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -1842,22 +1842,24 @@ ro:
     destroy:
       destroyed: Mesaj șters
   passwords:
     destroy:
       destroyed: Mesaj șters
   passwords:

-    lost_password:
+    new:

       title: Parola pierdută
       heading: Ai uitat parola?
       email address: 'Adresa de e-mail:'
       new password button: Resetare parolă
       help_text: Introduceți adresa de e-mail pe care ați utilizat-o pentru a vă înscrie,
         vom trimite un link la aceasta pe care îl puteți utiliza pentru a reseta parola.
       title: Parola pierdută
       heading: Ai uitat parola?
       email address: 'Adresa de e-mail:'
       new password button: Resetare parolă
       help_text: Introduceți adresa de e-mail pe care ați utilizat-o pentru a vă înscrie,
         vom trimite un link la aceasta pe care îl puteți utiliza pentru a reseta parola.

+    create:

       notice email on way: Ne pare rău că ați pierdut-o :-( dar un e-mail este pe
         drum, astfel încât să puteți să-l resetați în curând.
       notice email cannot find: Nu am putut găsi adresa de e-mail, îmi pare rău.
       notice email on way: Ne pare rău că ați pierdut-o :-( dar un e-mail este pe
         drum, astfel încât să puteți să-l resetați în curând.
       notice email cannot find: Nu am putut găsi adresa de e-mail, îmi pare rău.

-    reset_password:
+    edit:

       title: Resetare parolă
       heading: Resetați parola pentru %{user}
       reset: Resetează parola
       title: Resetare parolă
       heading: Resetați parola pentru %{user}
       reset: Resetează parola

-      flash changed: Parola dumneavoastră a fost schimbată.

       flash token bad: Nu ați găsit acel simbol, verificați adresa URL?
       flash token bad: Nu ați găsit acel simbol, verificați adresa URL?

+    update:
+      flash changed: Parola dumneavoastră a fost schimbată.

   preferences:
     show:
       title: Preferințe
   preferences:
     show:
       title: Preferințe


@@ -2359,9 +2361,6 @@ ro:
           footway: Trotuar
           rail: Cale ferată
           subway: Stație de metrou
           footway: Trotuar
           rail: Cale ferată
           subway: Stație de metrou

-          tram:
-          - Metrou
-          - tramvai

           cable:
           - Telecabină
           - Telescaun
           cable:
           - Telecabină
           - Telescaun


@@ -2372,15 +2371,16 @@ ro:
           - Aeronavă
           - terminal
           admin: Graniță administrativă
           - Aeronavă
           - terminal
           admin: Graniță administrativă

-          forest: Pădure
-          wood: Lemn
+          forest:
+          - Pădure
+          - Lemn

           golf: Teren de golf
           park: Parc
           golf: Teren de golf
           park: Parc

-          resident: Zonă rezidențială

           common:
           - Comun
           - luncă
           - grădină
           common:
           - Comun
           - luncă
           - grădină

+          resident: Zonă rezidențială

           retail: Spațiul de retail
           industrial: Zonă industrială
           commercial: Zonă comercială
           retail: Spațiul de retail
           industrial: Zonă industrială
           commercial: Zonă comercială

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 55c84d5333eaaeeff3dc4b16749e56d3e0a44c6f..7a1eadc3b9bf6bba30329689b95b9550c1bae5d7 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1889,22 +1889,24 @@ ru:
     destroy:
       destroyed: Сообщение удалено
   passwords:
     destroy:
       destroyed: Сообщение удалено
   passwords:

-    lost_password:
+    new:

       title: Восстановление пароля
       heading: Забыли пароль?
       email address: 'Адрес электронной почты:'
       new password button: Вышлите мне новый пароль
       help_text: Введите адрес вашей электронной почты, который вы использовали для
         подписки, и мы вышлем инструкции, как можно обновить ваш пароль.
       title: Восстановление пароля
       heading: Забыли пароль?
       email address: 'Адрес электронной почты:'
       new password button: Вышлите мне новый пароль
       help_text: Введите адрес вашей электронной почты, который вы использовали для
         подписки, и мы вышлем инструкции, как можно обновить ваш пароль.

+    create:

       notice email on way: Жаль, что вы потеряли пароль :-( но ничего, скоро придёт
         письмо и вы сможете поменять свой пароль.
       notice email cannot find: Такой адрес не зарегистрирован.
       notice email on way: Жаль, что вы потеряли пароль :-( но ничего, скоро придёт
         письмо и вы сможете поменять свой пароль.
       notice email cannot find: Такой адрес не зарегистрирован.

-    reset_password:
+    edit:

       title: Повторная установка пароля
       heading: Повторная установка пароля для %{user}
       reset: Установить пароль
       title: Повторная установка пароля
       heading: Повторная установка пароля для %{user}
       reset: Установить пароль

-      flash changed: Ваш пароль был изменён.

       flash token bad: Невозможно найти такой код подтверждения, проверьте ссылку.
       flash token bad: Невозможно найти такой код подтверждения, проверьте ссылку.

+    update:
+      flash changed: Ваш пароль был изменён.

   preferences:
     show:
       title: Мои предпочтения
   preferences:
     show:
       title: Мои предпочтения


@@ -2311,9 +2313,6 @@ ru:
           footway: Пешеходная дорожка
           rail: Железная дорога
           subway: Линия метро
           footway: Пешеходная дорожка
           rail: Железная дорога
           subway: Линия метро

-          tram:
-          - Легкорельсовый транспорт
-          - трамвай

           cable:
           - Канатная дорога
           - кресельный подъёмник
           cable:
           - Канатная дорога
           - кресельный подъёмник


@@ -2324,15 +2323,16 @@ ru:
           - Перрон аэродрома
           - терминал
           admin: Административная граница
           - Перрон аэродрома
           - терминал
           admin: Административная граница

-          forest: Лес
-          wood: Роща
+          forest:
+          - Лес
+          - Роща

           golf: Площадка для гольфа
           park: Парк
           golf: Площадка для гольфа
           park: Парк

-          resident: Жилой район

           common:
           - Общественная земля
           - луг
           - сад
           common:
           - Общественная земля
           - луг
           - сад

+          resident: Жилой район

           retail: Торговый район
           industrial: Промышленный район
           commercial: Коммерческий район
           retail: Торговый район
           industrial: Промышленный район
           commercial: Коммерческий район

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index c48c8e850a534f8dd36a6b33c14757fa2e33d800..bea210681861c12750b227d2003048ac8a22a571 100644 (file)
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -521,10 +521,10 @@ sat:
     sent_message_summary:
       destroy_button: ᱜᱮᱫ ᱜᱤᱰᱤ
   passwords:
     sent_message_summary:
       destroy_button: ᱜᱮᱫ ᱜᱤᱰᱤ
   passwords:

-    lost_password:
+    new:

       title: ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱫ ᱠᱮᱫᱟᱢ
       email address: 'ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'
       title: ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱫ ᱠᱮᱫᱟᱢ
       email address: 'ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:'

-    reset_password:
+    update:

       flash changed: ᱟᱢᱟᱜ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱫᱚ ᱵᱚᱫᱚᱞᱮᱱᱟ ᱾
   profiles:
     edit:
       flash changed: ᱟᱢᱟᱜ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱫᱚ ᱵᱚᱫᱚᱞᱮᱱᱟ ᱾
   profiles:
     edit:


@@ -586,8 +586,9 @@ sat:
       table:
         entry:
           footway: ᱛᱟᱲᱟᱢᱦᱚᱨ
       table:
         entry:
           footway: ᱛᱟᱲᱟᱢᱦᱚᱨ

-          forest: ᱵᱤᱨ
-          wood: ᱠᱟᱴᱷ
+          forest:
+          - ᱵᱤᱨ
+          - ᱠᱟᱴᱷ

           park: ᱵᱟᱜᱟᱱ
           school:
           - ᱤᱛᱩᱱ ᱟᱥᱲᱟ
           park: ᱵᱟᱜᱟᱱ
           school:
           - ᱤᱛᱩᱱ ᱟᱥᱲᱟ

diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 7d5b6c6cef746787d752c86e1f477e663fa3eadf..b795f76dd8c4c4a38f253b37bc63a23acaec1713 100644 (file)
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -1836,7 +1836,7 @@ sc:
     destroy:
       destroyed: Messàgiu iscantzelladu
   passwords:
     destroy:
       destroyed: Messàgiu iscantzelladu
   passwords:

-    lost_password:
+    new:

       title: Crae de intrada pèrdida
       heading: Ais ismentigadu sa crae de intrada?
       email address: 'Indiritzu de posta eletrònica:'
       title: Crae de intrada pèrdida
       heading: Ais ismentigadu sa crae de intrada?
       email address: 'Indiritzu de posta eletrònica:'


@@ -1844,16 +1844,18 @@ sc:
       help_text: Inserta s'indiritzu de posta chi as impreadu pro ti registrare, l'amus
         a imbiare unu ligàmene chi as a pòdere impreare pro ripristinare sa crae de
         intrada tua.
       help_text: Inserta s'indiritzu de posta chi as impreadu pro ti registrare, l'amus
         a imbiare unu ligàmene chi as a pòdere impreare pro ripristinare sa crae de
         intrada tua.

+    create:

       notice email on way: Nos dispraghet chi l'apas pèrdida :-( ma t'amus imbiadu
         unu messàgiu de posta eletrònica pro chi la potzas ripristinare.
       notice email cannot find: A dolu mannu non semus resèssidos a agatare custu
         indiritzu de posta eletrònica.
       notice email on way: Nos dispraghet chi l'apas pèrdida :-( ma t'amus imbiadu
         unu messàgiu de posta eletrònica pro chi la potzas ripristinare.
       notice email cannot find: A dolu mannu non semus resèssidos a agatare custu
         indiritzu de posta eletrònica.

-    reset_password:
+    edit:

       title: Riprìstina sa crae de intrada
       heading: Riprìstina sa crae de intrada pro %{user}
       reset: Riprìstina sa crae de intrada
       title: Riprìstina sa crae de intrada
       heading: Riprìstina sa crae de intrada pro %{user}
       reset: Riprìstina sa crae de intrada

-      flash changed: Sa crae de intrada tua est istada mudada.

       flash token bad: No amus agatadu custu getone, proa a verificare s'URL.
       flash token bad: No amus agatadu custu getone, proa a verificare s'URL.

+    update:
+      flash changed: Sa crae de intrada tua est istada mudada.

   preferences:
     show:
       title: Preferèntzias meas
   preferences:
     show:
       title: Preferèntzias meas


@@ -2361,9 +2363,6 @@ sc:
           footway: Caminu pro pedones
           rail: Ferrovia
           subway: Metropolitana
           footway: Caminu pro pedones
           rail: Ferrovia
           subway: Metropolitana

-          tram:
-          - Trenu lèbiu/metropolitana lèbia
-          - Tram

           cable:
           - Funivia
           - ascensore carrotzina
           cable:
           - Funivia
           - ascensore carrotzina


@@ -2374,15 +2373,16 @@ sc:
           - Àrea de parchègiu de sos aèreos
           - terminale
           admin: Làcana amministrativa
           - Àrea de parchègiu de sos aèreos
           - terminale
           admin: Làcana amministrativa

-          forest: Litu
-          wood: Buscu
+          forest:
+          - Litu
+          - Buscu

           golf: Campu de golf
           park: Parcu
           golf: Campu de golf
           park: Parcu

-          resident: Àrea de residèntzia

           common:
           - Comunu
           - pradu
           - giardinu
           common:
           - Comunu
           - pradu
           - giardinu

+          resident: Àrea de residèntzia

           retail: Àrea cummertziale
           industrial: Àrea industriale
           commercial: Àrea cummertziale
           retail: Àrea cummertziale
           industrial: Àrea industriale
           commercial: Àrea cummertziale

diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index 2d445a4da5eccc8803b884433d2432566cc6f8b4..18388fb6909929304614993f4604a2e685f290fd 100644 (file)
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -1230,22 +1230,24 @@ scn:
     destroy:
       destroyed: Missaggiu cancillatu
   passwords:
     destroy:
       destroyed: Missaggiu cancillatu
   passwords:

-    lost_password:
+    new:

       title: Palora d'òrdini pirduta
       heading: Ti scurdasti la palora d'òrdini?
       email address: 'Nnirizzu di posta elittrònica:'
       new password button: Azzera la palora d'òrdini
       help_text: Scrivi lu nnirizzu di posta elittrònica c'adupirasti quannu ti scrivisti,
         e ci mannamu nu culligamentu chi poi adupirari p'azzirari la tò palora d'òrdini.
       title: Palora d'òrdini pirduta
       heading: Ti scurdasti la palora d'òrdini?
       email address: 'Nnirizzu di posta elittrònica:'
       new password button: Azzera la palora d'òrdini
       help_text: Scrivi lu nnirizzu di posta elittrònica c'adupirasti quannu ti scrivisti,
         e ci mannamu nu culligamentu chi poi adupirari p'azzirari la tò palora d'òrdini.

+    create:

       notice email on way: Ni dispiaci chi la pirdisti :-( pirò ti sta arrivannu nu
         missaggiu di posta elittrònica pi menzu dû quali prestu la poi azzirari.
       notice email cannot find: Putroppu nun s'attrova stu nnirizzu di posta elittrònica.
       notice email on way: Ni dispiaci chi la pirdisti :-( pirò ti sta arrivannu nu
         missaggiu di posta elittrònica pi menzu dû quali prestu la poi azzirari.
       notice email cannot find: Putroppu nun s'attrova stu nnirizzu di posta elittrònica.

-    reset_password:
+    edit:

       title: Azzera la palora d'òrdini
       heading: Azziramentu dâ palora d'òrdini di %{user}
       reset: Azzera la palora d'òrdini
       title: Azzera la palora d'òrdini
       heading: Azziramentu dâ palora d'òrdini di %{user}
       reset: Azzera la palora d'òrdini

-      flash changed: La tò palora d'òrdini fu canciata.

       flash token bad: Stu còdici nun s'attrova, pirchì nun cuntrolli l'URL?
       flash token bad: Stu còdici nun s'attrova, pirchì nun cuntrolli l'URL?

+    update:
+      flash changed: La tò palora d'òrdini fu canciata.

   preferences:
     show:
       title: Li mè prifirenzi
   preferences:
     show:
       title: Li mè prifirenzi


@@ -1514,9 +1516,6 @@ scn:
           footway: Caminu pidunali
           rail: Ferruvìa
           subway: Mitrupulitana
           footway: Caminu pidunali
           rail: Ferruvìa
           subway: Mitrupulitana

-          tram:
-          - Mitrupulitana leggia
-          - tram

           cable:
           - Funivìa
           - seggiuvìa
           cable:
           - Funivìa
           - seggiuvìa


@@ -1527,14 +1526,15 @@ scn:
           - Ària di parcheggiu ariupurtuali
           - terminal
           admin: Cunfini amministrativu
           - Ària di parcheggiu ariupurtuali
           - terminal
           admin: Cunfini amministrativu

-          forest: Furesta
-          wood: Voscu
+          forest:
+          - Furesta
+          - Voscu

           golf: Campu di golf
           park: Villa
           golf: Campu di golf
           park: Villa

-          resident: Zona risidinziali

           common:
           - Cumuni
           - Pratu
           common:
           - Cumuni
           - Pratu

+          resident: Zona risidinziali

           retail: Zona di nigozzî
           industrial: Zona nnustriali
           commercial: Zona cummirciali
           retail: Zona di nigozzî
           industrial: Zona nnustriali
           commercial: Zona cummirciali

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index b297330bf639577c04ad4117f232842159186a7c..a3b2fda1e1f6541c60d310dd08eba8b226c3f6ce 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -797,7 +797,7 @@ sco:
         subject_other: '[OpenStreetMap] %{commenter} haes commentit on a note ye are
           interestit in'
   passwords:
         subject_other: '[OpenStreetMap] %{commenter} haes commentit on a note ye are
           interestit in'
   passwords:

-    lost_password:
+    new:

       title: Lost password
       heading: Forgotten Passwird?
   sessions:
       title: Lost password
       heading: Forgotten Passwird?
   sessions:


@@ -916,7 +916,8 @@ sco:
     key:
       table:
         entry:
     key:
       table:
         entry:

-          wood: Wid
+          forest:
+            1: Wid

           golf: Gowf coorse
           park: Pairk
           resident: Residential aurie
           golf: Gowf coorse
           park: Pairk
           resident: Residential aurie

diff --git a/config/locales/sh.yml b/config/locales/sh.yml
index b529925dfa972b8e37a058cacbb78d08ff3673ca..1b791110c500e7a9b32c6f4a2cd05b34839abc2d 100644 (file)
--- a/config/locales/sh.yml
+++ b/config/locales/sh.yml
@@ -730,9 +730,6 @@ sh:
           footway: Pješačka staza
           rail: Željeznica
           subway: Podzemna željeznica
           footway: Pješačka staza
           rail: Željeznica
           subway: Podzemna željeznica

-          tram:
-          - Laka željeznica
-          - tramvaj

           cable:
           - Kabinska žičara
           - sedežnica
           cable:
           - Kabinska žičara
           - sedežnica


@@ -743,14 +740,15 @@ sh:
           - Parking za avione
           - terminal
           admin: Administrativna granica
           - Parking za avione
           - terminal
           admin: Administrativna granica

-          forest: Šuma
-          wood: Šume (prirodne, neodržavane)
+          forest:
+          - Šuma
+          - Šume (prirodne, neodržavane)

           golf: Golf teren
           park: Park
           golf: Golf teren
           park: Park

-          resident: Stambeno područje

           common:
           - Travnjaci
           - livada
           common:
           - Travnjaci
           - livada

+          resident: Stambeno područje

           retail: Maloprodajno područje
           industrial: Industrijsko područje
           commercial: Poslovno područje
           retail: Maloprodajno područje
           industrial: Industrijsko područje
           commercial: Poslovno područje

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 5f075a8127b93f779ed6626ce970ed1848d90237..b8e2c6c48c06f52573e8b9aaf6133c8ba26fd00d 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1712,22 +1712,24 @@ sk:
     destroy:
       destroyed: Správa vymazaná
   passwords:
     destroy:
       destroyed: Správa vymazaná
   passwords:

-    lost_password:
+    new:

       title: Stratené heslo
       heading: Zabudli ste heslo?
       email address: 'E-mailová adresa:'
       new password button: Resetnúť heslo
       help_text: Vložte emailovú adresu, ktorú ste uviedli pri registrácii, pošleme
         vám odkaz, pomocou ktorého si budete môcť nastaviť nové heslo.
       title: Stratené heslo
       heading: Zabudli ste heslo?
       email address: 'E-mailová adresa:'
       new password button: Resetnúť heslo
       help_text: Vložte emailovú adresu, ktorú ste uviedli pri registrácii, pošleme
         vám odkaz, pomocou ktorého si budete môcť nastaviť nové heslo.

+    create:

       notice email on way: Škoda zabudnutého hesla :-( ale e-mail je už na ceste,
         takže si čoskoro budete môcť zvoliť nové.
       notice email cannot find: Ľutujeme, túto e-mailovú adresu nie je možné nájsť.
       notice email on way: Škoda zabudnutého hesla :-( ale e-mail je už na ceste,
         takže si čoskoro budete môcť zvoliť nové.
       notice email cannot find: Ľutujeme, túto e-mailovú adresu nie je možné nájsť.

-    reset_password:
+    edit:

       title: Resetnúť heslo
       heading: Resetnúť heslo pre %{user}
       reset: Vynulovať heslo
       title: Resetnúť heslo
       heading: Resetnúť heslo pre %{user}
       reset: Vynulovať heslo

-      flash changed: Vaše heslo bolo zmenené.

       flash token bad: Zodpovedajúci kód nebol nájdený, skontrolujte prípadne URL.
       flash token bad: Zodpovedajúci kód nebol nájdený, skontrolujte prípadne URL.

+    update:
+      flash changed: Vaše heslo bolo zmenené.

   preferences:
     show:
       title: Moje predvoľby
   preferences:
     show:
       title: Moje predvoľby


@@ -2119,9 +2121,6 @@ sk:
           footway: Chodník pre peších
           rail: Železnica
           subway: Metro
           footway: Chodník pre peších
           rail: Železnica
           subway: Metro

-          tram:
-          - Rýchloelektrička
-          - električka

           cable:
           - Lanovka
           - sedačková lanovka
           cable:
           - Lanovka
           - sedačková lanovka


@@ -2132,14 +2131,15 @@ sk:
           - Letisková odbavovacia plocha
           - terminál
           admin: Administratívne hranice
           - Letisková odbavovacia plocha
           - terminál
           admin: Administratívne hranice

-          forest: Les (udržiavaný)
-          wood: Les (neudržiavaný)
+          forest:
+          - Les (udržiavaný)
+          - Les (neudržiavaný)

           golf: Golfové ihrisko
           park: Park
           golf: Golfové ihrisko
           park: Park

-          resident: Obytná oblasť

           common:
           - Pastvina
           - lúka
           common:
           - Pastvina
           - lúka

+          resident: Obytná oblasť

           retail: Nákupná oblasť
           industrial: Priemyselná oblasť
           commercial: Komerčná oblasť
           retail: Nákupná oblasť
           industrial: Priemyselná oblasť
           commercial: Komerčná oblasť

diff --git a/config/locales/skr-arab.yml b/config/locales/skr-arab.yml
index 4fba080b7cdba0052eb578398e834fc880a097e5..34749cf451d9a92d645901e6fcc88b1f199973ee 100644 (file)
--- a/config/locales/skr-arab.yml
+++ b/config/locales/skr-arab.yml
@@ -1070,12 +1070,13 @@ skr-arab:
     destroy:
       destroyed: سنیہا مٹ ڳیا
   passwords:
     destroy:
       destroyed: سنیہا مٹ ڳیا
   passwords:

-    lost_password:
+    new:

       email address: 'ای میل پتہ:'
       new password button: پاس ورڈ ولدا ٹھیک کرو
       email address: 'ای میل پتہ:'
       new password button: پاس ورڈ ولدا ٹھیک کرو

-    reset_password:
+    edit:

       title: پاس ورڈ ولدا ٹھیک کرو
       reset: پاس ورڈ ولدا ٹھیک کرو
       title: پاس ورڈ ولدا ٹھیک کرو
       reset: پاس ورڈ ولدا ٹھیک کرو

+    update:

       flash changed: تہاݙا پاس ورڈ تبدیل تھی ڳیا۔
   preferences:
     show:
       flash changed: تہاݙا پاس ورڈ تبدیل تھی ڳیا۔
   preferences:
     show:


@@ -1213,13 +1214,23 @@ skr-arab:
       table:
         entry:
           track: ٹرَیک
       table:
         entry:
           track: ٹرَیک

-          tram:
-            1: ٹرام
+          train: ڳَݙی
+          light_rail: لائٹ ریل
+          tram_only: ٹرام
+          trolleybus: ٹرالی بس
+          bus: بس

           cable:
           - کیبل کار
           - چیئر لفٹ
           cable:
           - کیبل کار
           - چیئر لفٹ

-          forest: جنگل
-          wood: لکڑ
+          orchard:
+          - بغیچا
+          forest:
+          - جنگل
+          - لکڑ
+          grass:
+          - گھا
+          - چراگاہ
+          sand: ریت

           golf: گولف مَیدان
           park: پارک
           common:
           golf: گولف مَیدان
           park: پارک
           common:


@@ -1231,11 +1242,15 @@ skr-arab:
           commercial: کمرشل ایریا
           lake:
           - جھیل
           commercial: کمرشل ایریا
           lake:
           - جھیل

+          glacier: گلیشیئر

           farm: کھیت
           school:
           - سکول
           - یونی ورسٹی
           farm: کھیت
           school:
           - سکول
           - یونی ورسٹی

+          - ہسپتال

           station: ریلوے ٹیشݨ
           station: ریلوے ٹیشݨ

+          bus_stop: بساں دا اݙا
+          stop: اݙہ

     welcome:
       title: ست بسم اللہ!
       basic_terms:
     welcome:
       title: ست بسم اللہ!
       basic_terms:

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 0708a3722feddb131bd40154fb99d432911dd039..9e4bfa9200ed7d641e2aa2aec182240b1bee0b27 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1877,24 +1877,26 @@ sl:
     destroy:
       destroyed: Sporočilo izbrisano
   passwords:
     destroy:
       destroyed: Sporočilo izbrisano
   passwords:

-    lost_password:
+    new:

       title: pozabljeno geslo
       heading: Ste pozabili geslo?
       email address: 'E-poštni naslov:'
       new password button: Pošlji mi novo geslo
       help_text: Vpišite e-poštni naslov, s katerim ste se registrirali. Poslali vam
         bomo povezavo za ponastavitev gesla.
       title: pozabljeno geslo
       heading: Ste pozabili geslo?
       email address: 'E-poštni naslov:'
       new password button: Pošlji mi novo geslo
       help_text: Vpišite e-poštni naslov, s katerim ste se registrirali. Poslali vam
         bomo povezavo za ponastavitev gesla.

+    create:

       notice email on way: E-pismo z vsemi potrebnimi podatki za nastavitev novega
         gesla je že na poti.
       notice email cannot find: Oprostite, toda vnesenega e-poštnega naslova ni bilo
         mogoče najti.
       notice email on way: E-pismo z vsemi potrebnimi podatki za nastavitev novega
         gesla je že na poti.
       notice email cannot find: Oprostite, toda vnesenega e-poštnega naslova ni bilo
         mogoče najti.

-    reset_password:
+    edit:

       title: Ponastavitev gesla
       heading: Ponastavi geslo za %{user}
       reset: Ponastavitev gesla
       title: Ponastavitev gesla
       heading: Ponastavi geslo za %{user}
       reset: Ponastavitev gesla

-      flash changed: Vaše geslo je bilo spremenjeno.

       flash token bad: Tega žetona ni bilo mogoče najti.  Predlagamo, da preverite
         naslov URL.
       flash token bad: Tega žetona ni bilo mogoče najti.  Predlagamo, da preverite
         naslov URL.

+    update:
+      flash changed: Vaše geslo je bilo spremenjeno.

   preferences:
     show:
       title: Moje prilagoditve
   preferences:
     show:
       title: Moje prilagoditve


@@ -2392,9 +2394,6 @@ sl:
           footway: Pešpot
           rail: Železnica
           subway: Podzemna železnica
           footway: Pešpot
           rail: Železnica
           subway: Podzemna železnica

-          tram:
-          - Mestna železnica
-          - tramvaj

           cable:
           - Nihalka
           - sedežnica
           cable:
           - Nihalka
           - sedežnica


@@ -2405,15 +2404,16 @@ sl:
           - Letališka ploščad
           - terminal
           admin: Upravna razmejitev
           - Letališka ploščad
           - terminal
           admin: Upravna razmejitev

-          forest: Gozd
-          wood: Pragozd
+          forest:
+          - Gozd
+          - Pragozd

           golf: Igrišče za golf
           park: Park
           golf: Igrišče za golf
           park: Park

-          resident: Naselje

           common:
           - Travniki
           - travnik
           - vrt
           common:
           - Travniki
           - travnik
           - vrt

+          resident: Naselje

           retail: Trgovinsko območje
           industrial: Industrijsko območje
           commercial: Poslovno območje
           retail: Trgovinsko območje
           industrial: Industrijsko območje
           commercial: Poslovno območje

diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 30f0e88f83fd86cdc1dc07cb3a3771c00cf02de3..d557e8472d5e4ad227e9a4f90bdcf9c291212330 100644 (file)
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1002,7 +1002,7 @@ sq:
       as_read: Mesazhi është shënuar si të lexuar
       as_unread: Mesazhi është shënuar si i palexuar
   passwords:
       as_read: Mesazhi është shënuar si të lexuar
       as_unread: Mesazhi është shënuar si i palexuar
   passwords:

-    lost_password:
+    new:

       title: Fjalëkalimi i humbur
       heading: Ke harruar fjalëkalimin?
       email address: 'Adresa e emailit:'
       title: Fjalëkalimi i humbur
       heading: Ke harruar fjalëkalimin?
       email address: 'Adresa e emailit:'


@@ -1010,16 +1010,18 @@ sq:
       help_text: Shkruani adresën e emailit që keni përdorur për tu regjistruar, ne
         do të dërgojmë një lidhje të cilën mund të përdorni për të rivendosur fjalëkalimin
         tuaj.
       help_text: Shkruani adresën e emailit që keni përdorur për tu regjistruar, ne
         do të dërgojmë një lidhje të cilën mund të përdorni për të rivendosur fjalëkalimin
         tuaj.

+    create:

       notice email on way: Na vjen keq e keni humbur atë :-( por një email është në
         rrugëtim kështu që ju mund të rivendosni atë së shpejti.
       notice email cannot find: Na vjen keq, ne nuk arritë ta gjejmë adresën e emailit
         të dhënë.
       notice email on way: Na vjen keq e keni humbur atë :-( por një email është në
         rrugëtim kështu që ju mund të rivendosni atë së shpejti.
       notice email cannot find: Na vjen keq, ne nuk arritë ta gjejmë adresën e emailit
         të dhënë.

-    reset_password:
+    edit:

       title: Rivendos fjalëkalimin
       heading: Rivendos fjalëkalimin për %{user}
       reset: Rivendos fjalëkalimin
       title: Rivendos fjalëkalimin
       heading: Rivendos fjalëkalimin për %{user}
       reset: Rivendos fjalëkalimin

-      flash changed: Fjalëkalimi yt është ndryshuar.

       flash token bad: Nuk e gjet atë shenjë, kontrollo URL-në?
       flash token bad: Nuk e gjet atë shenjë, kontrollo URL-në?

+    update:
+      flash changed: Fjalëkalimi yt është ndryshuar.

   profiles:
     edit:
       image: Imazhi
   profiles:
     edit:
       image: Imazhi

diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index adcbcc88687483d35a720feb1958d4861e863d17..eedf47e7cd9f4ba3604d0d545d3489e01eee07db 100644 (file)
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -889,21 +889,23 @@ sr-Latn:
     destroy:
       destroyed: Poruka je obrisana
   passwords:
     destroy:
       destroyed: Poruka je obrisana
   passwords:

-    lost_password:
+    new:

       title: Povratak lozinke
       heading: Zaboravili ste lozinku?
       email address: 'E-adresa:'
       new password button: Poništi lozinku
       help_text: Unesite e-adresu koju ste uneli pri upisu, a mi ćemo vam poslati
         vezu pomoću koje možete da poništite lozinku.
       title: Povratak lozinke
       heading: Zaboravili ste lozinku?
       email address: 'E-adresa:'
       new password button: Poništi lozinku
       help_text: Unesite e-adresu koju ste uneli pri upisu, a mi ćemo vam poslati
         vezu pomoću koje možete da poništite lozinku.

+    create:

       notice email on way: Poruka za poništavanje lozinke je poslata.
       notice email cannot find: E-adresa nije pronađena.
       notice email on way: Poruka za poništavanje lozinke je poslata.
       notice email cannot find: E-adresa nije pronađena.

-    reset_password:
+    edit:

       title: Poništi lozinku
       heading: Poništavanje lozinke za %{user}
       reset: Poništi lozinku
       title: Poništi lozinku
       heading: Poništavanje lozinke za %{user}
       reset: Poništi lozinku

-      flash changed: Vaša lozinka je promenjena.

       flash token bad: Takav novčić nije pronađen. Proverite adresu.
       flash token bad: Takav novčić nije pronađen. Proverite adresu.

+    update:
+      flash changed: Vaša lozinka je promenjena.

   profiles:
     edit:
       image: 'Slika:'
   profiles:
     edit:
       image: 'Slika:'


@@ -1030,9 +1032,6 @@ sr-Latn:
           footway: Pešačka staza
           rail: Železnička pruga
           subway: Podzemna železnica
           footway: Pešačka staza
           rail: Železnička pruga
           subway: Podzemna železnica

-          tram:
-          - Laka železnica
-          - tramvaj

           cable:
           - Žičara
           - sedišnica
           cable:
           - Žičara
           - sedišnica


@@ -1043,14 +1042,15 @@ sr-Latn:
           - Aerodromski peron
           - terminal
           admin: Administrativna granica
           - Aerodromski peron
           - terminal
           admin: Administrativna granica

-          forest: Šuma
-          wood: Šuma
+          forest:
+          - Šuma
+          - Šuma

           golf: Golf teren
           park: Park
           golf: Golf teren
           park: Park

-          resident: Stambeno područje

           common:
           - Poljana
           - livada
           common:
           - Poljana
           - livada

+          resident: Stambeno područje

           retail: Maloprodajno područje
           industrial: Industrijsko područje
           commercial: Poslovno područje
           retail: Maloprodajno područje
           industrial: Industrijsko područje
           commercial: Poslovno područje

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 2141d356570da27d5b92967fe5182671d1b4d6d7..09e0ccb90af79fb15a601256769306a4d303df05 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1402,21 +1402,23 @@ sr:
     destroy:
       destroyed: Порука је обрисана
   passwords:
     destroy:
       destroyed: Порука је обрисана
   passwords:

-    lost_password:
+    new:

       title: Повратак лозинке
       heading: Заборавили сте лозинку?
       email address: 'Имејл адреса:'
       new password button: Поништи лозинку
       help_text: Унесите е-адресу коју сте унели при упису, а ми ћемо вам послати
         везу помоћу које можете да поништите лозинку.
       title: Повратак лозинке
       heading: Заборавили сте лозинку?
       email address: 'Имејл адреса:'
       new password button: Поништи лозинку
       help_text: Унесите е-адресу коју сте унели при упису, а ми ћемо вам послати
         везу помоћу које можете да поништите лозинку.

+    create:

       notice email on way: Порука за поништавање лозинке је послата.
       notice email cannot find: Имејл адреса није пронађена, жао нам је.
       notice email on way: Порука за поништавање лозинке је послата.
       notice email cannot find: Имејл адреса није пронађена, жао нам је.

-    reset_password:
+    edit:

       title: Поништи лозинку
       heading: Поништавање лозинке за %{user}
       reset: Поништи лозинку
       title: Поништи лозинку
       heading: Поништавање лозинке за %{user}
       reset: Поништи лозинку

-      flash changed: Ваша лозинка је промењена.

       flash token bad: Такав новчић није пронађен. Проверите адресу.
       flash token bad: Такав новчић није пронађен. Проверите адресу.

+    update:
+      flash changed: Ваша лозинка је промењена.

   profiles:
     edit:
       image: Слика
   profiles:
     edit:
       image: Слика


@@ -1666,10 +1668,10 @@ sr:
           cycleway_local: Локална бициклистичка стаза
           footway: Пешачка стаза
           rail: Железничка пруга
           cycleway_local: Локална бициклистичка стаза
           footway: Пешачка стаза
           rail: Железничка пруга

+          train: Воз

           subway: Подземна железница
           subway: Подземна железница

-          tram:
-          - Лака железница
-          - трамвај
+          trolleybus: Тролејбус
+          bus: Аутобус

           cable:
           - Жичара
           - седишница
           cable:
           - Жичара
           - седишница


@@ -1680,14 +1682,15 @@ sr:
           - Аеродромски перон
           - терминал
           admin: Административна граница
           - Аеродромски перон
           - терминал
           admin: Административна граница

-          forest: Шума
-          wood: Шума
+          forest:
+          - Шума
+          - шума

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

-          resident: Стамбено подручје

           common:
           - Пољана
           - ливада
           common:
           - Пољана
           - ливада

+          resident: Стамбено подручје

           retail: Малопродајно подручје
           industrial: Индустријско подручје
           commercial: Пословно подручје
           retail: Малопродајно подручје
           industrial: Индустријско подручје
           commercial: Пословно подручје


@@ -1716,6 +1719,7 @@ sr:
           private: Приватни посед
           destination: Приступ одредишту
           construction: Путеви у изградњи
           private: Приватни посед
           destination: Приступ одредишту
           construction: Путеви у изградњи

+          bus_stop: Аутобуска станица

           bicycle_shop: Продавница бицикала
           bicycle_parking: Паркинг за бицикле
           toilets: Тоалети
           bicycle_shop: Продавница бицикала
           bicycle_parking: Паркинг за бицикле
           toilets: Тоалети

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 791d63e93850fb37d9d13bf329c00ee63976f2ee..1d75fbcb5dcd6e1bf085c9e6f604f8c9548b9a9a 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1847,21 +1847,23 @@ sv:
     destroy:
       destroyed: Meddelande raderat
   passwords:
     destroy:
       destroyed: Meddelande raderat
   passwords:

-    lost_password:
+    new:

       title: Förlorat lösenord
       heading: Glömt lösenord?
       email address: 'E-postadress:'
       new password button: Återställ lösenord
       help_text: Ange e-postadressen du använde för att registrera dig så skickar
         vi en länk till den som du kan använda för att återställa ditt lösenord.
       title: Förlorat lösenord
       heading: Glömt lösenord?
       email address: 'E-postadress:'
       new password button: Återställ lösenord
       help_text: Ange e-postadressen du använde för att registrera dig så skickar
         vi en länk till den som du kan använda för att återställa ditt lösenord.

+    create:

       notice email on way: Synd att du förlorade det, men ett nytt är på väg via e-post.
       notice email cannot find: Kunde inte hitta den e-postadressen.
       notice email on way: Synd att du förlorade det, men ett nytt är på väg via e-post.
       notice email cannot find: Kunde inte hitta den e-postadressen.

-    reset_password:
+    edit:

       title: Återställ lösenord
       heading: Återställ lösenord för %{user}
       reset: Återställ lösenord
       title: Återställ lösenord
       heading: Återställ lösenord för %{user}
       reset: Återställ lösenord

-      flash changed: Ditt lösenord har ändrats.

       flash token bad: Hittade inte den nyckeln, kontrollera webbadressen.
       flash token bad: Hittade inte den nyckeln, kontrollera webbadressen.

+    update:
+      flash changed: Ditt lösenord har ändrats.

   preferences:
     show:
       title: Mina alternativ
   preferences:
     show:
       title: Mina alternativ


@@ -2323,9 +2325,6 @@ sv:
           footway: Gångväg
           rail: Järnväg
           subway: Tunnelbana
           footway: Gångväg
           rail: Järnväg
           subway: Tunnelbana

-          tram:
-          - Snabbspårväg
-          - spårväg

           cable:
           - Linbana
           - stollift
           cable:
           - Linbana
           - stollift


@@ -2336,15 +2335,16 @@ sv:
           - Flygplatsplatta
           - terminal
           admin: Administrativ gräns
           - Flygplatsplatta
           - terminal
           admin: Administrativ gräns

-          forest: Kulturskog
-          wood: Naturskog
+          forest:
+          - Kulturskog
+          - Naturskog

           golf: Golfbana
           park: Park
           golf: Golfbana
           park: Park

-          resident: Bostadsområde

           common:
           - Allmänning
           - äng
           - trädgård
           common:
           - Allmänning
           - äng
           - trädgård

+          resident: Bostadsområde

           retail: Område för Detaljhandel
           industrial: Industriellt område
           commercial: Kommersiellt område
           retail: Område för Detaljhandel
           industrial: Industriellt område
           commercial: Kommersiellt område

diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index d94d886741351fa322b65e652162ba75b3ad28de..8ee2fdfab857dd1bd0ba7e83e2d0a31628c19495 100644 (file)
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -3,6 +3,7 @@
 # Export driver: phpyaml
 # Author: Aswn
 # Author: ElangoRamanujam
 # Export driver: phpyaml
 # Author: Aswn
 # Author: ElangoRamanujam

+# Author: Fahimrazick

 # Author: Gurulenin
 # Author: Karthi.dr
 # Author: Krishnaprasaths
 # Author: Gurulenin
 # Author: Karthi.dr
 # Author: Krishnaprasaths


@@ -598,7 +599,7 @@ ta:
     message_summary:
       unread_button: வாசிக்கப்படாததாக என குறியிடு
       read_button: வாசித்ததாக குறியிடு
     message_summary:
       unread_button: வாசிக்கப்படாததாக என குறியிடு
       read_button: வாசித்ததாக குறியிடு

-      reply_button: பதிலà¯\8d à®\85ளி
+      reply_button: பதிலளி

       destroy_button: நீக்கு
     new:
       title: தகவல் அனுப்பு
       destroy_button: நீக்கு
     new:
       title: தகவல் அனுப்பு


@@ -615,7 +616,7 @@ ta:
       date: நாள்
     show:
       title: தகவலை வாசிக்கவும்
       date: நாள்
     show:
       title: தகவலை வாசிக்கவும்

-      reply_button: பதிலà¯\8d à®\85ளி
+      reply_button: பதிலளி

       unread_button: வாசிக்கப்படாததாக  குறியிடு
       destroy_button: நீக்குக
     sent_message_summary:
       unread_button: வாசிக்கப்படாததாக  குறியிடு
       destroy_button: நீக்குக
     sent_message_summary:


@@ -623,15 +624,16 @@ ta:
     destroy:
       destroyed: தகவல் நீக்கப்பட்டது
   passwords:
     destroy:
       destroyed: தகவல் நீக்கப்பட்டது
   passwords:

-    lost_password:
+    new:

       title: காணப்படாத கடவுச்சொல்
       heading: கடவுச்சொல் மறந்துவிட்டதா?
       email address: 'மின்னஞ்சல் முகவரி:'
       new password button: கடவுச்சொல்லை மீட்டமை
       title: காணப்படாத கடவுச்சொல்
       heading: கடவுச்சொல் மறந்துவிட்டதா?
       email address: 'மின்னஞ்சல் முகவரி:'
       new password button: கடவுச்சொல்லை மீட்டமை

-    reset_password:
+    edit:

       title: கடவுச்சொல்லை மீட்டமை
       heading: ' %{user}க்கு கடவுச்சொல் மீட்டமை'
       reset: கடவுச்சொல்லை மீட்டமை
       title: கடவுச்சொல்லை மீட்டமை
       heading: ' %{user}க்கு கடவுச்சொல் மீட்டமை'
       reset: கடவுச்சொல்லை மீட்டமை

+    update:

       flash changed: உங்கள் கடவுச்சொல் மாற்றப்பட்டது.
   profiles:
     edit:
       flash changed: உங்கள் கடவுச்சொல் மாற்றப்பட்டது.
   profiles:
     edit:


@@ -691,8 +693,9 @@ ta:
           secondary: இரண்டாம் நிலை சாலை
           unclassified: வகைப்படுத்தாத சாலை
           rail: இரயில்வே
           secondary: இரண்டாம் நிலை சாலை
           unclassified: வகைப்படுத்தாத சாலை
           rail: இரயில்வே

-          forest: காடு
-          wood: விறகு
+          forest:
+          - காடு
+          - விறகு

           park: பூங்கா
           common:
           - பொதுவான
           park: பூங்கா
           common:
           - பொதுவான

diff --git a/config/locales/te.yml b/config/locales/te.yml
index e87767a89321085346596a53e24f18428ace26d3..382a2e6f430af0f829cd9e34c27ed7412ee8d5d1 100644 (file)
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -1705,22 +1705,24 @@ te:
     destroy:
       destroyed: సందేశాన్ని తొలగించాం
   passwords:
     destroy:
       destroyed: సందేశాన్ని తొలగించాం
   passwords:

-    lost_password:
+    new:

       title: సంకేతపదం పోయింది
       heading: సంకేతపదం మర్చిపోయారా?
       email address: 'ఈమెయిల్ చిరునామా:'
       new password button: సంకేతపదాన్ని మార్చు
       help_text: నమోదైనపుడు మీరిచ్చిన ఈమెయిలు చిరునామాను ఇవ్వండి. సంకేతపదాన్ని మార్చుకునే
         లింకును ఆ చిరునామాకు పంపిస్తాం.
       title: సంకేతపదం పోయింది
       heading: సంకేతపదం మర్చిపోయారా?
       email address: 'ఈమెయిల్ చిరునామా:'
       new password button: సంకేతపదాన్ని మార్చు
       help_text: నమోదైనపుడు మీరిచ్చిన ఈమెయిలు చిరునామాను ఇవ్వండి. సంకేతపదాన్ని మార్చుకునే
         లింకును ఆ చిరునామాకు పంపిస్తాం.

+    create:

       notice email on way: అయ్యో.. పోయిందా :-( పోన్లెండి, దాన్ని మార్చుకునేందుకు ఒక
         ఈమెయిలు వచ్చేస్తోంది.
       notice email cannot find: క్షమించండి, ఆ ఈమెయిలు చిరునామా దొరకలేదు.
       notice email on way: అయ్యో.. పోయిందా :-( పోన్లెండి, దాన్ని మార్చుకునేందుకు ఒక
         ఈమెయిలు వచ్చేస్తోంది.
       notice email cannot find: క్షమించండి, ఆ ఈమెయిలు చిరునామా దొరకలేదు.

-    reset_password:
+    edit:

       title: సంకేతపదం మార్పు
       heading: '%{user} సంకేతపదాన్ని మార్చు'
       reset: సంకేతపదాన్ని మార్చు
       title: సంకేతపదం మార్పు
       heading: '%{user} సంకేతపదాన్ని మార్చు'
       reset: సంకేతపదాన్ని మార్చు

-      flash changed: మీ సంకేతపదాన్ని మార్చాం.

       flash token bad: ఆ టోకెను కనబడలేదు, ఓసారి URL సరిచూస్తారా?
       flash token bad: ఆ టోకెను కనబడలేదు, ఓసారి URL సరిచూస్తారా?

+    update:
+      flash changed: మీ సంకేతపదాన్ని మార్చాం.

   preferences:
     show:
       title: నా అభీష్టాలు
   preferences:
     show:
       title: నా అభీష్టాలు


@@ -2003,9 +2005,6 @@ te:
           footway: కాల్దారి
           rail: రైలుమార్గం
           subway: కిందారి
           footway: కాల్దారి
           rail: రైలుమార్గం
           subway: కిందారి

-          tram:
-          - లైట్ రైల్
-          - ట్రాము

           cable:
           - కేబుల్ కారు
           - చెయిర్ లిఫ్ట్
           cable:
           - కేబుల్ కారు
           - చెయిర్ లిఫ్ట్


@@ -2016,14 +2015,15 @@ te:
           - విమానాశ్రయం ఏప్రాన్
           - టర్మినల్
           admin: పరిపాలనా సరిహద్దు
           - విమానాశ్రయం ఏప్రాన్
           - టర్మినల్
           admin: పరిపాలనా సరిహద్దు

-          forest: అడవి
-          wood: కలప
+          forest:
+          - అడవి
+          - కలప

           golf: గోల్ఫ్ కోర్సు
           park: పార్కు
           golf: గోల్ఫ్ కోర్సు
           park: పార్కు

-          resident: నివాస ప్రాంతం

           common:
           - పచ్చికబయలు
           - పచ్చికబయలు
           common:
           - పచ్చికబయలు
           - పచ్చికబయలు

+          resident: నివాస ప్రాంతం

           retail: రిటెయిల్ ప్రదేశం
           industrial: పారిశ్రామిక ప్రదేశం
           commercial: వాణిజ్య ప్రదేశం
           retail: రిటెయిల్ ప్రదేశం
           industrial: పారిశ్రామిక ప్రదేశం
           commercial: వాణిజ్య ప్రదేశం

diff --git a/config/locales/th.yml b/config/locales/th.yml
index b38cecd945a913a7193f89755b17d97926ef6fdd..f9ae71818c1f8205cb84aac8b53f7c702ec5229e 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1418,16 +1418,18 @@ th:
     destroy:
       destroyed: ข้อความถูกลบแล้ว
   passwords:
     destroy:
       destroyed: ข้อความถูกลบแล้ว
   passwords:

-    lost_password:
+    new:

       title: ตั้งรหัสผ่านใหม่
       heading: ลืมรหัสผ่านหรือ?
       email address: 'ที่อยู่อีเมล:'
       new password button: ตั้งรหัสผ่านใหม่
       title: ตั้งรหัสผ่านใหม่
       heading: ลืมรหัสผ่านหรือ?
       email address: 'ที่อยู่อีเมล:'
       new password button: ตั้งรหัสผ่านใหม่

+    create:

       notice email cannot find: ขออภัย, ไม่พบที่อยู่อีเมลที่ระบุ
       notice email cannot find: ขออภัย, ไม่พบที่อยู่อีเมลที่ระบุ

-    reset_password:
+    edit:

       title: ตั้งรหัสผ่านใหม่
       heading: 'ตั้วรหัสผ่านใหม่สำหรับ: %{user}'
       reset: ตั้งรหัสผ่านใหม่
       title: ตั้งรหัสผ่านใหม่
       heading: 'ตั้วรหัสผ่านใหม่สำหรับ: %{user}'
       reset: ตั้งรหัสผ่านใหม่

+    update:

       flash changed: เปลี่ยนรหัสผ่านของคุณแล้วเรียบร้อย
   profiles:
     edit:
       flash changed: เปลี่ยนรหัสผ่านของคุณแล้วเรียบร้อย
   profiles:
     edit:


@@ -1647,9 +1649,6 @@ th:
           footway: ทางเดินเท้า
           rail: ทางรถไฟ
           subway: รถไฟใต้ดิน
           footway: ทางเดินเท้า
           rail: ทางรถไฟ
           subway: รถไฟใต้ดิน

-          tram:
-          - รถไฟเบา
-          - รถราง

           cable:
           - รถกระเช้า
           - รถกระเช้าเปลือย
           cable:
           - รถกระเช้า
           - รถกระเช้าเปลือย


@@ -1660,14 +1659,15 @@ th:
           - โรงซ่อมบำรุงเครื่องบิน
           - อาคารผู้โดยสาร
           admin: ขอบเขตการปกครอง
           - โรงซ่อมบำรุงเครื่องบิน
           - อาคารผู้โดยสาร
           admin: ขอบเขตการปกครอง

-          forest: ป่า
-          wood: ไม้
+          forest:
+          - ป่า
+          - ไม้

           golf: สนามกอล์ฟ
           park: สวน
           golf: สนามกอล์ฟ
           park: สวน

-          resident: เขตที่พักอาศัย

           common:
           - ที่ส่วนกลาง
           - ทุ่งหญ้า
           common:
           - ที่ส่วนกลาง
           - ทุ่งหญ้า

+          resident: เขตที่พักอาศัย

           retail: พื้นที่พาณิชยกรรม
           industrial: พื้นที่อุตสาหกรรม
           commercial: พื้นที่พาณิชยกรรม
           retail: พื้นที่พาณิชยกรรม
           industrial: พื้นที่อุตสาหกรรม
           commercial: พื้นที่พาณิชยกรรม

diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 623514b661e2a2b42638b088ef4d8082ca011cc4..d6a9ddcde5d816b9ffcc578f44a90206c0bc3ab1 100644 (file)
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -1428,7 +1428,7 @@ tl:
     destroy:
       destroyed: Binura ang mensahe
   passwords:
     destroy:
       destroyed: Binura ang mensahe
   passwords:

-    lost_password:
+    new:

       title: Naiwalang password
       heading: Nakalimutang Password?
       email address: 'Tirahan ng e-liham:'
       title: Naiwalang password
       heading: Nakalimutang Password?
       email address: 'Tirahan ng e-liham:'


@@ -1436,15 +1436,17 @@ tl:
       help_text: Ipasok ang tirahan ng e-liham na ginamit mo upang magpatala, ipapadala
         namin ang isang kawing papunta rito na magagamit mo upang muling maitakda
         mo ang iyong password.
       help_text: Ipasok ang tirahan ng e-liham na ginamit mo upang magpatala, ipapadala
         namin ang isang kawing papunta rito na magagamit mo upang muling maitakda
         mo ang iyong password.

+    create:

       notice email on way: Ikinalulungkot na naiwala mo iyan :-( ngunit darating na
         ang isang e-liham upang maitakda mong muli iyan kaagad.
       notice email cannot find: Hindi matagpuan ang ganyang tirahan ng e-liham, paumanhin.
       notice email on way: Ikinalulungkot na naiwala mo iyan :-( ngunit darating na
         ang isang e-liham upang maitakda mong muli iyan kaagad.
       notice email cannot find: Hindi matagpuan ang ganyang tirahan ng e-liham, paumanhin.

-    reset_password:
+    edit:

       title: Muling itakda ang password
       heading: Muling itakda ang Hudyat para kay %{user}
       reset: Muling Itakda ang Password
       title: Muling itakda ang password
       heading: Muling itakda ang Hudyat para kay %{user}
       reset: Muling Itakda ang Password

-      flash changed: Napalitan na ang hudyat mo.

       flash token bad: Hindi natagpuan ang ganyang kahalip, suriin kaya ang URL?
       flash token bad: Hindi natagpuan ang ganyang kahalip, suriin kaya ang URL?

+    update:
+      flash changed: Napalitan na ang hudyat mo.

   preferences:
     show:
       preferred_languages: Nais na mga Wika
   preferences:
     show:
       preferred_languages: Nais na mga Wika


@@ -1688,9 +1690,6 @@ tl:
           footway: Lakaran ng tao
           rail: Daambakal
           subway: Daanang pang-ilalim
           footway: Lakaran ng tao
           rail: Daambakal
           subway: Daanang pang-ilalim

-          tram:
-          - Banayad na riles
-          - trambya

           cable:
           - Kotse ng kable
           - upuang inaangat
           cable:
           - Kotse ng kable
           - upuang inaangat


@@ -1701,15 +1700,16 @@ tl:
           - Tapis ng paliparan
           - terminal
           admin: Hangganang pampangangasiwa
           - Tapis ng paliparan
           - terminal
           admin: Hangganang pampangangasiwa

-          forest: Gubat
-          wood: Kahoy
+          forest:
+          - Gubat
+          - Kahoy

           golf: Kurso ng golp
           park: Liwasan
           golf: Kurso ng golp
           park: Liwasan

-          resident: Pook na panuluyan

           common:
           - Karaniwan
           - kaparangan
           - halamanan
           common:
           - Karaniwan
           - kaparangan
           - halamanan

+          resident: Pook na panuluyan

           retail: Lugar na tingian
           industrial: Pook na pang-industriya
           commercial: Pook na pangkalakalan
           retail: Lugar na tingian
           industrial: Pook na pang-industriya
           commercial: Pook na pangkalakalan

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 27d2c67c712fc53c9231b47f577e9e5436fbac85..21649d62fbf02b1ca256af898fc62dd9d3354194 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1864,22 +1864,24 @@ tr:
     destroy:
       destroyed: Mesaj silindi
   passwords:
     destroy:
       destroyed: Mesaj silindi
   passwords:

-    lost_password:
+    new:

       title: Kayıp parola
       heading: Parolanızı mı Unuttunuz?
       email address: 'E-posta Adresi:'
       new password button: Parolayı sıfırla
       help_text: Kaydolmak için kullandığınız e-posta adresini girin, şifrenizi sıfırlamak
         için kullanabileceğiniz bir bağlantı yollayacağız.
       title: Kayıp parola
       heading: Parolanızı mı Unuttunuz?
       email address: 'E-posta Adresi:'
       new password button: Parolayı sıfırla
       help_text: Kaydolmak için kullandığınız e-posta adresini girin, şifrenizi sıfırlamak
         için kullanabileceğiniz bir bağlantı yollayacağız.

+    create:

       notice email on way: Maalesef şifrenizi kaybettiniz :-( Ancak yeni bir e-posta
         yolda böylece şifreniziyakında sıfırlayabilirsiniz.
       notice email cannot find: 'Üzgünüz: bu e-posta adresi bulunamadı.'
       notice email on way: Maalesef şifrenizi kaybettiniz :-( Ancak yeni bir e-posta
         yolda böylece şifreniziyakında sıfırlayabilirsiniz.
       notice email cannot find: 'Üzgünüz: bu e-posta adresi bulunamadı.'

-    reset_password:
+    edit:

       title: Parolayı sıfırla
       heading: '%{user} İçin Parolayı Sıfırlayın'
       reset: Parolayı Sıfırla
       title: Parolayı sıfırla
       heading: '%{user} İçin Parolayı Sıfırlayın'
       reset: Parolayı Sıfırla

-      flash changed: Parolanız değiştirildi.

       flash token bad: Bu simgeyi bulamadıysanız belki de bağlantıyı kontrol etmelisiniz?
       flash token bad: Bu simgeyi bulamadıysanız belki de bağlantıyı kontrol etmelisiniz?

+    update:
+      flash changed: Parolanız değiştirildi.

   preferences:
     show:
       title: Tercihlerim
   preferences:
     show:
       title: Tercihlerim


@@ -2371,9 +2373,6 @@ tr:
           footway: Yaya yolu
           rail: Demiryolu
           subway: Metro
           footway: Yaya yolu
           rail: Demiryolu
           subway: Metro

-          tram:
-          - Dar raylı demiryolu
-          - tramvay

           cable:
           - Teleferik
           - gondol
           cable:
           - Teleferik
           - gondol


@@ -2384,15 +2383,16 @@ tr:
           - Havaalanı apronu
           - terminal
           admin: İdari sınırı
           - Havaalanı apronu
           - terminal
           admin: İdari sınırı

-          forest: Orman
-          wood: Orman
+          forest:
+          - Orman
+          - Orman

           golf: Golf sahası
           park: Park
           golf: Golf sahası
           park: Park

-          resident: Yerleşim bölgesi

           common:
           - Çimen
           - mera
           - bahçe
           common:
           - Çimen
           - mera
           - bahçe

+          resident: Yerleşim bölgesi

           retail: Alışveriş merkezi
           industrial: Sanayi alanı
           commercial: Ticari ve hizmet alanı
           retail: Alışveriş merkezi
           industrial: Sanayi alanı
           commercial: Ticari ve hizmet alanı


@@ -2858,15 +2858,15 @@ tr:
       role:
         administrator: Bu kullanıcı, bir yöneticidir.
         moderator: Bu kullanıcı, bir moderatördür.
       role:
         administrator: Bu kullanıcı, bir yöneticidir.
         moderator: Bu kullanıcı, bir moderatördür.

-        importer: Bu kullanıcı bir ithalatçıdır
+        importer: Bu kullanıcı bir içe aktarıcıdır

         grant:
           administrator: Yönetici erişim hakkı
           moderator: Moderatör erişim izni
         grant:
           administrator: Yönetici erişim hakkı
           moderator: Moderatör erişim izni

-          importer: İthalatçıya erişim izni ver
+          importer: İçe aktarım erişim izni ver

         revoke:
           administrator: Yönetici erişimini iptal etme
           moderator: Moderatör erişimini iptal etme
         revoke:
           administrator: Yönetici erişimini iptal etme
           moderator: Moderatör erişimini iptal etme

-          importer: İthalatçı erişimini iptal et
+          importer: İçe aktarıcı erişimini iptal et

       block_history: Etkin Engellemeler
       moderator_history: Verilen Engellemeler
       comments: Yorumlar
       block_history: Etkin Engellemeler
       moderator_history: Verilen Engellemeler
       comments: Yorumlar

diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index b76b45b4a640c3265cc5fa4aa83750e6fb59ff38..4803bc536a9e2a318796b493b430d494845abb72 100644 (file)
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -840,7 +840,7 @@ tt:
     new:
       title: Хәбәр җибәрү
   passwords:
     new:
       title: Хәбәр җибәрү
   passwords:

-    lost_password:
+    new:

       email address: 'Электрон почта адресы:'
   profiles:
     edit:
       email address: 'Электрон почта адресы:'
   profiles:
     edit:


@@ -892,20 +892,18 @@ tt:
           cycleway: Әйләнаяк юлы
           rail: Тимер юл
           subway: Метро
           cycleway: Әйләнаяк юлы
           rail: Тимер юл
           subway: Метро

-          tram:
-          - Җиңел рельслы т/ю транспорты
-          - трамвай

           cable:
           - Канат юлы
           apron:
             1: терминал
           admin: Административ чик
           cable:
           - Канат юлы
           apron:
             1: терминал
           admin: Административ чик

-          forest: Урман
-          wood: Агачлык
+          forest:
+          - Урман
+          - Агачлык

           park: Парк
           park: Парк

-          resident: Торак районы

           common:
             1: болын
           common:
             1: болын

+          resident: Торак районы

           industrial: Сәнәгый район
           heathland: Буш җир
           lake:
           industrial: Сәнәгый район
           heathland: Буш җир
           lake:

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index e819260b41a818d22e1d740ddfc346c639580864..0011f22c2d26432afcf417edf8b1d7633561d60c 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1904,22 +1904,25 @@ uk:
     destroy:
       destroyed: Повідомлення вилучено
   passwords:
     destroy:
       destroyed: Повідомлення вилучено
   passwords:

-    lost_password:
+    new:

       title: Відновлення пароля
       heading: Забули пароль?
       email address: 'Адреса ел. пошти:'
       new password button: Вишліть мені новий пароль
       help_text: Введіть адресу вашої електронної пошти, яку ви використовували для
         реєстрації, і ми надішлемо інструкції, як можна відновити ваш пароль.
       title: Відновлення пароля
       heading: Забули пароль?
       email address: 'Адреса ел. пошти:'
       new password button: Вишліть мені новий пароль
       help_text: Введіть адресу вашої електронної пошти, яку ви використовували для
         реєстрації, і ми надішлемо інструкції, як можна відновити ваш пароль.

+    create:

       notice email on way: Шкода, що ви втратили пароль :-( але нічого, скоро прийде
         лист і ви зможете перевстановити свій пароль.
       notice email cannot find: На жаль, така адреса не зареєстрована.
       notice email on way: Шкода, що ви втратили пароль :-( але нічого, скоро прийде
         лист і ви зможете перевстановити свій пароль.
       notice email cannot find: На жаль, така адреса не зареєстрована.

-    reset_password:
+    edit:

       title: Скидання пароля
       heading: Скидання пароля для %{user}
       reset: Скидання пароля
       title: Скидання пароля
       heading: Скидання пароля для %{user}
       reset: Скидання пароля

-      flash changed: Ваш пароль було змінено.

       flash token bad: Неможливо знайти такий код підтвердження, перевірте посилання.
       flash token bad: Неможливо знайти такий код підтвердження, перевірте посилання.

+    update:
+      flash changed: Ваш пароль було змінено.
+      flash token bad: Неможливо знайти такий токен, перевірте посилання.

   preferences:
     show:
       title: Вподобання
   preferences:
     show:
       title: Вподобання


@@ -2401,10 +2404,13 @@ uk:
           cycleway_local: Місцеві велошляхи
           footway: Пішохідна доріжка
           rail: Залізниця
           cycleway_local: Місцеві велошляхи
           footway: Пішохідна доріжка
           rail: Залізниця

+          train: Поїзд

           subway: Лінія метро
           subway: Лінія метро

-          tram:
-          - Швидкісний трамвай
-          - трамвай
+          ferry: Паром
+          light_rail: Швидкісний трамвай
+          tram_only: Трамвай
+          trolleybus: Тролейбус
+          bus: Автобус

           cable:
           - Канатна дорога
           - крісельний підйомник
           cable:
           - Канатна дорога
           - крісельний підйомник


@@ -2415,15 +2421,16 @@ uk:
           - Перон аеропорту
           - термінал
           admin: Адміністративна межа
           - Перон аеропорту
           - термінал
           admin: Адміністративна межа

-          forest: Ліс
-          wood: Дерева
+          forest:
+          - Ліс
+          - Дерева

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

-          resident: Жила зона

           common:
           - Суспільні землі
           - левада
           - сад
           common:
           - Суспільні землі
           - левада
           - сад

+          resident: Жила зона

           retail: Торговельний район
           industrial: Промисловий район
           commercial: Бізнесова зона
           retail: Торговельний район
           industrial: Промисловий район
           commercial: Бізнесова зона


@@ -2452,6 +2459,8 @@ uk:
           private: Приватний доступ
           destination: Цільовий доступ
           construction: Будівництво дороги
           private: Приватний доступ
           destination: Цільовий доступ
           construction: Будівництво дороги

+          bus_stop: Автобусна зупинка
+          stop: Зупинка

           bicycle_shop: Веломагазин
           bicycle_parking: Велопарковка
           toilets: Туалети
           bicycle_shop: Веломагазин
           bicycle_parking: Велопарковка
           toilets: Туалети

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 4271be41cd19922f705c9ceb86b718c0c60a7232..0ae844b51933ea741cd387fb1864ffd2bd4d11e3 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -4,6 +4,7 @@
 # Author: A Retired User
 # Author: Anewplayer
 # Author: Dinhxuanduyet
 # Author: A Retired User
 # Author: Anewplayer
 # Author: Dinhxuanduyet

+# Author: Doraemonluonbentoi

 # Author: Flyplanevn27
 # Author: Ioe2015
 # Author: JohnsonLee01
 # Author: Flyplanevn27
 # Author: Ioe2015
 # Author: JohnsonLee01


@@ -1660,22 +1661,24 @@ vi:
     destroy:
       destroyed: Đã xóa thư
   passwords:
     destroy:
       destroyed: Đã xóa thư
   passwords:

-    lost_password:
+    new:

       title: Quên mất mật khẩu
       heading: Quên mất Mật khẩu?
       email address: 'Địa chỉ Thư điện tử:'
       new password button: Đặt lại mật khẩu
       help_text: Nhập địa chỉ thư điện tử mà bạn đã dùng để mở tài khoản, rồi chúng
         tôi sẽ gửi liên kết cho địa chỉ đó để cho bạn đặt lại mật khẩu.
       title: Quên mất mật khẩu
       heading: Quên mất Mật khẩu?
       email address: 'Địa chỉ Thư điện tử:'
       new password button: Đặt lại mật khẩu
       help_text: Nhập địa chỉ thư điện tử mà bạn đã dùng để mở tài khoản, rồi chúng
         tôi sẽ gửi liên kết cho địa chỉ đó để cho bạn đặt lại mật khẩu.

+    create:

       notice email on way: Đáng tiếc là bạn quên nó. :-( May là thư điện tử sắp tới
         để bạn đặt nó lại.
       notice email cannot find: Rất tiếc, không tìm thấy địa chỉ thư điện tử.
       notice email on way: Đáng tiếc là bạn quên nó. :-( May là thư điện tử sắp tới
         để bạn đặt nó lại.
       notice email cannot find: Rất tiếc, không tìm thấy địa chỉ thư điện tử.

-    reset_password:
+    edit:

       title: Đặt lại mật khẩu
       heading: Đặt lại Mật khẩu của %{user}
       reset: Đặt lại Mật khẩu
       title: Đặt lại mật khẩu
       heading: Đặt lại Mật khẩu của %{user}
       reset: Đặt lại Mật khẩu

-      flash changed: Mật khẩu của bạn đã được thay đổi.

       flash token bad: Không tìm thấy dấu hiệu đó. Có lẽ kiểm tra URL?
       flash token bad: Không tìm thấy dấu hiệu đó. Có lẽ kiểm tra URL?

+    update:
+      flash changed: Mật khẩu của bạn đã được thay đổi.

   preferences:
     show:
       title: Tùy chỉnh
   preferences:
     show:
       title: Tùy chỉnh


@@ -2022,9 +2025,6 @@ vi:
           footway: Đường đi bộ
           rail: Đường sắt
           subway: Đường ngầm
           footway: Đường đi bộ
           rail: Đường sắt
           subway: Đường ngầm

-          tram:
-          - Đường sắt nhẹ
-          - xe điện

           cable:
           - Đường xe cáp
           - ghế cáp treo
           cable:
           - Đường xe cáp
           - ghế cáp treo


@@ -2035,15 +2035,16 @@ vi:
           - Sân đậu máy bay
           - nhà ga hành khách
           admin: Biên giới hành chính
           - Sân đậu máy bay
           - nhà ga hành khách
           admin: Biên giới hành chính

-          forest: Rừng trồng cây
-          wood: Rừng
+          forest:
+          - Rừng trồng cây
+          - Rừng

           golf: Sân golf
           park: Công viên
           golf: Sân golf
           park: Công viên

-          resident: Khu vực nhà ở

           common:
           - Đất công
           - bãi cỏ
           - vườn
           common:
           - Đất công
           - bãi cỏ
           - vườn

+          resident: Khu vực nhà ở

           retail: Khu vực buôn bán
           industrial: Khu vực công nghiệp
           commercial: Khu vực thương mại
           retail: Khu vực buôn bán
           industrial: Khu vực công nghiệp
           commercial: Khu vực thương mại

diff --git a/config/locales/yo.yml b/config/locales/yo.yml
index 99bb6c4901d2a97d9d0582cb7a5062f144191442..7edd241cbcac3a93d214e376336bc00d6778042f 100644 (file)
--- a/config/locales/yo.yml
+++ b/config/locales/yo.yml
@@ -44,10 +44,10 @@ yo:
     show:
       title: Ka message
   passwords:
     show:
       title: Ka message
   passwords:

-    lost_password:
+    new:

       title: lost password
       new password button: Fi ọ̀rọ̀ìpamọ́ tuntun ránsẹ́ sí mi
       title: lost password
       new password button: Fi ọ̀rọ̀ìpamọ́ tuntun ránsẹ́ sí mi

-    reset_password:
+    edit:

       title: ìtúntò ọ̀rọ̀ìpamọ́
   sessions:
     new:
       title: ìtúntò ọ̀rọ̀ìpamọ́
   sessions:
     new:

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index ccd2f0d6a3ae43a98a9d4553ea1f3e57151f2834..4d42dfa11e21be516885c293ee7a051067a8c971 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -14,6 +14,7 @@
 # Author: David S. Hwang
 # Author: Deathkon
 # Author: Dimension
 # Author: David S. Hwang
 # Author: Deathkon
 # Author: Dimension

+# Author: Dream Star.cn

 # Author: Duolaimi
 # Author: FakeGreenHand
 # Author: Fanjiayi
 # Author: Duolaimi
 # Author: FakeGreenHand
 # Author: Fanjiayi


@@ -1784,18 +1785,21 @@ zh-CN:
     destroy:
       destroyed: 消息已删除
   passwords:
     destroy:
       destroyed: 消息已删除
   passwords:

-    lost_password:
+    new:

       title: 忘记密码
       heading: 忘记密码？
       email address: 电子邮件地址：
       new password button: 重置密码
       help_text: 输入您的电子邮件地址来注册，我们会寄出链接给它，这样您就可以用它来重置密码。
       title: 忘记密码
       heading: 忘记密码？
       email address: 电子邮件地址：
       new password button: 重置密码
       help_text: 输入您的电子邮件地址来注册，我们会寄出链接给它，这样您就可以用它来重置密码。

+    create:

       notice email on way: 很遗憾您遗失了密码:-(不过一封电子邮件已经发往您的邮箱，您很快就可以重置密码了。
       notice email cannot find: 对不起，无法找到邮箱。
       notice email on way: 很遗憾您遗失了密码:-(不过一封电子邮件已经发往您的邮箱，您很快就可以重置密码了。
       notice email cannot find: 对不起，无法找到邮箱。

-    reset_password:
+    edit:

       title: 重置密码
       heading: 重置%{user}的密码
       reset: 重置密码
       title: 重置密码
       heading: 重置%{user}的密码
       reset: 重置密码

+      flash token bad: 未找到标记，建议检查 URL?
+    update:

       flash changed: 您的密码已经更改。
       flash token bad: 未找到标记，建议检查 URL?
   preferences:
       flash changed: 您的密码已经更改。
       flash token bad: 未找到标记，建议检查 URL?
   preferences:


@@ -2204,9 +2208,6 @@ zh-CN:
           footway: 步道
           rail: 铁路
           subway: 地铁
           footway: 步道
           rail: 铁路
           subway: 地铁

-          tram:
-          - 轻轨
-          - 电车

           cable:
           - 缆车
           - 吊椅缆车
           cable:
           - 缆车
           - 吊椅缆车


@@ -2217,15 +2218,22 @@ zh-CN:
           - 机场停机坪
           - 航站楼
           admin: 行政区边界
           - 机场停机坪
           - 航站楼
           admin: 行政区边界

-          forest: 森林
-          wood: 林
+          orchard:
+          - 果园
+          - 葡萄园
+          forest:
+          - 森林
+          - 林
+          grass:
+          - 草坪
+          bare_rock: 裸岩

           golf: 高尔夫球场
           park: 公园
           golf: 高尔夫球场
           park: 公园

-          resident: 居住区

           common:
           - 公地
           - 草甸
           - 花园
           common:
           - 公地
           - 草甸
           - 花园

+          resident: 居住区

           retail: 零售区
           industrial: 工业区
           commercial: 商业区
           retail: 零售区
           industrial: 工业区
           commercial: 商业区

diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 5662aa6f8d5cca7888895c7158ff5f02a812b777..7afe87c39c5bd3e5c47c41c183128f119d800c21 100644 (file)
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1078,16 +1078,17 @@ zh-HK:
     outbox:
       title: 寄件匣
   passwords:
     outbox:
       title: 寄件匣
   passwords:

-    lost_password:
+    new:

       title: 忘記密碼
       heading: 忘記密碼？
       email address: 電郵地址：
       new password button: 重設密碼
       help_text: 輸入您註冊時用的電郵地址，我們會將可用於重設密碼的連結發送至該地址。
       title: 忘記密碼
       heading: 忘記密碼？
       email address: 電郵地址：
       new password button: 重設密碼
       help_text: 輸入您註冊時用的電郵地址，我們會將可用於重設密碼的連結發送至該地址。

-    reset_password:
+    edit:

       title: 重設密碼
       heading: 重設%{user}的密碼
       reset: 重設密碼
       title: 重設密碼
       heading: 重設%{user}的密碼
       reset: 重設密碼

+    update:

       flash changed: 您的密碼已經變更。
   sessions:
     new:
       flash changed: 您的密碼已經變更。
   sessions:
     new:


@@ -1139,16 +1140,14 @@ zh-HK:
           motorway: 高速公路
           rail: 鐵路
           subway: 地鐵
           motorway: 高速公路
           rail: 鐵路
           subway: 地鐵

-          tram:
-          - 輕便鐵路
-          - 電車

           runway:
           - 機場跑道
           apron:
           - 機場停機坪
           - 客運大樓
           admin: 行政邊界
           runway:
           - 機場跑道
           apron:
           - 機場停機坪
           - 客運大樓
           admin: 行政邊界

-          forest: 森林
+          forest:
+          - 森林

           golf: 哥爾夫球場
           park: 公園
           resident: 住宅區
           golf: 哥爾夫球場
           park: 公園
           resident: 住宅區

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index b1b8cee59b870130acbfc06132c9f9e07f843234..3ce9fe47510e02ef529f42f9e3c9739093883003 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1693,7 +1693,7 @@ zh-TW:
       press confirm button: 按下確認按鈕以確認您的新電子郵件地址。
       button: 確認
       success: 已確認您變更的電子郵件地址！
       press confirm button: 按下確認按鈕以確認您的新電子郵件地址。
       button: 確認
       success: 已確認您變更的電子郵件地址！

-      failure: 電子郵件地址已使用此密鑰確認過。
+      failure: 電子郵件地址已使用此權杖確認過。

       unknown_token: 確認碼已經過期或不存在。
     resend_success_flash:
       confirmation_sent: 我們已發送新的確認通知到 %{email}，一旦您確認您的帳號後，就能取得製圖。
       unknown_token: 確認碼已經過期或不存在。
     resend_success_flash:
       confirmation_sent: 我們已發送新的確認通知到 %{email}，一旦您確認您的帳號後，就能取得製圖。


@@ -1760,20 +1760,23 @@ zh-TW:
     destroy:
       destroyed: 訊息已刪除
   passwords:
     destroy:
       destroyed: 訊息已刪除
   passwords:

-    lost_password:
+    new:

       title: 遺失密碼
       heading: 忘記密碼？
       email address: 電子郵件地址：
       new password button: 重設密碼
       help_text: 輸入您的電子郵件地址來註冊，我們會將連結送至該地址，而您可以用它來重設密碼。
       title: 遺失密碼
       heading: 忘記密碼？
       email address: 電子郵件地址：
       new password button: 重設密碼
       help_text: 輸入您的電子郵件地址來註冊，我們會將連結送至該地址，而您可以用它來重設密碼。

+    create:

       notice email on way: 很遺憾您忘了它 :-( 不過讓您可以重設它的電子郵件已經寄出，您待會便可重設。
       notice email cannot find: 很抱歉，找不到該電子郵件地址。
       notice email on way: 很遺憾您忘了它 :-( 不過讓您可以重設它的電子郵件已經寄出，您待會便可重設。
       notice email cannot find: 很抱歉，找不到該電子郵件地址。

-    reset_password:
+    edit:

       title: 重設密碼
       heading: 重設 %{user} 的密碼
       reset: 重設密碼
       title: 重設密碼
       heading: 重設 %{user} 的密碼
       reset: 重設密碼

+      flash token bad: 找不到該權杖，可能要檢查一下 URL？
+    update:

       flash changed: 您的密碼已經變更。
       flash changed: 您的密碼已經變更。

-      flash token bad: 找不到該密鑰，可能要檢查一下 URL？
+      flash token bad: 找不到該權杖，可能要檢查一下 URL？

   preferences:
     show:
       title: 我的偏好設定
   preferences:
     show:
       title: 我的偏好設定


@@ -2177,10 +2180,13 @@ zh-TW:
           cycleway_local: 地區自行車道
           footway: 步道
           rail: 鐵路
           cycleway_local: 地區自行車道
           footway: 步道
           rail: 鐵路

+          train: 列車

           subway: 地下鐵
           subway: 地下鐵

-          tram:
-          - 輕軌
-          - 電車軌道
+          ferry: 渡輪
+          light_rail: 輕軌
+          tram_only: 路面電車
+          trolleybus: 無軌電車
+          bus: 公車

           cable:
           - 大型纜車
           - 升降吊椅
           cable:
           - 大型纜車
           - 升降吊椅


@@ -2191,22 +2197,38 @@ zh-TW:
           - 機場停機坪
           - 航廈
           admin: 行政區邊界
           - 機場停機坪
           - 航廈
           admin: 行政區邊界

-          forest: 森林
-          wood: 樹木
+          orchard:
+          - 果園
+          - 葡萄園
+          forest:
+          - 森林
+          - 森林
+          farmland: 農地
+          grass:
+          - 草坪
+          - 牧草地
+          bare_rock: 裸岩
+          sand: 沙地

           golf: 高爾夫球場
           park: 公園
           golf: 高爾夫球場
           park: 公園

-          resident: 住宅區

           common:
           - 共有地
           - 野草地
           - 花園
           common:
           - 共有地
           - 野草地
           - 花園

+          built_up: 組成面積
+          resident: 住宅區

           retail: 商店區
           industrial: 工業區
           commercial: 商業區
           heathland: 石楠荒地
           retail: 商店區
           industrial: 工業區
           commercial: 商業區
           heathland: 石楠荒地

+          scrubland: 灌木叢林地

           lake:
           - 湖泊
           - 水庫
           lake:
           - 湖泊
           - 水庫

+          intermittent_water: 間歇性水體
+          glacier: 冰河
+          reef: 礁
+          wetland: 濕地

           farm: 農田
           brownfield: 低污染再利用地
           cemetery: 公墓
           farm: 農田
           brownfield: 低污染再利用地
           cemetery: 公墓


@@ -2218,6 +2240,7 @@ zh-TW:
           school:
           - 學校
           - 大學
           school:
           - 學校
           - 大學

+          - 醫院

           building: 重要建築
           station: 鐵路車站
           summit:
           building: 重要建築
           station: 鐵路車站
           summit:


@@ -2228,6 +2251,8 @@ zh-TW:
           private: 私人進出
           destination: 目的地進出
           construction: 建造中道路
           private: 私人進出
           destination: 目的地進出
           construction: 建造中道路

+          bus_stop: 公車站
+          stop: 停車站

           bicycle_shop: 自行車店
           bicycle_parking: 自行車停車場
           toilets: 廁所
           bicycle_shop: 自行車店
           bicycle_parking: 自行車停車場
           toilets: 廁所


@@ -2457,7 +2482,7 @@ zh-TW:
     index:
       title: 我的 OAuth 詳細資料
       my_tokens: 我授權的應用程式
     index:
       title: 我的 OAuth 詳細資料
       my_tokens: 我授權的應用程式

-      list_tokens: 下列密鑰已核發給您名下的應用程式：
+      list_tokens: 下列權杖已核發給您名下的應用程式：

       application: 應用程式名稱
       issued_at: 已發於
       revoke: 撤銷！
       application: 應用程式名稱
       issued_at: 已發於
       revoke: 撤銷！