Localisation updates from https://translatewiki.net.

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 7df91cc3b2d8f401ee857bdf5eecf4af6e00a509..af6ef7f16b3bf10474988afcc0c8d55feb085e18 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -1589,62 +1589,6 @@ af:
       modes:
         bicycle: Fiets
         car: Kar
       modes:
         bicycle: Fiets
         car: Kar

-    key:
-      table:
-        entry:
-          motorway: Snelweg
-          main_road: Hoofweg
-          trunk: Hoofroete
-          primary: Primêre weg
-          secondary: Sekondêre pad
-          unclassified: Ongeklassifiseerde weg
-          track: Spoor
-          bridleway: Ruiterpad
-          cycleway: Fietspad
-          cycleway_national: Nasionale fietsroete
-          footway: Voetpad
-          rail: Spoorweg
-          subway: Ondergrondse spoorweg
-          cable_car: Sweefspoor
-          chair_lift: stoelhyser
-          runway: Aanloopbaan
-          taxiway: vliegtuigrybaan
-          apron: Lughaweplatform
-          admin: Administratiewe grens
-          forest: Woud
-          wood: Bos
-          golf: Gholfbaan
-          park: Park
-          common: Gemeen
-          resident: Woongebied
-          retail: Kleinhandel-gebied
-          industrial: Nywerheidsgebied
-          commercial: Handelsgebied
-          heathland: Heide
-          lake: Meer
-          reservoir: reservoir
-          farm: Plaas
-          brownfield: Braakveldterrein
-          cemetery: Begraafplaas
-          allotments: Volkstuine
-          pitch: Sportveld
-          centre: Sportsentrum
-          reserve: Natuurreservaat
-          military: Militêre gebied
-          school: Skool
-          university: universiteit
-          building: Betekenisvolle gebou
-          station: Spoorwegstasie
-          summit: Piek
-          peak: piek
-          tunnel: Strepieomhulsel = tonnel
-          bridge: Swart omhulsel = brug
-          private: Privaat toegang
-          destination: Bestemmingsverkeer
-          construction: Wege in aanbou
-          bicycle_shop: Fietswinkel
-          bicycle_parking: Fietsparkering
-          toilets: Toilette

     welcome:
       title: Welkom!
       basic_terms:
     welcome:
       title: Welkom!
       basic_terms:


@@ -1656,6 +1600,62 @@ af:
       start_mapping: Begin karteer
       add_a_note:
         title: Geen tyd om te redigeer nie? Voeg 'n nota by!
       start_mapping: Begin karteer
       add_a_note:
         title: Geen tyd om te redigeer nie? Voeg 'n nota by!

+  map_keys:
+    show:
+      entries:
+        motorway: Snelweg
+        main_road: Hoofweg
+        trunk: Hoofroete
+        primary: Primêre weg
+        secondary: Sekondêre pad
+        unclassified: Ongeklassifiseerde weg
+        track: Spoor
+        bridleway: Ruiterpad
+        cycleway: Fietspad
+        cycleway_national: Nasionale fietsroete
+        footway: Voetpad
+        rail: Spoorweg
+        subway: Ondergrondse spoorweg
+        cable_car: Sweefspoor
+        chair_lift: stoelhyser
+        runway: Aanloopbaan
+        taxiway: vliegtuigrybaan
+        apron: Lughaweplatform
+        admin: Administratiewe grens
+        forest: Woud
+        wood: Bos
+        golf: Gholfbaan
+        park: Park
+        common: Gemeen
+        resident: Woongebied
+        retail: Kleinhandel-gebied
+        industrial: Nywerheidsgebied
+        commercial: Handelsgebied
+        heathland: Heide
+        lake: Meer
+        reservoir: reservoir
+        farm: Plaas
+        brownfield: Braakveldterrein
+        cemetery: Begraafplaas
+        allotments: Volkstuine
+        pitch: Sportveld
+        centre: Sportsentrum
+        reserve: Natuurreservaat
+        military: Militêre gebied
+        school: Skool
+        university: universiteit
+        building: Betekenisvolle gebou
+        station: Spoorwegstasie
+        summit: Piek
+        peak: piek
+        tunnel: Strepieomhulsel = tonnel
+        bridge: Swart omhulsel = brug
+        private: Privaat toegang
+        destination: Bestemmingsverkeer
+        construction: Wege in aanbou
+        bicycle_shop: Fietswinkel
+        bicycle_parking: Fietsparkering
+        toilets: Toilette

   traces:
     new:
       upload_trace: Laai GPS-spore op
   traces:
     new:
       upload_trace: Laai GPS-spore op

diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index 9ddbcb2509aa1cb29a2dd3d7258343b05d8526df..5ee687f06b500346e1979fb7d7fb105a6586019a 100644 (file)
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -829,57 +829,57 @@ aln:
       where_am_i: Ku jom une?
       where_am_i_title: Përshkruje lokacionin e tanishëm tuj e përdor makinën kërkuese
       submit_text: Shkoj
       where_am_i: Ku jom une?
       where_am_i_title: Përshkruje lokacionin e tanishëm tuj e përdor makinën kërkuese
       submit_text: Shkoj

-    key:
-      table:
-        entry:
-          motorway: Autostradë
-          trunk: rrugë nacionale
-          primary: Udhë kryesore
-          secondary: rrugë e mesme
-          unclassified: Udhë e paklasifikume
-          track: Udhë
-          bridleway: Bridleway
-          cycleway: Cycleway
-          footway: Këmbësore
-          rail: Hekurudhor
-          subway: Metro
-          cable_car: teleferik
-          chair_lift: heqë karrige
-          runway: Aeroporti i pistës
-          taxiway: taxiway
-          apron: aeroportit Aeroporti
-          admin: kufitare administrative
-          forest: Pyll
-          wood: Druri
-          golf: fushë e golfit
-          park: Park
-          common: I përbashkët
-          resident: Zonë Rezidenciale
-          retail: zonë me pakicë
-          industrial: Zonë Industriale
-          commercial: Zona Tregtare
-          heathland: Heathland
-          lake: Liqe
-          reservoir: rezervuar
-          farm: Ferm
-          brownfield: site Brownfield
-          cemetery: Varrezë
-          allotments: Ndarje
-          pitch: katran Sport
-          centre: Qendër Sportive
-          reserve: rezervë Natyra
-          military: Zonë Ushtarake
-          school: Shkollë
-          university: universitet
-          building: ndërtimin e rëndësishme
-          station: Stacion hekurudhor
-          summit: Samiti i
-          peak: pik
-          tunnel: tunel zorrë thye =
-          bridge: Shtresë e jashtme e Zi = urë
-          private: qasje privat
-          destination: qasje Destinacioni
-          construction: Rrugët në ndërtim e sipër
+  map_keys:
+    show:
+      entries:
+        motorway: Autostradë
+        trunk: rrugë nacionale
+        primary: Udhë kryesore
+        secondary: rrugë e mesme
+        unclassified: Udhë e paklasifikume
+        track: Udhë
+        bridleway: Bridleway
+        cycleway: Cycleway
+        footway: Këmbësore
+        rail: Hekurudhor
+        subway: Metro
+        cable_car: teleferik
+        chair_lift: heqë karrige
+        runway: Aeroporti i pistës
+        taxiway: taxiway
+        apron: aeroportit Aeroporti
+        admin: kufitare administrative
+        forest: Pyll
+        wood: Druri
+        golf: fushë e golfit
+        park: Park
+        common: I përbashkët
+        resident: Zonë Rezidenciale
+        retail: zonë me pakicë
+        industrial: Zonë Industriale
+        commercial: Zona Tregtare
+        heathland: Heathland
+        lake: Liqe
+        reservoir: rezervuar
+        farm: Ferm
+        brownfield: site Brownfield
+        cemetery: Varrezë
+        allotments: Ndarje
+        pitch: katran Sport
+        centre: Qendër Sportive
+        reserve: rezervë Natyra
+        military: Zonë Ushtarake
+        school: Shkollë
+        university: universitet
+        building: ndërtimin e rëndësishme
+        station: Stacion hekurudhor
+        summit: Samiti i
+        peak: pik
+        tunnel: tunel zorrë thye =
+        bridge: Shtresë e jashtme e Zi = urë
+        private: qasje privat
+        destination: qasje Destinacioni
+        construction: Rrugët në ndërtim e sipër

   traces:
     visibility:
       private: Private (ndahen vetem si pika anonime të rendituna)
   traces:
     visibility:
       private: Private (ndahen vetem si pika anonime të rendituna)

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index a98a262e20699d2bfc51ebdf80b634975e83fe01..dab2b0a9bceb7741b18d44e7ef525a90c7e8a9d6 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1437,16 +1437,16 @@ ar:
           weir: سياج
           "yes": معبر مائي
       admin_levels:
           weir: سياج
           "yes": معبر مائي
       admin_levels:

-        level2: حدÙ\88د Ù\82طرية
-        level3: حدÙ\88د اÙ\84Ù\85Ù\86Ø·Ù\82Ø©
-        level4: حدÙ\88د اÙ\84دÙ\88Ù\84Ø©
-        level5: حدÙ\88د اÙ\84Ù\85Ù\86Ø·Ù\82Ø©
-        level6: حدÙ\88د Ù\82طرÙ\8aØ©
-        level7: حدÙ\88د اÙ\84بÙ\84دÙ\8aØ©
-        level8: حدÙ\88د اÙ\84Ù\85دÙ\8aÙ\86Ø©
-        level9: حدÙ\88د Ù\82رÙ\8aØ©
-        level10: حدÙ\88د اÙ\84ضاحÙ\8aØ©
-        level11: حدÙ\88د اÙ\84Ø­Ù\8a
+        level2: اÙ\84حدÙ\88د اÙ\84دÙ\88Ù\84ية
+        level3: اÙ\84حدÙ\88د اÙ\84إدارÙ\8aØ© (اÙ\84Ù\85ستÙ\88Ù\89 3)
+        level4: اÙ\84حدÙ\88د اÙ\84إدارÙ\8aØ© (اÙ\84Ù\85ستÙ\88Ù\89 4)
+        level5: اÙ\84حدÙ\88د اÙ\84إدارÙ\8aØ© (اÙ\84Ù\85ستÙ\88Ù\89 5)
+        level6: اÙ\84حدÙ\88د اÙ\84إدارÙ\8aØ© (اÙ\84Ù\85ستÙ\88Ù\89 6)
+        level7: اÙ\84حدÙ\88د اÙ\84إدارÙ\8aØ© (اÙ\84Ù\85ستÙ\88Ù\89 7)
+        level8: اÙ\84حدÙ\88د اÙ\84إدارÙ\8aØ© (اÙ\84Ù\85ستÙ\88Ù\89 8)
+        level9: اÙ\84حدÙ\88د اÙ\84إدارÙ\8aØ© (اÙ\84Ù\85ستÙ\88Ù\89 9)
+        level10: اÙ\84حدÙ\88د اÙ\84إدارÙ\8aØ© (اÙ\84Ù\85ستÙ\88Ù\89 10)
+        level11: اÙ\84حدÙ\88د اÙ\84إدارÙ\8aØ© (اÙ\84Ù\85ستÙ\88Ù\89 11)

     results:
       no_results: لم يتم العثور على نتائج
       more_results: المزيد من النتائج
     results:
       no_results: لم يتم العثور على نتائج
       more_results: المزيد من النتائج


@@ -2125,71 +2125,6 @@ ar:
         bicycle: دراجة
         car: سيارة
         foot: قدم
         bicycle: دراجة
         car: سيارة
         foot: قدم

-    key:
-      table:
-        entry:
-          motorway: طريق سريع
-          main_road: طريق رئيسي
-          trunk: طريق رئيسي
-          primary: طريق رئيسي
-          secondary: طريق ثانوي
-          unclassified: طريق غير مصنّف
-          pedestrian: طريق للمشاة
-          track: مسار
-          bridleway: مسلك خيول
-          cycleway: طريق دراجات
-          cycleway_national: طريق الدراجات الوطني
-          cycleway_regional: طريق الدراجات الإقليمي
-          cycleway_local: طريق الدراجات المحلي
-          footway: طريق مشاة
-          rail: سكة حديدية
-          train: قطار
-          subway: قطار الأنفاق
-          ferry: عبارة
-          bus: حافلة
-          cable_car: عربة أسلاك
-          chair_lift: مصعد كرسي
-          runway: مدرج مطار
-          taxiway: ممر الطائرات
-          apron: ساحة مطار
-          admin: حدود إدارية
-          city: مدينة
-          forest: غابة
-          wood: خشب
-          golf: ملعب غولف
-          park: منتزه
-          common: شائع
-          resident: منطقة سكنية
-          retail: منطقة بيع بالمفرق
-          industrial: منطقة صناعية
-          commercial: منطقة تجارية
-          heathland: أرض بور
-          lake: بحيرة
-          reservoir: خزان
-          farm: مزرعة
-          brownfield: موقع مخلفات
-          cemetery: مقبرة
-          allotments: حصص سكنية
-          pitch: ملعب رياضي
-          centre: مركز رياضي
-          beach: شاطئ
-          reserve: محمية طبيعية
-          military: منطقة عسكرية
-          school: مدرسة
-          university: جامعة
-          building: مبنى كبير
-          station: محطة قطار
-          summit: قمة
-          peak: قمة
-          tunnel: غطاء متقطع = نفق
-          bridge: غطاء أسود = جسر
-          private: وصول خصوصي
-          destination: وجهة الوصول
-          construction: الطرق تحت الإنشاء
-          bus_stop: موقف حافلات
-          bicycle_shop: متجر دراجات
-          bicycle_parking: مرآب دراجات
-          toilets: مرحاض

     welcome:
       title: مرحبا!
       introduction: مرحبًا بك في OpenStreetMap ، خريطة حرة وقابلة للتعديل بواسطة العالم.
     welcome:
       title: مرحبا!
       introduction: مرحبًا بك في OpenStreetMap ، خريطة حرة وقابلة للتعديل بواسطة العالم.


@@ -2208,6 +2143,71 @@ ar:
         title: لا وقت للتعديل؟ أضف ملاحظة!
         para_1: إذا كنت تريد إصلاح مجرد شيء صغير وليس لديك الوقت للتسجيل ومعرفة كيفية
           التحرير، فإنه من السهل أن تضيف ملاحظة.
         title: لا وقت للتعديل؟ أضف ملاحظة!
         para_1: إذا كنت تريد إصلاح مجرد شيء صغير وليس لديك الوقت للتسجيل ومعرفة كيفية
           التحرير، فإنه من السهل أن تضيف ملاحظة.

+  map_keys:
+    show:
+      entries:
+        motorway: طريق سريع
+        main_road: طريق رئيسي
+        trunk: طريق رئيسي
+        primary: طريق رئيسي
+        secondary: طريق ثانوي
+        unclassified: طريق غير مصنّف
+        pedestrian: طريق للمشاة
+        track: مسار
+        bridleway: مسلك خيول
+        cycleway: طريق دراجات
+        cycleway_national: طريق الدراجات الوطني
+        cycleway_regional: طريق الدراجات الإقليمي
+        cycleway_local: طريق الدراجات المحلي
+        footway: طريق مشاة
+        rail: سكة حديدية
+        train: قطار
+        subway: قطار الأنفاق
+        ferry: عبارة
+        bus: حافلة
+        cable_car: عربة أسلاك
+        chair_lift: مصعد كرسي
+        runway: مدرج مطار
+        taxiway: ممر الطائرات
+        apron: ساحة مطار
+        admin: حدود إدارية
+        city: مدينة
+        forest: غابة
+        wood: خشب
+        golf: ملعب غولف
+        park: منتزه
+        common: شائع
+        resident: منطقة سكنية
+        retail: منطقة بيع بالمفرق
+        industrial: منطقة صناعية
+        commercial: منطقة تجارية
+        heathland: أرض بور
+        lake: بحيرة
+        reservoir: خزان
+        farm: مزرعة
+        brownfield: موقع مخلفات
+        cemetery: مقبرة
+        allotments: حصص سكنية
+        pitch: ملعب رياضي
+        centre: مركز رياضي
+        beach: شاطئ
+        reserve: محمية طبيعية
+        military: منطقة عسكرية
+        school: مدرسة
+        university: جامعة
+        building: مبنى كبير
+        station: محطة قطار
+        summit: قمة
+        peak: قمة
+        tunnel: غطاء متقطع = نفق
+        bridge: غطاء أسود = جسر
+        private: وصول خصوصي
+        destination: وجهة الوصول
+        construction: الطرق تحت الإنشاء
+        bus_stop: موقف حافلات
+        bicycle_shop: متجر دراجات
+        bicycle_parking: مرآب دراجات
+        toilets: مرحاض

   traces:
     visibility:
       private: خصوصي (يظهر كمجهول الهوية ونقاط غير مرتبة)
   traces:
     visibility:
       private: خصوصي (يظهر كمجهول الهوية ونقاط غير مرتبة)


@@ -2299,10 +2299,11 @@ ar:
     setup_user_auth:
       blocked_zero_hour: لديك رسالة عاجلة على موقع ويب OpenStreetMap. يجب أن تقرأ
         الرسالة قبل أن تتمكن من حفظ تعديلاتك.
     setup_user_auth:
       blocked_zero_hour: لديك رسالة عاجلة على موقع ويب OpenStreetMap. يجب أن تقرأ
         الرسالة قبل أن تتمكن من حفظ تعديلاتك.

-      blocked: لقد تم عرقلة وصولك إلى الـ API. يرجى تسجيل الدخول من صفحة الموقع لمعرفة
-        المزيد.
-      need_to_see_terms: تم تعليق دخولك إلى API مؤقتا. الرجاء تسجيل الدخول في واجهة
-        الويب لعرض شروط المساهمة. أنت لا تحتاج إلى موافق،ة لكن يجب عرضها.
+      blocked: تم حظر وصولك إلى واجهة برمجة التطبيقات. يُرجى تسجيل الدخول إلى واجهة
+        الويب لمعرفة المزيد.
+      need_to_see_terms: تم تعليق وصولك إلى واجهة برمجة التطبيقات مؤقتًا. يُرجى تسجيل
+        الدخول إلى واجهة الويب للاطلاع على شروط المساهم. لستَ مُلزمًا بالموافقة، ولكن
+        يجب عليك الاطلاع عليها.

     settings_menu:
       account_settings: إعدادات الحساب
     auth_providers:
     settings_menu:
       account_settings: إعدادات الحساب
     auth_providers:

diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index 8b664c80d602c065a676b85ab93b697af096fbd5..817373d9f5e52d36c7a7316351a3dcba8729f8d1 100644 (file)
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -695,50 +695,50 @@ arz:
       where_am_i: أين أنا؟
       where_am_i_title: صِف الموقع الحالى باستخدام محرك البحث
       submit_text: اذهب
       where_am_i: أين أنا؟
       where_am_i_title: صِف الموقع الحالى باستخدام محرك البحث
       submit_text: اذهب

-    key:
-      table:
-        entry:
-          motorway: طريق سريع
-          trunk: طريق رئيسي
-          primary: طريق رئيسي
-          secondary: طريق ثانوي
-          unclassified: طريق غير مصنّف
-          track: مسار
-          bridleway: مسلك خيول
-          cycleway: طريق دراجات
-          footway: طريق مشاة
-          rail: سكه حديدية
-          subway: قطار الأنفاق
-          runway: مدرج مطار للإقلاع/الهبوط
-          taxiway: طريق تاكسي
-          apron: ساحه مطار
-          admin: حدود إدارية
-          forest: غابة
-          wood: الخشب
-          golf: ملعب غولف
-          park: منتزه
-          common: شائع
-          resident: منطقه سكنية
-          retail: منطقه بيع بالمفرق
-          industrial: منطقه صناعية
-          commercial: منطقه تجارية
-          lake: بحيرة
-          reservoir: مخزن
-          farm: أرض زراعية
-          cemetery: مقبرة
-          allotments: حصص سكنية
-          pitch: ملعب رياضي
-          centre: مركز رياضي
-          reserve: محميه طبيعية
-          military: منطقه عسكرية
-          school: مدرسة
-          university: جامعة
-          building: مبنى كبير
-          station: محطه قطار
-          summit: قمة
-          peak: قمة
-          private: استخدام خصوصي
-          construction: الطرق تحت الإنشاء
+  map_keys:
+    show:
+      entries:
+        motorway: طريق سريع
+        trunk: طريق رئيسي
+        primary: طريق رئيسي
+        secondary: طريق ثانوي
+        unclassified: طريق غير مصنّف
+        track: مسار
+        bridleway: مسلك خيول
+        cycleway: طريق دراجات
+        footway: طريق مشاة
+        rail: سكه حديدية
+        subway: قطار الأنفاق
+        runway: مدرج مطار للإقلاع/الهبوط
+        taxiway: طريق تاكسي
+        apron: ساحه مطار
+        admin: حدود إدارية
+        forest: غابة
+        wood: الخشب
+        golf: ملعب غولف
+        park: منتزه
+        common: شائع
+        resident: منطقه سكنية
+        retail: منطقه بيع بالمفرق
+        industrial: منطقه صناعية
+        commercial: منطقه تجارية
+        lake: بحيرة
+        reservoir: مخزن
+        farm: أرض زراعية
+        cemetery: مقبرة
+        allotments: حصص سكنية
+        pitch: ملعب رياضي
+        centre: مركز رياضي
+        reserve: محميه طبيعية
+        military: منطقه عسكرية
+        school: مدرسة
+        university: جامعة
+        building: مبنى كبير
+        station: محطه قطار
+        summit: قمة
+        peak: قمة
+        private: استخدام خصوصي
+        construction: الطرق تحت الإنشاء

   traces:
     visibility:
       private: خصوصى (يظهر كمجهول الهويه ونقاط غير مرتبة)
   traces:
     visibility:
       private: خصوصى (يظهر كمجهول الهويه ونقاط غير مرتبة)


@@ -802,8 +802,8 @@ arz:
       cookies_needed: يبدو أن الكوكيز عندك معطله - يرجى تفعيل الكوكيز فى متصفحك قبل
         المتابعه.
     setup_user_auth:
       cookies_needed: يبدو أن الكوكيز عندك معطله - يرجى تفعيل الكوكيز فى متصفحك قبل
         المتابعه.
     setup_user_auth:

-      blocked: لقد تم عرقله وصولك إلى الـ API. يرجى تسجيل الدخول من صفحه الموقع لمعرفه
-        المزيد.
+      blocked: تم حظر وصولك إلى واجهة برمجة التطبيقات. يُرجى تسجيل الدخول إلى واجهة
+        اÙ\84Ù\88Ù\8aب Ù\84Ù\85عرÙ\81Ø© اÙ\84Ù\85زÙ\8aد.

   users:
     new:
       title: اعمل حساب
   users:
     new:
       title: اعمل حساب

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 0532b088902fad85045d46f300a0e4568d03bb11..319c78445d00100b1b437da958469ba84c254738 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -1578,64 +1578,6 @@ ast:
         bicycle: Bicicleta
         car: En coche
         foot: A pie
         bicycle: Bicicleta
         car: En coche
         foot: A pie

-    key:
-      table:
-        entry:
-          motorway: Autoestrada
-          main_road: Carretera principal
-          trunk: Carretera nacional
-          primary: Carretera primaria
-          secondary: Carretera secundaria
-          unclassified: Carretera ensin clasificar
-          track: Pista
-          bridleway: Caleya
-          cycleway: Carril bici
-          cycleway_national: Carril bici nacional
-          cycleway_regional: Carril bici rexonal
-          cycleway_local: Carril bici llocal
-          footway: Camín peatonal
-          rail: Ferrocarril
-          subway: Metro
-          cable_car: Teleféricu
-          chair_lift: telesilla
-          runway: Pista d'aeropuertu
-          taxiway: cai de rodaxe
-          apron: Aparcamientu d'aviones
-          admin: Llende alministrativa
-          forest: Área forestal
-          wood: Viesca
-          golf: Campu de golf
-          park: Parque
-          common: Espaciu comunal
-          resident: Área residencial
-          retail: Área de tiendes
-          industrial: Área industrial
-          commercial: Área comercial
-          heathland: Berezal
-          lake: Llagu
-          reservoir: banzáu
-          farm: Casería
-          brownfield: Terrén en derribu
-          cemetery: Cementeriu
-          allotments: Güertes recreatives
-          pitch: Campu deportivu
-          centre: Centru deportivu
-          reserve: Reserva natural
-          military: Área militar
-          school: Escuela
-          university: universidá
-          building: Edificiu destacáu
-          station: Estación de tren
-          summit: Cume
-          peak: picu
-          tunnel: Borde de rayes = túnel
-          bridge: Borde prietu = ponte
-          private: Accesu priváu
-          destination: Accesu pa destín
-          construction: Carreteres en construcción
-          bicycle_shop: Tienda de bicicletes
-          bicycle_parking: Aparcamientu de bicicletes
-          toilets: Servicios

     welcome:
       title: ¡Afáyate!
       introduction: |-
     welcome:
       title: ¡Afáyate!
       introduction: |-


@@ -1656,6 +1598,64 @@ ast:
         para_1: |-
           Si namái quier iguar daqué pequeño y nun tien tiempu pa dase d'alta y deprender cómo editar,
           ye fácil amestar una nota.
         para_1: |-
           Si namái quier iguar daqué pequeño y nun tien tiempu pa dase d'alta y deprender cómo editar,
           ye fácil amestar una nota.

+  map_keys:
+    show:
+      entries:
+        motorway: Autoestrada
+        main_road: Carretera principal
+        trunk: Carretera nacional
+        primary: Carretera primaria
+        secondary: Carretera secundaria
+        unclassified: Carretera ensin clasificar
+        track: Pista
+        bridleway: Caleya
+        cycleway: Carril bici
+        cycleway_national: Carril bici nacional
+        cycleway_regional: Carril bici rexonal
+        cycleway_local: Carril bici llocal
+        footway: Camín peatonal
+        rail: Ferrocarril
+        subway: Metro
+        cable_car: Teleféricu
+        chair_lift: telesilla
+        runway: Pista d'aeropuertu
+        taxiway: cai de rodaxe
+        apron: Aparcamientu d'aviones
+        admin: Llende alministrativa
+        forest: Área forestal
+        wood: Viesca
+        golf: Campu de golf
+        park: Parque
+        common: Espaciu comunal
+        resident: Área residencial
+        retail: Área de tiendes
+        industrial: Área industrial
+        commercial: Área comercial
+        heathland: Berezal
+        lake: Llagu
+        reservoir: banzáu
+        farm: Casería
+        brownfield: Terrén en derribu
+        cemetery: Cementeriu
+        allotments: Güertes recreatives
+        pitch: Campu deportivu
+        centre: Centru deportivu
+        reserve: Reserva natural
+        military: Área militar
+        school: Escuela
+        university: universidá
+        building: Edificiu destacáu
+        station: Estación de tren
+        summit: Cume
+        peak: picu
+        tunnel: Borde de rayes = túnel
+        bridge: Borde prietu = ponte
+        private: Accesu priváu
+        destination: Accesu pa destín
+        construction: Carreteres en construcción
+        bicycle_shop: Tienda de bicicletes
+        bicycle_parking: Aparcamientu de bicicletes
+        toilets: Servicios

   traces:
     visibility:
       private: Priváu (compartíu sólo como anónimu, puntos ensin axeitar)
   traces:
     visibility:
       private: Priváu (compartíu sólo como anónimu, puntos ensin axeitar)

diff --git a/config/locales/az.yml b/config/locales/az.yml
index f217107cb17d57e46838eccec1118d3d0c0205b3..55dfeb92b533ffcd1c37e368118265104a5d1e04 100644 (file)
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -944,40 +944,40 @@ az:
       search: Axtar
       where_am_i: Mən haradayam?
       submit_text: Keç
       search: Axtar
       where_am_i: Mən haradayam?
       submit_text: Keç

-    key:
-      table:
-        entry:
-          motorway: Avtomagistral
-          trunk: Baş yol
-          primary: Birinci dərəcəli yol
-          secondary: İkici dərəcəli yol
-          unclassified: Təsnifatsız yol
-          track: Cığır
-          footway: Piyada yolu
-          rail: Dəmir yolu
-          subway: Metro
-          runway: Aeroport uçuş-enmə zolağı
-          admin: Administrativ sərhəd
-          forest: Meşə
-          park: Park
-          resident: Yaşayış sahəsi
-          retail: Ticarət sahəsi
-          industrial: Sənaye sahəsi
-          commercial: Ticarət sahəsi
-          lake: Göl
-          reservoir: su anbarı
-          farm: Ferma
-          cemetery: Məzarlıq
-          centre: İdman mərkəzi
-          reserve: Təbiət Qoruğu
-          military: Hərbi ərazi
-          school: Məktəb
-          university: universitet
-          building: Əhəmiyyətli bina
-          station: Dəmiryol stansiyası
-          summit: Zirvə
-          peak: pik
-          private: Xüsusi giriş
+  map_keys:
+    show:
+      entries:
+        motorway: Avtomagistral
+        trunk: Baş yol
+        primary: Birinci dərəcəli yol
+        secondary: İkici dərəcəli yol
+        unclassified: Təsnifatsız yol
+        track: Cığır
+        footway: Piyada yolu
+        rail: Dəmir yolu
+        subway: Metro
+        runway: Aeroport uçuş-enmə zolağı
+        admin: Administrativ sərhəd
+        forest: Meşə
+        park: Park
+        resident: Yaşayış sahəsi
+        retail: Ticarət sahəsi
+        industrial: Sənaye sahəsi
+        commercial: Ticarət sahəsi
+        lake: Göl
+        reservoir: su anbarı
+        farm: Ferma
+        cemetery: Məzarlıq
+        centre: İdman mərkəzi
+        reserve: Təbiət Qoruğu
+        military: Hərbi ərazi
+        school: Məktəb
+        university: universitet
+        building: Əhəmiyyətli bina
+        station: Dəmiryol stansiyası
+        summit: Zirvə
+        peak: pik
+        private: Xüsusi giriş

   traces:
     new:
       help: Kömək
   traces:
     new:
       help: Kömək

diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index 9edff36df5650353384b14a326b7dac8b9ee8b6f..a2ad6a664ed6110375b1fc05b6251c29324c04fc 100644 (file)
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -1104,57 +1104,57 @@ be-Tarask:
       where_am_i_title: Апішыце цяперашняе месцазнаходжаньне з дапамогай інструмэнту
         пошуку
       submit_text: Перайсьці
       where_am_i_title: Апішыце цяперашняе месцазнаходжаньне з дапамогай інструмэнту
         пошуку
       submit_text: Перайсьці

-    key:
-      table:
-        entry:
-          motorway: Аўтастрада
-          trunk: Шаша
-          primary: Галоўная дарога
-          secondary: Другасная дарога
-          unclassified: Дарога раённага значэньня
-          track: Грунтовая дарога
-          bridleway: Дарога для коней
-          cycleway: Роварная дарога
-          footway: Пешаходная дарога
-          rail: Чыгунка
-          subway: Мэтро
-          cable_car: Канатная дарога
-          chair_lift: Крэславы пад’ёмнік
-          runway: Узьлётная паласа
-          taxiway: Рулёжная дарога
-          apron: Пэрон аэрапорта
-          admin: Адміністрацыйная мяжа
-          forest: Лес
-          wood: Лес
-          golf: Поле для гольфу
-          park: Парк
-          common: Грамадзкая зямля
-          resident: Жылы раён
-          retail: Гандлёвы раён
-          industrial: Прамысловы раён
-          commercial: Камэрцыйны раён
-          heathland: Пусташ
-          lake: Возера
-          reservoir: Вадасховішча
-          farm: Фэрма
-          brownfield: Закінутая тэрыторыя
-          cemetery: Могілкі
-          allotments: Агароды
-          pitch: Спартовая пляцоўка
-          centre: Спартовы цэнтар
-          reserve: Запаведнік
-          military: Вайсковая тэрыторыя
-          school: Школа
-          university: Унівэрсытэт
-          building: Значны будынак
-          station: Чыгуначная станцыя
-          summit: Вяршыня
-          peak: Пік
-          tunnel: Пункцір = тунэль
-          bridge: Чорная лінія = мост
-          private: Прыватны доступ
-          destination: Мэтавы доступ
-          construction: Будаўніцтва дарогаў
+  map_keys:
+    show:
+      entries:
+        motorway: Аўтастрада
+        trunk: Шаша
+        primary: Галоўная дарога
+        secondary: Другасная дарога
+        unclassified: Дарога раённага значэньня
+        track: Грунтовая дарога
+        bridleway: Дарога для коней
+        cycleway: Роварная дарога
+        footway: Пешаходная дарога
+        rail: Чыгунка
+        subway: Мэтро
+        cable_car: Канатная дарога
+        chair_lift: Крэславы пад’ёмнік
+        runway: Узьлётная паласа
+        taxiway: Рулёжная дарога
+        apron: Пэрон аэрапорта
+        admin: Адміністрацыйная мяжа
+        forest: Лес
+        wood: Лес
+        golf: Поле для гольфу
+        park: Парк
+        common: Грамадзкая зямля
+        resident: Жылы раён
+        retail: Гандлёвы раён
+        industrial: Прамысловы раён
+        commercial: Камэрцыйны раён
+        heathland: Пусташ
+        lake: Возера
+        reservoir: Вадасховішча
+        farm: Фэрма
+        brownfield: Закінутая тэрыторыя
+        cemetery: Могілкі
+        allotments: Агароды
+        pitch: Спартовая пляцоўка
+        centre: Спартовы цэнтар
+        reserve: Запаведнік
+        military: Вайсковая тэрыторыя
+        school: Школа
+        university: Унівэрсытэт
+        building: Значны будынак
+        station: Чыгуначная станцыя
+        summit: Вяршыня
+        peak: Пік
+        tunnel: Пункцір = тунэль
+        bridge: Чорная лінія = мост
+        private: Прыватны доступ
+        destination: Мэтавы доступ
+        construction: Будаўніцтва дарогаў

   traces:
     visibility:
       private: Прыватны (даступны толькі ананімна, неўладкаваныя пункты)
   traces:
     visibility:
       private: Прыватны (даступны толькі ананімна, неўладкаваныя пункты)

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 2ded61ae173c8667d41e1c8bc07cb24754abadc1..608cd16502168793e2ddf6faa26f04cd0b43c22a 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -2213,75 +2213,6 @@ be:
       modes:
         bicycle: Веласіпед
         car: Аўтамабіль
       modes:
         bicycle: Веласіпед
         car: Аўтамабіль

-    key:
-      table:
-        entry:
-          motorway: Аўтамагістраль
-          main_road: Галоўная дарога
-          trunk: Шаша
-          primary: Асноўная дарога
-          secondary: Другасная дарога
-          unclassified: Некласіфікаваная дарога
-          track: Палявая дарога
-          bridleway: Дарога для коней
-          cycleway: Веласіпедная дарожка
-          cycleway_national: Нацыянальная веладарожка
-          cycleway_regional: Рэгіянальная веладарожка
-          cycleway_local: Веладарожка мясцовага значэння
-          footway: Пешаходная дарожка
-          rail: Чыгунка
-          train: Цягнік
-          subway: Метро
-          ferry: Паром
-          tram: Трамвай
-          trolleybus: Тралейбус
-          bus: Аўтобус
-          cable_car: Канатная дарога
-          chair_lift: Крэсельны пад'ёмнік
-          runway: Узлетна-пасадачная паласа
-          taxiway: рулёжная дарожка
-          apron: Перон аэрапорта
-          admin: Адміністрацыйная мяжа
-          capital: Сталіца
-          city: Горад
-          forest: Лес
-          wood: пушча
-          sand: Пясок
-          golf: Поле для гольфа
-          park: Парк
-          common: Агульныя
-          resident: Жылы раён
-          retail: Гандлевая плошча
-          industrial: Прамысловая зона
-          commercial: Камерцыйная зона
-          heathland: Пустка
-          lake: Возера
-          reservoir: вадасховішча
-          glacier: Ляднік
-          farm: Ферма
-          brownfield: Ачышчаная пляцоўка для забудовы
-          cemetery: Могілкі
-          allotments: Сады-агароды
-          pitch: Спартыўная пляцоўка
-          centre: Спартыўны цэнтр
-          reserve: Запаведнік
-          military: Ваенная зона
-          school: Школа
-          university: Універсітэт
-          hospital: Бальніца
-          building: Значны будынак
-          station: Чыгуначны вакзал
-          summit: Вяршыня
-          peak: Пік
-          tunnel: Тунэль (пункцірам)
-          bridge: Мост (суцэльная лінія)
-          private: Прыватны доступ
-          destination: Мэтавы доступ
-          construction: Дарогі ў стадыі будаўніцтва
-          bus_stop: Аўтобусны прыпынак
-          bicycle_shop: Крама ровараў
-          bicycle_parking: Паркоўка для ровараў
-          toilets: Прыбіральні

     welcome:
       title: Вітаем!
       introduction: Вітаем у OpenStreetMap, свабоднай і даступнай для рэдагавання
     welcome:
       title: Вітаем!
       introduction: Вітаем у OpenStreetMap, свабоднай і даступнай для рэдагавання


@@ -2322,6 +2253,75 @@ be:
           аддзяленне. Насамрэч многія групы вельмі паспяхова існуюць у выглядзе нефармальных
           сустрэч або суполак. Кожны можа заснаваць такую суполку або далучыцца да
           яе. Больш падрабязна на старонцы %{communities_wiki_link}.
           аддзяленне. Насамрэч многія групы вельмі паспяхова існуюць у выглядзе нефармальных
           сустрэч або суполак. Кожны можа заснаваць такую суполку або далучыцца да
           яе. Больш падрабязна на старонцы %{communities_wiki_link}.

+  map_keys:
+    show:
+      entries:
+        motorway: Аўтамагістраль
+        main_road: Галоўная дарога
+        trunk: Шаша
+        primary: Асноўная дарога
+        secondary: Другасная дарога
+        unclassified: Некласіфікаваная дарога
+        track: Палявая дарога
+        bridleway: Дарога для коней
+        cycleway: Веласіпедная дарожка
+        cycleway_national: Нацыянальная веладарожка
+        cycleway_regional: Рэгіянальная веладарожка
+        cycleway_local: Веладарожка мясцовага значэння
+        footway: Пешаходная дарожка
+        rail: Чыгунка
+        train: Цягнік
+        subway: Метро
+        ferry: Паром
+        tram: Трамвай
+        trolleybus: Тралейбус
+        bus: Аўтобус
+        cable_car: Канатная дарога
+        chair_lift: Крэсельны пад'ёмнік
+        runway: Узлетна-пасадачная паласа
+        taxiway: рулёжная дарожка
+        apron: Перон аэрапорта
+        admin: Адміністрацыйная мяжа
+        capital: Сталіца
+        city: Горад
+        forest: Лес
+        wood: пушча
+        sand: Пясок
+        golf: Поле для гольфа
+        park: Парк
+        common: Агульныя
+        resident: Жылы раён
+        retail: Гандлевая плошча
+        industrial: Прамысловая зона
+        commercial: Камерцыйная зона
+        heathland: Пустка
+        lake: Возера
+        reservoir: вадасховішча
+        glacier: Ляднік
+        farm: Ферма
+        brownfield: Ачышчаная пляцоўка для забудовы
+        cemetery: Могілкі
+        allotments: Сады-агароды
+        pitch: Спартыўная пляцоўка
+        centre: Спартыўны цэнтр
+        reserve: Запаведнік
+        military: Ваенная зона
+        school: Школа
+        university: Універсітэт
+        hospital: Бальніца
+        building: Значны будынак
+        station: Чыгуначны вакзал
+        summit: Вяршыня
+        peak: Пік
+        tunnel: Тунэль (пункцірам)
+        bridge: Мост (суцэльная лінія)
+        private: Прыватны доступ
+        destination: Мэтавы доступ
+        construction: Дарогі ў стадыі будаўніцтва
+        bus_stop: Аўтобусны прыпынак
+        bicycle_shop: Крама ровараў
+        bicycle_parking: Паркоўка для ровараў
+        toilets: Прыбіральні

   traces:
     visibility:
       private: Прыватны (ананімны з неспарадкаванымі пунктамі)
   traces:
     visibility:
       private: Прыватны (ананімны з неспарадкаванымі пунктамі)

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index c7e17ff5506ecf2fea143e804138a57b13258710..cca7eef6ce58d88acd113942dc6141a84f08d632 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1636,63 +1636,6 @@ bg:
         bicycle: Велосипед
         car: Автомобил
         foot: Пеша
         bicycle: Велосипед
         car: Автомобил
         foot: Пеша

-    key:
-      table:
-        entry:
-          motorway: Магистрала
-          main_road: Главен път
-          trunk: Междуградски път
-          primary: Главен път
-          secondary: Второстепенен път
-          unclassified: Некласифициран път
-          track: Полски път
-          bridleway: Конен път
-          cycleway: Велосипедна пътека
-          cycleway_national: Национална велосипедна алея
-          cycleway_regional: Регионална велосипедна алея
-          cycleway_local: Локална велосипедна алея
-          footway: Пътека
-          rail: Железен път
-          subway: Метро
-          cable_car: Кабинков лифт
-          chair_lift: Седалков лифт
-          runway: Летищна писта
-          taxiway: Път за рулиране
-          apron: Летищен перон
-          admin: Административна граница
-          forest: Гора
-          wood: Гора
-          golf: Игрище за голф
-          park: Парк
-          common: Обща
-          resident: Жилищна зона
-          retail: Търговска зона
-          industrial: Промишлена зона
-          commercial: Търговска зона
-          heathland: Пустош
-          lake: Езеро
-          reservoir: Язовир
-          farm: Ферма
-          brownfield: Място за строеж
-          cemetery: Гробище
-          allotments: Градини
-          pitch: Спортна площадка
-          centre: Спортен център
-          reserve: Природен резерват
-          military: Военна зона
-          school: Училище
-          university: Университет
-          building: Значима сграда
-          station: Железопътна гара
-          summit: Било
-          peak: Връх
-          tunnel: Тунел (пунктирана линия)
-          bridge: Мост (плътна линия)
-          private: Частен достъп
-          construction: Пътища в изграждане
-          bicycle_shop: Магазин за велосипеди
-          bicycle_parking: Паркинг на велосипеди
-          toilets: Тоалетни

     welcome:
       title: Добре дошли!
       introduction: Добре дошли в OpenStreetMap, безплатната и редактируема карта
     welcome:
       title: Добре дошли!
       introduction: Добре дошли в OpenStreetMap, безплатната и редактируема карта


@@ -1757,6 +1700,63 @@ bg:
           като неформално събиране на хора или като общностна група. Всеки може да
           ги създаде или да се присъедини към тях. Прочетете повече на %{communities_wiki_link}.
         communities_wiki: уики страницата на общностите
           като неформално събиране на хора или като общностна група. Всеки може да
           ги създаде или да се присъедини към тях. Прочетете повече на %{communities_wiki_link}.
         communities_wiki: уики страницата на общностите

+  map_keys:
+    show:
+      entries:
+        motorway: Магистрала
+        main_road: Главен път
+        trunk: Междуградски път
+        primary: Главен път
+        secondary: Второстепенен път
+        unclassified: Некласифициран път
+        track: Полски път
+        bridleway: Конен път
+        cycleway: Велосипедна пътека
+        cycleway_national: Национална велосипедна алея
+        cycleway_regional: Регионална велосипедна алея
+        cycleway_local: Локална велосипедна алея
+        footway: Пътека
+        rail: Железен път
+        subway: Метро
+        cable_car: Кабинков лифт
+        chair_lift: Седалков лифт
+        runway: Летищна писта
+        taxiway: Път за рулиране
+        apron: Летищен перон
+        admin: Административна граница
+        forest: Гора
+        wood: Гора
+        golf: Игрище за голф
+        park: Парк
+        common: Обща
+        resident: Жилищна зона
+        retail: Търговска зона
+        industrial: Промишлена зона
+        commercial: Търговска зона
+        heathland: Пустош
+        lake: Езеро
+        reservoir: Язовир
+        farm: Ферма
+        brownfield: Място за строеж
+        cemetery: Гробище
+        allotments: Градини
+        pitch: Спортна площадка
+        centre: Спортен център
+        reserve: Природен резерват
+        military: Военна зона
+        school: Училище
+        university: Университет
+        building: Значима сграда
+        station: Железопътна гара
+        summit: Било
+        peak: Връх
+        tunnel: Тунел (пунктирана линия)
+        bridge: Мост (плътна линия)
+        private: Частен достъп
+        construction: Пътища в изграждане
+        bicycle_shop: Магазин за велосипеди
+        bicycle_parking: Паркинг на велосипеди
+        toilets: Тоалетни

   traces:
     new:
       upload_trace: Качване на следи от GPS
   traces:
     new:
       upload_trace: Качване на следи от GPS

diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 4da967dcb08e24b04589817095cf4e8cc78fd416..10c12dbcc81201ebd0abd6009ac0bc3632384fdb 100644 (file)
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -1755,61 +1755,6 @@ bn:
         foot: হেঁটে
       providers:
         fossgis_valhalla: ভালহাল্লা
         foot: হেঁটে
       providers:
         fossgis_valhalla: ভালহাল্লা

-    key:
-      table:
-        entry:
-          motorway: মোটরপথ
-          main_road: প্রধান সড়ক
-          trunk: মূল সড়ক
-          primary: প্রাথমিক সড়ক
-          secondary: অপ্রধান সড়ক
-          unclassified: অশ্রেণীকৃত সড়ক
-          cycleway: সাইকেলপথ
-          cycleway_national: জাতীয় সাইকেলের রাস্তা
-          cycleway_regional: আঞ্চলিক সাইকেলের রাস্তা
-          cycleway_local: স্থানীয় সাইকেলের রাস্তা
-          footway: ফুটপাথ
-          rail: রেলপথ
-          train: রেলগাড়ি
-          subway: ভূগর্ভস্থ পথ
-          ferry: ফেরি
-          tram: ট্রাম
-          bus: বাস
-          cable_car: ক্যাবল কার
-          admin: প্রশাসনিক সীমানা
-          orchard: ফলবাগিচা
-          vineyard: আঙুর খেত
-          forest: অরণ্য
-          wood: কাঠ
-          farmland: কৃষিজমি
-          meadow: তৃণভূমি
-          sand: বালু
-          golf: গল্ফ মাঠ
-          park: উদ্যান
-          common: সাধারণ
-          resident: আবাসিক এলাকা
-          industrial: শিল্পাঞ্চল
-          commercial: বাণিজ্যিক এলাকা
-          lake: হ্রদ
-          reservoir: জলাধার
-          glacier: হিমবাহ
-          farm: খামার
-          cemetery: কবরস্থান
-          centre: ক্রীড়া কেন্দ্র
-          military: সামরিক এলাকা
-          school: বিদ্যালয়
-          university: বিশ্ববিদ্যালয়
-          hospital: হাসপাতাল
-          station: রেল স্টেশন
-          railway_halt: রেলওয়ে স্টপ
-          subway_station: সাবওয়ে স্টেশন
-          tram_stop: ট্রাম স্টপ
-          peak: শৃঙ্গ
-          bus_stop: বাস স্টপ
-          bicycle_shop: সাইকেলের দোকান
-          bicycle_rental: সাইকেল ভাড়া
-          bicycle_parking: সাইকেল পার্কিং
-          toilets: পায়খানা

     welcome:
       title: স্বাগতম!
       whats_on_the_map:
     welcome:
       title: স্বাগতম!
       whats_on_the_map:


@@ -1824,6 +1769,61 @@ bn:
         the_map: মানচিত্র
     communities:
       title: সম্প্রদায়
         the_map: মানচিত্র
     communities:
       title: সম্প্রদায়

+  map_keys:
+    show:
+      entries:
+        motorway: মোটরপথ
+        main_road: প্রধান সড়ক
+        trunk: মূল সড়ক
+        primary: প্রাথমিক সড়ক
+        secondary: অপ্রধান সড়ক
+        unclassified: অশ্রেণীকৃত সড়ক
+        cycleway: সাইকেলপথ
+        cycleway_national: জাতীয় সাইকেলের রাস্তা
+        cycleway_regional: আঞ্চলিক সাইকেলের রাস্তা
+        cycleway_local: স্থানীয় সাইকেলের রাস্তা
+        footway: ফুটপাথ
+        rail: রেলপথ
+        train: রেলগাড়ি
+        subway: ভূগর্ভস্থ পথ
+        ferry: ফেরি
+        tram: ট্রাম
+        bus: বাস
+        cable_car: ক্যাবল কার
+        admin: প্রশাসনিক সীমানা
+        orchard: ফলবাগিচা
+        vineyard: আঙুর খেত
+        forest: অরণ্য
+        wood: কাঠ
+        farmland: কৃষিজমি
+        meadow: তৃণভূমি
+        sand: বালু
+        golf: গল্ফ মাঠ
+        park: উদ্যান
+        common: সাধারণ
+        resident: আবাসিক এলাকা
+        industrial: শিল্পাঞ্চল
+        commercial: বাণিজ্যিক এলাকা
+        lake: হ্রদ
+        reservoir: জলাধার
+        glacier: হিমবাহ
+        farm: খামার
+        cemetery: কবরস্থান
+        centre: ক্রীড়া কেন্দ্র
+        military: সামরিক এলাকা
+        school: বিদ্যালয়
+        university: বিশ্ববিদ্যালয়
+        hospital: হাসপাতাল
+        station: রেল স্টেশন
+        railway_halt: রেলওয়ে স্টপ
+        subway_station: সাবওয়ে স্টেশন
+        tram_stop: ট্রাম স্টপ
+        peak: শৃঙ্গ
+        bus_stop: বাস স্টপ
+        bicycle_shop: সাইকেলের দোকান
+        bicycle_rental: সাইকেল ভাড়া
+        bicycle_parking: সাইকেল পার্কিং
+        toilets: পায়খানা

   traces:
     new:
       visibility_help: এটার মানে কি?
   traces:
     new:
       visibility_help: এটার মানে কি?

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 8a092fc9d2d6b8e3118fd24e9f2a40349a04e379..8955a0d79c00f41f3405346d4d8fc7457a7a5982 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -2251,95 +2251,6 @@ br:
         bicycle: War varc'h-houarn
         car: Karr
         foot: War droad
         bicycle: War varc'h-houarn
         car: Karr
         foot: War droad

-    key:
-      table:
-        entry:
-          motorway: Gourhent
-          main_road: Hent pennañ
-          trunk: Hent broadel
-          primary: Hent bras
-          secondary: Hent bihan
-          unclassified: Hent n'eo ket rummet
-          pedestrian: Hent evit an dud war-droad
-          track: Roudenn
-          bridleway: Hent evit kezeg
-          cycleway: Roudenn divrodegoù
-          cycleway_national: roudenn vroadel evit an divrodegoù
-          cycleway_regional: Roudenn divrodegoù rannvroel
-          cycleway_local: roudenn lec'hel evit an divrodegoù
-          cycleway_mtb: Hent MTB
-          footway: Hent evit an dud war droad
-          rail: Hent-houarn
-          train: Tren
-          subway: Linenn vetro
-          ferry: Karrlistri
-          light_rail: Metro skañv
-          tram: Tramgarr
-          trolleybus: Trollebus
-          bus: Karr-boutin
-          cable_car: Teleferik
-          chair_lift: Fungador
-          runway: Roudenn evit an taksioù
-          taxiway: Hent evit an taksioù
-          apron: Roudenn aerborzh
-          admin: Bevenn velestradurel
-          capital: Kêr-benn
-          city: Kêr
-          orchard: Gwerje
-          vineyard: Gwinieg
-          forest: Koad
-          wood: Koad
-          farmland: Tachenn labour-douar
-          grass: Geot
-          meadow: Prad
-          bare_rock: Roc'h noazh
-          sand: Traezh
-          golf: Tachenn golf
-          park: Park
-          common: prad
-          built_up: Takad savet
-          resident: Takad annez
-          retail: Takad kenwerzh
-          industrial: Takad greantel
-          commercial: Takad kenwerzhel
-          heathland: Lanneier
-          scrubland: Strouezheg
-          lake: Lenn
-          reservoir: Mirlenn
-          intermittent_water: Ledennad dour a-bep-eil
-          glacier: Skorneg
-          reef: Karreg
-          wetland: Takad gleborek
-          farm: Ti-feurm
-          brownfield: Takad greanterezh
-          cemetery: Bered
-          allotments: Lodennaouegoù
-          pitch: Tachenn sport
-          centre: Kreizenn sport
-          beach: Traezhenn
-          reserve: Gwarezva natur
-          military: Takad milourel
-          school: Skol
-          university: Skol-veur
-          hospital: Ospital
-          building: Savadur pouezus
-          station: Porzh-houarn
-          railway_halt: Porzh-houarn
-          subway_station: Arsav metro
-          tram_stop: Arsav tramgarr
-          summit: Lein
-          peak: Pikern
-          tunnel: Bord poentoùigoù = riboul
-          bridge: Bord du = pont
-          private: Moned prevez
-          destination: Moned d'ar pal
-          construction: Hentoù war ar stern
-          bus_stop: Arsav karr-boutin
-          bicycle_shop: Stal varc'hoù-houarn
-          bicycle_rental: Stal feurmiñ marc'hoù-houarn
-          bicycle_parking: Parklec'h belioù
-          bicycle_parking_small: Parklec'h marc'hoù-houarn bihan
-          toilets: Privezioù

     welcome:
       title: Deuet-mat oc'h !
       introduction: Degemer mat en OpenStreetMap, ar gartenn digoust eus ar bed hag
     welcome:
       title: Deuet-mat oc'h !
       introduction: Degemer mat en OpenStreetMap, ar gartenn digoust eus ar bed hag


@@ -2394,6 +2305,95 @@ br:
       other_groups:
         title: Strolladoù all
         communities_wiki: pajenn wiki ar c'humuniezhioù
       other_groups:
         title: Strolladoù all
         communities_wiki: pajenn wiki ar c'humuniezhioù

+  map_keys:
+    show:
+      entries:
+        motorway: Gourhent
+        main_road: Hent pennañ
+        trunk: Hent broadel
+        primary: Hent bras
+        secondary: Hent bihan
+        unclassified: Hent n'eo ket rummet
+        pedestrian: Hent evit an dud war-droad
+        track: Roudenn
+        bridleway: Hent evit kezeg
+        cycleway: Roudenn divrodegoù
+        cycleway_national: roudenn vroadel evit an divrodegoù
+        cycleway_regional: Roudenn divrodegoù rannvroel
+        cycleway_local: roudenn lec'hel evit an divrodegoù
+        cycleway_mtb: Hent MTB
+        footway: Hent evit an dud war droad
+        rail: Hent-houarn
+        train: Tren
+        subway: Linenn vetro
+        ferry: Karrlistri
+        light_rail: Metro skañv
+        tram: Tramgarr
+        trolleybus: Trollebus
+        bus: Karr-boutin
+        cable_car: Teleferik
+        chair_lift: Fungador
+        runway: Roudenn evit an taksioù
+        taxiway: Hent evit an taksioù
+        apron: Roudenn aerborzh
+        admin: Bevenn velestradurel
+        capital: Kêr-benn
+        city: Kêr
+        orchard: Gwerje
+        vineyard: Gwinieg
+        forest: Koad
+        wood: Koad
+        farmland: Tachenn labour-douar
+        grass: Geot
+        meadow: Prad
+        bare_rock: Roc'h noazh
+        sand: Traezh
+        golf: Tachenn golf
+        park: Park
+        common: prad
+        built_up: Takad savet
+        resident: Takad annez
+        retail: Takad kenwerzh
+        industrial: Takad greantel
+        commercial: Takad kenwerzhel
+        heathland: Lanneier
+        scrubland: Strouezheg
+        lake: Lenn
+        reservoir: Mirlenn
+        intermittent_water: Ledennad dour a-bep-eil
+        glacier: Skorneg
+        reef: Karreg
+        wetland: Takad gleborek
+        farm: Ti-feurm
+        brownfield: Takad greanterezh
+        cemetery: Bered
+        allotments: Lodennaouegoù
+        pitch: Tachenn sport
+        centre: Kreizenn sport
+        beach: Traezhenn
+        reserve: Gwarezva natur
+        military: Takad milourel
+        school: Skol
+        university: Skol-veur
+        hospital: Ospital
+        building: Savadur pouezus
+        station: Porzh-houarn
+        railway_halt: Porzh-houarn
+        subway_station: Arsav metro
+        tram_stop: Arsav tramgarr
+        summit: Lein
+        peak: Pikern
+        tunnel: Bord poentoùigoù = riboul
+        bridge: Bord du = pont
+        private: Moned prevez
+        destination: Moned d'ar pal
+        construction: Hentoù war ar stern
+        bus_stop: Arsav karr-boutin
+        bicycle_shop: Stal varc'hoù-houarn
+        bicycle_rental: Stal feurmiñ marc'hoù-houarn
+        bicycle_parking: Parklec'h belioù
+        bicycle_parking_small: Parklec'h marc'hoù-houarn bihan
+        toilets: Privezioù

   traces:
     visibility:
       private: Prevez (rannet ent dizanv hepken, poentoù hep urzh)
   traces:
     visibility:
       private: Prevez (rannet ent dizanv hepken, poentoù hep urzh)

diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index d904e1b277438190febf106383f98616e684dddb..b4e58a5d99c3033084a70c66a17980461ea880b3 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1086,65 +1086,65 @@ bs:
       where_am_i: Gdje sam?
       where_am_i_title: Opišite trenutnu lokaciju koristeći pretraživač
       submit_text: Idi
       where_am_i: Gdje sam?
       where_am_i_title: Opišite trenutnu lokaciju koristeći pretraživač
       submit_text: Idi

-    key:
-      table:
-        entry:
-          motorway: Autoput
-          main_road: Glavni put
-          trunk: Brza cesta
-          primary: Državna cesta
-          secondary: Sekundarna cesta
-          unclassified: Neklasificirana cesta
-          track: Staza
-          bridleway: Konjička staza
-          cycleway: Biciklistička staza
-          cycleway_national: Državna biciklistička staza
-          cycleway_local: Mjesna biciklistička staza
-          footway: Pješačka staza
-          rail: Željeznica
-          subway: Podzemna željeznica
-          cable_car: Kabinska žičara
-          chair_lift: Uspinjača sa naslonjačem
-          runway: Aerodromska pista
-          taxiway: Aerodromska rulna staza
-          apron: Parking za avione
-          admin: Administrativna granica
-          forest: Šume (održavane, od šumarije)
-          wood: Šume (prirodne, neodržavane)
-          golf: Golf teren
-          park: Park
-          common: Travnjaci
-          resident: Stambeno područje
-          retail: Maloprodajno područje
-          industrial: Industrijsko područje
-          commercial: Poslovno područje
-          heathland: Stepa
-          lake: Jezero
-          reservoir: Rezervoar
-          farm: Polja, farme, njive
-          brownfield: Gradilište
-          cemetery: Groblje
-          allotments: Vrtovi
-          pitch: Sportski teren
-          centre: Sportski centar
-          reserve: Rezervat prirode
-          military: Vojno područje
-          school: Škola
-          university: Univerzitet
-          building: Značajna zgrada
-          station: Željeznička stanica
-          summit: Vrh
-          peak: Kota
-          tunnel: Iscrtkani rubovi = tunel
-          bridge: Crni rubovi = most
-          private: Privatni pristup
-          destination: Pristup odredištu
-          construction: Ceste u izgradnji
-          bicycle_parking: Biciklistički parking

     welcome:
       title: Dobrodošli!
       basic_terms:
         title: Osnovni pojmovi za mapiranje
     welcome:
       title: Dobrodošli!
       basic_terms:
         title: Osnovni pojmovi za mapiranje

+  map_keys:
+    show:
+      entries:
+        motorway: Autoput
+        main_road: Glavni put
+        trunk: Brza cesta
+        primary: Državna cesta
+        secondary: Sekundarna cesta
+        unclassified: Neklasificirana cesta
+        track: Staza
+        bridleway: Konjička staza
+        cycleway: Biciklistička staza
+        cycleway_national: Državna biciklistička staza
+        cycleway_local: Mjesna biciklistička staza
+        footway: Pješačka staza
+        rail: Željeznica
+        subway: Podzemna željeznica
+        cable_car: Kabinska žičara
+        chair_lift: Uspinjača sa naslonjačem
+        runway: Aerodromska pista
+        taxiway: Aerodromska rulna staza
+        apron: Parking za avione
+        admin: Administrativna granica
+        forest: Šume (održavane, od šumarije)
+        wood: Šume (prirodne, neodržavane)
+        golf: Golf teren
+        park: Park
+        common: Travnjaci
+        resident: Stambeno područje
+        retail: Maloprodajno područje
+        industrial: Industrijsko područje
+        commercial: Poslovno područje
+        heathland: Stepa
+        lake: Jezero
+        reservoir: Rezervoar
+        farm: Polja, farme, njive
+        brownfield: Gradilište
+        cemetery: Groblje
+        allotments: Vrtovi
+        pitch: Sportski teren
+        centre: Sportski centar
+        reserve: Rezervat prirode
+        military: Vojno područje
+        school: Škola
+        university: Univerzitet
+        building: Značajna zgrada
+        station: Željeznička stanica
+        summit: Vrh
+        peak: Kota
+        tunnel: Iscrtkani rubovi = tunel
+        bridge: Crni rubovi = most
+        private: Privatni pristup
+        destination: Pristup odredištu
+        construction: Ceste u izgradnji
+        bicycle_parking: Biciklistički parking

   traces:
     visibility:
       private: Privatni (prikazuje se kao anoniman, neuređene tačke)
   traces:
     visibility:
       private: Privatni (prikazuje se kao anoniman, neuređene tačke)

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index bfab7cb72f7df8bdbf8f830baffb4c1eb37da819..932068f8361830026fd247e99187471ee39cdd80 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -2228,95 +2228,6 @@ ca:
         bicycle: Bicicleta
         car: Cotxe
         foot: A peu
         bicycle: Bicicleta
         car: Cotxe
         foot: A peu

-    key:
-      table:
-        entry:
-          motorway: Autopista
-          main_road: Carretera principal
-          trunk: Via ràpida
-          primary: Carretera principal
-          secondary: Carretera secundària
-          unclassified: Carretera sense classificar
-          pedestrian: Via per a vianants
-          track: Pista - Camí
-          bridleway: Camí de ferradura
-          cycleway: Carril bici
-          cycleway_national: Carril bici nacional
-          cycleway_regional: Carril bici regional
-          cycleway_local: Carril bici local
-          cycleway_mtb: Ruta de bicicleta de muntanya
-          footway: Via de vianants
-          rail: Ferrocarril
-          train: Tren
-          subway: Metro
-          ferry: Ferri
-          light_rail: Ferrocarril lleuger
-          tram: Tramvia
-          trolleybus: Troleibús
-          bus: Autobús
-          cable_car: Telefèric
-          chair_lift: Telecadira
-          runway: Pista d'aeroport
-          taxiway: Carrer de rodatge
-          apron: Estacionament d'avions
-          admin: Límit administratiu
-          capital: Capital
-          city: Ciutat
-          orchard: Hort
-          vineyard: Vinya
-          forest: Bosc
-          wood: Arbreda
-          farmland: Terra de conreu
-          grass: Gespa
-          meadow: Prada
-          bare_rock: Roca pelada
-          sand: Sorra
-          golf: Camp de golf
-          park: Parc
-          common: Àrea comunal
-          built_up: Zona edificada
-          resident: Zona residencial
-          retail: Àrea comercial
-          industrial: Zona industrial
-          commercial: Zona comercial
-          heathland: Bruguerar
-          scrubland: Matolls
-          lake: Llac
-          reservoir: Embassament
-          intermittent_water: Cos d'aigua intermitent
-          glacier: Glacera
-          reef: Escull
-          wetland: Aiguamoll
-          farm: Granja
-          brownfield: Àrea industrial abandonada
-          cemetery: Cementiri
-          allotments: Horts
-          pitch: Camp d'esports
-          centre: Centre esportiu
-          beach: Platja
-          reserve: Reserva natural
-          military: Àrea militar
-          school: Escola - Institut
-          university: Universitat
-          hospital: Hospital
-          building: Edifici significatiu
-          station: Estació de tren
-          railway_halt: Parada del ferrocarril
-          subway_station: Estació de metro
-          tram_stop: Parada de tramvia
-          summit: Cim
-          peak: Cim
-          tunnel: Línia discontínua = túnel
-          bridge: Línia negra = pont
-          private: Accés privat
-          destination: Servitud de pas
-          construction: Carreteres en construcció
-          bus_stop: Parada d'autobús
-          bicycle_shop: Botiga de bicicletes
-          bicycle_rental: Lloguer de bicicletes
-          bicycle_parking: Aparcament de bicicletes
-          bicycle_parking_small: Aparcament de bicicletes petit
-          toilets: Lavabos

     welcome:
       title: Us donem la benvinguda!
       introduction: Us donem la benvinguda a l'OpenStreetMap, el mapamundi lliure
     welcome:
       title: Us donem la benvinguda!
       introduction: Us donem la benvinguda a l'OpenStreetMap, el mapamundi lliure


@@ -2387,6 +2298,95 @@ ca:
           De fet, molts grups existeixen amb molt d'èxit com a reunió informal de persones o com a
           grup comunitari. Qualsevol pot configurar o unir-se a aquests. Més informació a la %{communities_wiki_link}.
         communities_wiki: Pàgina wiki de les comunitats
           De fet, molts grups existeixen amb molt d'èxit com a reunió informal de persones o com a
           grup comunitari. Qualsevol pot configurar o unir-se a aquests. Més informació a la %{communities_wiki_link}.
         communities_wiki: Pàgina wiki de les comunitats

+  map_keys:
+    show:
+      entries:
+        motorway: Autopista
+        main_road: Carretera principal
+        trunk: Via ràpida
+        primary: Carretera principal
+        secondary: Carretera secundària
+        unclassified: Carretera sense classificar
+        pedestrian: Via per a vianants
+        track: Pista - Camí
+        bridleway: Camí de ferradura
+        cycleway: Carril bici
+        cycleway_national: Carril bici nacional
+        cycleway_regional: Carril bici regional
+        cycleway_local: Carril bici local
+        cycleway_mtb: Ruta de bicicleta de muntanya
+        footway: Via de vianants
+        rail: Ferrocarril
+        train: Tren
+        subway: Metro
+        ferry: Ferri
+        light_rail: Ferrocarril lleuger
+        tram: Tramvia
+        trolleybus: Troleibús
+        bus: Autobús
+        cable_car: Telefèric
+        chair_lift: Telecadira
+        runway: Pista d'aeroport
+        taxiway: Carrer de rodatge
+        apron: Estacionament d'avions
+        admin: Límit administratiu
+        capital: Capital
+        city: Ciutat
+        orchard: Hort
+        vineyard: Vinya
+        forest: Bosc
+        wood: Arbreda
+        farmland: Terra de conreu
+        grass: Gespa
+        meadow: Prada
+        bare_rock: Roca pelada
+        sand: Sorra
+        golf: Camp de golf
+        park: Parc
+        common: Àrea comunal
+        built_up: Zona edificada
+        resident: Zona residencial
+        retail: Àrea comercial
+        industrial: Zona industrial
+        commercial: Zona comercial
+        heathland: Bruguerar
+        scrubland: Matolls
+        lake: Llac
+        reservoir: Embassament
+        intermittent_water: Cos d'aigua intermitent
+        glacier: Glacera
+        reef: Escull
+        wetland: Aiguamoll
+        farm: Granja
+        brownfield: Àrea industrial abandonada
+        cemetery: Cementiri
+        allotments: Horts
+        pitch: Camp d'esports
+        centre: Centre esportiu
+        beach: Platja
+        reserve: Reserva natural
+        military: Àrea militar
+        school: Escola - Institut
+        university: Universitat
+        hospital: Hospital
+        building: Edifici significatiu
+        station: Estació de tren
+        railway_halt: Parada del ferrocarril
+        subway_station: Estació de metro
+        tram_stop: Parada de tramvia
+        summit: Cim
+        peak: Cim
+        tunnel: Línia discontínua = túnel
+        bridge: Línia negra = pont
+        private: Accés privat
+        destination: Servitud de pas
+        construction: Carreteres en construcció
+        bus_stop: Parada d'autobús
+        bicycle_shop: Botiga de bicicletes
+        bicycle_rental: Lloguer de bicicletes
+        bicycle_parking: Aparcament de bicicletes
+        bicycle_parking_small: Aparcament de bicicletes petit
+        toilets: Lavabos

   traces:
     visibility:
       private: Privat (només compartit com a punts anònims no ordenats)
   traces:
     visibility:
       private: Privat (només compartit com a punts anònims no ordenats)

diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index c514e8579e84a4110f36f0eead730eb92ac50c91..a0564c725da6759fd778062dd09b2bc30ddfe9ef 100644 (file)
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -2273,95 +2273,6 @@ ce:
         bicycle: Вилспед
         car: машен тӀехь
         foot: гӀаш
         bicycle: Вилспед
         car: машен тӀехь
         foot: гӀаш

-    key:
-      table:
-        entry:
-          motorway: Бокх некъ
-          main_road: Коьрта некъ
-          trunk: Некъ
-          primary: Коьрта некъ
-          secondary: Къезга лелабо некъ
-          unclassified: Меттигера некъ
-          pedestrian: ГIаш лела урам
-          track: Ворданан некъ
-          bridleway: Говр хьохку некъ
-          cycleway: Вилспетан некъ
-          cycleway_national: Националан вилспетан некъ
-          cycleway_regional: КIоштар вилспетан некъ
-          cycleway_local: Меттигера вилспетан некъ
-          cycleway_mtb: Ломар вилспетан некъ
-          footway: ГIаш лела кача
-          rail: Аьчкан некъ
-          train: ЦӀерпошт
-          subway: Метро
-          ferry: Паром
-          light_rail: Йей рельсан транспорт
-          tram: Трамвай
-          trolleybus: Троллейбус
-          bus: Автобус
-          cable_car: Муьшан некъ
-          chair_lift: Муш тесна хьалаойург
-          runway: Аэропортан некъ
-          taxiway: Кема нийсадо некъ
-          apron: Аэропортан перрон
-          admin: Административан доза
-          capital: Коьрта гӀала
-          city: ГӀала
-          orchard: Стоьмийн беш
-          vineyard: Кемсийн беш
-          forest: Хьун
-          wood: Хьун
-          farmland: ДIадуь латт
-          grass: Буц
-          meadow: Бай
-          bare_rock: Йерзина тарх
-          sand: ГӀум
-          golf: Гольфан майда
-          park: Парк
-          common: Йуккъара латт
-          built_up: ГӀишлойар меттиг
-          resident: Нах беха меттиг
-          retail: Мах бо территори
-          industrial: Ерматаллин меттиг
-          commercial: Коммерцин меттиг
-          heathland: эрна латта
-          scrubland: Коьллаш
-          lake: Iам
-          reservoir: Хи латтийла
-          intermittent_water: Йуккъ-йуккъера Iам
-          glacier: Шалам
-          reef: Риф
-          wetland: Ишалан меттиг
-          farm: Ферма
-          brownfield: ДIатесна меттиг
-          cemetery: Кешнаш
-          allotments: Бешлелор
-          pitch: Спортан майда
-          centre: Спортан центр
-          beach: Пляж
-          reserve: Лардойла
-          military: ТӀеман меттиг
-          school: Ишкол
-          university: Университет
-          hospital: Госпиталь
-          building: Мехала гӀишло
-          station: ЦӀерпоштан вокзал
-          railway_halt: ЦӀерпоштан соцунгӀа
-          subway_station: Метрон станци
-          tram_stop: Трамвайн соцунгӀа
-          summit: Бохь
-          peak: Ломан бохь
-          tunnel: Пунктирни турба = тоннель
-          bridge: Ӏаьржа чкъор = тӀай
-          private: Ша тӀекхача
-          destination: Ӏалашан тӀекхача
-          construction: Некъ бар
-          bus_stop: Автобус соцу меттиг
-          bicycle_shop: Вилспетан туька
-          bicycle_rental: Вилспетан прокат
-          bicycle_parking: Вилспетан парковка
-          bicycle_parking_small: Жима вилспетан парковка
-          toilets: ХьаштагӀа

     welcome:
       title: Марша догӀийла!
       introduction: Марша вогӀийла хьо OpenStreetMap, маьрша а, хийца йиш йолу а дуьненан
     welcome:
       title: Марша догӀийла!
       introduction: Марша вогӀийла хьо OpenStreetMap, маьрша а, хийца йиш йолу а дуьненан


@@ -2433,6 +2344,95 @@ ce:
           Меттигерчу дакъанаша цхьана барамехь формалан кепара тоба кхолла оьшуш дац.
           Баккъалла а дуккха а тобанаш йу чӀогӀа кхиамца адамийн формалан доцу гулам санна йа юкъараллин тоба санна. Муьлххачу а стеган йиш йу уьш дӀахӀитто йа дӀакхета. Кхин дӀа еша %{communities_wiki_link} тӀехь.
         communities_wiki: Йукъараллаш вики агӀо
           Меттигерчу дакъанаша цхьана барамехь формалан кепара тоба кхолла оьшуш дац.
           Баккъалла а дуккха а тобанаш йу чӀогӀа кхиамца адамийн формалан доцу гулам санна йа юкъараллин тоба санна. Муьлххачу а стеган йиш йу уьш дӀахӀитто йа дӀакхета. Кхин дӀа еша %{communities_wiki_link} тӀехь.
         communities_wiki: Йукъараллаш вики агӀо

+  map_keys:
+    show:
+      entries:
+        motorway: Бокх некъ
+        main_road: Коьрта некъ
+        trunk: Некъ
+        primary: Коьрта некъ
+        secondary: Къезга лелабо некъ
+        unclassified: Меттигера некъ
+        pedestrian: ГIаш лела урам
+        track: Ворданан некъ
+        bridleway: Говр хьохку некъ
+        cycleway: Вилспетан некъ
+        cycleway_national: Националан вилспетан некъ
+        cycleway_regional: КIоштар вилспетан некъ
+        cycleway_local: Меттигера вилспетан некъ
+        cycleway_mtb: Ломар вилспетан некъ
+        footway: ГIаш лела кача
+        rail: Аьчкан некъ
+        train: ЦӀерпошт
+        subway: Метро
+        ferry: Паром
+        light_rail: Йей рельсан транспорт
+        tram: Трамвай
+        trolleybus: Троллейбус
+        bus: Автобус
+        cable_car: Муьшан некъ
+        chair_lift: Муш тесна хьалаойург
+        runway: Аэропортан некъ
+        taxiway: Кема нийсадо некъ
+        apron: Аэропортан перрон
+        admin: Административан доза
+        capital: Коьрта гӀала
+        city: ГӀала
+        orchard: Стоьмийн беш
+        vineyard: Кемсийн беш
+        forest: Хьун
+        wood: Хьун
+        farmland: ДIадуь латт
+        grass: Буц
+        meadow: Бай
+        bare_rock: Йерзина тарх
+        sand: ГӀум
+        golf: Гольфан майда
+        park: Парк
+        common: Йуккъара латт
+        built_up: ГӀишлойар меттиг
+        resident: Нах беха меттиг
+        retail: Мах бо территори
+        industrial: Ерматаллин меттиг
+        commercial: Коммерцин меттиг
+        heathland: эрна латта
+        scrubland: Коьллаш
+        lake: Iам
+        reservoir: Хи латтийла
+        intermittent_water: Йуккъ-йуккъера Iам
+        glacier: Шалам
+        reef: Риф
+        wetland: Ишалан меттиг
+        farm: Ферма
+        brownfield: ДIатесна меттиг
+        cemetery: Кешнаш
+        allotments: Бешлелор
+        pitch: Спортан майда
+        centre: Спортан центр
+        beach: Пляж
+        reserve: Лардойла
+        military: ТӀеман меттиг
+        school: Ишкол
+        university: Университет
+        hospital: Госпиталь
+        building: Мехала гӀишло
+        station: ЦӀерпоштан вокзал
+        railway_halt: ЦӀерпоштан соцунгӀа
+        subway_station: Метрон станци
+        tram_stop: Трамвайн соцунгӀа
+        summit: Бохь
+        peak: Ломан бохь
+        tunnel: Пунктирни турба = тоннель
+        bridge: Ӏаьржа чкъор = тӀай
+        private: Ша тӀекхача
+        destination: Ӏалашан тӀекхача
+        construction: Некъ бар
+        bus_stop: Автобус соцу меттиг
+        bicycle_shop: Вилспетан туька
+        bicycle_rental: Вилспетан прокат
+        bicycle_parking: Вилспетан парковка
+        bicycle_parking_small: Жима вилспетан парковка
+        toilets: ХьаштагӀа

   traces:
     visibility:
       private: Къаьсттина (анониман бен тIекхочийла йац, гойту ларийн тептарехь а,
   traces:
     visibility:
       private: Къаьсттина (анониман бен тIекхочийла йац, гойту ларийн тептарехь а,

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index e96083f7639b7edac9dd298670320eee84bacd28..f9e0b8deac192e6ff84fa14ace1e738b4a98137b 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -2520,95 +2520,6 @@ cs:
         bicycle: Na kole
         car: Autem
         foot: Pěšky
         bicycle: Na kole
         car: Autem
         foot: Pěšky

-    key:
-      table:
-        entry:
-          motorway: Dálnice
-          main_road: Hlavní silnice
-          trunk: Významná silnice
-          primary: Silnice první třídy
-          secondary: Silnice druhé třídy
-          unclassified: Silnice
-          pedestrian: Cesta pro pěší
-          track: Lesní a polní cesta
-          bridleway: Koňská stezka
-          cycleway: Cyklostezka
-          cycleway_national: Národní cyklotrasa
-          cycleway_regional: Regionální cyklotrasa
-          cycleway_local: Místní cyklotrasa
-          cycleway_mtb: Trasa pro horská kola
-          footway: Pěší cesta
-          rail: Železnice
-          train: Vlak
-          subway: Metro
-          ferry: Trajekt
-          light_rail: Rychlodráha
-          tram: Tramvaj
-          trolleybus: Trolejbus
-          bus: Autobus
-          cable_car: Lanovka
-          chair_lift: sedačková lanovka
-          runway: Vzletová a přistávací dráha
-          taxiway: pojezdová dráha
-          apron: Letištní odbavovací plocha
-          admin: Administrativní hranice
-          capital: Hlavní město
-          city: Město
-          orchard: Sad
-          vineyard: Vinice
-          forest: Les
-          wood: les
-          farmland: Pole
-          grass: Tráva
-          meadow: louka
-          bare_rock: Holá skála
-          sand: Písčina
-          golf: Golfové hřiště
-          park: Park
-          common: Pastvina
-          built_up: Zastavěná plocha
-          resident: Obytná oblast
-          retail: Nákupní oblast
-          industrial: Průmyslová oblast
-          commercial: Kancelářská oblast
-          heathland: Vřesoviště
-          scrubland: Křoviny
-          lake: Jezero
-          reservoir: nádrž
-          intermittent_water: Občasná vodní plocha
-          glacier: Ledovec
-          reef: Rif
-          wetland: Mokřad
-          farm: Farma
-          brownfield: Zbořeniště
-          cemetery: Hřbitov
-          allotments: Zahrádkářská kolonie
-          pitch: Sportovní hřiště
-          centre: Sportovní centrum
-          beach: Pláž
-          reserve: Přírodní rezervace
-          military: Vojenský prostor
-          school: Škola
-          university: univerzita
-          hospital: nemocnice
-          building: Významná budova
-          station: Nádraží
-          railway_halt: Železniční zastávka
-          subway_station: Stanice metra
-          tram_stop: Tramvajová zastávka
-          summit: Vrchol
-          peak: hora
-          tunnel: Čárkované obrysy = tunel
-          bridge: Černé obrysy = most
-          private: Soukromý pozemek
-          destination: Průjezd zakázán
-          construction: Cesta ve výstavbě
-          bus_stop: Autobusová zastávka
-          bicycle_shop: Cykloobchod
-          bicycle_rental: Půjčovna kol
-          bicycle_parking: Parkoviště pro kola
-          bicycle_parking_small: Malé parkoviště pro kola
-          toilets: Záchody

     welcome:
       title: Vítejte!
       introduction: Vítejte v OpenStreetMap, svobodné a editovatelné mapě světa. Teď,
     welcome:
       title: Vítejte!
       introduction: Vítejte v OpenStreetMap, svobodné a editovatelné mapě světa. Teď,


@@ -2681,6 +2592,95 @@ cs:
           komunitní skupina. Kdokoli může založit takovou skupinu nebo se připojit.
           Více informací najdete na %{communities_wiki_link}.
         communities_wiki: wiki stránce pro komunity
           komunitní skupina. Kdokoli může založit takovou skupinu nebo se připojit.
           Více informací najdete na %{communities_wiki_link}.
         communities_wiki: wiki stránce pro komunity

+  map_keys:
+    show:
+      entries:
+        motorway: Dálnice
+        main_road: Hlavní silnice
+        trunk: Významná silnice
+        primary: Silnice první třídy
+        secondary: Silnice druhé třídy
+        unclassified: Silnice
+        pedestrian: Cesta pro pěší
+        track: Lesní a polní cesta
+        bridleway: Koňská stezka
+        cycleway: Cyklostezka
+        cycleway_national: Národní cyklotrasa
+        cycleway_regional: Regionální cyklotrasa
+        cycleway_local: Místní cyklotrasa
+        cycleway_mtb: Trasa pro horská kola
+        footway: Pěší cesta
+        rail: Železnice
+        train: Vlak
+        subway: Metro
+        ferry: Trajekt
+        light_rail: Rychlodráha
+        tram: Tramvaj
+        trolleybus: Trolejbus
+        bus: Autobus
+        cable_car: Lanovka
+        chair_lift: sedačková lanovka
+        runway: Vzletová a přistávací dráha
+        taxiway: pojezdová dráha
+        apron: Letištní odbavovací plocha
+        admin: Administrativní hranice
+        capital: Hlavní město
+        city: Město
+        orchard: Sad
+        vineyard: Vinice
+        forest: Les
+        wood: les
+        farmland: Pole
+        grass: Tráva
+        meadow: louka
+        bare_rock: Holá skála
+        sand: Písčina
+        golf: Golfové hřiště
+        park: Park
+        common: Pastvina
+        built_up: Zastavěná plocha
+        resident: Obytná oblast
+        retail: Nákupní oblast
+        industrial: Průmyslová oblast
+        commercial: Kancelářská oblast
+        heathland: Vřesoviště
+        scrubland: Křoviny
+        lake: Jezero
+        reservoir: nádrž
+        intermittent_water: Občasná vodní plocha
+        glacier: Ledovec
+        reef: Rif
+        wetland: Mokřad
+        farm: Farma
+        brownfield: Zbořeniště
+        cemetery: Hřbitov
+        allotments: Zahrádkářská kolonie
+        pitch: Sportovní hřiště
+        centre: Sportovní centrum
+        beach: Pláž
+        reserve: Přírodní rezervace
+        military: Vojenský prostor
+        school: Škola
+        university: univerzita
+        hospital: nemocnice
+        building: Významná budova
+        station: Nádraží
+        railway_halt: Železniční zastávka
+        subway_station: Stanice metra
+        tram_stop: Tramvajová zastávka
+        summit: Vrchol
+        peak: hora
+        tunnel: Čárkované obrysy = tunel
+        bridge: Černé obrysy = most
+        private: Soukromý pozemek
+        destination: Průjezd zakázán
+        construction: Cesta ve výstavbě
+        bus_stop: Autobusová zastávka
+        bicycle_shop: Cykloobchod
+        bicycle_rental: Půjčovna kol
+        bicycle_parking: Parkoviště pro kola
+        bicycle_parking_small: Malé parkoviště pro kola
+        toilets: Záchody

   traces:
     visibility:
       private: Soukromá (veřejně dostupná jedině jako anonymní, neuspořádané body)
   traces:
     visibility:
       private: Soukromá (veřejně dostupná jedině jako anonymní, neuspořádané body)

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index b1888175fe423300124398fe375360ce7e8635c9..91dce8db9f8197bb8f03fb465c94b241d832274d 100644 (file)
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -2426,95 +2426,6 @@ cy:
         bicycle: Beic
         car: Car
         foot: Troed
         bicycle: Beic
         car: Car
         foot: Troed

-    key:
-      table:
-        entry:
-          motorway: Traffordd
-          main_road: Priffordd
-          trunk: Cefnffordd
-          primary: Priffordd
-          secondary: Ffordd eilaidd
-          unclassified: Ffordd Diddosbarth
-          pedestrian: Llwybr cerddwyr
-          track: Trac
-          bridleway: Llwybr ceffylau
-          cycleway: Llwybr beiciau
-          cycleway_national: Llwybr beiciau cenedlaethol
-          cycleway_regional: Llwybr beiciau rhanbarthol
-          cycleway_local: Llwybr beiciau lleol
-          cycleway_mtb: Ffordd Feicio Mynydd
-          footway: Troedffordd
-          rail: Rheilffordd
-          train: Trên
-          subway: Trenau tanddaear
-          ferry: Fferi
-          light_rail: Rheilffordd ysgafn
-          tram: Tram
-          trolleybus: Bws Drydan
-          bus: Bws
-          cable_car: Car cebl
-          chair_lift: Cadair godi
-          runway: Llwybr glanio
-          taxiway: Tacsiffordd
-          apron: Llain
-          admin: Ffin gweinyddol
-          capital: Prifddinas
-          city: Dinas
-          orchard: Perllan
-          vineyard: Gwinllan
-          forest: Coedwig
-          wood: Coedlan
-          farmland: Tir Ffermio
-          grass: Gwair
-          meadow: Gwaun
-          bare_rock: Carreg Plaen
-          sand: Tywod
-          golf: Maes golff
-          park: Parc
-          common: Comin
-          built_up: Ardal Adeiledig
-          resident: Ardal Breswyl
-          retail: Ardal Fanwerthu
-          industrial: Ardal Ddiwydiannol
-          commercial: Ardal Fasnachol
-          heathland: Rhos
-          scrubland: Prysgwydd
-          lake: Llyn
-          reservoir: Cronfa Ddŵr
-          intermittent_water: Dŵr ysbeidiol
-          glacier: Rhewlif
-          reef: Riff
-          wetland: Gwlyptir
-          farm: Fferm
-          brownfield: Safle tir llwyd
-          cemetery: Mynwent
-          allotments: Rhandiroedd
-          pitch: Cae chwaraeon
-          centre: Canolfan chwaraeon
-          beach: Traeth
-          reserve: Gwarchodfa natur
-          military: Ardal filwrol
-          school: Ysgol
-          university: Prifysgol
-          hospital: Ysbyty
-          building: Adeilad arwyddocâol
-          station: Gorsaf drên
-          railway_halt: Arhosfa drenau
-          subway_station: Gorsaf Isffordd
-          tram_stop: Safle Tramiau
-          summit: Pen Mynydd
-          peak: Copa
-          tunnel: Border toredig = twnnel
-          bridge: Border du = pont
-          private: Mynediad preifat
-          destination: Mynediad cyrchfan
-          construction: Ffyrdd yn cael eu hadeiladu
-          bus_stop: Safle Bws
-          bicycle_shop: Siop feiciau
-          bicycle_rental: Beic Hur
-          bicycle_parking: Man parcio beiciau
-          bicycle_parking_small: Parcio Beiciau Bach
-          toilets: Toiledau

     welcome:
       title: Croeso!
       introduction: Croeso i OpenStreetMap, map y byd rhydd ac agored. Nawr eich bod
     welcome:
       title: Croeso!
       introduction: Croeso i OpenStreetMap, map y byd rhydd ac agored. Nawr eich bod


@@ -2587,6 +2498,95 @@ cy:
           Nid oes rhaid sefydlu grŵp ffurfiol yn yr un modd â'r Siapteri Lleol.
           Mae llawer o grwpiau llwyddiannus yn bodoli fel grwpiau anffurfiol neu fel grŵp cymunedol. Gall unrhyw un ddechrau neu ymuno â grwp. Darllenwch fwy ar y %{communities_wiki_link}.
         communities_wiki: dudalen wici Cymunedau
           Nid oes rhaid sefydlu grŵp ffurfiol yn yr un modd â'r Siapteri Lleol.
           Mae llawer o grwpiau llwyddiannus yn bodoli fel grwpiau anffurfiol neu fel grŵp cymunedol. Gall unrhyw un ddechrau neu ymuno â grwp. Darllenwch fwy ar y %{communities_wiki_link}.
         communities_wiki: dudalen wici Cymunedau

+  map_keys:
+    show:
+      entries:
+        motorway: Traffordd
+        main_road: Priffordd
+        trunk: Cefnffordd
+        primary: Priffordd
+        secondary: Ffordd eilaidd
+        unclassified: Ffordd Diddosbarth
+        pedestrian: Llwybr cerddwyr
+        track: Trac
+        bridleway: Llwybr ceffylau
+        cycleway: Llwybr beiciau
+        cycleway_national: Llwybr beiciau cenedlaethol
+        cycleway_regional: Llwybr beiciau rhanbarthol
+        cycleway_local: Llwybr beiciau lleol
+        cycleway_mtb: Ffordd Feicio Mynydd
+        footway: Troedffordd
+        rail: Rheilffordd
+        train: Trên
+        subway: Trenau tanddaear
+        ferry: Fferi
+        light_rail: Rheilffordd ysgafn
+        tram: Tram
+        trolleybus: Bws Drydan
+        bus: Bws
+        cable_car: Car cebl
+        chair_lift: Cadair godi
+        runway: Llwybr glanio
+        taxiway: Tacsiffordd
+        apron: Llain
+        admin: Ffin gweinyddol
+        capital: Prifddinas
+        city: Dinas
+        orchard: Perllan
+        vineyard: Gwinllan
+        forest: Coedwig
+        wood: Coedlan
+        farmland: Tir Ffermio
+        grass: Gwair
+        meadow: Gwaun
+        bare_rock: Carreg Plaen
+        sand: Tywod
+        golf: Maes golff
+        park: Parc
+        common: Comin
+        built_up: Ardal Adeiledig
+        resident: Ardal Breswyl
+        retail: Ardal Fanwerthu
+        industrial: Ardal Ddiwydiannol
+        commercial: Ardal Fasnachol
+        heathland: Rhos
+        scrubland: Prysgwydd
+        lake: Llyn
+        reservoir: Cronfa Ddŵr
+        intermittent_water: Dŵr ysbeidiol
+        glacier: Rhewlif
+        reef: Riff
+        wetland: Gwlyptir
+        farm: Fferm
+        brownfield: Safle tir llwyd
+        cemetery: Mynwent
+        allotments: Rhandiroedd
+        pitch: Cae chwaraeon
+        centre: Canolfan chwaraeon
+        beach: Traeth
+        reserve: Gwarchodfa natur
+        military: Ardal filwrol
+        school: Ysgol
+        university: Prifysgol
+        hospital: Ysbyty
+        building: Adeilad arwyddocâol
+        station: Gorsaf drên
+        railway_halt: Arhosfa drenau
+        subway_station: Gorsaf Isffordd
+        tram_stop: Safle Tramiau
+        summit: Pen Mynydd
+        peak: Copa
+        tunnel: Border toredig = twnnel
+        bridge: Border du = pont
+        private: Mynediad preifat
+        destination: Mynediad cyrchfan
+        construction: Ffyrdd yn cael eu hadeiladu
+        bus_stop: Safle Bws
+        bicycle_shop: Siop feiciau
+        bicycle_rental: Beic Hur
+        bicycle_parking: Man parcio beiciau
+        bicycle_parking_small: Parcio Beiciau Bach
+        toilets: Toiledau

   traces:
     visibility:
       private: Preifat (dim ond yn cael ei rannu fel pwyntiau dienw, heb eu trefnu)
   traces:
     visibility:
       private: Preifat (dim ond yn cael ei rannu fel pwyntiau dienw, heb eu trefnu)

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 279fd840d3fc3f879cc7a9c1d40d5dce2f3447b1..79c2d9634effbfd3eab90f5ddba671511eb135e6 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -392,8 +392,8 @@ da:
         did_not_confirm: Du har ikke bekræftet, at du anser dine redigeringer for
           at være i det offentlige domæne.
   browse:
         did_not_confirm: Du har ikke bekræftet, at du anser dine redigeringer for
           at være i det offentlige domæne.
   browse:

-    deleted_ago_by_html: Slettet %{time_ago} af %{user}
-    edited_ago_by_html: Redigeret %{time_ago} af %{user}
+    deleted_ago_by_html: Slettet for %{time_ago} af %{user}
+    edited_ago_by_html: Redigeret for %{time_ago} af %{user}

     version: Version
     redacted_version: Redigeret version
     in_changeset: Ændringssæt
     version: Version
     redacted_version: Redigeret version
     in_changeset: Ændringssæt


@@ -565,8 +565,8 @@ da:
       closed: 'Lukket: %{when}'
       created_ago_html: Oprettet %{time_ago}
       closed_ago_html: Lukket %{time_ago}
       closed: 'Lukket: %{when}'
       created_ago_html: Oprettet %{time_ago}
       closed_ago_html: Lukket %{time_ago}

-      created_ago_by_html: Oprettet %{time_ago} af %{user}
-      closed_ago_by_html: Lukket %{time_ago} af %{user}
+      created_ago_by_html: Oprettet for %{time_ago} af %{user}
+      closed_ago_by_html: Lukket for %{time_ago} af %{user}

       discussion: Diskussion
       join_discussion: Log på for at deltage i diskussionen
       still_open: Ændringssæt er stadig åben - diskussion vil åbne når ændringssættet
       discussion: Diskussion
       join_discussion: Log på for at deltage i diskussionen
       still_open: Ændringssæt er stadig åben - diskussion vil åbne når ændringssættet


@@ -2477,95 +2477,6 @@ da:
         bicycle: Cykel
         car: Bil
         foot: Til fods
         bicycle: Cykel
         car: Bil
         foot: Til fods

-    key:
-      table:
-        entry:
-          motorway: Motorvej
-          main_road: Hovedvej
-          trunk: Motortrafikvej
-          primary: Hovedvej (primærrute)
-          secondary: Hovedvej (sekundærrute)
-          unclassified: Anden vej
-          pedestrian: Gågade
-          track: Hjulspor
-          bridleway: Ridesti
-          cycleway: Cykelsti
-          cycleway_national: National cykelsti
-          cycleway_regional: Regional cykelsti
-          cycleway_local: Lokal cykelsti
-          cycleway_mtb: Mountainbikerute
-          footway: Gangsti
-          rail: Jernbane
-          train: Tog
-          subway: Undergrundsbane
-          ferry: Færge
-          light_rail: Letbane
-          tram: Sporvogn
-          trolleybus: Trolleybus
-          bus: Bus
-          cable_car: Kabelvogn
-          chair_lift: Stolelift
-          runway: Landingsbane
-          taxiway: Rullevej
-          apron: Lufthavnsforplads
-          admin: Administrativ grænse
-          capital: Hovedstad
-          city: By
-          orchard: Plantage
-          vineyard: Vingård
-          forest: Skov
-          wood: Træ
-          farmland: Landbrugsjord
-          grass: Græs
-          meadow: Eng
-          bare_rock: Blottet klippe
-          sand: Sand
-          golf: Golfbane
-          park: Park
-          common: Fælled
-          built_up: Bebygget område
-          resident: Boligområde
-          retail: Detailhandelsområde
-          industrial: Industriområde
-          commercial: Erhvervsområde
-          heathland: Hede
-          scrubland: Buskads
-          lake: Sø
-          reservoir: Reservoir
-          intermittent_water: Periodisk vandmasse
-          glacier: Gletsjer
-          reef: Rev
-          wetland: Vådområde
-          farm: Gård
-          brownfield: Tidligere industriområde
-          cemetery: Begravelsesplads
-          allotments: Kolonihaver
-          pitch: Sportsbane
-          centre: Sportscenter
-          beach: Strand
-          reserve: Naturreservat
-          military: Militært område
-          school: Skole
-          university: Universitet
-          hospital: Sygehus
-          building: Vigtig bygning
-          station: Togstation
-          railway_halt: Jernbane-trinbræt
-          subway_station: Undergrundsstation
-          tram_stop: Sporvognsstoppested
-          summit: Bjergtop
-          peak: Højdepunkt
-          tunnel: Stiplet kant = tunnel
-          bridge: Sort kant = bro
-          private: Privat adgang
-          destination: Ærindekørsel tilladt
-          construction: Veje under konstruktion
-          bus_stop: Busstop
-          bicycle_shop: Cykelhandler
-          bicycle_rental: Cykeludlejning
-          bicycle_parking: Cykelparkering
-          bicycle_parking_small: Mindre cykelparkering
-          toilets: Toiletter

     welcome:
       title: Velkommen!
       introduction: Velkommen til OpenStreetMap, det frie brugerredigerede verdenskort.
     welcome:
       title: Velkommen!
       introduction: Velkommen til OpenStreetMap, det frie brugerredigerede verdenskort.


@@ -2638,6 +2549,95 @@ da:
           faste rammer. Enhver kan oprette eller blive medlem af sådanne. Læs mere
           på %{communities_wiki_link}.
         communities_wiki: wiki-siden for fællesskaber
           faste rammer. Enhver kan oprette eller blive medlem af sådanne. Læs mere
           på %{communities_wiki_link}.
         communities_wiki: wiki-siden for fællesskaber

+  map_keys:
+    show:
+      entries:
+        motorway: Motorvej
+        main_road: Hovedvej
+        trunk: Motortrafikvej
+        primary: Hovedvej (primærrute)
+        secondary: Hovedvej (sekundærrute)
+        unclassified: Anden vej
+        pedestrian: Gågade
+        track: Hjulspor
+        bridleway: Ridesti
+        cycleway: Cykelsti
+        cycleway_national: National cykelsti
+        cycleway_regional: Regional cykelsti
+        cycleway_local: Lokal cykelsti
+        cycleway_mtb: Mountainbikerute
+        footway: Gangsti
+        rail: Jernbane
+        train: Tog
+        subway: Undergrundsbane
+        ferry: Færge
+        light_rail: Letbane
+        tram: Sporvogn
+        trolleybus: Trolleybus
+        bus: Bus
+        cable_car: Kabelvogn
+        chair_lift: Stolelift
+        runway: Landingsbane
+        taxiway: Rullevej
+        apron: Lufthavnsforplads
+        admin: Administrativ grænse
+        capital: Hovedstad
+        city: By
+        orchard: Plantage
+        vineyard: Vingård
+        forest: Skov
+        wood: Træ
+        farmland: Landbrugsjord
+        grass: Græs
+        meadow: Eng
+        bare_rock: Blottet klippe
+        sand: Sand
+        golf: Golfbane
+        park: Park
+        common: Fælled
+        built_up: Bebygget område
+        resident: Boligområde
+        retail: Detailhandelsområde
+        industrial: Industriområde
+        commercial: Erhvervsområde
+        heathland: Hede
+        scrubland: Buskads
+        lake: Sø
+        reservoir: Reservoir
+        intermittent_water: Periodisk vandmasse
+        glacier: Gletsjer
+        reef: Rev
+        wetland: Vådområde
+        farm: Gård
+        brownfield: Tidligere industriområde
+        cemetery: Begravelsesplads
+        allotments: Kolonihaver
+        pitch: Sportsbane
+        centre: Sportscenter
+        beach: Strand
+        reserve: Naturreservat
+        military: Militært område
+        school: Skole
+        university: Universitet
+        hospital: Sygehus
+        building: Vigtig bygning
+        station: Togstation
+        railway_halt: Jernbane-trinbræt
+        subway_station: Undergrundsstation
+        tram_stop: Sporvognsstoppested
+        summit: Bjergtop
+        peak: Højdepunkt
+        tunnel: Stiplet kant = tunnel
+        bridge: Sort kant = bro
+        private: Privat adgang
+        destination: Ærindekørsel tilladt
+        construction: Veje under konstruktion
+        bus_stop: Busstop
+        bicycle_shop: Cykelhandler
+        bicycle_rental: Cykeludlejning
+        bicycle_parking: Cykelparkering
+        bicycle_parking_small: Mindre cykelparkering
+        toilets: Toiletter

   traces:
     visibility:
       private: Privat (kun delt som anonyme punkter uden rækkefølge og tidsstempler)
   traces:
     visibility:
       private: Privat (kun delt som anonyme punkter uden rækkefølge og tidsstempler)

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 45b169b8915cc3a27fad5278563e55566ad7d99d..7ed9ab0b658086cad65f6c528cb65ec5a4c91497 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2605,95 +2605,6 @@ de:
         bicycle: Fahrrad
         car: Auto
         foot: Fuß
         bicycle: Fahrrad
         car: Auto
         foot: Fuß

-    key:
-      table:
-        entry:
-          motorway: Autobahn
-          main_road: Hauptstraße
-          trunk: Schnellstraße
-          primary: Bundesstraße
-          secondary: Landes-, Kreisstraße
-          unclassified: Straße
-          pedestrian: Fußgängerzone
-          track: Wald-, Feldweg
-          bridleway: Reitweg
-          cycleway: Radweg
-          cycleway_national: Nationaler Radweg
-          cycleway_regional: Regionaler Radweg
-          cycleway_local: Lokaler Radweg
-          cycleway_mtb: Mountainbike-Route
-          footway: Fußweg
-          rail: Eisenbahn
-          train: Zug
-          subway: U-Bahn
-          ferry: Fähre
-          light_rail: Stadtbahn
-          tram: Straßenbahn
-          trolleybus: Oberleitungsbus
-          bus: Bus
-          cable_car: Seilbahn
-          chair_lift: Sessellift
-          runway: Start- und Landebahn
-          taxiway: Rollbahn
-          apron: Flughafenvorfeld
-          admin: Landesgrenzen, sonstige Grenzen
-          capital: Hauptstadt
-          city: Stadt
-          orchard: Obstplantage
-          vineyard: Weinberg
-          forest: Wald
-          wood: Wald
-          farmland: Ackerland
-          grass: Gras
-          meadow: Wiese
-          bare_rock: Nackter Fels
-          sand: Sand
-          golf: Golfplatz
-          park: Park
-          common: öffentliche Grünfläche (brit.)
-          built_up: Bebautes Gebiet
-          resident: Wohngebiet
-          retail: Einkaufszentrum
-          industrial: Industriegebiet
-          commercial: Gewerbegebiet
-          heathland: Heide
-          scrubland: Buschland
-          lake: See
-          reservoir: Reservoir
-          intermittent_water: Intermittierender Gewässer
-          glacier: Gletscher
-          reef: Riff
-          wetland: Feuchtgebiet
-          farm: Landwirtschaft
-          brownfield: Brachfläche
-          cemetery: Friedhof
-          allotments: Kleingartenanlage
-          pitch: Spielfeld
-          centre: Sportzentrum
-          beach: Strand
-          reserve: Naturschutzgebiet
-          military: Militärgebiet
-          school: Schule, Universität
-          university: Universität
-          hospital: Krankenhaus
-          building: Bedeutendes Gebäude
-          station: Bahnhof
-          railway_halt: Eisenbahnhaltestelle
-          subway_station: U-Bahnhof
-          tram_stop: Straßenbahnhaltestelle
-          summit: Gipfel
-          peak: Gipfel
-          tunnel: Gestrichelter Rand = Tunnel
-          bridge: Schwarzer Rand = Brücke
-          private: Privater Zugang
-          destination: Nur Zufahrt gestattet
-          construction: Straßen im Bau
-          bus_stop: Bushaltestelle
-          bicycle_shop: Fahrradladen
-          bicycle_rental: Fahrradverleih
-          bicycle_parking: Fahrradparkplatz
-          bicycle_parking_small: Kleiner Fahrradabstellplatz
-          toilets: Toiletten

     welcome:
       title: Willkommen!
       introduction: |-
     welcome:
       title: Willkommen!
       introduction: |-


@@ -2768,6 +2679,95 @@ de:
           Es besteht keine Notwendigkeit, eine Gruppe im gleichen Umfang wie die Local Chapters offiziell zu gründen.
           Tatsächlich existieren viele Gruppen sehr erfolgreich als informelle Zusammenkunft von Menschen oder als Community-Gruppe. Jeder kann diese gründen oder beitreten. Lies mehr im %{communities_wiki_link}.
         communities_wiki: Community-Wiki-Seite
           Es besteht keine Notwendigkeit, eine Gruppe im gleichen Umfang wie die Local Chapters offiziell zu gründen.
           Tatsächlich existieren viele Gruppen sehr erfolgreich als informelle Zusammenkunft von Menschen oder als Community-Gruppe. Jeder kann diese gründen oder beitreten. Lies mehr im %{communities_wiki_link}.
         communities_wiki: Community-Wiki-Seite

+  map_keys:
+    show:
+      entries:
+        motorway: Autobahn
+        main_road: Hauptstraße
+        trunk: Schnellstraße
+        primary: Bundesstraße
+        secondary: Landes-, Kreisstraße
+        unclassified: Straße
+        pedestrian: Fußgängerzone
+        track: Wald-, Feldweg
+        bridleway: Reitweg
+        cycleway: Radweg
+        cycleway_national: Nationaler Radweg
+        cycleway_regional: Regionaler Radweg
+        cycleway_local: Lokaler Radweg
+        cycleway_mtb: Mountainbike-Route
+        footway: Fußweg
+        rail: Eisenbahn
+        train: Zug
+        subway: U-Bahn
+        ferry: Fähre
+        light_rail: Stadtbahn
+        tram: Straßenbahn
+        trolleybus: Oberleitungsbus
+        bus: Bus
+        cable_car: Seilbahn
+        chair_lift: Sessellift
+        runway: Start- und Landebahn
+        taxiway: Rollbahn
+        apron: Flughafenvorfeld
+        admin: Landesgrenzen, sonstige Grenzen
+        capital: Hauptstadt
+        city: Stadt
+        orchard: Obstplantage
+        vineyard: Weinberg
+        forest: Wald
+        wood: Wald
+        farmland: Ackerland
+        grass: Gras
+        meadow: Wiese
+        bare_rock: Nackter Fels
+        sand: Sand
+        golf: Golfplatz
+        park: Park
+        common: öffentliche Grünfläche (brit.)
+        built_up: Bebautes Gebiet
+        resident: Wohngebiet
+        retail: Einkaufszentrum
+        industrial: Industriegebiet
+        commercial: Gewerbegebiet
+        heathland: Heide
+        scrubland: Buschland
+        lake: See
+        reservoir: Reservoir
+        intermittent_water: Intermittierender Gewässer
+        glacier: Gletscher
+        reef: Riff
+        wetland: Feuchtgebiet
+        farm: Landwirtschaft
+        brownfield: Brachfläche
+        cemetery: Friedhof
+        allotments: Kleingartenanlage
+        pitch: Spielfeld
+        centre: Sportzentrum
+        beach: Strand
+        reserve: Naturschutzgebiet
+        military: Militärgebiet
+        school: Schule, Universität
+        university: Universität
+        hospital: Krankenhaus
+        building: Bedeutendes Gebäude
+        station: Bahnhof
+        railway_halt: Eisenbahnhaltestelle
+        subway_station: U-Bahnhof
+        tram_stop: Straßenbahnhaltestelle
+        summit: Gipfel
+        peak: Gipfel
+        tunnel: Gestrichelter Rand = Tunnel
+        bridge: Schwarzer Rand = Brücke
+        private: Privater Zugang
+        destination: Nur Zufahrt gestattet
+        construction: Straßen im Bau
+        bus_stop: Bushaltestelle
+        bicycle_shop: Fahrradladen
+        bicycle_rental: Fahrradverleih
+        bicycle_parking: Fahrradparkplatz
+        bicycle_parking_small: Kleiner Fahrradabstellplatz
+        toilets: Toiletten

   traces:
     visibility:
       private: Privat (werden nur als anonyme, unsortierte Punkte ohne Zeitangaben
   traces:
     visibility:
       private: Privat (werden nur als anonyme, unsortierte Punkte ohne Zeitangaben

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index d33031f9e4ef8b3e28a6aec37ecf9ef6b6cb2333..17bc3f976b58381a6986007539c0a72fbdb8e290 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -909,27 +909,27 @@ diq:
       modes:
         bicycle: Bisiklet
         foot: Lınge
       modes:
         bicycle: Bisiklet
         foot: Lınge

-    key:
-      table:
-        entry:
-          track: Raya Herın
-          bridleway: Raya Ancınıştan
-          cycleway: Raya Bisiklet
-          forest: Mêşe
-          wood: Meşe
-          golf: Saxay Golfi
-          park: Perk
-          common: Çimen
-          lake: Gol
-          farm: Cıtinin
-          cemetery: Mezlaser
-          allotments: Bostan
-          school: Wendxane
-          university: Uniwersita
-          summit: Sersıq
-          peak: Ko

     welcome:
       title: Xeyr amey!
     welcome:
       title: Xeyr amey!

+  map_keys:
+    show:
+      entries:
+        track: Raya Herın
+        bridleway: Raya Ancınıştan
+        cycleway: Raya Bisiklet
+        forest: Mêşe
+        wood: Meşe
+        golf: Saxay Golfi
+        park: Perk
+        common: Çimen
+        lake: Gol
+        farm: Cıtinin
+        cemetery: Mezlaser
+        allotments: Bostan
+        school: Wendxane
+        university: Uniwersita
+        summit: Sersıq
+        peak: Ko

   traces:
     new:
       help: Peşti
   traces:
     new:
       help: Peşti

diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index 55d042aeb29ebfbd521a2d0accee4b16f9180af1..033d8ab54df46a453a16e44291ae7c447697e976 100644 (file)
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -1206,58 +1206,6 @@ dsb:
         bicycle: Kólaso
         car: Awto
         foot: Pěšy
         bicycle: Kólaso
         car: Awto
         foot: Pěšy

-    key:
-      table:
-        entry:
-          motorway: Awtodroga
-          trunk: Malsna droga
-          primary: Zwězkowa droga
-          secondary: Nakrajna droga
-          unclassified: Njeklasificěrowana droga
-          track: Cera
-          bridleway: Rejtarska drožka
-          cycleway: Sćažka za kolesowarjow
-          footway: Drožka
-          rail: Zeleznica
-          subway: Pódzemska
-          cable_car: Kablowa elektriska
-          chair_lift: sedłowy lift
-          runway: Pśizemjeńska cera
-          taxiway: lětadłowa cera
-          apron: Pśedpólo lětanišća
-          admin: Zastojnstwowa granica
-          forest: Góla
-          wood: Lěs
-          golf: Golfowišćo
-          park: Park
-          common: Powšykny
-          resident: Bydleński wobcerk
-          retail: Nakupowanišćo
-          industrial: Industrijowy wobcerk
-          commercial: Źěłarstwowy wobcerk
-          heathland: Wrjosate strony
-          lake: Jazor
-          reservoir: gaśeński jazor
-          farm: Farma
-          brownfield: Industrijowe lědo
-          cemetery: Kjarchob
-          allotments: Gumnyškarnje
-          pitch: Sportnišćo
-          centre: Sportowy centrum
-          reserve: Strony šćitaneje pśirody
-          military: Militarny wobcerk
-          school: Šula
-          university: uniwersita
-          building: Pśesegajuce twarjenje
-          station: Dwórnišćo, zeleznicowa stacija
-          summit: Wjerch
-          peak: špica
-          tunnel: Smužkowane wobcerjenje = tunel
-          bridge: Carne wobcerjenje = móst
-          private: Priwatny pśistup
-          destination: Jano za pśigranicujucych
-          construction: Drogi w twari
-          bicycle_shop: Kólasaŕnja

     welcome:
       title: Witaj!
       introduction: Witaj k OpenstreetMap, lichej a wobźěłujobnej kórśe swěta. Něnto,
     welcome:
       title: Witaj!
       introduction: Witaj k OpenstreetMap, lichej a wobźěłujobnej kórśe swěta. Něnto,


@@ -1281,6 +1229,58 @@ dsb:
         list_text: 'Slědujuce zgromadnosći su oficielnje ako lokalne zwězki zregistrěrowane:'
       other_groups:
         title: Druge kupki
         list_text: 'Slědujuce zgromadnosći su oficielnje ako lokalne zwězki zregistrěrowane:'
       other_groups:
         title: Druge kupki

+  map_keys:
+    show:
+      entries:
+        motorway: Awtodroga
+        trunk: Malsna droga
+        primary: Zwězkowa droga
+        secondary: Nakrajna droga
+        unclassified: Njeklasificěrowana droga
+        track: Cera
+        bridleway: Rejtarska drožka
+        cycleway: Sćažka za kolesowarjow
+        footway: Drožka
+        rail: Zeleznica
+        subway: Pódzemska
+        cable_car: Kablowa elektriska
+        chair_lift: sedłowy lift
+        runway: Pśizemjeńska cera
+        taxiway: lětadłowa cera
+        apron: Pśedpólo lětanišća
+        admin: Zastojnstwowa granica
+        forest: Góla
+        wood: Lěs
+        golf: Golfowišćo
+        park: Park
+        common: Powšykny
+        resident: Bydleński wobcerk
+        retail: Nakupowanišćo
+        industrial: Industrijowy wobcerk
+        commercial: Źěłarstwowy wobcerk
+        heathland: Wrjosate strony
+        lake: Jazor
+        reservoir: gaśeński jazor
+        farm: Farma
+        brownfield: Industrijowe lědo
+        cemetery: Kjarchob
+        allotments: Gumnyškarnje
+        pitch: Sportnišćo
+        centre: Sportowy centrum
+        reserve: Strony šćitaneje pśirody
+        military: Militarny wobcerk
+        school: Šula
+        university: uniwersita
+        building: Pśesegajuce twarjenje
+        station: Dwórnišćo, zeleznicowa stacija
+        summit: Wjerch
+        peak: špica
+        tunnel: Smužkowane wobcerjenje = tunel
+        bridge: Carne wobcerjenje = móst
+        private: Priwatny pśistup
+        destination: Jano za pśigranicujucych
+        construction: Drogi w twari
+        bicycle_shop: Kólasaŕnja

   traces:
     visibility:
       private: Priwatny (jano źělony ako anonymne, njezrědowane dypki)
   traces:
     visibility:
       private: Priwatny (jano źělony ako anonymne, njezrědowane dypki)

diff --git a/config/locales/el.yml b/config/locales/el.yml
index c3b42122ae015b0b23fe50e837a3485b519de406..46bf8d3bbaf2f2431d449a6afb074d9b551ce547 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -2553,95 +2553,6 @@ el:
         bicycle: Ποδήλατο
         car: Αυτοκίνητο
         foot: Πόδια
         bicycle: Ποδήλατο
         car: Αυτοκίνητο
         foot: Πόδια

-    key:
-      table:
-        entry:
-          motorway: Αυτοκινητόδρομος
-          main_road: Κύρια οδός
-          trunk: Εθνική οδός
-          primary: Κύρια οδός
-          secondary: Δευτερεύουσα οδός
-          unclassified: Αταξινόμητη οδός
-          pedestrian: Πεζόδρομος
-          track: Αγροτικός / Δασικός δρόμος
-          bridleway: Μονοπάτι για άλογα
-          cycleway: Ποδηλατόδρομος
-          cycleway_national: Εθνικός ποδηλατόδρομος
-          cycleway_regional: Περιφερειακός ποδηλατόδρομος
-          cycleway_local: Τοπικός ποδηλατόδρομος
-          cycleway_mtb: Ορεινή ποδηλατική διαδρομή
-          footway: Μονοπάτι
-          rail: Σιδηρόδρομος
-          train: Τρένο
-          subway: Υπόγειος Σιδηρόδρομος
-          ferry: Πορθμείο
-          light_rail: Ελαφρύς σιδηρόδρομος
-          tram: Τραμ
-          trolleybus: Τρόλεϊ
-          bus: Λεωφορείο
-          cable_car: Τελεφερίκ
-          chair_lift: Αναβατήρας
-          runway: Διάδρομος Αεροδρομίου
-          taxiway: Τροχόδρομος
-          apron: Πίστα προσγείωσης αεροδρομίου
-          admin: Διοικητικό όριο
-          capital: Πρωτεύουσα
-          city: Πόλη
-          orchard: Περιβόλι
-          vineyard: Αμπελώνας
-          forest: Δάσος
-          wood: Δάσος
-          farmland: Καλλιεργήσιμη έκταση
-          grass: Γρασίδι
-          meadow: Λιβάδι
-          bare_rock: Γυμνός βράχος
-          sand: Άμμος
-          golf: Γήπεδο γκολφ
-          park: Πάρκο
-          common: Κοινόχρηστο
-          built_up: Δομημένη περιοχή
-          resident: Κατοικημένη περιοχή
-          retail: Περιοχή λιανικού εμπορίου
-          industrial: Βιομηχανική περιοχή
-          commercial: Εμπορική περιοχή
-          heathland: Φρυγανότοπος
-          scrubland: Θαμνότοπος
-          lake: Λίμνη
-          reservoir: Ταμιευτήρας
-          intermittent_water: Σώμα νερού με διαλείπουσα ροή
-          glacier: Παγετώνας
-          reef: Ύφαλος
-          wetland: Έλος
-          farm: Αγρόκτημα
-          brownfield: Πρώην βιομηχανική περιοχή
-          cemetery: Κοιμητήριο
-          allotments: Παραχώρηση γης
-          pitch: Γήπεδο αθλήματος
-          centre: Αθλητικό κέντρο
-          beach: Παραλία
-          reserve: Φυσικό καταφύγιο
-          military: Στρατιωτική περιοχή
-          school: Σχολείο
-          university: Πανεπιστήμιο
-          hospital: Νοσοκομείο
-          building: Σημαντικό κτήριο
-          station: Σιδηροδρομικός σταθμός
-          railway_halt: Σιδηροδρομική στάση
-          subway_station: Σταθμός μετρό
-          tram_stop: Στάση τραμ
-          summit: Κορυφή
-          peak: Κορυφή
-          tunnel: Διακεκομμένο περίβλημα = σήραγγα
-          bridge: Μαύρο περίβλημα = γέφυρα
-          private: Ιδιωτική πρόσβαση
-          destination: Πρόσβαση προορισμού
-          construction: Δρόμοι υπό κατασκευή
-          bus_stop: Στάση λεωφορείου
-          bicycle_shop: Κατάστημα ποδηλάτων
-          bicycle_rental: Ενοικίαση ποδηλάτων
-          bicycle_parking: Χώρος στάθμευσης ποδηλάτων
-          bicycle_parking_small: Μικρό πάρκινγκ ποδηλάτων
-          toilets: Τουαλέτες

     welcome:
       title: Καλώς ήρθατε!
       introduction: Σας καλωσορίζουμε στο OpenStreetMap, τον ελεύθερο και επεξεργάσιμο
     welcome:
       title: Καλώς ήρθατε!
       introduction: Σας καλωσορίζουμε στο OpenStreetMap, τον ελεύθερο και επεξεργάσιμο


@@ -2720,6 +2631,95 @@ el:
           Οποιοσδήποτε μπορεί να στήσει μια ή να συμμετάσχει σε αυτές. Διαβάστε περισσότερα
           στη %{communities_wiki_link}.
         communities_wiki: Wiki σελίδα κοινοτήτων
           Οποιοσδήποτε μπορεί να στήσει μια ή να συμμετάσχει σε αυτές. Διαβάστε περισσότερα
           στη %{communities_wiki_link}.
         communities_wiki: Wiki σελίδα κοινοτήτων

+  map_keys:
+    show:
+      entries:
+        motorway: Αυτοκινητόδρομος
+        main_road: Κύρια οδός
+        trunk: Εθνική οδός
+        primary: Κύρια οδός
+        secondary: Δευτερεύουσα οδός
+        unclassified: Αταξινόμητη οδός
+        pedestrian: Πεζόδρομος
+        track: Αγροτικός / Δασικός δρόμος
+        bridleway: Μονοπάτι για άλογα
+        cycleway: Ποδηλατόδρομος
+        cycleway_national: Εθνικός ποδηλατόδρομος
+        cycleway_regional: Περιφερειακός ποδηλατόδρομος
+        cycleway_local: Τοπικός ποδηλατόδρομος
+        cycleway_mtb: Ορεινή ποδηλατική διαδρομή
+        footway: Μονοπάτι
+        rail: Σιδηρόδρομος
+        train: Τρένο
+        subway: Υπόγειος Σιδηρόδρομος
+        ferry: Πορθμείο
+        light_rail: Ελαφρύς σιδηρόδρομος
+        tram: Τραμ
+        trolleybus: Τρόλεϊ
+        bus: Λεωφορείο
+        cable_car: Τελεφερίκ
+        chair_lift: Αναβατήρας
+        runway: Διάδρομος Αεροδρομίου
+        taxiway: Τροχόδρομος
+        apron: Πίστα προσγείωσης αεροδρομίου
+        admin: Διοικητικό όριο
+        capital: Πρωτεύουσα
+        city: Πόλη
+        orchard: Περιβόλι
+        vineyard: Αμπελώνας
+        forest: Δάσος
+        wood: Δάσος
+        farmland: Καλλιεργήσιμη έκταση
+        grass: Γρασίδι
+        meadow: Λιβάδι
+        bare_rock: Γυμνός βράχος
+        sand: Άμμος
+        golf: Γήπεδο γκολφ
+        park: Πάρκο
+        common: Κοινόχρηστο
+        built_up: Δομημένη περιοχή
+        resident: Κατοικημένη περιοχή
+        retail: Περιοχή λιανικού εμπορίου
+        industrial: Βιομηχανική περιοχή
+        commercial: Εμπορική περιοχή
+        heathland: Φρυγανότοπος
+        scrubland: Θαμνότοπος
+        lake: Λίμνη
+        reservoir: Ταμιευτήρας
+        intermittent_water: Σώμα νερού με διαλείπουσα ροή
+        glacier: Παγετώνας
+        reef: Ύφαλος
+        wetland: Έλος
+        farm: Αγρόκτημα
+        brownfield: Πρώην βιομηχανική περιοχή
+        cemetery: Κοιμητήριο
+        allotments: Παραχώρηση γης
+        pitch: Γήπεδο αθλήματος
+        centre: Αθλητικό κέντρο
+        beach: Παραλία
+        reserve: Φυσικό καταφύγιο
+        military: Στρατιωτική περιοχή
+        school: Σχολείο
+        university: Πανεπιστήμιο
+        hospital: Νοσοκομείο
+        building: Σημαντικό κτήριο
+        station: Σιδηροδρομικός σταθμός
+        railway_halt: Σιδηροδρομική στάση
+        subway_station: Σταθμός μετρό
+        tram_stop: Στάση τραμ
+        summit: Κορυφή
+        peak: Κορυφή
+        tunnel: Διακεκομμένο περίβλημα = σήραγγα
+        bridge: Μαύρο περίβλημα = γέφυρα
+        private: Ιδιωτική πρόσβαση
+        destination: Πρόσβαση προορισμού
+        construction: Δρόμοι υπό κατασκευή
+        bus_stop: Στάση λεωφορείου
+        bicycle_shop: Κατάστημα ποδηλάτων
+        bicycle_rental: Ενοικίαση ποδηλάτων
+        bicycle_parking: Χώρος στάθμευσης ποδηλάτων
+        bicycle_parking_small: Μικρό πάρκινγκ ποδηλάτων
+        toilets: Τουαλέτες

   traces:
     visibility:
       private: Ιδιωτικό (διαμοιρασμός μόνο ως ανώνυμα, μη χρονοσημασμένα σημεία)
   traces:
     visibility:
       private: Ιδιωτικό (διαμοιρασμός μόνο ως ανώνυμα, μη χρονοσημασμένα σημεία)

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 934132002327feb9180fdf6898d518a853dfe1c2..13f6cee5b6d407122695c2680fb73203b9c1fbc5 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1431,64 +1431,6 @@ en-GB:
       where_am_i_title: Describe the current location using the search engine
       submit_text: Go
       reverse_directions_text: Reverse Directions
       where_am_i_title: Describe the current location using the search engine
       submit_text: Go
       reverse_directions_text: Reverse Directions

-    key:
-      table:
-        entry:
-          motorway: Motorway
-          main_road: Main road
-          trunk: Trunk road
-          primary: Primary road
-          secondary: Secondary road
-          unclassified: Unclassified road
-          track: Track
-          bridleway: Bridleway
-          cycleway: Cycleway
-          cycleway_national: National cycleway
-          cycleway_regional: Regional cycleway
-          cycleway_local: Local cycleway
-          footway: Footway
-          rail: Railway
-          subway: Subway
-          cable_car: Cable car
-          chair_lift: Chairlift
-          runway: Airport Runway
-          taxiway: Taxiway
-          apron: Airport apron
-          admin: Administrative boundary
-          forest: Forest
-          wood: Wood
-          golf: Golf course
-          park: Park
-          common: Common
-          resident: Residential area
-          retail: Retail area
-          industrial: Industrial area
-          commercial: Commercial area
-          heathland: Heathland
-          lake: Lake
-          reservoir: Reservoir
-          farm: Farm
-          brownfield: Brownfield site
-          cemetery: Cemetery
-          allotments: Allotments
-          pitch: Sports pitch
-          centre: Sports centre
-          reserve: Nature reserve
-          military: Military area
-          school: School
-          university: University
-          building: Significant building
-          station: Railway station
-          summit: Summit
-          peak: Peak
-          tunnel: Dashed casing = tunnel
-          bridge: Black casing = bridge
-          private: Private access
-          destination: Destination access
-          construction: Roads under construction
-          bicycle_shop: Bicycle shop
-          bicycle_parking: Bicycle parking
-          toilets: Toilets

     welcome:
       title: Welcome!
       introduction: Welcome to OpenStreetMap, the free and editable map of the world.
     welcome:
       title: Welcome!
       introduction: Welcome to OpenStreetMap, the free and editable map of the world.


@@ -1507,6 +1449,64 @@ en-GB:
         title: No Time To Edit? Add a Note!
         para_1: If you just want something small fixed and don't have the time to
           sign up and learn how to edit, it's easy to add a note.
         title: No Time To Edit? Add a Note!
         para_1: If you just want something small fixed and don't have the time to
           sign up and learn how to edit, it's easy to add a note.

+  map_keys:
+    show:
+      entries:
+        motorway: Motorway
+        main_road: Main road
+        trunk: Trunk road
+        primary: Primary road
+        secondary: Secondary road
+        unclassified: Unclassified road
+        track: Track
+        bridleway: Bridleway
+        cycleway: Cycleway
+        cycleway_national: National cycleway
+        cycleway_regional: Regional cycleway
+        cycleway_local: Local cycleway
+        footway: Footway
+        rail: Railway
+        subway: Subway
+        cable_car: Cable car
+        chair_lift: Chairlift
+        runway: Airport Runway
+        taxiway: Taxiway
+        apron: Airport apron
+        admin: Administrative boundary
+        forest: Forest
+        wood: Wood
+        golf: Golf course
+        park: Park
+        common: Common
+        resident: Residential area
+        retail: Retail area
+        industrial: Industrial area
+        commercial: Commercial area
+        heathland: Heathland
+        lake: Lake
+        reservoir: Reservoir
+        farm: Farm
+        brownfield: Brownfield site
+        cemetery: Cemetery
+        allotments: Allotments
+        pitch: Sports pitch
+        centre: Sports centre
+        reserve: Nature reserve
+        military: Military area
+        school: School
+        university: University
+        building: Significant building
+        station: Railway station
+        summit: Summit
+        peak: Peak
+        tunnel: Dashed casing = tunnel
+        bridge: Black casing = bridge
+        private: Private access
+        destination: Destination access
+        construction: Roads under construction
+        bicycle_shop: Bicycle shop
+        bicycle_parking: Bicycle parking
+        toilets: Toilets

   traces:
     visibility:
       private: Private (only shared as anonymous, unordered points)
   traces:
     visibility:
       private: Private (only shared as anonymous, unordered points)

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index c97bfcd78d909971b50c695d4838f542f7ecb6c3..1a1d4c5911803cc8b8a1041fdbaa8fb8ea568b37 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1560,16 +1560,43 @@ eo:
           weir: Riversojlo
           "yes": Akvovojo
       admin_levels:
           weir: Riversojlo
           "yes": Akvovojo
       admin_levels:

-        level2: Limo de lando (niv.2)
-        level3: Regionlimo
-        level4: Limo de provinco (niv.4)
-        level5: Limo de regiono (niv.5)
-        level6: Limo de distrikto (niv.6)
-        level7: Limo de komunumo (niv.7)
-        level8: Limo de urbo (niv.8)
-        level9: Limo de kvartalo (niv.9)
-        level10: Limo de subkvartalo (niv.10)
-        level11: Limo de najbaraĵo (niv.11)
+        level2: Interŝtata limo
+        level3: Administra limo (nivelo 3)
+        level4: Administra limo (nivelo 4)
+        level5: Administra limo (nivelo 5)
+        level6: Administra limo (nivelo 6)
+        level7: Administra limo (nivelo 7)
+        level8: Administra limo (nivelo 8)
+        level9: Administra limo (nivelo 9)
+        level10: Administra limo (nivelo 10)
+        level11: Administra limo (nivelo 11)
+      border_types:
+        arrondissement: Limo de arondismento
+        borough: Limo de municipo («borough»)
+        cercle: Limo de distrikto («cercle»)
+        city: Limo de urbo
+        comarca: Limo de komarko
+        county: Limo de kantono
+        departement: Limo de departemento
+        department: Limo de departemento
+        district: Limo de distrikto
+        distrito: Limo de distrikto
+        freguesia: Limo de komunumo («freguesia»)
+        local_authority: Limo de loka aŭtoritato (PBT)
+        municipality: Limo de municipo
+        municipi: Limo de municipo
+        município: Limo de municipo
+        nation: Interŝtata limo
+        national: Interŝtata limo
+        neighbourhood: Limo de najbaraĵo
+        parish: Limo de paroĥo (nereligia)
+        province: Limo de provinco
+        região: Limo de aŭtonoma regiono
+        region: Limo de regiono
+        state: Limo de subŝtato
+        town: Limo de urbo
+        township: Limo de urbo («township»)
+        village: Limo de municipo («village»)

     results:
       no_results: Neniu rezulto trovita
       more_results: Pliaj rezultoj
     results:
       no_results: Neniu rezulto trovita
       more_results: Pliaj rezultoj


@@ -1580,8 +1607,10 @@ eo:
     index:
       title: Problemoj
       select_status: Elekti staton
     index:
       title: Problemoj
       select_status: Elekti staton

-      select_type: Elekti tipon
+      select_type: Elekti specon
+      select_last_managed_by: Elekti laste pritraktitajn de

       reported_user: Raporti uzanton
       reported_user: Raporti uzanton

+      not_managed: neniu

       search: Serĉi
       search_guidance: 'Serĉi problemon:'
       states:
       search: Serĉi
       search_guidance: 'Serĉi problemon:'
       states:


@@ -1595,6 +1624,7 @@ eo:
       status: Stato
       reports: Raportoj
       last_updated: Laste aktualigita
       status: Stato
       reports: Raportoj
       last_updated: Laste aktualigita

+      last_managed: Lasta pritraktanto

       reporting_users: Raportantaj uzantoj
       reports_count:
         one: '%{count} raporto'
       reporting_users: Raportantaj uzantoj
       reports_count:
         one: '%{count} raporto'


@@ -1641,7 +1671,16 @@ eo:
       reportable_title:
         diary_comment: '%{entry_title}, komento #%{comment_id}'
         note: 'Rimarko #%{note_id}'
       reportable_title:
         diary_comment: '%{entry_title}, komento #%{comment_id}'
         note: 'Rimarko #%{note_id}'

+      reportable_heading:
+        diary_comment_html: Taglibra komento %{title} kreita je %{datetime_created},
+          ĝisdatigita je %{datetime_updated}
+        diary_entry_html: Taglibra afiŝo %{title} kreita je%{datetime_created}, ĝisdatigita
+          je %{datetime_updated}
+        note_html: '%{title} kreita je %{datetime_created}, ĝisdatigita je %{datetime_updated}'
+        user_html: Uzanto %{title} kreita je %{datetime_created}

     reporters:
     reporters:

+      index:
+        title: 'Raportantoj de problemo #%{issue_id}'

       reporters:
         more_reporters: kaj %{count} pli
   issue_comments:
       reporters:
         more_reporters: kaj %{count} pli
   issue_comments:


@@ -2430,95 +2469,6 @@ eo:
         bicycle: Bicikle
         car: Aŭte
         foot: Piede
         bicycle: Bicikle
         car: Aŭte
         foot: Piede

-    key:
-      table:
-        entry:
-          motorway: Aŭtovojo
-          main_road: Ĉefa vojo
-          trunk: Vojo ekspresa
-          primary: Vojo unua-ranga
-          secondary: Vojo dua-ranga
-          unclassified: Vojo kvara-ranga
-          pedestrian: Piedirada strato
-          track: Vojo kampa
-          bridleway: Ĉevalvojo
-          cycleway: Bicikla vojo
-          cycleway_national: Bicikla kurso ŝtata
-          cycleway_regional: Bicikla kurso regiona
-          cycleway_local: Bicikla kurso loka
-          cycleway_mtb: Montbicikla kurso
-          footway: Trotuaro
-          rail: Fervojo
-          train: Vagonaro
-          subway: Metroo
-          ferry: Pramo
-          light_rail: Malpeza vagonaro
-          tram: Tramo
-          trolleybus: Trolebuso
-          bus: Aŭtobuso
-          cable_car: Kablovojo
-          chair_lift: Telfero seĝa
-          runway: Avia dromo
-          taxiway: Aŭtokur-strato
-          apron: Aviadil-parkumejo
-          admin: Administra limo
-          capital: Ĉefurbo
-          city: Urbo
-          orchard: Fruktoĝardeno
-          vineyard: Vinberĝardeno
-          forest: Kultiv-arbaro
-          wood: Arbaro
-          farmland: Agrokultura tereno
-          grass: Herbotapiŝo
-          meadow: Herbejo
-          bare_rock: Roka areo
-          sand: Sabla tereno
-          golf: Golfejo
-          park: Parko
-          common: Publika ripoza tereno
-          built_up: Konstruaĵ-kovrita tereno
-          resident: Privatdoma tereno
-          retail: Komercejo
-          industrial: Industria areo
-          commercial: Oficeja tereno
-          heathland: Erikejo
-          scrubland: Arbustaro
-          lake: Lago
-          reservoir: Lago artefarita
-          intermittent_water: Sezona akvujo
-          glacier: Glacirivero
-          reef: Rifo
-          wetland: Malsekejo
-          farm: Farmobieno
-          brownfield: Antaŭ-konstruejo (post-malkonstruado)
-          cemetery: Tombejo
-          allotments: Familiaj ĝardenoj
-          pitch: Ludkampo
-          centre: Sporta centro
-          beach: Sablobordo
-          reserve: Naturrezervejo
-          military: Armea tereno
-          school: Lernejo
-          university: Universitato
-          hospital: Malsanulejo
-          building: Grava konstruaĵo
-          station: Stacidomo
-          railway_halt: Haltejo fervoja
-          subway_station: Stacio metroa
-          tram_stop: Haltejo trama
-          summit: Montosupro
-          peak: Montpinto
-          tunnel: Strekumita konturo - tunelo
-          bridge: Nigra konturo - ponto
-          private: Privata aliro
-          destination: Aliro nur al celo
-          construction: Vojoj konstruataj
-          bus_stop: Haltejo aŭtobusa
-          bicycle_shop: Bicikl-vendejo
-          bicycle_rental: Bicikl-pruntejo
-          bicycle_parking: Parkumejo bicikla
-          bicycle_parking_small: Malgranda parkumejo bicikla
-          toilets: Necesejo

     welcome:
       title: Bonvenon!
       introduction: Bonvenon al OpenStreetMap, la libera kaj redaktebla mapo de la
     welcome:
       title: Bonvenon!
       introduction: Bonvenon al OpenStreetMap, la libera kaj redaktebla mapo de la


@@ -2593,6 +2543,95 @@ eo:
           aŭ kiel komunumoj. Ĉiu povas aliĝi aŭ krei la propran. Pliaj informoj troviĝas
           sur %{communities_wiki_link}.
         communities_wiki: tiu ĉi viki-paĝo
           aŭ kiel komunumoj. Ĉiu povas aliĝi aŭ krei la propran. Pliaj informoj troviĝas
           sur %{communities_wiki_link}.
         communities_wiki: tiu ĉi viki-paĝo

+  map_keys:
+    show:
+      entries:
+        motorway: Aŭtovojo
+        main_road: Ĉefa vojo
+        trunk: Vojo ekspresa
+        primary: Vojo unua-ranga
+        secondary: Vojo dua-ranga
+        unclassified: Vojo kvara-ranga
+        pedestrian: Piedirada strato
+        track: Vojo kampa
+        bridleway: Ĉevalvojo
+        cycleway: Bicikla vojo
+        cycleway_national: Bicikla kurso ŝtata
+        cycleway_regional: Bicikla kurso regiona
+        cycleway_local: Bicikla kurso loka
+        cycleway_mtb: Montbicikla kurso
+        footway: Trotuaro
+        rail: Fervojo
+        train: Vagonaro
+        subway: Metroo
+        ferry: Pramo
+        light_rail: Malpeza vagonaro
+        tram: Tramo
+        trolleybus: Trolebuso
+        bus: Aŭtobuso
+        cable_car: Kablovojo
+        chair_lift: Telfero seĝa
+        runway: Avia dromo
+        taxiway: Aŭtokur-strato
+        apron: Aviadil-parkumejo
+        admin: Administra limo
+        capital: Ĉefurbo
+        city: Urbo
+        orchard: Fruktoĝardeno
+        vineyard: Vinberĝardeno
+        forest: Kultiv-arbaro
+        wood: Arbaro
+        farmland: Agrokultura tereno
+        grass: Herbotapiŝo
+        meadow: Herbejo
+        bare_rock: Roka areo
+        sand: Sabla tereno
+        golf: Golfejo
+        park: Parko
+        common: Publika ripoza tereno
+        built_up: Konstruaĵ-kovrita tereno
+        resident: Privatdoma tereno
+        retail: Komercejo
+        industrial: Industria areo
+        commercial: Oficeja tereno
+        heathland: Erikejo
+        scrubland: Arbustaro
+        lake: Lago
+        reservoir: Lago artefarita
+        intermittent_water: Sezona akvujo
+        glacier: Glacirivero
+        reef: Rifo
+        wetland: Malsekejo
+        farm: Farmobieno
+        brownfield: Antaŭ-konstruejo (post-malkonstruado)
+        cemetery: Tombejo
+        allotments: Familiaj ĝardenoj
+        pitch: Ludkampo
+        centre: Sporta centro
+        beach: Sablobordo
+        reserve: Naturrezervejo
+        military: Armea tereno
+        school: Lernejo
+        university: Universitato
+        hospital: Malsanulejo
+        building: Grava konstruaĵo
+        station: Stacidomo
+        railway_halt: Haltejo fervoja
+        subway_station: Stacio metroa
+        tram_stop: Haltejo trama
+        summit: Montosupro
+        peak: Montpinto
+        tunnel: Strekumita konturo - tunelo
+        bridge: Nigra konturo - ponto
+        private: Privata aliro
+        destination: Aliro nur al celo
+        construction: Vojoj konstruataj
+        bus_stop: Haltejo aŭtobusa
+        bicycle_shop: Bicikl-vendejo
+        bicycle_rental: Bicikl-pruntejo
+        bicycle_parking: Parkumejo bicikla
+        bicycle_parking_small: Malgranda parkumejo bicikla
+        toilets: Necesejo

   traces:
     visibility:
       private: privata (kunhavigata nur kiel sennomaj, malordigitaj punktoj)
   traces:
     visibility:
       private: privata (kunhavigata nur kiel sennomaj, malordigitaj punktoj)


@@ -2699,11 +2738,11 @@ eo:
     setup_user_auth:
       blocked_zero_hour: Vi havas urĝan mesaĝon en la retejo OpenStreetMap. Vi devas
         legi la mesaĝon antaŭ ol vi povos konservi viajn redaktojn.
     setup_user_auth:
       blocked_zero_hour: Vi havas urĝan mesaĝon en la retejo OpenStreetMap. Vi devas
         legi la mesaĝon antaŭ ol vi povos konservi viajn redaktojn.

-      blocked: Via aliro al API estas blokita. Bonvolu ensaluti al reta interfaco
-        por sciiĝi pli.
-      need_to_see_terms: Via aliro al API estas dumtempe provizore haltigita. Bonvolu
-        ensaluti al reta fasado por legi interkonsenton pri kontribuado. Vi ne devas
-        akcepti ĝin, sed vi devas legi ĝin.
+      blocked: Via aliro al API estas blokita. Ensalutu al reta interfaco por sciiĝi
+        pli.
+      need_to_see_terms: Via aliro al API estas provizore haltigita. Ensalutu al reta
+        fasado por legi la Interkonsenton pri kontribuado. Vi ne devas akcepti ĝin,
+        sed vi devas legi ĝin.

     settings_menu:
       account_settings: Agordoj pri konto
       oauth2_applications: Aplikaĵoj OAuth 2
     settings_menu:
       account_settings: Agordoj pri konto
       oauth2_applications: Aplikaĵoj OAuth 2


@@ -2960,6 +2999,9 @@ eo:
           deleted: forigita
         name_or_email: Nomo aŭ retpoŝta adreso
         ip_address: IP-adreso
           deleted: forigita
         name_or_email: Nomo aŭ retpoŝta adreso
         ip_address: IP-adreso

+        edits: Redaktoj?
+        has_edits: kun redaktoj
+        no_edits: sen redaktoj

         search: Serĉi
       page:
         found_users:
         search: Serĉi
       page:
         found_users:


@@ -3408,6 +3450,12 @@ eo:
     home:
       marker_title: Mia hejmloko
       not_set: Hejmloko ne estas agordita por via konto
     home:
       marker_title: Mia hejmloko
       not_set: Hejmloko ne estas agordita por via konto

+    heatmap:
+      tooltip:
+        no_contributions: neniu kontribuo je %{date}
+        contributions:
+          one: '%{count} kontribuo je %{date}'
+          other: '%{count} kontribuoj je %{date}'

   redactions:
     edit:
       heading: Redakti korekton
   redactions:
     edit:
       heading: Redakti korekton

diff --git a/config/locales/es.yml b/config/locales/es.yml
index bf5e0f85df05895e2282884df213cf5669b1d5a7..7c8736a804bcee63b44620e9e6756e6b775e8c63 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -2475,95 +2475,6 @@ es:
         bicycle: Bicicleta
         car: Automóvil
         foot: A pie
         bicycle: Bicicleta
         car: Automóvil
         foot: A pie

-    key:
-      table:
-        entry:
-          motorway: Autopista
-          main_road: Vía principal
-          trunk: Vía troncal
-          primary: Vía primaria
-          secondary: Vía secundaria
-          unclassified: Vía de menos nivel
-          pedestrian: Vía peatonal
-          track: Pista
-          bridleway: Vía ecuestre
-          cycleway: Ciclovía
-          cycleway_national: Ciclovía nacional
-          cycleway_regional: Ciclovía regional
-          cycleway_local: Ciclovía local
-          cycleway_mtb: Ruta de bicicleta de montaña
-          footway: Vía peatonal
-          rail: Ferrocarril
-          train: Tren
-          subway: Metro
-          ferry: Ferry
-          light_rail: Tren Ligero
-          tram: Tranvía
-          trolleybus: Trolebús
-          bus: Autobús
-          cable_car: Telecabina
-          chair_lift: Telesilla
-          runway: Pista de aeropuerto
-          taxiway: Calle de rodaje
-          apron: Rampa aeroportuaria
-          admin: Límite administrativo
-          capital: Capital
-          city: Ciudad
-          orchard: Huerta
-          vineyard: Viñedo
-          forest: Bosque
-          wood: Bosque maderable
-          farmland: Tierras de cultivo
-          grass: Césped
-          meadow: Pradera
-          bare_rock: Roca desnuda
-          sand: Arena
-          golf: Campo de golf
-          park: Parque
-          common: Común
-          built_up: Área construida
-          resident: Zona residencial
-          retail: Zona de comercios
-          industrial: Zona industrial
-          commercial: Zona comercial
-          heathland: Brezal
-          scrubland: Matorral
-          lake: Lago
-          reservoir: Embalse
-          intermittent_water: Cuerpo de agua intermitente
-          glacier: Glaciar
-          reef: Arrecife
-          wetland: Pantano
-          farm: Granja
-          brownfield: Sitio baldío
-          cemetery: Cementerio
-          allotments: Huertos de ocio
-          pitch: Campo de juego
-          centre: Centro deportivo
-          beach: Playa
-          reserve: Reserva natural
-          military: Área militar
-          school: Escuela
-          university: Universidad
-          hospital: Hospital
-          building: Edificio significativo
-          station: Estación de tren
-          railway_halt: Parada de ferrocarril
-          subway_station: Estación de metro
-          tram_stop: Parada de tranvía
-          summit: Cumbre
-          peak: Pico
-          tunnel: Borde a rayas = túnel
-          bridge: Borde negro = puente
-          private: Acceso privado
-          destination: Acceso a destino
-          construction: Vías en construcción
-          bus_stop: Parada de autobuses
-          bicycle_shop: Tienda de bicicletas
-          bicycle_rental: Alquiler de bicicletas
-          bicycle_parking: Estacionamiento de bicicletas
-          bicycle_parking_small: Pequeño aparcamiento para bicicletas
-          toilets: Baños

     welcome:
       title: ¡Bienvenido!
       introduction: Te damos la bienvenida a OpenStreetMap, el mapa libre y editable
     welcome:
       title: ¡Bienvenido!
       introduction: Te damos la bienvenida a OpenStreetMap, el mapa libre y editable


@@ -2642,6 +2553,95 @@ es:
           comunitario. Cualquiera puede crearlos o unirse a estos. Obten más información en %{communities_wiki_link}.
         communities_wiki: Página wiki de comunidades
         communities_wiki_url: https://wiki.openstreetmap.org/wiki/ES:Grupo_de_usuarios
           comunitario. Cualquiera puede crearlos o unirse a estos. Obten más información en %{communities_wiki_link}.
         communities_wiki: Página wiki de comunidades
         communities_wiki_url: https://wiki.openstreetmap.org/wiki/ES:Grupo_de_usuarios

+  map_keys:
+    show:
+      entries:
+        motorway: Autopista
+        main_road: Vía principal
+        trunk: Vía troncal
+        primary: Vía primaria
+        secondary: Vía secundaria
+        unclassified: Vía de menos nivel
+        pedestrian: Vía peatonal
+        track: Pista
+        bridleway: Vía ecuestre
+        cycleway: Ciclovía
+        cycleway_national: Ciclovía nacional
+        cycleway_regional: Ciclovía regional
+        cycleway_local: Ciclovía local
+        cycleway_mtb: Ruta de bicicleta de montaña
+        footway: Vía peatonal
+        rail: Ferrocarril
+        train: Tren
+        subway: Metro
+        ferry: Ferry
+        light_rail: Tren Ligero
+        tram: Tranvía
+        trolleybus: Trolebús
+        bus: Autobús
+        cable_car: Telecabina
+        chair_lift: Telesilla
+        runway: Pista de aeropuerto
+        taxiway: Calle de rodaje
+        apron: Rampa aeroportuaria
+        admin: Límite administrativo
+        capital: Capital
+        city: Ciudad
+        orchard: Huerta
+        vineyard: Viñedo
+        forest: Bosque
+        wood: Bosque maderable
+        farmland: Tierras de cultivo
+        grass: Césped
+        meadow: Pradera
+        bare_rock: Roca desnuda
+        sand: Arena
+        golf: Campo de golf
+        park: Parque
+        common: Común
+        built_up: Área construida
+        resident: Zona residencial
+        retail: Zona de comercios
+        industrial: Zona industrial
+        commercial: Zona comercial
+        heathland: Brezal
+        scrubland: Matorral
+        lake: Lago
+        reservoir: Embalse
+        intermittent_water: Cuerpo de agua intermitente
+        glacier: Glaciar
+        reef: Arrecife
+        wetland: Pantano
+        farm: Granja
+        brownfield: Sitio baldío
+        cemetery: Cementerio
+        allotments: Huertos de ocio
+        pitch: Campo de juego
+        centre: Centro deportivo
+        beach: Playa
+        reserve: Reserva natural
+        military: Área militar
+        school: Escuela
+        university: Universidad
+        hospital: Hospital
+        building: Edificio significativo
+        station: Estación de tren
+        railway_halt: Parada de ferrocarril
+        subway_station: Estación de metro
+        tram_stop: Parada de tranvía
+        summit: Cumbre
+        peak: Pico
+        tunnel: Borde a rayas = túnel
+        bridge: Borde negro = puente
+        private: Acceso privado
+        destination: Acceso a destino
+        construction: Vías en construcción
+        bus_stop: Parada de autobuses
+        bicycle_shop: Tienda de bicicletas
+        bicycle_rental: Alquiler de bicicletas
+        bicycle_parking: Estacionamiento de bicicletas
+        bicycle_parking_small: Pequeño aparcamiento para bicicletas
+        toilets: Baños

   traces:
     visibility:
       private: Privado (solo compartido como anónimo, puntos no ordenados)
   traces:
     visibility:
       private: Privado (solo compartido como anónimo, puntos no ordenados)

diff --git a/config/locales/et.yml b/config/locales/et.yml
index 23545433aff3097aaba3b4ee70ac403a2349f407..74a764bcbf9c09101bf773943b786e8b6fbf621d 100644 (file)
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -2260,95 +2260,6 @@ et:
         bicycle: Rattaga
         car: Autoga
         foot: Jalgsi
         bicycle: Rattaga
         car: Autoga
         foot: Jalgsi

-    key:
-      table:
-        entry:
-          motorway: Kiirtee
-          main_road: Peatee
-          trunk: Esimese klassi tee
-          primary: Põhimaantee
-          secondary: Tugimaantee
-          unclassified: Klassifitseerimata tee
-          pedestrian: Jalakäijate tee
-          track: Rada
-          bridleway: Ratsatee
-          cycleway: Jalgrattatee
-          cycleway_national: Riigiülene jalgrattatee
-          cycleway_regional: Piirkondlik jalgrattatee
-          cycleway_local: Kohalik jalgrattatee
-          cycleway_mtb: Mägirattarada
-          footway: Jalgtee
-          rail: Raudtee
-          train: Rong
-          subway: Metroo
-          ferry: Praam
-          light_rail: Kergraudtee
-          tram: Tramm
-          trolleybus: Trollibuss
-          bus: Buss
-          cable_car: Köisraudtee
-          chair_lift: Toolilift
-          runway: Lennurada
-          taxiway: Ruleerimistee
-          apron: Lennujaama perroon
-          admin: Halduspiir
-          capital: Pealinn
-          city: Linn
-          orchard: Viljapuuaed
-          vineyard: Viinamarjaistandus
-          forest: Tulundusmets
-          wood: Mets
-          farmland: Põllumaa
-          grass: Muru
-          meadow: Niit
-          bare_rock: Paljand
-          sand: Liiv
-          golf: Golfiväljak
-          park: Park
-          common: Heinamaa
-          built_up: Hoonestatud ala
-          resident: Elamurajoon
-          retail: Kaubanduspiirkond
-          industrial: Tööstuspiirkond
-          commercial: Äripiirkond
-          heathland: Nõmm
-          scrubland: Võsamaa
-          lake: Järv
-          reservoir: Veehoidla
-          intermittent_water: Perioodiline veekogu
-          glacier: Liustik
-          reef: Riff
-          wetland: Märgala
-          farm: Põllumajanduslik maa
-          brownfield: Ehitusmaa
-          cemetery: Surnuaed
-          allotments: Aiamaa
-          pitch: Spordiväljak
-          centre: Spordikeskus
-          beach: Rand
-          reserve: Looduskaitseala
-          military: Militaarala
-          school: Kool
-          university: Ülikool
-          hospital: Haigla
-          building: Märkimisväärne hoone
-          station: Raudteejaam
-          railway_halt: Raudteepeatus
-          subway_station: Metroojaam
-          tram_stop: Trammipeatus
-          summit: Mäetipp
-          peak: Mäetipp
-          tunnel: Katkendlik ümbris = tunnel
-          bridge: Must ümbris = sild
-          private: Üksnes omanikule
-          destination: Üksnes läbisõiduks
-          construction: Ehitatavad teed
-          bus_stop: Bussipeatus
-          bicycle_shop: Rattapood
-          bicycle_rental: Jalgrattarent
-          bicycle_parking: Jalgrattaparkla
-          bicycle_parking_small: Väike jalgrattaparkla
-          toilets: Tualettruumid

     welcome:
       title: Tere tulemast!
       introduction: Tere tulemast OpenStreetMapi, vabasse ja muudetavasse maailmakaarti.
     welcome:
       title: Tere tulemast!
       introduction: Tere tulemast OpenStreetMapi, vabasse ja muudetavasse maailmakaarti.


@@ -2420,6 +2331,95 @@ et:
           Rühma ei pea moodustama haruühinguna ega sama ametlikul moel.
           Paljud rühmad tegutsevad õigupoolest väga edukalt, olles kokku tulnud mitteametlikult või kogukonnarühmana. Igaüks võib neid kokku kutsuda või nendega ühineda. Loe rohkem %{communities_wiki_link}.
         communities_wiki: kogukondade viki leheküljelt
           Rühma ei pea moodustama haruühinguna ega sama ametlikul moel.
           Paljud rühmad tegutsevad õigupoolest väga edukalt, olles kokku tulnud mitteametlikult või kogukonnarühmana. Igaüks võib neid kokku kutsuda või nendega ühineda. Loe rohkem %{communities_wiki_link}.
         communities_wiki: kogukondade viki leheküljelt

+  map_keys:
+    show:
+      entries:
+        motorway: Kiirtee
+        main_road: Peatee
+        trunk: Esimese klassi tee
+        primary: Põhimaantee
+        secondary: Tugimaantee
+        unclassified: Klassifitseerimata tee
+        pedestrian: Jalakäijate tee
+        track: Rada
+        bridleway: Ratsatee
+        cycleway: Jalgrattatee
+        cycleway_national: Riigiülene jalgrattatee
+        cycleway_regional: Piirkondlik jalgrattatee
+        cycleway_local: Kohalik jalgrattatee
+        cycleway_mtb: Mägirattarada
+        footway: Jalgtee
+        rail: Raudtee
+        train: Rong
+        subway: Metroo
+        ferry: Praam
+        light_rail: Kergraudtee
+        tram: Tramm
+        trolleybus: Trollibuss
+        bus: Buss
+        cable_car: Köisraudtee
+        chair_lift: Toolilift
+        runway: Lennurada
+        taxiway: Ruleerimistee
+        apron: Lennujaama perroon
+        admin: Halduspiir
+        capital: Pealinn
+        city: Linn
+        orchard: Viljapuuaed
+        vineyard: Viinamarjaistandus
+        forest: Tulundusmets
+        wood: Mets
+        farmland: Põllumaa
+        grass: Muru
+        meadow: Niit
+        bare_rock: Paljand
+        sand: Liiv
+        golf: Golfiväljak
+        park: Park
+        common: Heinamaa
+        built_up: Hoonestatud ala
+        resident: Elamurajoon
+        retail: Kaubanduspiirkond
+        industrial: Tööstuspiirkond
+        commercial: Äripiirkond
+        heathland: Nõmm
+        scrubland: Võsamaa
+        lake: Järv
+        reservoir: Veehoidla
+        intermittent_water: Perioodiline veekogu
+        glacier: Liustik
+        reef: Riff
+        wetland: Märgala
+        farm: Põllumajanduslik maa
+        brownfield: Ehitusmaa
+        cemetery: Surnuaed
+        allotments: Aiamaa
+        pitch: Spordiväljak
+        centre: Spordikeskus
+        beach: Rand
+        reserve: Looduskaitseala
+        military: Militaarala
+        school: Kool
+        university: Ülikool
+        hospital: Haigla
+        building: Märkimisväärne hoone
+        station: Raudteejaam
+        railway_halt: Raudteepeatus
+        subway_station: Metroojaam
+        tram_stop: Trammipeatus
+        summit: Mäetipp
+        peak: Mäetipp
+        tunnel: Katkendlik ümbris = tunnel
+        bridge: Must ümbris = sild
+        private: Üksnes omanikule
+        destination: Üksnes läbisõiduks
+        construction: Ehitatavad teed
+        bus_stop: Bussipeatus
+        bicycle_shop: Rattapood
+        bicycle_rental: Jalgrattarent
+        bicycle_parking: Jalgrattaparkla
+        bicycle_parking_small: Väike jalgrattaparkla
+        toilets: Tualettruumid

   traces:
     visibility:
       private: Isiklik (jagatud ainult anonüümselt, järjestamata punktid)
   traces:
     visibility:
       private: Isiklik (jagatud ainult anonüümselt, järjestamata punktid)

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 3a109f087b0a800be9fd85681b7e71f339decf96..fd645dd3a1dff36381faf21a9680bae7e303efa0 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -2145,90 +2145,6 @@ eu:
         bicycle: Bizikleta
         car: Autoz
         foot: Oinez
         bicycle: Bizikleta
         car: Autoz
         foot: Oinez

-    key:
-      table:
-        entry:
-          motorway: Autobidea
-          main_road: Errepide nagusia
-          trunk: Errepide nagusia
-          primary: Lehen mailako errepidea
-          secondary: Bigarren mailako errepidea
-          unclassified: Sailkatu gabeko errepidea
-          pedestrian: Oinezkoen bidea
-          track: Pista
-          bridleway: Oinezkoen gunea
-          cycleway: Bidegorria
-          cycleway_national: Bizikleta bide nazionala
-          cycleway_regional: Eskualde bizikleta bidea
-          cycleway_local: Bizikleta bide lokala
-          cycleway_mtb: Mendiko bizikletarako ibilbidea
-          footway: Oinezkoen bidea
-          rail: Trenbidea
-          train: Trena
-          subway: Metroa
-          ferry: Ferrya
-          light_rail: Trenbide arina
-          tram: Tranbia
-          trolleybus: Trolebusa
-          bus: Autobusa
-          cable_car: Funikularra
-          chair_lift: Teleaulkia
-          runway: Aireportuko Pista
-          taxiway: Taxi-bidea
-          apron: Aireportu plataforma
-          admin: Muga administratiboa
-          capital: Hiriburua
-          city: Hiria
-          orchard: Baratzea
-          vineyard: Mahastia
-          forest: Baso
-          wood: Basoa
-          farmland: Nekazaritza-lurrak
-          grass: Belardia
-          meadow: Larrea
-          bare_rock: Harkaitz biluzia
-          sand: Harea
-          golf: Golf-zelai
-          park: Parke
-          common: Arrunta
-          resident: Etxebizitza ingurua
-          retail: Txikizkako azalera
-          industrial: Industrialdea
-          commercial: Merkataritza eremua
-          heathland: Txilardia
-          scrubland: Sastrakadiak
-          lake: Aintzira
-          reservoir: Urtegia
-          glacier: Glaziarra
-          reef: Arrezifea
-          wetland: Hezegunea
-          farm: Baserria
-          brownfield: Landarik gabeko gunea
-          cemetery: Hilerri
-          allotments: Alokatutako Baratzeak
-          pitch: Kirolgunea
-          centre: Kiroldegi
-          beach: Hondartza
-          reserve: Natura-erreserba
-          military: Eremu militarra
-          school: Eskola
-          university: Unibertsitatea
-          hospital: Ospitalea
-          building: Eraikin garrantzitsua
-          station: Tren geltokia
-          summit: Tontorra
-          peak: Gailurra
-          tunnel: Marratxodun estalkia = tunela
-          bridge: Estalki beltza = zubia
-          private: Sarbide pribatua
-          destination: Helmuga sarbidea
-          construction: Eraikitzen ari diren errepideak
-          bus_stop: Autobus geltokia
-          bicycle_shop: Bizikleta-denda
-          bicycle_rental: Bizikleta alokairua
-          bicycle_parking: Bizikleta-aparkalekua
-          bicycle_parking_small: Bizikleten aparkaleku txikia
-          toilets: Komunak

     welcome:
       title: Ongi etorri!
       introduction: Ongi etorri OpenStreetMapera, edonork alda dezakeen munduko mapa
     welcome:
       title: Ongi etorri!
       introduction: Ongi etorri OpenStreetMapera, edonork alda dezakeen munduko mapa


@@ -2277,6 +2193,90 @@ eu:
           Izan ere, talde asko arrakastaz existitzen dira jendearen bilkura informal gisa edo
           komunitate talde gisa. Edonork konfiguratu edo batu daiteke hauetara. Irakurri gehiago %{communities_wiki_link} webgunean.
         communities_wiki: Komunitateen wiki orria
           Izan ere, talde asko arrakastaz existitzen dira jendearen bilkura informal gisa edo
           komunitate talde gisa. Edonork konfiguratu edo batu daiteke hauetara. Irakurri gehiago %{communities_wiki_link} webgunean.
         communities_wiki: Komunitateen wiki orria

+  map_keys:
+    show:
+      entries:
+        motorway: Autobidea
+        main_road: Errepide nagusia
+        trunk: Errepide nagusia
+        primary: Lehen mailako errepidea
+        secondary: Bigarren mailako errepidea
+        unclassified: Sailkatu gabeko errepidea
+        pedestrian: Oinezkoen bidea
+        track: Pista
+        bridleway: Oinezkoen gunea
+        cycleway: Bidegorria
+        cycleway_national: Bizikleta bide nazionala
+        cycleway_regional: Eskualde bizikleta bidea
+        cycleway_local: Bizikleta bide lokala
+        cycleway_mtb: Mendiko bizikletarako ibilbidea
+        footway: Oinezkoen bidea
+        rail: Trenbidea
+        train: Trena
+        subway: Metroa
+        ferry: Ferrya
+        light_rail: Trenbide arina
+        tram: Tranbia
+        trolleybus: Trolebusa
+        bus: Autobusa
+        cable_car: Funikularra
+        chair_lift: Teleaulkia
+        runway: Aireportuko Pista
+        taxiway: Taxi-bidea
+        apron: Aireportu plataforma
+        admin: Muga administratiboa
+        capital: Hiriburua
+        city: Hiria
+        orchard: Baratzea
+        vineyard: Mahastia
+        forest: Baso
+        wood: Basoa
+        farmland: Nekazaritza-lurrak
+        grass: Belardia
+        meadow: Larrea
+        bare_rock: Harkaitz biluzia
+        sand: Harea
+        golf: Golf-zelai
+        park: Parke
+        common: Arrunta
+        resident: Etxebizitza ingurua
+        retail: Txikizkako azalera
+        industrial: Industrialdea
+        commercial: Merkataritza eremua
+        heathland: Txilardia
+        scrubland: Sastrakadiak
+        lake: Aintzira
+        reservoir: Urtegia
+        glacier: Glaziarra
+        reef: Arrezifea
+        wetland: Hezegunea
+        farm: Baserria
+        brownfield: Landarik gabeko gunea
+        cemetery: Hilerri
+        allotments: Alokatutako Baratzeak
+        pitch: Kirolgunea
+        centre: Kiroldegi
+        beach: Hondartza
+        reserve: Natura-erreserba
+        military: Eremu militarra
+        school: Eskola
+        university: Unibertsitatea
+        hospital: Ospitalea
+        building: Eraikin garrantzitsua
+        station: Tren geltokia
+        summit: Tontorra
+        peak: Gailurra
+        tunnel: Marratxodun estalkia = tunela
+        bridge: Estalki beltza = zubia
+        private: Sarbide pribatua
+        destination: Helmuga sarbidea
+        construction: Eraikitzen ari diren errepideak
+        bus_stop: Autobus geltokia
+        bicycle_shop: Bizikleta-denda
+        bicycle_rental: Bizikleta alokairua
+        bicycle_parking: Bizikleta-aparkalekua
+        bicycle_parking_small: Bizikleten aparkaleku txikia
+        toilets: Komunak

   traces:
     visibility:
       private: Pribatua (puntu anonimo eta desordenatu gisa soilik partekatzen da)
   traces:
     visibility:
       private: Pribatua (puntu anonimo eta desordenatu gisa soilik partekatzen da)

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 2bbeb7f0386da50e2e5b20485b66cb11e577a4f2..05498b7f8217b6721937bc1770c963a37f13c325 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1987,64 +1987,6 @@ fa:
       modes:
         bicycle: دوچرخه
         car: خودرو
       modes:
         bicycle: دوچرخه
         car: خودرو

-    key:
-      table:
-        entry:
-          motorway: آزادراه
-          main_road: جادهٔ اصلی
-          trunk: بزرگراه
-          primary: جادهٔ درجه یک
-          secondary: جادهٔ درجه دو
-          unclassified: جاده
-          track: رد
-          bridleway: راه حیوان رو
-          cycleway: مسیر دوچرخه
-          cycleway_national: مسیر ملی دوچرخه
-          cycleway_regional: مسیر منطقه‌ای دوچرخه
-          cycleway_local: مسیر محلی دوچرخه
-          footway: راه پیاده
-          rail: راه‌آهن
-          subway: مترو
-          cable_car: تله‌فریک
-          chair_lift: صندلی بالابر
-          runway: باند فرودگاه
-          taxiway: خزش‌راه
-          apron: پیشگاه فرودگاه
-          admin: مرز اداری
-          forest: جنگل
-          wood: چوب
-          golf: زمین گلف
-          park: پارک
-          common: مشاع
-          resident: منطقهٔ مسکونی
-          retail: منطقه خرده فروشی
-          industrial: منطقه صنعتی
-          commercial: منطقه تجاری
-          heathland: Heathland
-          lake: دریاچه
-          reservoir: مخزن
-          farm: مزرعه
-          brownfield: سایت قهوه‌ای
-          cemetery: گورستان
-          allotments: اراضی اختصاص‌یافته
-          pitch: زمین ورزشی
-          centre: مرکز ورزشی
-          reserve: طبیعت حفاظت شده
-          military: منطقه نظامی
-          school: مدرسه
-          university: دانشگاه
-          building: ساختمان مهم
-          station: ایستگاه راه آهن
-          summit: چکاد
-          peak: قله
-          tunnel: لبهٔ خط‌چین‌دار = تونل
-          bridge: لبهٔ سیاه = پل
-          private: دسترسی شخصی
-          destination: دسترسی مقصد
-          construction: جاده در دست ساخت
-          bicycle_shop: فروشگاه دوچرخه
-          bicycle_parking: پارکینگ دوچرخه
-          toilets: سرویس‌های بهداشتی

     welcome:
       title: خوش آمدید!
       introduction: به OpenStreetMap، نقشهٔ آزاد و قابل ویرایش جهان، خوش آمدید. اکنون
     welcome:
       title: خوش آمدید!
       introduction: به OpenStreetMap، نقشهٔ آزاد و قابل ویرایش جهان، خوش آمدید. اکنون


@@ -2066,6 +2008,64 @@ fa:
           یک یادداشت بنویسید.
     communities:
       title: جوامع
           یک یادداشت بنویسید.
     communities:
       title: جوامع

+  map_keys:
+    show:
+      entries:
+        motorway: آزادراه
+        main_road: جادهٔ اصلی
+        trunk: بزرگراه
+        primary: جادهٔ درجه یک
+        secondary: جادهٔ درجه دو
+        unclassified: جاده
+        track: رد
+        bridleway: راه حیوان رو
+        cycleway: مسیر دوچرخه
+        cycleway_national: مسیر ملی دوچرخه
+        cycleway_regional: مسیر منطقه‌ای دوچرخه
+        cycleway_local: مسیر محلی دوچرخه
+        footway: راه پیاده
+        rail: راه‌آهن
+        subway: مترو
+        cable_car: تله‌فریک
+        chair_lift: صندلی بالابر
+        runway: باند فرودگاه
+        taxiway: خزش‌راه
+        apron: پیشگاه فرودگاه
+        admin: مرز اداری
+        forest: جنگل
+        wood: چوب
+        golf: زمین گلف
+        park: پارک
+        common: مشاع
+        resident: منطقهٔ مسکونی
+        retail: منطقه خرده فروشی
+        industrial: منطقه صنعتی
+        commercial: منطقه تجاری
+        heathland: Heathland
+        lake: دریاچه
+        reservoir: مخزن
+        farm: مزرعه
+        brownfield: سایت قهوه‌ای
+        cemetery: گورستان
+        allotments: اراضی اختصاص‌یافته
+        pitch: زمین ورزشی
+        centre: مرکز ورزشی
+        reserve: طبیعت حفاظت شده
+        military: منطقه نظامی
+        school: مدرسه
+        university: دانشگاه
+        building: ساختمان مهم
+        station: ایستگاه راه آهن
+        summit: چکاد
+        peak: قله
+        tunnel: لبهٔ خط‌چین‌دار = تونل
+        bridge: لبهٔ سیاه = پل
+        private: دسترسی شخصی
+        destination: دسترسی مقصد
+        construction: جاده در دست ساخت
+        bicycle_shop: فروشگاه دوچرخه
+        bicycle_parking: پارکینگ دوچرخه
+        toilets: سرویس‌های بهداشتی

   traces:
     visibility:
       private: خصوصی (همرسانی فقط به‌صورت گمنام، نقاط نامرتب)
   traces:
     visibility:
       private: خصوصی (همرسانی فقط به‌صورت گمنام، نقاط نامرتب)

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index c57826f2a743753a01eb27059d06ab9e22aae49c..4164010a023b0b1a174aa81d963a316f6851742f 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -2100,92 +2100,6 @@ fi:
         bicycle: Pyörällä
         car: Autolla
         foot: Kävellen
         bicycle: Pyörällä
         car: Autolla
         foot: Kävellen

-    key:
-      table:
-        entry:
-          motorway: Moottoritie
-          main_road: Päätie
-          trunk: Valtatie
-          primary: Kantatie
-          secondary: Seututie
-          unclassified: Luokittelematon tie
-          pedestrian: Jalkakäytävä
-          track: Metsätie
-          bridleway: Ratsastustie
-          cycleway: Pyörätie
-          cycleway_national: Kansallinen pyörätie
-          cycleway_regional: Alueellinen pyörätie
-          cycleway_local: Paikallinen pyörätie
-          cycleway_mtb: Maastopyöräreitti
-          footway: Jalkakäytävä
-          rail: Junarata
-          train: Juna
-          subway: Metro
-          ferry: Lautta
-          light_rail: Pikaraitiotie
-          tram: Raitiotie
-          trolleybus: Johdinauto
-          bus: Bussi
-          cable_car: Köysirata
-          chair_lift: Tuolihissi
-          runway: Lentokentän kiitotie
-          taxiway: Rullaustie
-          apron: Lentokentän asemataso
-          admin: Hallinnollinen raja
-          capital: Pääkaupunki
-          city: Kaupunki
-          orchard: Hedelmätarha
-          vineyard: Viinitarha
-          forest: Talousmetsä
-          wood: Metsä
-          farmland: Viljelysmaa
-          grass: Nurmikko
-          meadow: Niitty
-          bare_rock: Avokallio
-          sand: Hiekka
-          golf: Golfkenttä
-          park: Puisto
-          common: Niitty
-          built_up: Rakennettu alue
-          resident: Asuinalue
-          retail: Kaupallinen alue
-          industrial: Teollisuusalue
-          commercial: Toimistoalue
-          heathland: Kanervikko
-          scrubland: Pensaikko
-          lake: Järvi
-          reservoir: Tekojärvi
-          intermittent_water: Ajoittainen vesi
-          glacier: Jäätikkö
-          reef: Riutta
-          wetland: Kosteikko
-          farm: Maatila
-          brownfield: Purettujen rakennusten alue
-          cemetery: Hautausmaa
-          allotments: Siirtolapuutarha
-          pitch: Urheilukenttä
-          centre: Urheilukeskus
-          beach: Hiekkaranta
-          reserve: Luonnonsuojelualue
-          military: Sotilasalue
-          school: Koulu
-          university: Yliopisto
-          hospital: Sairaala
-          building: Merkittävä rakennus
-          station: Rautatieasema
-          summit: Vuorenhuippu
-          peak: Huippu
-          tunnel: Katkoviivallinen kehys = tunneli
-          bridge: Musta kehys = silta
-          private: Yksityinen
-          destination: Ei läpikulkua
-          construction: Rakenteilla olevia teitä
-          bus_stop: Bussipysäkki
-          bicycle_shop: Pyöräkauppa
-          bicycle_rental: Polkupyörän vuokraus
-          bicycle_parking: Pyöräparkki
-          bicycle_parking_small: Pieni pyöräparkki
-          toilets: Vessat

     welcome:
       title: Tervetuloa!
       introduction: 'Tervetuloa OpenStreetMapiin: ilmaiseen ja vapaasti muokattavaan
     welcome:
       title: Tervetuloa!
       introduction: 'Tervetuloa OpenStreetMapiin: ilmaiseen ja vapaasti muokattavaan


@@ -2230,6 +2144,92 @@ fi:
       other_groups:
         title: Muut ryhmät
         communities_wiki: Yhteisöjen wiki-sivu
       other_groups:
         title: Muut ryhmät
         communities_wiki: Yhteisöjen wiki-sivu

+  map_keys:
+    show:
+      entries:
+        motorway: Moottoritie
+        main_road: Päätie
+        trunk: Valtatie
+        primary: Kantatie
+        secondary: Seututie
+        unclassified: Luokittelematon tie
+        pedestrian: Jalkakäytävä
+        track: Metsätie
+        bridleway: Ratsastustie
+        cycleway: Pyörätie
+        cycleway_national: Kansallinen pyörätie
+        cycleway_regional: Alueellinen pyörätie
+        cycleway_local: Paikallinen pyörätie
+        cycleway_mtb: Maastopyöräreitti
+        footway: Jalkakäytävä
+        rail: Junarata
+        train: Juna
+        subway: Metro
+        ferry: Lautta
+        light_rail: Pikaraitiotie
+        tram: Raitiotie
+        trolleybus: Johdinauto
+        bus: Bussi
+        cable_car: Köysirata
+        chair_lift: Tuolihissi
+        runway: Lentokentän kiitotie
+        taxiway: Rullaustie
+        apron: Lentokentän asemataso
+        admin: Hallinnollinen raja
+        capital: Pääkaupunki
+        city: Kaupunki
+        orchard: Hedelmätarha
+        vineyard: Viinitarha
+        forest: Talousmetsä
+        wood: Metsä
+        farmland: Viljelysmaa
+        grass: Nurmikko
+        meadow: Niitty
+        bare_rock: Avokallio
+        sand: Hiekka
+        golf: Golfkenttä
+        park: Puisto
+        common: Niitty
+        built_up: Rakennettu alue
+        resident: Asuinalue
+        retail: Kaupallinen alue
+        industrial: Teollisuusalue
+        commercial: Toimistoalue
+        heathland: Kanervikko
+        scrubland: Pensaikko
+        lake: Järvi
+        reservoir: Tekojärvi
+        intermittent_water: Ajoittainen vesi
+        glacier: Jäätikkö
+        reef: Riutta
+        wetland: Kosteikko
+        farm: Maatila
+        brownfield: Purettujen rakennusten alue
+        cemetery: Hautausmaa
+        allotments: Siirtolapuutarha
+        pitch: Urheilukenttä
+        centre: Urheilukeskus
+        beach: Hiekkaranta
+        reserve: Luonnonsuojelualue
+        military: Sotilasalue
+        school: Koulu
+        university: Yliopisto
+        hospital: Sairaala
+        building: Merkittävä rakennus
+        station: Rautatieasema
+        summit: Vuorenhuippu
+        peak: Huippu
+        tunnel: Katkoviivallinen kehys = tunneli
+        bridge: Musta kehys = silta
+        private: Yksityinen
+        destination: Ei läpikulkua
+        construction: Rakenteilla olevia teitä
+        bus_stop: Bussipysäkki
+        bicycle_shop: Pyöräkauppa
+        bicycle_rental: Polkupyörän vuokraus
+        bicycle_parking: Pyöräparkki
+        bicycle_parking_small: Pieni pyöräparkki
+        toilets: Vessat

   traces:
     visibility:
       private: Yksityinen (vain pisteet ilman nimeä ja aikaleimoja)
   traces:
     visibility:
       private: Yksityinen (vain pisteet ilman nimeä ja aikaleimoja)

diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index d89f34f3a33ad3d917c7aae6588320cfa6c7cecb..27c2d9abdb081e3aafc2b922bc53b3997bcb1adf 100644 (file)
--- a/config/locales/fit.yml
+++ b/config/locales/fit.yml
@@ -744,14 +744,14 @@ fit:
       to: Määränpää
       where_am_i: Mikä tämä paikka oon?
       submit_text: Hae
       to: Määränpää
       where_am_i: Mikä tämä paikka oon?
       submit_text: Hae

-    key:
-      table:
-        entry:
-          university: yniversiteetti

     welcome:
       title: Tervetuloa!
       add_a_note:
         title: Eikö mookkaaminen innosta? Ilmoita karttavirheistä!
     welcome:
       title: Tervetuloa!
       add_a_note:
         title: Eikö mookkaaminen innosta? Ilmoita karttavirheistä!

+  map_keys:
+    show:
+      entries:
+        university: yniversiteetti

   traces:
     new:
       upload_trace: Ylöslattaa GPS-jälki
   traces:
     new:
       upload_trace: Ylöslattaa GPS-jälki

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index f2e2e0be24c1ea40aea1a3719fef53e4d76a53ca..6e28d30022cce14dc632b8d141e1e08d93fa320b 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -2664,95 +2664,6 @@ fr:
         bicycle: À vélo
         car: En voiture
         foot: À pied
         bicycle: À vélo
         car: En voiture
         foot: À pied

-    key:
-      table:
-        entry:
-          motorway: Autoroute
-          main_road: Route principale
-          trunk: Voie express
-          primary: Route principale
-          secondary: Route secondaire
-          unclassified: Route non classifiée
-          pedestrian: Rue piétonne
-          track: Piste
-          bridleway: Sentier équestre
-          cycleway: Piste cyclable
-          cycleway_national: Itinéraire cyclable national
-          cycleway_regional: Itinéraire cyclable régional
-          cycleway_local: Itinéraire cyclable local
-          cycleway_mtb: Chemin de vélo de montagne
-          footway: Chemin piéton
-          rail: Voie de chemin de fer
-          train: Train
-          subway: Ligne de métro
-          ferry: Ferry
-          light_rail: Voie ferrée légère
-          tram: Tramway
-          trolleybus: Trolleybus
-          bus: Bus
-          cable_car: Téléphérique
-          chair_lift: Télésiège
-          runway: Piste d’aéroport
-          taxiway: Piste de circulation d'un aéroport
-          apron: Stationnement d’avions
-          admin: Limite administrative
-          capital: Capitale
-          city: Ville
-          orchard: Verger
-          vineyard: Vignoble
-          forest: Forêt
-          wood: Bois
-          farmland: Terres agricoles
-          grass: Pelouse
-          meadow: Prairie
-          bare_rock: Roche nue
-          sand: Sable
-          golf: Parcours de golf
-          park: Parc
-          common: Espace commun
-          built_up: Zone bâtie
-          resident: Zone résidentielle
-          retail: Zone de commerce
-          industrial: Zone industrielle
-          commercial: Zone tertiaire
-          heathland: Lande
-          scrubland: Fruticée
-          lake: Lac
-          reservoir: Réservoir
-          intermittent_water: plan d’eau intermittent
-          glacier: Glacier
-          reef: Récif
-          wetland: Zone humide
-          farm: Zone agricole
-          brownfield: Zone de démolition
-          cemetery: Cimetière
-          allotments: Jardins familiaux
-          pitch: Terrain de sport
-          centre: Centre sportif
-          beach: Plage
-          reserve: Réserve naturelle
-          military: Zone militaire
-          school: École
-          university: Université
-          hospital: Hôpital
-          building: Bâtiment important
-          station: Gare ferroviaire
-          railway_halt: Gare ferroviaire
-          subway_station: Station de métro
-          tram_stop: Arrêt de tramway
-          summit: Sommet
-          peak: Pic
-          tunnel: Bordure pointillée = tunnel
-          bridge: Bord noir = pont
-          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_rental: Location de vélos
-          bicycle_parking: Parking à vélos
-          bicycle_parking_small: Petit parking à vélos
-          toilets: Toilettes

     welcome:
       title: Bienvenue !
       introduction: Bienvenue dans OpenStreetMap, la carte du monde libre et éditable.
     welcome:
       title: Bienvenue !
       introduction: Bienvenue dans OpenStreetMap, la carte du monde libre et éditable.


@@ -2834,6 +2745,95 @@ fr:
           Par ailleurs, de nombreux groupes existent déjà avec grand succès en tant que rassemblement informel de personnes ou en tant que groupe communautaire. Vous pouvez les rejoindre ou bien créer le votre. Pour aller plus loin voir la %{communities_wiki_link}.
         communities_wiki: page wiki des communautés
         communities_wiki_url: https://wiki.openstreetmap.org/wiki/FR:User_group
           Par ailleurs, de nombreux groupes existent déjà avec grand succès en tant que rassemblement informel de personnes ou en tant que groupe communautaire. Vous pouvez les rejoindre ou bien créer le votre. Pour aller plus loin voir la %{communities_wiki_link}.
         communities_wiki: page wiki des communautés
         communities_wiki_url: https://wiki.openstreetmap.org/wiki/FR:User_group

+  map_keys:
+    show:
+      entries:
+        motorway: Autoroute
+        main_road: Route principale
+        trunk: Voie express
+        primary: Route principale
+        secondary: Route secondaire
+        unclassified: Route non classifiée
+        pedestrian: Rue piétonne
+        track: Piste
+        bridleway: Sentier équestre
+        cycleway: Piste cyclable
+        cycleway_national: Itinéraire cyclable national
+        cycleway_regional: Itinéraire cyclable régional
+        cycleway_local: Itinéraire cyclable local
+        cycleway_mtb: Chemin de vélo de montagne
+        footway: Chemin piéton
+        rail: Voie de chemin de fer
+        train: Train
+        subway: Ligne de métro
+        ferry: Ferry
+        light_rail: Voie ferrée légère
+        tram: Tramway
+        trolleybus: Trolleybus
+        bus: Bus
+        cable_car: Téléphérique
+        chair_lift: Télésiège
+        runway: Piste d’aéroport
+        taxiway: Piste de circulation d'un aéroport
+        apron: Stationnement d’avions
+        admin: Limite administrative
+        capital: Capitale
+        city: Ville
+        orchard: Verger
+        vineyard: Vignoble
+        forest: Forêt
+        wood: Bois
+        farmland: Terres agricoles
+        grass: Pelouse
+        meadow: Prairie
+        bare_rock: Roche nue
+        sand: Sable
+        golf: Parcours de golf
+        park: Parc
+        common: Espace commun
+        built_up: Zone bâtie
+        resident: Zone résidentielle
+        retail: Zone de commerce
+        industrial: Zone industrielle
+        commercial: Zone tertiaire
+        heathland: Lande
+        scrubland: Fruticée
+        lake: Lac
+        reservoir: Réservoir
+        intermittent_water: plan d’eau intermittent
+        glacier: Glacier
+        reef: Récif
+        wetland: Zone humide
+        farm: Zone agricole
+        brownfield: Zone de démolition
+        cemetery: Cimetière
+        allotments: Jardins familiaux
+        pitch: Terrain de sport
+        centre: Centre sportif
+        beach: Plage
+        reserve: Réserve naturelle
+        military: Zone militaire
+        school: École
+        university: Université
+        hospital: Hôpital
+        building: Bâtiment important
+        station: Gare ferroviaire
+        railway_halt: Gare ferroviaire
+        subway_station: Station de métro
+        tram_stop: Arrêt de tramway
+        summit: Sommet
+        peak: Pic
+        tunnel: Bordure pointillée = tunnel
+        bridge: Bord noir = pont
+        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_rental: Location de vélos
+        bicycle_parking: Parking à vélos
+        bicycle_parking_small: Petit parking à vélos
+        toilets: Toilettes

   traces:
     visibility:
       private: Privé (partagé anonymement, points non ordonnés)
   traces:
     visibility:
       private: Privé (partagé anonymement, points non ordonnés)

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 3893607deeb1e48f9b1ece0912ba847b17ab72c5..a93ce7ff920fa2f5f5924af4f471823d9f31201d 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -1210,50 +1210,6 @@ fur:
         bicycle: Biciclete
         car: Machine
         foot: A pît
         bicycle: Biciclete
         car: Machine
         foot: A pît

-    key:
-      table:
-        entry:
-          motorway: Autostrade
-          main_road: Strade principâl
-          trunk: Strade rapide
-          primary: Strade primarie
-          secondary: Strade secondarie
-          unclassified: Strade no classificade
-          pedestrian: Strade pedonâl
-          track: Piste
-          rail: Ferade
-          subway: Metropolitane
-          ferry: Traghet
-          tram: Tram
-          runway: Piste dal aeropuart
-          admin: Confin aministratîf
-          forest: Bosc
-          grass: Prât
-          meadow: Prâts
-          sand: Savalon
-          golf: Troi di golf
-          park: Parc
-          common: Comugnâi
-          resident: Zone residenziâl
-          retail: Zone di buteghis
-          industrial: Zone industriâl
-          commercial: Aree comerciâl
-          lake: Lâc
-          cemetery: Simiteri
-          pitch: Cjamp sportîf
-          centre: Centri sportîf
-          reserve: Riserve naturâl
-          military: Zone militâr
-          school: Scuele
-          university: Universitât
-          hospital: Ospedâl
-          station: stazion de ferade
-          tunnel: Rie a trats = galarie
-          bridge: Rie nere = puint
-          private: Acès privât
-          construction: Stradis in costruzion
-          bus_stop: Fermade autobus
-          bicycle_shop: Buteghe di bicicletis

     welcome:
       title: Benvignût!
       whats_on_the_map:
     welcome:
       title: Benvignût!
       whats_on_the_map:


@@ -1271,6 +1227,50 @@ fur:
       title: Comunitâts
       other_groups:
         title: Altris grups
       title: Comunitâts
       other_groups:
         title: Altris grups

+  map_keys:
+    show:
+      entries:
+        motorway: Autostrade
+        main_road: Strade principâl
+        trunk: Strade rapide
+        primary: Strade primarie
+        secondary: Strade secondarie
+        unclassified: Strade no classificade
+        pedestrian: Strade pedonâl
+        track: Piste
+        rail: Ferade
+        subway: Metropolitane
+        ferry: Traghet
+        tram: Tram
+        runway: Piste dal aeropuart
+        admin: Confin aministratîf
+        forest: Bosc
+        grass: Prât
+        meadow: Prâts
+        sand: Savalon
+        golf: Troi di golf
+        park: Parc
+        common: Comugnâi
+        resident: Zone residenziâl
+        retail: Zone di buteghis
+        industrial: Zone industriâl
+        commercial: Aree comerciâl
+        lake: Lâc
+        cemetery: Simiteri
+        pitch: Cjamp sportîf
+        centre: Centri sportîf
+        reserve: Riserve naturâl
+        military: Zone militâr
+        school: Scuele
+        university: Universitât
+        hospital: Ospedâl
+        station: stazion de ferade
+        tunnel: Rie a trats = galarie
+        bridge: Rie nere = puint
+        private: Acès privât
+        construction: Stradis in costruzion
+        bus_stop: Fermade autobus
+        bicycle_shop: Buteghe di bicicletis

   traces:
     new:
       upload_trace: Cjame percors GPS
   traces:
     new:
       upload_trace: Cjame percors GPS

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index a7a8162f2a3cbe73cfca935ba6c71fe0f4743829..8c521b56452ac1136edc8dc6782e65a069eedc54 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1902,64 +1902,6 @@ fy:
         bicycle: Fyts
         car: Auto
         foot: Rinne
         bicycle: Fyts
         car: Auto
         foot: Rinne

-    key:
-      table:
-        entry:
-          motorway: Autogongwei
-          main_road: Haadwei
-          trunk: Autowei
-          primary: Primêre wei
-          secondary: Sekundêre wei
-          unclassified: Net-klassifisearre wei
-          track: Lânpaad
-          bridleway: Ruterpaad
-          cycleway: Fytspaad
-          cycleway_national: Nasjonaal fytspaad
-          cycleway_regional: Regionaal fytspaad
-          cycleway_local: Lokaal fytspaad
-          footway: Fuotpaad
-          rail: Spoarwei
-          subway: Metrospoar
-          cable_car: Kabelbaan
-          chair_lift: stuoltsjelift
-          runway: Start-/lânings-
-          taxiway: taksybaan lofthaven
-          apron: Platfoarm
-          admin: Bestjoerlike grins
-          forest: Bosk
-          wood: Wâld
-          golf: Golfbaan
-          park: Park
-          common: Miente
-          resident: Wengebiet
-          retail: Winkelgebiet
-          industrial: Yndustrygebiet
-          commercial: Kommersjeel gebiet
-          heathland: Heidelân
-          lake: Mar
-          reservoir: opslachmar
-          farm: Boerepleats
-          brownfield: Braaklân
-          cemetery: Begraafplak
-          allotments: Folkstunen
-          pitch: Sportfjild
-          centre: Sportsintrum
-          reserve: Natuerreservaat
-          military: Militêr terrein
-          school: Skoalle
-          university: universiteit
-          building: Wichtich gebou
-          station: Spoarweistasjon
-          summit: Top
-          peak: pyk
-          tunnel: Streekte râne = tunnel
-          bridge: Swarte râne = brêge
-          private: Tagong privee
-          destination: Bestimmingsferkear
-          construction: Wegen yn oanlis
-          bicycle_shop: Fytsesaak
-          bicycle_parking: Fytsestalling
-          toilets: Húskes

     welcome:
       title: Wolkom!
       introduction: |-
     welcome:
       title: Wolkom!
       introduction: |-


@@ -1980,6 +1922,64 @@ fy:
         para_1: |-
           At jo allinnich wat lyts oanpasse wolle, en gjin tiid hawwe yn te skriuwen en bewurkjen te learen, is
           in notysje taheakjen noflik.
         para_1: |-
           At jo allinnich wat lyts oanpasse wolle, en gjin tiid hawwe yn te skriuwen en bewurkjen te learen, is
           in notysje taheakjen noflik.

+  map_keys:
+    show:
+      entries:
+        motorway: Autogongwei
+        main_road: Haadwei
+        trunk: Autowei
+        primary: Primêre wei
+        secondary: Sekundêre wei
+        unclassified: Net-klassifisearre wei
+        track: Lânpaad
+        bridleway: Ruterpaad
+        cycleway: Fytspaad
+        cycleway_national: Nasjonaal fytspaad
+        cycleway_regional: Regionaal fytspaad
+        cycleway_local: Lokaal fytspaad
+        footway: Fuotpaad
+        rail: Spoarwei
+        subway: Metrospoar
+        cable_car: Kabelbaan
+        chair_lift: stuoltsjelift
+        runway: Start-/lânings-
+        taxiway: taksybaan lofthaven
+        apron: Platfoarm
+        admin: Bestjoerlike grins
+        forest: Bosk
+        wood: Wâld
+        golf: Golfbaan
+        park: Park
+        common: Miente
+        resident: Wengebiet
+        retail: Winkelgebiet
+        industrial: Yndustrygebiet
+        commercial: Kommersjeel gebiet
+        heathland: Heidelân
+        lake: Mar
+        reservoir: opslachmar
+        farm: Boerepleats
+        brownfield: Braaklân
+        cemetery: Begraafplak
+        allotments: Folkstunen
+        pitch: Sportfjild
+        centre: Sportsintrum
+        reserve: Natuerreservaat
+        military: Militêr terrein
+        school: Skoalle
+        university: universiteit
+        building: Wichtich gebou
+        station: Spoarweistasjon
+        summit: Top
+        peak: pyk
+        tunnel: Streekte râne = tunnel
+        bridge: Swarte râne = brêge
+        private: Tagong privee
+        destination: Bestimmingsferkear
+        construction: Wegen yn oanlis
+        bicycle_shop: Fytsesaak
+        bicycle_parking: Fytsestalling
+        toilets: Húskes

   traces:
     visibility:
       private: Privee (inkeld dield as anonime, net-oardere punten)
   traces:
     visibility:
       private: Privee (inkeld dield as anonime, net-oardere punten)

diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index ae10030b697d9585d965c2168c81313f8f65b64f..6a3ea3bc59e35bad368969f9cba93a64aab1e133 100644 (file)
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -1422,64 +1422,6 @@ ga:
         bicycle: Rothar
         car: Carr
         foot: Ag Siúl
         bicycle: Rothar
         car: Carr
         foot: Ag Siúl

-    key:
-      table:
-        entry:
-          motorway: Mótarbhealach
-          main_road: Príomhbhóthar
-          trunk: Mórbhóthar
-          primary: Príomhbhóthar
-          secondary: Fobhóthar
-          unclassified: Bóthar neamhaicmithe
-          track: Cosán
-          bridleway: Cosán marcaíochta
-          cycleway: Slí rothar
-          cycleway_national: Slí rothar náisiúnta
-          cycleway_regional: Slí rothar réigiúnach
-          cycleway_local: Slí rothar áitiúil
-          footway: Cosán
-          rail: Iarnród
-          subway: Meitreo
-          cable_car: Carr cábla
-          chair_lift: cathaoir chábla
-          runway: Rúidbhealach Aerfoirt
-          taxiway: bealach innealta
-          apron: Naprún Aerfoirt
-          admin: Teorainn riaracháin
-          forest: Foraois
-          wood: Coill
-          golf: Galfchúrsa
-          park: Páirc
-          common: Coimín
-          resident: Ceantar cónaithe
-          retail: Limistéar miondíola
-          industrial: Limistéar tionsclaíoch
-          commercial: Limistéar tráchtála
-          heathland: Móinteach/fraochmhá
-          lake: Loch
-          reservoir: taiscumar
-          farm: Feirm
-          brownfield: Láithreán athfhorbraíochta
-          cemetery: Reilig
-          allotments: Cuibhrinn
-          pitch: Páirc spóirt
-          centre: Ionad spóirt
-          reserve: Tearmann dúlra
-          military: Limistéar míleata
-          school: Scoil
-          university: ollscoil
-          building: Foirgneamh suntasach
-          station: Stáisiún Iarnróid
-          summit: Mullach
-          peak: binn
-          tunnel: Líne bhriste = tollán
-          bridge: Líne dhubh = droichead
-          private: Rochtain phríobháideach
-          destination: Rochtain ar cheann scríbe
-          construction: Bóithre á dtógáil
-          bicycle_shop: Siopa rothar
-          bicycle_parking: Páirceáil do rothair
-          toilets: Leithreas

     welcome:
       title: Fáilte!
       introduction: Fáilte go OpenStreepMap, léarscáil den Domhan atá saor in aisce
     welcome:
       title: Fáilte!
       introduction: Fáilte go OpenStreepMap, léarscáil den Domhan atá saor in aisce


@@ -1500,6 +1442,64 @@ ga:
         para_1: Mura bhfuil tú ag iarraidh ach go ndéanfaí rud beag a cheartú agus
           gan an t-am agat clárú agus foghlaim conas eagarthóireacht a dhéanamh, tá
           sé an-éasca nóta a scríobh.
         para_1: Mura bhfuil tú ag iarraidh ach go ndéanfaí rud beag a cheartú agus
           gan an t-am agat clárú agus foghlaim conas eagarthóireacht a dhéanamh, tá
           sé an-éasca nóta a scríobh.

+  map_keys:
+    show:
+      entries:
+        motorway: Mótarbhealach
+        main_road: Príomhbhóthar
+        trunk: Mórbhóthar
+        primary: Príomhbhóthar
+        secondary: Fobhóthar
+        unclassified: Bóthar neamhaicmithe
+        track: Cosán
+        bridleway: Cosán marcaíochta
+        cycleway: Slí rothar
+        cycleway_national: Slí rothar náisiúnta
+        cycleway_regional: Slí rothar réigiúnach
+        cycleway_local: Slí rothar áitiúil
+        footway: Cosán
+        rail: Iarnród
+        subway: Meitreo
+        cable_car: Carr cábla
+        chair_lift: cathaoir chábla
+        runway: Rúidbhealach Aerfoirt
+        taxiway: bealach innealta
+        apron: Naprún Aerfoirt
+        admin: Teorainn riaracháin
+        forest: Foraois
+        wood: Coill
+        golf: Galfchúrsa
+        park: Páirc
+        common: Coimín
+        resident: Ceantar cónaithe
+        retail: Limistéar miondíola
+        industrial: Limistéar tionsclaíoch
+        commercial: Limistéar tráchtála
+        heathland: Móinteach/fraochmhá
+        lake: Loch
+        reservoir: taiscumar
+        farm: Feirm
+        brownfield: Láithreán athfhorbraíochta
+        cemetery: Reilig
+        allotments: Cuibhrinn
+        pitch: Páirc spóirt
+        centre: Ionad spóirt
+        reserve: Tearmann dúlra
+        military: Limistéar míleata
+        school: Scoil
+        university: ollscoil
+        building: Foirgneamh suntasach
+        station: Stáisiún Iarnróid
+        summit: Mullach
+        peak: binn
+        tunnel: Líne bhriste = tollán
+        bridge: Líne dhubh = droichead
+        private: Rochtain phríobháideach
+        destination: Rochtain ar cheann scríbe
+        construction: Bóithre á dtógáil
+        bicycle_shop: Siopa rothar
+        bicycle_parking: Páirceáil do rothair
+        toilets: Leithreas

   traces:
     visibility:
       private: Príobháideacha (ní chomhroinnfear é ach mar phointí gan ainm, gan ord)
   traces:
     visibility:
       private: Príobháideacha (ní chomhroinnfear é ach mar phointí gan ainm, gan ord)

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index 204332d2e4d5cf68d1d01328abbd7a103654ab53..b32bee47838853b7243e5cd5453352ebaed1c8e9 100644 (file)
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -549,35 +549,35 @@ gcf:
       submit_text: Voyé
       modes:
         bicycle: biskèt
       submit_text: Voyé
       modes:
         bicycle: biskèt

-    key:
-      table:
-        entry:
-          motorway: Lotowout
-          main_road: Chimen a gouvèlman
-          trunk: Wokad
-          primary: Chimen a gouvèlman
-          train: Tren
-          taxiway: Koulwa a avyon
-          city: Vil prensipal
-          forest: Granbwa
-          grass: Zèb
-          sand: Sab
-          lake: Létan
-          reservoir: Rézèvwa
-          reef: Kay
-          cemetery: Simityè
-          beach: Bòdlanmè
-          school: Lékòl
-          hospital: Lopital
-          station: Laga féwovyè
-          peak: Fètay
-          toilets: Kakatwa

     welcome:
       title: Kontan vwè-w!
       rules:
         title: Larèl-la!
       add_a_note:
         the_map: Kat-la
     welcome:
       title: Kontan vwè-w!
       rules:
         title: Larèl-la!
       add_a_note:
         the_map: Kat-la

+  map_keys:
+    show:
+      entries:
+        motorway: Lotowout
+        main_road: Chimen a gouvèlman
+        trunk: Wokad
+        primary: Chimen a gouvèlman
+        train: Tren
+        taxiway: Koulwa a avyon
+        city: Vil prensipal
+        forest: Granbwa
+        grass: Zèb
+        sand: Sab
+        lake: Létan
+        reservoir: Rézèvwa
+        reef: Kay
+        cemetery: Simityè
+        beach: Bòdlanmè
+        school: Lékòl
+        hospital: Lopital
+        station: Laga féwovyè
+        peak: Fètay
+        toilets: Kakatwa

   traces:
     new:
       help: Anmwé
   traces:
     new:
       help: Anmwé

diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 2bf70784a2894575222d4430bc86edacd4e8d4f7..a2b2d431f2acacd8acc420c7f16932e0f572cbe1 100644 (file)
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1511,72 +1511,6 @@ gd:
         bicycle: Rothair
         car: Càr
         foot: Coiseachd
         bicycle: Rothair
         car: Càr
         foot: Coiseachd

-    key:
-      table:
-        entry:
-          motorway: Mòr-rathad
-          main_road: Prìomh-rathad
-          trunk: Prìomh-rathad
-          primary: Prìomh-rathad
-          secondary: Rathad dàrnach
-          unclassified: Rathad neo-sheòrsaichte
-          track: Slighe
-          bridleway: Ceum marcachd
-          cycleway: Slighe baidhseagail
-          cycleway_national: Slighe baidhseagail nàiseanta
-          cycleway_regional: Slighe baidhseagail roinneil
-          cycleway_local: Slighe baidhseagail ionadail
-          footway: Àrainn-choisichean
-          rail: Rèile
-          train: Trèana
-          subway: Meatro
-          ferry: Aiseag
-          light_rail: Rèile aotrom
-          tram: Trama
-          bus: Bus
-          cable_car: Carbad-càbaill
-          chair_lift: Lioft-sèitheir
-          runway: Raon-laighe puirt-adhair
-          taxiway: Raon-cuairteachaidh
-          apron: Aparan puirt-adhair
-          admin: Crìoch rianachd
-          forest: Coille
-          wood: Coille
-          grass: Feur
-          sand: Gainmheach
-          golf: Raon goilf
-          park: Pàirc
-          common: Coitcheann
-          resident: Raon-còmhnaidh
-          retail: Raon bhuitean
-          industrial: Raon gnìomhachais
-          commercial: Raon malairt
-          heathland: Aonach
-          lake: Loch
-          reservoir: Loch-tasgaidh
-          farm: Tuathanas
-          brownfield: Fearann fàs
-          cemetery: Cladh
-          allotments: Cuibhreann talmhainn
-          pitch: Raon spòrs
-          centre: Ionad-spòrs
-          beach: Tràigh
-          reserve: Tèarmann nàdair
-          military: Raon an airm
-          school: Sgoil
-          university: Oilthigh
-          building: Togalach cudromach
-          station: Stèisean-rèile
-          summit: Mullach
-          peak: Sgùrr
-          tunnel: Oir-strìochagan = tunail
-          bridge: Oir-loidhnichean = drochaid
-          private: Cead-inntrigidh prìobhaideach
-          destination: Inntrigeadh a' chinn-uidhe
-          construction: Rathaidean 'gan togail
-          bicycle_shop: Bùth bhaidhseagalan
-          bicycle_parking: Pàirceadh bhaidhseagalan
-          toilets: Taighean-beaga

     welcome:
       title: Fàilte!
       introduction: Fàilte gu OpenStreetMap, mapa saor an t-saoghail a ghabhas deasachadh.
     welcome:
       title: Fàilte!
       introduction: Fàilte gu OpenStreetMap, mapa saor an t-saoghail a ghabhas deasachadh.


@@ -1598,6 +1532,72 @@ gd:
         para_1: Ma thogras tu rud beag a chàradh ach chan eil ùine agad gus clàradh
           agus ionnsachadh mar a nì thu deasachadh, tha e furasta nòta a chur ris.
         the_map: am mapa
         para_1: Ma thogras tu rud beag a chàradh ach chan eil ùine agad gus clàradh
           agus ionnsachadh mar a nì thu deasachadh, tha e furasta nòta a chur ris.
         the_map: am mapa

+  map_keys:
+    show:
+      entries:
+        motorway: Mòr-rathad
+        main_road: Prìomh-rathad
+        trunk: Prìomh-rathad
+        primary: Prìomh-rathad
+        secondary: Rathad dàrnach
+        unclassified: Rathad neo-sheòrsaichte
+        track: Slighe
+        bridleway: Ceum marcachd
+        cycleway: Slighe baidhseagail
+        cycleway_national: Slighe baidhseagail nàiseanta
+        cycleway_regional: Slighe baidhseagail roinneil
+        cycleway_local: Slighe baidhseagail ionadail
+        footway: Àrainn-choisichean
+        rail: Rèile
+        train: Trèana
+        subway: Meatro
+        ferry: Aiseag
+        light_rail: Rèile aotrom
+        tram: Trama
+        bus: Bus
+        cable_car: Carbad-càbaill
+        chair_lift: Lioft-sèitheir
+        runway: Raon-laighe puirt-adhair
+        taxiway: Raon-cuairteachaidh
+        apron: Aparan puirt-adhair
+        admin: Crìoch rianachd
+        forest: Coille
+        wood: Coille
+        grass: Feur
+        sand: Gainmheach
+        golf: Raon goilf
+        park: Pàirc
+        common: Coitcheann
+        resident: Raon-còmhnaidh
+        retail: Raon bhuitean
+        industrial: Raon gnìomhachais
+        commercial: Raon malairt
+        heathland: Aonach
+        lake: Loch
+        reservoir: Loch-tasgaidh
+        farm: Tuathanas
+        brownfield: Fearann fàs
+        cemetery: Cladh
+        allotments: Cuibhreann talmhainn
+        pitch: Raon spòrs
+        centre: Ionad-spòrs
+        beach: Tràigh
+        reserve: Tèarmann nàdair
+        military: Raon an airm
+        school: Sgoil
+        university: Oilthigh
+        building: Togalach cudromach
+        station: Stèisean-rèile
+        summit: Mullach
+        peak: Sgùrr
+        tunnel: Oir-strìochagan = tunail
+        bridge: Oir-loidhnichean = drochaid
+        private: Cead-inntrigidh prìobhaideach
+        destination: Inntrigeadh a' chinn-uidhe
+        construction: Rathaidean 'gan togail
+        bicycle_shop: Bùth bhaidhseagalan
+        bicycle_parking: Pàirceadh bhaidhseagalan
+        toilets: Taighean-beaga

   traces:
     visibility:
       private: Prìobhaideach (cha dèid a cho-roinneadh ach 'na phuingean gun urra
   traces:
     visibility:
       private: Prìobhaideach (cha dèid a cho-roinneadh ach 'na phuingean gun urra

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 19725331c451463a74ff7e7d1781672508349986..0bcb79ea3f5a8ae705cf6edf00eebb4ce4f2fd4b 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -2529,95 +2529,6 @@ gl:
         bicycle: Bicicleta
         car: Coche
         foot: A pé
         bicycle: Bicicleta
         car: Coche
         foot: A pé

-    key:
-      table:
-        entry:
-          motorway: Autoestrada
-          main_road: Estrada principal
-          trunk: Estrada principal
-          primary: Estrada primaria
-          secondary: Estrada secundaria
-          unclassified: Estrada sen clasificar
-          pedestrian: Camiño peonil
-          track: Pista
-          bridleway: Pista de cabalos
-          cycleway: Senda ciclista
-          cycleway_national: Carril bici nacional
-          cycleway_regional: Carril bici rexional
-          cycleway_local: Carril bici local
-          cycleway_mtb: Ruta de bicicleta de montaña
-          footway: Senda peonil
-          rail: Ferrocarril
-          train: Tren
-          subway: Metro
-          ferry: Transbordador
-          light_rail: Metro lixeiro
-          tram: Tranvía
-          trolleybus: Trolebús
-          bus: Autobús
-          cable_car: Teleférico
-          chair_lift: Telecadeira
-          runway: Pista do aeroporto
-          taxiway: Vía de circulación do aeroporto
-          apron: Plataforma do aeroporto
-          admin: Límite administrativo
-          capital: Capital
-          city: Cidade
-          orchard: Horta
-          vineyard: Viñedo
-          forest: Bosque
-          wood: Bosque
-          farmland: Terra de labranza
-          grass: Herba
-          meadow: Pradaría
-          bare_rock: Rocha núa
-          sand: Area
-          golf: Campo de golf
-          park: Parque
-          common: Espazo común
-          built_up: Zona edificada
-          resident: Zona residencial
-          retail: Zona comercial
-          industrial: Zona industrial
-          commercial: Zona de oficinas
-          heathland: Breixeira
-          scrubland: Matogueira
-          lake: Lagoa
-          reservoir: Encoro
-          intermittent_water: Masa de auga intermitente
-          glacier: Glaciar
-          reef: Arrecife
-          wetland: Pantano
-          farm: Granxa
-          brownfield: Lugar baldío
-          cemetery: Cemiterio
-          allotments: Hortas
-          pitch: Cancha deportiva
-          centre: Centro deportivo
-          beach: Praia
-          reserve: Reserva natural
-          military: Zona militar
-          school: Escola
-          university: Universidade
-          hospital: Hospital
-          building: Edificio significativo
-          station: Estación de ferrocarrís
-          railway_halt: Apeadoiro de ferrocarrís
-          subway_station: Estación de metro
-          tram_stop: Parada de tranvía
-          summit: Cumio
-          peak: Cume
-          tunnel: Bordo a raias = túnel
-          bridge: Bordo negro = ponte
-          private: Acceso privado
-          destination: Acceso a destino
-          construction: Estradas baixo construción
-          bus_stop: Parada de bus
-          bicycle_shop: Tenda de bicicletas
-          bicycle_rental: Alugueiro de bicicletas
-          bicycle_parking: Aparcadoiro de bicicletas
-          bicycle_parking_small: Aparcadoiro de bicicletas pequeno
-          toilets: Servizos

     welcome:
       title: Reciba a nosa benvida!
       introduction: Dámoslle a benvida ó OpenStreetMap, o mapa do mundo libre e editábel.
     welcome:
       title: Reciba a nosa benvida!
       introduction: Dámoslle a benvida ó OpenStreetMap, o mapa do mundo libre e editábel.


@@ -2692,6 +2603,95 @@ gl:
           De feito, moitos grupos existen con moito éxito como reunión informal de persoas ou como grupo
           comunitario. Calquera pode configurar ou unirse a estes grupos. Le máis na %{communities_wiki_link}.
         communities_wiki: páxina wiki sobre as comunidades
           De feito, moitos grupos existen con moito éxito como reunión informal de persoas ou como grupo
           comunitario. Calquera pode configurar ou unirse a estes grupos. Le máis na %{communities_wiki_link}.
         communities_wiki: páxina wiki sobre as comunidades

+  map_keys:
+    show:
+      entries:
+        motorway: Autoestrada
+        main_road: Estrada principal
+        trunk: Estrada principal
+        primary: Estrada primaria
+        secondary: Estrada secundaria
+        unclassified: Estrada sen clasificar
+        pedestrian: Camiño peonil
+        track: Pista
+        bridleway: Pista de cabalos
+        cycleway: Senda ciclista
+        cycleway_national: Carril bici nacional
+        cycleway_regional: Carril bici rexional
+        cycleway_local: Carril bici local
+        cycleway_mtb: Ruta de bicicleta de montaña
+        footway: Senda peonil
+        rail: Ferrocarril
+        train: Tren
+        subway: Metro
+        ferry: Transbordador
+        light_rail: Metro lixeiro
+        tram: Tranvía
+        trolleybus: Trolebús
+        bus: Autobús
+        cable_car: Teleférico
+        chair_lift: Telecadeira
+        runway: Pista do aeroporto
+        taxiway: Vía de circulación do aeroporto
+        apron: Plataforma do aeroporto
+        admin: Límite administrativo
+        capital: Capital
+        city: Cidade
+        orchard: Horta
+        vineyard: Viñedo
+        forest: Bosque
+        wood: Bosque
+        farmland: Terra de labranza
+        grass: Herba
+        meadow: Pradaría
+        bare_rock: Rocha núa
+        sand: Area
+        golf: Campo de golf
+        park: Parque
+        common: Espazo común
+        built_up: Zona edificada
+        resident: Zona residencial
+        retail: Zona comercial
+        industrial: Zona industrial
+        commercial: Zona de oficinas
+        heathland: Breixeira
+        scrubland: Matogueira
+        lake: Lagoa
+        reservoir: Encoro
+        intermittent_water: Masa de auga intermitente
+        glacier: Glaciar
+        reef: Arrecife
+        wetland: Pantano
+        farm: Granxa
+        brownfield: Lugar baldío
+        cemetery: Cemiterio
+        allotments: Hortas
+        pitch: Cancha deportiva
+        centre: Centro deportivo
+        beach: Praia
+        reserve: Reserva natural
+        military: Zona militar
+        school: Escola
+        university: Universidade
+        hospital: Hospital
+        building: Edificio significativo
+        station: Estación de ferrocarrís
+        railway_halt: Apeadoiro de ferrocarrís
+        subway_station: Estación de metro
+        tram_stop: Parada de tranvía
+        summit: Cumio
+        peak: Cume
+        tunnel: Bordo a raias = túnel
+        bridge: Bordo negro = ponte
+        private: Acceso privado
+        destination: Acceso a destino
+        construction: Estradas baixo construción
+        bus_stop: Parada de bus
+        bicycle_shop: Tenda de bicicletas
+        bicycle_rental: Alugueiro de bicicletas
+        bicycle_parking: Aparcadoiro de bicicletas
+        bicycle_parking_small: Aparcadoiro de bicicletas pequeno
+        toilets: Servizos

   traces:
     visibility:
       private: Privado (só compartido como anónimo; puntos desordenados)
   traces:
     visibility:
       private: Privado (só compartido como anónimo; puntos desordenados)

diff --git a/config/locales/gu.yml b/config/locales/gu.yml
index 44c82085d45c1293b8f810eb70bcc7d8a2be3b00..69fee0a1112f34213b4543651cd2cc2ba8e42845 100644 (file)
--- a/config/locales/gu.yml
+++ b/config/locales/gu.yml
@@ -678,45 +678,45 @@ gu:
     any_questions:
       title: કોઈ પ્રશ્ન?
       get_help_here: અહીં સહાયતા મેળવો
     any_questions:
       title: કોઈ પ્રશ્ન?
       get_help_here: અહીં સહાયતા મેળવો

-    key:
-      table:
-        entry:
-          main_road: મુખ્ય માર્ગ
-          primary: પ્રાથમિક માર્ગ
-          rail: રેલવે
-          train: ટ્રેન
-          bus: બસ
-          admin: વહીવટી સીમા
-          capital: પાટનગર
-          city: શહેર
-          forest: જંગલ
-          wood: લાકડું
-          farmland: ખેતીની જમીન
-          grass: ઘાસ
-          meadow: ઘાસનું મેદાન
-          sand: રેતી
-          park: પાર્ક
-          industrial: ઔદ્યોગિક વિસ્તાર
-          lake: તળાવ
-          reservoir: જળાશય
-          military: લશ્કરી વિસ્તાર
-          school: શાળા
-          university: યુનિવર્સિટી
-          hospital: હોસ્પિટલ
-          station: રેલવે સ્ટેશન
-          peak: શિખર
-          bus_stop: બસ સ્ટોપ
-          bicycle_shop: સાયકલની દુકાન
-          bicycle_rental: ભાડેથી સાયકલ
-          bicycle_parking: સાયકલ પાર્કિંગ
-          bicycle_parking_small: નાનું સાયકલ પાર્કિંગ
-          toilets: શૌચાલયો

     welcome:
       title: સ્વાગત છે!
       basic_terms:
         editor: સંપાદક
       rules:
         title: નિયમો!
     welcome:
       title: સ્વાગત છે!
       basic_terms:
         editor: સંપાદક
       rules:
         title: નિયમો!

+  map_keys:
+    show:
+      entries:
+        main_road: મુખ્ય માર્ગ
+        primary: પ્રાથમિક માર્ગ
+        rail: રેલવે
+        train: ટ્રેન
+        bus: બસ
+        admin: વહીવટી સીમા
+        capital: પાટનગર
+        city: શહેર
+        forest: જંગલ
+        wood: લાકડું
+        farmland: ખેતીની જમીન
+        grass: ઘાસ
+        meadow: ઘાસનું મેદાન
+        sand: રેતી
+        park: પાર્ક
+        industrial: ઔદ્યોગિક વિસ્તાર
+        lake: તળાવ
+        reservoir: જળાશય
+        military: લશ્કરી વિસ્તાર
+        school: શાળા
+        university: યુનિવર્સિટી
+        hospital: હોસ્પિટલ
+        station: રેલવે સ્ટેશન
+        peak: શિખર
+        bus_stop: બસ સ્ટોપ
+        bicycle_shop: સાયકલની દુકાન
+        bicycle_rental: ભાડેથી સાયકલ
+        bicycle_parking: સાયકલ પાર્કિંગ
+        bicycle_parking_small: નાનું સાયકલ પાર્કિંગ
+        toilets: શૌચાલયો

   traces:
     show:
       filename: 'ફાઇલનામ:'
   traces:
     show:
       filename: 'ફાઇલનામ:'

diff --git a/config/locales/he.yml b/config/locales/he.yml
index dc782f98310049b445be1df339fe335ace0d9ef0..c648f4f4aa8fec82f4e27a2c56bcd4ce72a4e1f4 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -2395,95 +2395,6 @@ he:
         bicycle: באופניים
         car: במכונית
         foot: ברגל
         bicycle: באופניים
         car: במכונית
         foot: ברגל

-    key:
-      table:
-        entry:
-          motorway: כביש מהיר
-          main_road: דרך ראשית
-          trunk: דרך ראשית
-          primary: כביש ראשי
-          secondary: כביש משני
-          unclassified: דרך לא מסווגת
-          pedestrian: דרך להולכי רגל
-          track: מסלול
-          bridleway: מסלול לרכיבת סוסים
-          cycleway: דרך לאופניים
-          cycleway_national: מסלול אופניים לאומי
-          cycleway_regional: מסלול אופניים אזורי
-          cycleway_local: מסלול אופניים מקומי
-          cycleway_mtb: מסלול אופני הרים
-          footway: שביל להולכי רגל
-          rail: מסילת ברזל
-          train: רכבת
-          subway: רכבת תחתית
-          ferry: מעבורת
-          light_rail: רכבת קלה
-          tram: חשמלית
-          trolleybus: טרוליבוס
-          bus: אוטובוס
-          cable_car: רכבל
-          chair_lift: רכבל מושבים
-          runway: מסלול נחיתה
-          taxiway: מסלול הסעה
-          apron: רחבת חניה למטוסים
-          admin: גבול שטח שיפוט
-          capital: בירה
-          city: עיר
-          orchard: מטע
-          vineyard: כרם
-          forest: יער
-          wood: חורשה
-          farmland: שטח חקלאי
-          grass: דשא
-          meadow: אחו
-          bare_rock: סלע חשוף
-          sand: חול
-          golf: מסלול גולף
-          park: פארק
-          common: מרעה
-          built_up: שטח בנוי
-          resident: אזור מגורים
-          retail: אזור קמעונאי
-          industrial: אזור תעשייה
-          commercial: אזור מסחרי
-          heathland: שדה פרא
-          scrubland: בתה
-          lake: אגם
-          reservoir: מאגר
-          intermittent_water: גוף מים תקופתי
-          glacier: קרחון יבשתי
-          reef: שונית
-          wetland: ביצה
-          farm: חווה
-          brownfield: אזור תעשייה נטוש
-          cemetery: בית עלמין
-          allotments: שטחים חקלאיים
-          pitch: מגרש ספורט
-          centre: מרכז ספורט
-          beach: חוף
-          reserve: שמורת טבע
-          military: שטח צבאי
-          school: בית ספר
-          university: אוניברסיטה
-          hospital: בית חולים
-          building: בניין בעל חשיבות
-          station: תחנת רכבת
-          railway_halt: מעצור מסילת ברזל
-          subway_station: תחנת רכבת תחתית
-          tram_stop: תחנת רכבת קלה
-          summit: פסגה
-          peak: פסגה
-          tunnel: קו מקווקו = מנהרה
-          bridge: קו שחור = גשר
-          private: גישה פרטית
-          destination: גישה ליעד
-          construction: דרכים בבנייה
-          bus_stop: תחנת אוטובוס
-          bicycle_shop: חנות אופניים
-          bicycle_rental: השכרת אופניים
-          bicycle_parking: חניית אופניים
-          bicycle_parking_small: חניית אופניים קטנה
-          toilets: שירותים

     welcome:
       title: ברוך בואך!
       introduction: ברוך בואך ל־OpenStreetMap, מפה חופשית של העולם, שאפשר לערוך. עכשיו
     welcome:
       title: ברוך בואך!
       introduction: ברוך בואך ל־OpenStreetMap, מפה חופשית של העולם, שאפשר לערוך. עכשיו


@@ -2550,6 +2461,95 @@ he:
           אומנם, קבוצות רבות קיימות בהצלחה רבה ככינוס בלתי־רשמי של אנשים או כקבוצה
           קהילתית. כל אחד יכול להקים אותן או להצטרף אליהן. אפשר לקרוא עוד ב%{communities_wiki_link}.
         communities_wiki: דף הוויקי של קהילות
           אומנם, קבוצות רבות קיימות בהצלחה רבה ככינוס בלתי־רשמי של אנשים או כקבוצה
           קהילתית. כל אחד יכול להקים אותן או להצטרף אליהן. אפשר לקרוא עוד ב%{communities_wiki_link}.
         communities_wiki: דף הוויקי של קהילות

+  map_keys:
+    show:
+      entries:
+        motorway: כביש מהיר
+        main_road: דרך ראשית
+        trunk: דרך ראשית
+        primary: כביש ראשי
+        secondary: כביש משני
+        unclassified: דרך לא מסווגת
+        pedestrian: דרך להולכי רגל
+        track: מסלול
+        bridleway: מסלול לרכיבת סוסים
+        cycleway: דרך לאופניים
+        cycleway_national: מסלול אופניים לאומי
+        cycleway_regional: מסלול אופניים אזורי
+        cycleway_local: מסלול אופניים מקומי
+        cycleway_mtb: מסלול אופני הרים
+        footway: שביל להולכי רגל
+        rail: מסילת ברזל
+        train: רכבת
+        subway: רכבת תחתית
+        ferry: מעבורת
+        light_rail: רכבת קלה
+        tram: חשמלית
+        trolleybus: טרוליבוס
+        bus: אוטובוס
+        cable_car: רכבל
+        chair_lift: רכבל מושבים
+        runway: מסלול נחיתה
+        taxiway: מסלול הסעה
+        apron: רחבת חניה למטוסים
+        admin: גבול שטח שיפוט
+        capital: בירה
+        city: עיר
+        orchard: מטע
+        vineyard: כרם
+        forest: יער
+        wood: חורשה
+        farmland: שטח חקלאי
+        grass: דשא
+        meadow: אחו
+        bare_rock: סלע חשוף
+        sand: חול
+        golf: מסלול גולף
+        park: פארק
+        common: מרעה
+        built_up: שטח בנוי
+        resident: אזור מגורים
+        retail: אזור קמעונאי
+        industrial: אזור תעשייה
+        commercial: אזור מסחרי
+        heathland: שדה פרא
+        scrubland: בתה
+        lake: אגם
+        reservoir: מאגר
+        intermittent_water: גוף מים תקופתי
+        glacier: קרחון יבשתי
+        reef: שונית
+        wetland: ביצה
+        farm: חווה
+        brownfield: אזור תעשייה נטוש
+        cemetery: בית עלמין
+        allotments: שטחים חקלאיים
+        pitch: מגרש ספורט
+        centre: מרכז ספורט
+        beach: חוף
+        reserve: שמורת טבע
+        military: שטח צבאי
+        school: בית ספר
+        university: אוניברסיטה
+        hospital: בית חולים
+        building: בניין בעל חשיבות
+        station: תחנת רכבת
+        railway_halt: מעצור מסילת ברזל
+        subway_station: תחנת רכבת תחתית
+        tram_stop: תחנת רכבת קלה
+        summit: פסגה
+        peak: פסגה
+        tunnel: קו מקווקו = מנהרה
+        bridge: קו שחור = גשר
+        private: גישה פרטית
+        destination: גישה ליעד
+        construction: דרכים בבנייה
+        bus_stop: תחנת אוטובוס
+        bicycle_shop: חנות אופניים
+        bicycle_rental: השכרת אופניים
+        bicycle_parking: חניית אופניים
+        bicycle_parking_small: חניית אופניים קטנה
+        toilets: שירותים

   traces:
     visibility:
       private: פרטי (משותף רק כאלמוני, נקודות לא ממוינות)
   traces:
     visibility:
       private: פרטי (משותף רק כאלמוני, נקודות לא ממוינות)

diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index aff039b74fb4a7a24950617320de3a3fed3f4953..3e0d01c684f481689a511520fe3502cfbe542bd8 100644 (file)
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -943,38 +943,38 @@ hi:
         title: ओपनस्ट्रीटमैप विकि
     any_questions:
       title: कोई प्रश्न है?
         title: ओपनस्ट्रीटमैप विकि
     any_questions:
       title: कोई प्रश्न है?

-    key:
-      table:
-        entry:
-          motorway: मोटरवे
-          trunk: ट्रंक रोड
-          primary: निजी सड़क
-          secondary: द्वितीय सड़क
-          unclassified: अवर्गीकृत सड़क
-          track: पट्टी
-          footway: पगडंडी
-          rail: रेलवे
-          subway: उपमार्ग
-          bus: बस
-          cable_car: केबल कार
-          runway: एयरपोर्ट रनवे
-          forest: वन
-          wood: लकड़ी
-          grass: घास
-          sand: रेत
-          golf: गोल्फ मैदान
-          park: पार्क
-          resident: रिहायशी क्षेत्र
-          industrial: औद्योगिक क्षेत्र
-          lake: झील
-          farm: खेत
-          cemetery: कब्रिस्तान
-          allotments: आवंटन
-          school: पाठशाला
-          university: विश्वविद्यालय
-          hospital: अस्पताल
-          building: महत्वपूर्ण भवन
-          station: रेलवे स्टेशन
+  map_keys:
+    show:
+      entries:
+        motorway: मोटरवे
+        trunk: ट्रंक रोड
+        primary: निजी सड़क
+        secondary: द्वितीय सड़क
+        unclassified: अवर्गीकृत सड़क
+        track: पट्टी
+        footway: पगडंडी
+        rail: रेलवे
+        subway: उपमार्ग
+        bus: बस
+        cable_car: केबल कार
+        runway: एयरपोर्ट रनवे
+        forest: वन
+        wood: लकड़ी
+        grass: घास
+        sand: रेत
+        golf: गोल्फ मैदान
+        park: पार्क
+        resident: रिहायशी क्षेत्र
+        industrial: औद्योगिक क्षेत्र
+        lake: झील
+        farm: खेत
+        cemetery: कब्रिस्तान
+        allotments: आवंटन
+        school: पाठशाला
+        university: विश्वविद्यालय
+        hospital: अस्पताल
+        building: महत्वपूर्ण भवन
+        station: रेलवे स्टेशन

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

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 61704d6b5165c3ac427949ea9bdbc1c05fdbaee5..53d5303e78fb829b0ae927e730e6c5e93c968105 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1327,64 +1327,6 @@ hr:
         bicycle: Bicikl
         car: Automobil
         foot: Pješke
         bicycle: Bicikl
         car: Automobil
         foot: Pješke

-    key:
-      table:
-        entry:
-          motorway: Autocesta
-          main_road: Glavna cesta
-          trunk: Brza cesta
-          primary: Primarna cesta
-          secondary: Sekundarna cesta
-          unclassified: Nerazvrstana cesta
-          track: Poljski ili šumski put
-          bridleway: Staza za konje
-          cycleway: Biciklistička staza
-          cycleway_national: Državna biciklistička staza
-          cycleway_regional: Regionalna biciklistička staza
-          cycleway_local: Lokalna biciklistička staza
-          footway: Pješačka staza
-          rail: Željeznica
-          subway: Podzemna željeznica
-          cable_car: Kabinska žičara
-          chair_lift: sedežnica
-          runway: Aerodromska pista
-          taxiway: aerodromske ceste (za avione)
-          apron: Parking za avione (apron)
-          admin: Administrativna granica
-          forest: Šuma (održavane, od šumarije)
-          wood: Šume (prirodne, neodržavane)
-          golf: Golf teren
-          park: Park
-          common: Travnjaci
-          resident: Stambeno područje
-          retail: Maloprodajno područje
-          industrial: Industrijsko područje
-          commercial: Poslovno područje
-          heathland: Gustiš, makija, grmlje
-          lake: Jezero
-          reservoir: rezervoar
-          farm: Polja, farme, njive
-          brownfield: Gradilište
-          cemetery: Groblje
-          allotments: Vrtovi
-          pitch: Sportski teren
-          centre: Sportski  centar
-          reserve: Rezervat prirode
-          military: Vojno područje
-          school: Škola
-          university: Sveučilište
-          building: Zgrada
-          station: Željeznički kolodvor
-          summit: Vrh
-          peak: vrhunac
-          tunnel: Iscrtkani rubovi = tunel
-          bridge: Crni rubovi = most
-          private: Privatni pristup
-          destination: Pristup odredištu
-          construction: Ceste u izgradnji
-          bicycle_shop: Biciklistička prodavaonica
-          bicycle_parking: Parkiralište za bicikle
-          toilets: Zahodi

     welcome:
       title: Dobrodošli!
       whats_on_the_map:
     welcome:
       title: Dobrodošli!
       whats_on_the_map:


@@ -1394,6 +1336,64 @@ hr:
         title: Nemaš vremena za uređivanje? Dodaj bilješku!
         para_1: Ako želiš samo napraviti malu doradu i nemaš vremena za registraciju
           i učenje pravila uređivanja, možeš jednostavno dodati bilješku na kartu.
         title: Nemaš vremena za uređivanje? Dodaj bilješku!
         para_1: Ako želiš samo napraviti malu doradu i nemaš vremena za registraciju
           i učenje pravila uređivanja, možeš jednostavno dodati bilješku na kartu.

+  map_keys:
+    show:
+      entries:
+        motorway: Autocesta
+        main_road: Glavna cesta
+        trunk: Brza cesta
+        primary: Primarna cesta
+        secondary: Sekundarna cesta
+        unclassified: Nerazvrstana cesta
+        track: Poljski ili šumski put
+        bridleway: Staza za konje
+        cycleway: Biciklistička staza
+        cycleway_national: Državna biciklistička staza
+        cycleway_regional: Regionalna biciklistička staza
+        cycleway_local: Lokalna biciklistička staza
+        footway: Pješačka staza
+        rail: Željeznica
+        subway: Podzemna željeznica
+        cable_car: Kabinska žičara
+        chair_lift: sedežnica
+        runway: Aerodromska pista
+        taxiway: aerodromske ceste (za avione)
+        apron: Parking za avione (apron)
+        admin: Administrativna granica
+        forest: Šuma (održavane, od šumarije)
+        wood: Šume (prirodne, neodržavane)
+        golf: Golf teren
+        park: Park
+        common: Travnjaci
+        resident: Stambeno područje
+        retail: Maloprodajno područje
+        industrial: Industrijsko područje
+        commercial: Poslovno područje
+        heathland: Gustiš, makija, grmlje
+        lake: Jezero
+        reservoir: rezervoar
+        farm: Polja, farme, njive
+        brownfield: Gradilište
+        cemetery: Groblje
+        allotments: Vrtovi
+        pitch: Sportski teren
+        centre: Sportski  centar
+        reserve: Rezervat prirode
+        military: Vojno područje
+        school: Škola
+        university: Sveučilište
+        building: Zgrada
+        station: Željeznički kolodvor
+        summit: Vrh
+        peak: vrhunac
+        tunnel: Iscrtkani rubovi = tunel
+        bridge: Crni rubovi = most
+        private: Privatni pristup
+        destination: Pristup odredištu
+        construction: Ceste u izgradnji
+        bicycle_shop: Biciklistička prodavaonica
+        bicycle_parking: Parkiralište za bicikle
+        toilets: Zahodi

   traces:
     visibility:
       private: Privatni (prikazuje se kao anonimne, nespoložene točke)
   traces:
     visibility:
       private: Privatni (prikazuje se kao anonimne, nespoložene točke)

diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 8d79fddf69235649d79cf2854f3d44a01726f6a9..b22cbc40bee0250f72bf7aadb96782221aae29db 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -59,6 +59,7 @@ hsb:
       message: Powěsć
       node: Suk
       node_tag: Sukowy atribut
       message: Powěsć
       node: Suk
       node_tag: Sukowy atribut

+      note: Notica

       old_node: Stary suk
       old_node_tag: Atribut stareho suka
       old_relation: Stara relacija
       old_node: Stary suk
       old_node_tag: Atribut stareho suka
       old_relation: Stara relacija


@@ -89,8 +90,9 @@ hsb:
         support_url: URL podpěry
         allow_read_prefs: twoje wužiwarske nastajenja wučitać
         allow_write_prefs: twoje wužiwarske nastajenja změnić.
         support_url: URL podpěry
         allow_read_prefs: twoje wužiwarske nastajenja wučitać
         allow_write_prefs: twoje wužiwarske nastajenja změnić.

-        allow_write_diary: dźenikowe zapiski a komentary spisać a přećelow namakać
+        allow_write_diary: dźenikowe zapiski a komentary wutworić

         allow_write_api: kartu wobdźěłać
         allow_write_api: kartu wobdźěłać

+        allow_write_changeset_comments: sadźby změnow komentować

         allow_read_gpx: twoje priwatne GPS-ćěrje čitać.
         allow_write_gpx: GPS-ćěrje nahrawać
         allow_write_notes: noticy wobdźěłać
         allow_read_gpx: twoje priwatne GPS-ćěrje čitać.
         allow_write_gpx: GPS-ćěrje nahrawać
         allow_write_notes: noticy wobdźěłać


@@ -120,7 +122,7 @@ hsb:
         longitude: Dołhostnik
         public: Zjawny
         description: Wopisanje
         longitude: Dołhostnik
         public: Zjawny
         description: Wopisanje

-        gpx_file: 'GPX-dataju nahrać:'
+        gpx_file: Dataju čary GPS wubrać

         visibility: Widźomnosć
         tagstring: Tagy
       message:
         visibility: Widźomnosć
         tagstring: Tagy
       message:


@@ -251,6 +253,7 @@ hsb:
         reopened_at_by_html: Před %{when} wot %{user} znowa aktiwizowany
       rss:
         title: Pokazki OpenStreetMap
         reopened_at_by_html: Před %{when} wot %{user} znowa aktiwizowany
       rss:
         title: Pokazki OpenStreetMap

+        description_all: Lisćina zdźělenych, skomentowanych abo začinjenych noticow

         description_area: Lisćina pokazkow, kotrež su so za twój wobwod [(%{min_lat}|%{min_lon})
           -- (%{max_lat}|%{max_lon})] zdźělili, komentowali abo sčinili
         description_item: RSS-kanal za pokazku %{id}
         description_area: Lisćina pokazkow, kotrež su so za twój wobwod [(%{min_lat}|%{min_lon})
           -- (%{max_lat}|%{max_lon})] zdźělili, komentowali abo sčinili
         description_item: RSS-kanal za pokazku %{id}


@@ -264,6 +267,7 @@ hsb:
   accounts:
     show:
       title: Konto wobdźěłać
   accounts:
     show:
       title: Konto wobdźěłać

+      my_account: Moje konto

       current email address: Aktualna e-mejlowa adresa
       external auth: Eksterna awtentifikacija
       openid:
       current email address: Aktualna e-mejlowa adresa
       external auth: Eksterna awtentifikacija
       openid:


@@ -276,6 +280,8 @@ hsb:
           za sobuskutkowarjow přehladał a akceptował.
         agreed_with_pd: Sy tež deklarował, zo twoje změny su zjawne.
         link text: što to je?
           za sobuskutkowarjow přehladał a akceptował.
         agreed_with_pd: Sy tež deklarował, zo twoje změny su zjawne.
         link text: što to je?

+        not_agreed_with_pd: Sy deklarował, zo maš swoje změny za zjawne.
+        pd_link_text: deklarować

       save changes button: Změny składować
       delete_account: Konto zhašeć…
     go_public:
       save changes button: Změny składować
       delete_account: Konto zhašeć…
     go_public:


@@ -307,6 +313,7 @@ hsb:
         heading_ct: Wuměnjenja za sobuskutkowarjow
         read_tou: Sym wužiwanske wuměnjenja přečitał a sym z nimi přezjedny|přezjedna
         continue: Dale
         heading_ct: Wuměnjenja za sobuskutkowarjow
         read_tou: Sym wužiwanske wuměnjenja přečitał a sym z nimi přezjedny|přezjedna
         continue: Dale

+        cancel: Přetorhnyć

         you need to accept or decline: Prošu přečitaj nowe wužiwarske wuměnjenja a
           akceptuj abo wotpokazaj je, prjedy hač dale činiš.
         legale_select: 'Prošu wubjer kraj swojeho bydlišća:'
         you need to accept or decline: Prošu přečitaj nowe wužiwarske wuměnjenja a
           akceptuj abo wotpokazaj je, prjedy hač dale činiš.
         legale_select: 'Prošu wubjer kraj swojeho bydlišća:'


@@ -321,7 +328,15 @@ hsb:
           njeakceptować. Za dalše informacije hlej prošu %{terms_declined_link}.
         terms_declined_link: tuta wikistrona
         terms_declined_url: https://wiki.openstreetmap.org/wiki/DE:Contributor_Terms_Declined
           njeakceptować. Za dalše informacije hlej prošu %{terms_declined_link}.
         terms_declined_link: tuta wikistrona
         terms_declined_url: https://wiki.openstreetmap.org/wiki/DE:Contributor_Terms_Declined

+    pd_declarations:
+      show:
+        confirm: Wobkrućić
+      create:
+        already_declared: Sy hižo deklarował, zo maš swoje změny za zjawne.
+        did_not_confirm: Njejsy wobkrućił, zo maš swoje změny za zjawne.

   browse:
   browse:

+    deleted_ago_by_html: Zhašany %{time_ago} wot wužiwarja %{user}
+    edited_ago_by_html: Wobdźěłany %{time_ago} wot wužiwarja %{user}

     version: Wersija
     in_changeset: Sadźba změnow
     anonymous: anonymny
     version: Wersija
     in_changeset: Sadźba změnow
     anonymous: anonymny


@@ -371,12 +386,12 @@ hsb:
         way: Puć
         relation: Relacija
     containing_relation:
         way: Puć
         relation: Relacija
     containing_relation:

-      entry_role_html: Relacija %{relation_name} (jako %{relation_role})
+      entry_role_html: '%{relation_name} (jako %{relation_role})'

     not_found:
       title: Njenamakane
     timeout:
       title: Zmylk časoweho překročenja
     not_found:
       title: Njenamakane
     timeout:
       title: Zmylk časoweho překročenja

-      sorry: Wodaj, traje předołho, daty za %{type} z ID %{id} wotwołać.
+      sorry: Wodaj, traješe předołho, daty za %{type} z ID %{id} wotwołać.

       type:
         node: suk
         way: puć
       type:
         node: suk
         way: puć


@@ -485,6 +500,8 @@ hsb:
         button: Diskusiju abonować
       unsubscribe:
         button: Diskusiju wotskazać
         button: Diskusiju abonować
       unsubscribe:
         button: Diskusiju wotskazać

+    heading:
+      title: Sadźba změnow %{id}

   dashboards:
     contact:
       km away: '%{count} km zdaleny'
   dashboards:
     contact:
       km away: '%{count} km zdaleny'


@@ -530,7 +547,7 @@ hsb:
       discussion: Diskusija
       leave_a_comment: Spisaj komentar
       login_to_leave_a_comment_html: '%{login_link}, zo by komentar spisał(a)'
       discussion: Diskusija
       leave_a_comment: Spisaj komentar
       login_to_leave_a_comment_html: '%{login_link}, zo by komentar spisał(a)'

-      login: Přizjew so
+      login: Přizjewić

     no_such_entry:
       title: Zapisk njebu namakany
       heading: Žadyn zapisk z čisłom %{id}
     no_such_entry:
       title: Zapisk njebu namakany
       heading: Žadyn zapisk z čisłom %{id}


@@ -1330,16 +1347,16 @@ hsb:
           weir: spušćadło
           "yes": wódna dróha
       admin_levels:
           weir: spušćadło
           "yes": wódna dróha
       admin_levels:

-        level2: statna hranica
-        level3: Regionowa hranica
-        level4: krajna hranica
-        level5: regionalna hranica
-        level6: wokrjesna hranica
-        level7: gmejnska hranica
-        level8: měšćanska hranica
-        level9: hranica měšćanskeho dźěla
-        level10: hranica štwórće
-        level11: Susodstwowa hranica
+        level2: Mjezynarodna hranica
+        level3: Administratiwna hranica
+        level4: Administratiwna hranica (runina 4)
+        level5: Administratiwna hranica (runina 5)
+        level6: Administratiwna hranica (runina 6)
+        level7: Administratiwna hranica (runina 7)
+        level8: Administratiwna hranica (runina 8)
+        level9: Administratiwna hranica (runina 9)
+        level10: Administratiwna hranica (runina 10)
+        level11: Administratiwna hranica (runina 11)

     results:
       no_results: Žane wuslědki namakane
       more_results: Dalše wuslědki
     results:
       no_results: Žane wuslědki namakane
       more_results: Dalše wuslědki


@@ -1495,7 +1512,7 @@ hsb:
       see_their_profile_html: Móžeš sej jeho abo jeje profil na %{userurl} wobhladać.
     gpx_failure:
       hi: Witaj %{to_user},
       see_their_profile_html: Móžeš sej jeho abo jeje profil na %{userurl} wobhladać.
     gpx_failure:
       hi: Witaj %{to_user},

-      failed_to_import: 'njemóhło so importować. Zmylk je:'
+      failed_to_import: Zda so, zo so waša dataja njehodźi so jako čara GPS importować.

       subject: '[OpenStreetMap] Zmylk při imporće GPX'
     gpx_success:
       hi: Witaj %{to_user},
       subject: '[OpenStreetMap] Zmylk při imporće GPX'
     gpx_success:
       hi: Witaj %{to_user},


@@ -1561,8 +1578,8 @@ hsb:
           komentował(a). Pokazka je blisko %{place}.'
         commented_note_html: '%{commenter} je kartowu pokazku {{GENDER:%{commenter}|reaktiwizował|reaktiwizowała}},
           kotruž sy komentował. Pokazka je blisko %{place}.'
           komentował(a). Pokazka je blisko %{place}.'
         commented_note_html: '%{commenter} je kartowu pokazku {{GENDER:%{commenter}|reaktiwizował|reaktiwizowała}},
           kotruž sy komentował. Pokazka je blisko %{place}.'

-      details: Dalše podrobnosće wo pokazce namakaš pod %{url}.
-      details_html: Dalše podrobnosće wo pokazce namakaš pod %{url}.
+      details: Wotmołw abo zhoń wjace wo pokazce pod %{url}.
+      details_html: Wotmołw abo zhoń wjace wo pokazce pod %{url}.

     changeset_comment_notification:
       hi: Witaj %{to_user},
       commented:
     changeset_comment_notification:
       hi: Witaj %{to_user},
       commented:


@@ -1581,8 +1598,8 @@ hsb:
         partial_changeset_with_comment: z přispomnjenku „%{changeset_comment}“
         partial_changeset_with_comment_html: z komentarom „%{changeset_comment}“
         partial_changeset_without_comment: bjez komentara
         partial_changeset_with_comment: z přispomnjenku „%{changeset_comment}“
         partial_changeset_with_comment_html: z komentarom „%{changeset_comment}“
         partial_changeset_without_comment: bjez komentara

-      details: Dalše podrobnosće wo sadźbje změnow namakaš na %{url}.
-      details_html: Dalše podrobnosće wo sadźbje změnow namakaš na %{url}.
+      details: Wotmołw abo zhoń wjace wo sadźbje změnow na %{url}.
+      details_html: Wotmołw abo zhoń wjace wo sadźbje změnow na %{url}.

       unsubscribe: Móžeće aktualizacije na tutej sadźbje změnow na %{url}wotskazać.
       unsubscribe_html: Móžeće aktualizacije na tutej sadźbje změnow na %{url}wotskazać.
   confirmations:
       unsubscribe: Móžeće aktualizacije na tutej sadźbje změnow na %{url}wotskazać.
       unsubscribe_html: Móžeće aktualizacije na tutej sadźbje změnow na %{url}wotskazać.
   confirmations:


@@ -1632,7 +1649,7 @@ hsb:
       unread_button: Jako njepřečitanu markěrować
       destroy_button: Wotstronić
       back: Wróćo
       unread_button: Jako njepřečitanu markěrować
       destroy_button: Wotstronić
       back: Wróćo

-      wrong_user: Sy jako `%{user}' přizjewjeny, ale powěsć, kotruž chceš čitać, bu
+      wrong_user: Sy jako '%{user}' přizjewjeny, ale powěsć, kotruž chceš čitać, bu

         na druheho wužiwarja pósłana. Prošu přizjew so z prawym kontom, zo by ju čitał(a).
     destroy:
       destroyed: Powěsć wotstronjena
         na druheho wužiwarja pósłana. Prošu přizjew so z prawym kontom, zo by ju čitał(a).
     destroy:
       destroyed: Powěsć wotstronjena


@@ -1696,7 +1713,7 @@ hsb:
         destroy_button: Wotstronić
     replies:
       new:
         destroy_button: Wotstronić
     replies:
       new:

-        wrong_user: Sy jako `%{user}' přizjewjeny, ale powěsć, na kotruž chceš wotmołwić,
+        wrong_user: Sy jako '%{user}' přizjewjeny, ale powěsć, na kotruž chceš wotmołwić,

           bu na druheho wužiwarja pósłana. Prošu přizjew so z prawym kontom, zo by
           wotmołwił(a).
   passwords:
           bu na druheho wužiwarja pósłana. Prošu přizjew so z prawym kontom, zo by
           wotmołwił(a).
   passwords:


@@ -1750,13 +1767,13 @@ hsb:
       failure: Profil njeda so aktualizować.
   sessions:
     new:
       failure: Profil njeda so aktualizować.
   sessions:
     new:

-      tab_title: Přizjewjenje
+      tab_title: Přizjewić

       email or username: E-mejlowa adresa abo wužiwarske mjeno
       password: Hesło
       remember: Spomjatkować sej
       lost password link: Swoje hesło zabył?
       email or username: E-mejlowa adresa abo wužiwarske mjeno
       password: Hesło
       remember: Spomjatkować sej
       lost password link: Swoje hesło zabył?

-      login_button: Přizjewjenje
-      with external: 'Wužiwaj jako alternatiwu třećeho za přizjewjenje:'
+      login_button: Přizjewić
+      with external: abo přizjew so wot třećeho poskićowarja

       auth failure: Bohužel přizjewjenje z tutymi podaćemi móžno njeje.
     destroy:
       title: Wotzjewić
       auth failure: Bohužel přizjewjenje z tutymi podaćemi móžno njeje.
     destroy:
       title: Wotzjewić


@@ -1975,80 +1992,6 @@ hsb:
         bicycle: Koleso
         car: Awto
         foot: Pěši
         bicycle: Koleso
         car: Awto
         foot: Pěši

-    key:
-      table:
-        entry:
-          motorway: Awtodróha
-          main_road: Hłowna dróha
-          trunk: Dalokodróha
-          primary: Zwjazkowa dróha
-          secondary: Krajna dróha, statna dróha
-          unclassified: Njeklasifikowana dróha
-          track: Čara
-          bridleway: Jěchanski puć
-          cycleway: Kolesowarska šćežka
-          cycleway_national: Narodna kolesowarska šćežka
-          cycleway_regional: Regionalna kolesowarska šćežka
-          cycleway_local: Lokalna kolesowarska šćežka
-          footway: Chódnik
-          rail: Železnica
-          train: Ćah
-          subway: Podzemska železnica
-          ferry: Přewoz
-          light_rail: Měšćanska železnica
-          tram: Nadróžna
-          trolleybus: Obus
-          bus: Bus
-          cable_car: Kablowa nadróžna
-          chair_lift: Sydłowy lift
-          runway: Přizemišćo
-          taxiway: Lětadłowa jězdnja
-          apron: Lětanišćowe předpolo
-          admin: Zarjadniska hranica
-          city: Město
-          forest: Hajina
-          wood: Lěs
-          grass: Trawa
-          meadow: Łuka
-          bare_rock: Naha skała
-          sand: Pěsk
-          golf: Golfownišćo
-          park: Park
-          common: Powšitkowny
-          resident: Bydlenski wobwod
-          retail: Nakupowanišćo
-          industrial: Industrijowa kónčina
-          commercial: Přemysłowa kónčina
-          heathland: Hola
-          lake: Jězor
-          reservoir: Reservoir
-          glacier: Lodowc
-          reef: Rif
-          farm: Farma
-          brownfield: Industrijowe lado
-          cemetery: Kěrchow
-          allotments: Małozahrodki
-          pitch: Sportnišćo
-          centre: Sportowy centrum
-          beach: Brjóh
-          reserve: Přirodoškitne pasmo
-          military: Wojerske pasmo
-          school: Šula
-          university: Uniwersita
-          hospital: Chorownja
-          building: Wuznamne twarjenje
-          station: Dwórnišćo
-          summit: Wjeršk
-          peak: Wjeršk hory
-          tunnel: Smužkowana kroma = tunl
-          bridge: Čorna kroma = móst
-          private: Priwatny přistup
-          destination: Jenož za přidróžnych
-          construction: Dróhi w twarje
-          bus_stop: Busowe zastanišćo
-          bicycle_shop: Kolesarnja
-          bicycle_parking: Kólaso parkowanišćo
-          toilets: Nuzniki

     welcome:
       title: Witaj!
       introduction: Witaj k OpenstreetMap, swobodnej a wobdźěłujomnej karće swěta.
     welcome:
       title: Witaj!
       introduction: Witaj k OpenstreetMap, swobodnej a wobdźěłujomnej karće swěta.


@@ -2083,6 +2026,80 @@ hsb:
       other_groups:
         title: Druhe skupiny
         communities_wiki: Wikistrona zhromadnosćow
       other_groups:
         title: Druhe skupiny
         communities_wiki: Wikistrona zhromadnosćow

+  map_keys:
+    show:
+      entries:
+        motorway: Awtodróha
+        main_road: Hłowna dróha
+        trunk: Dalokodróha
+        primary: Zwjazkowa dróha
+        secondary: Krajna dróha, statna dróha
+        unclassified: Njeklasifikowana dróha
+        track: Čara
+        bridleway: Jěchanski puć
+        cycleway: Kolesowarska šćežka
+        cycleway_national: Narodna kolesowarska šćežka
+        cycleway_regional: Regionalna kolesowarska šćežka
+        cycleway_local: Lokalna kolesowarska šćežka
+        footway: Chódnik
+        rail: Železnica
+        train: Ćah
+        subway: Podzemska železnica
+        ferry: Přewoz
+        light_rail: Měšćanska železnica
+        tram: Nadróžna
+        trolleybus: Obus
+        bus: Bus
+        cable_car: Kablowa nadróžna
+        chair_lift: Sydłowy lift
+        runway: Přizemišćo
+        taxiway: Lětadłowa jězdnja
+        apron: Lětanišćowe předpolo
+        admin: Zarjadniska hranica
+        city: Město
+        forest: Hajina
+        wood: Lěs
+        grass: Trawa
+        meadow: Łuka
+        bare_rock: Naha skała
+        sand: Pěsk
+        golf: Golfownišćo
+        park: Park
+        common: Powšitkowny
+        resident: Bydlenski wobwod
+        retail: Nakupowanišćo
+        industrial: Industrijowa kónčina
+        commercial: Přemysłowa kónčina
+        heathland: Hola
+        lake: Jězor
+        reservoir: Reservoir
+        glacier: Lodowc
+        reef: Rif
+        farm: Farma
+        brownfield: Industrijowe lado
+        cemetery: Kěrchow
+        allotments: Małozahrodki
+        pitch: Sportnišćo
+        centre: Sportowy centrum
+        beach: Brjóh
+        reserve: Přirodoškitne pasmo
+        military: Wojerske pasmo
+        school: Šula
+        university: Uniwersita
+        hospital: Chorownja
+        building: Wuznamne twarjenje
+        station: Dwórnišćo
+        summit: Wjeršk
+        peak: Wjeršk hory
+        tunnel: Smužkowana kroma = tunl
+        bridge: Čorna kroma = móst
+        private: Priwatny přistup
+        destination: Jenož za přidróžnych
+        construction: Dróhi w twarje
+        bus_stop: Busowe zastanišćo
+        bicycle_shop: Kolesarnja
+        bicycle_parking: Kólaso parkowanišćo
+        toilets: Nuzniki

   traces:
     visibility:
       private: Priwatna (jenož jako anonymna, njezrjadowane dypki )
   traces:
     visibility:
       private: Priwatna (jenož jako anonymna, njezrjadowane dypki )


@@ -2194,28 +2211,28 @@ hsb:
         přezjedny być, dyrbiš sej je jenož wobhladać.
     settings_menu:
       account_settings: Kontowe nastajenja
         přezjedny być, dyrbiš sej je jenož wobhladać.
     settings_menu:
       account_settings: Kontowe nastajenja

-      oauth2_applications: Nastajenja OAUTH 2
-      oauth2_authorizations: Prawa OAUTH 2
+      oauth2_applications: Nałoženja OAuth 2
+      oauth2_authorizations: Awtorizacije OAuth 2

       muted_users: Zněmjeni wužiwarjo
     auth_providers:
       openid:
       muted_users: Zněmjeni wužiwarjo
     auth_providers:
       openid:

-        title: Přizjewjenje z OpenID
-        alt: Přizjewjenje z OpenID-URL
+        title: Z OpenID přizjewić
+        alt: Logo OpenID

       google:
       google:

-        title: Přizjewjenje z Google
-        alt: Přizjewjenje z Google OpenID
+        title: Z Google přizjewić
+        alt: Logo Google

       facebook:
       facebook:

-        title: Přizjewjenje z Facebook
-        alt: Přizjewjenje z facebookowym kontom
+        title: Z Facebook přizjewić
+        alt: Logo Facebook

       microsoft:
       microsoft:

-        title: Přizjewjenje z Microsoft
-        alt: Přizjewjenje z kontom Microsoft
+        title: Z Microsoft přizjewić
+        alt: Logo Microsoft

       github:
         title: Z GitHub přizjewić
       github:
         title: Z GitHub přizjewić

-        alt: Z kontom GitHub přizjewić
+        alt: Logo GitHub

       wikipedia:
         title: Z Wikipediju přizjewić
       wikipedia:
         title: Z Wikipediju přizjewić

-        alt: Z kontom Wikipedije přizjewić
+        alt: Logo Wikipedije

   oauth:
     scopes:
       read_prefs: Wužiwarske nastajenja čitać
   oauth:
     scopes:
       read_prefs: Wužiwarske nastajenja čitać


@@ -2275,13 +2292,13 @@ hsb:
         załožić.
       support: pomoc
       about:
         załožić.
       support: pomoc
       about:

-        header: Swobodny a wobdźěłujomny
+        header: Swobodny a wobdźěłujomny.

       display name description: Sy wužiwarske mjeno zjawnje pokazał. Móžeš to pozdźišo
         w nastajenjach změnić.
       by_signing_up:
         privacy_policy: prawidła priwatnosće
       continue: Registrować
       display name description: Sy wužiwarske mjeno zjawnje pokazał. Móžeš to pozdźišo
         w nastajenjach změnić.
       by_signing_up:
         privacy_policy: prawidła priwatnosće
       continue: Registrować

-      use external auth: Jako alternatiwa wužij třeću stronu za přizjewjenje
+      use external auth: abo registruj so wot třećeho poskićowarja

     no_such_user:
       title: Wužiwar njeeksistuje
       heading: Wužiwar %{user} njeeksistuje
     no_such_user:
       title: Wužiwar njeeksistuje
       heading: Wužiwar %{user} njeeksistuje


@@ -2399,15 +2416,15 @@ hsb:
         wužiwarskich nastajenjach zwjazać.
   user_role:
     filter:
         wužiwarskich nastajenjach zwjazać.
   user_role:
     filter:

-      not_a_role: Znamješkowy rjećazk "%{role}" płaćiwa róla njeje.
+      not_a_role: Znamješkowy rjećazk '%{role}' płaćiwa róla njeje.

       already_has_role: Wužiwar hižo ma rólu %{role}.
       doesnt_have_role: Wužiwar nima rólu %{role}.
       not_revoke_admin_current_user: Administratorowa róla njeda so aktualnemu wužiwarjej
         prěč wzać.
     grant:
       already_has_role: Wužiwar hižo ma rólu %{role}.
       doesnt_have_role: Wužiwar nima rólu %{role}.
       not_revoke_admin_current_user: Administratorowa róla njeda so aktualnemu wužiwarjej
         prěč wzać.
     grant:

-      are_you_sure: Chceš woprawdźe wužiwarjej "%{name}" rólu "%{role}" dać?
+      are_you_sure: Chceš woprawdźe wužiwarjej '%{name}' rólu '%{role}' dać?

     revoke:
     revoke:

-      are_you_sure: Chceš woprawdźe wužiwarjej "%{name}" rólu "%{role}" preč wzać?
+      are_you_sure: Chceš woprawdźe wužiwarjej '%{name}' rólu '%{role}' preč wzać?

   user_blocks:
     model:
       non_moderator_update: Dyrbiš moderator być, zo by blokowanje wudźělił abo aktualizował.
   user_blocks:
     model:
       non_moderator_update: Dyrbiš moderator być, zo by blokowanje wudźělił abo aktualizował.


@@ -2561,7 +2578,7 @@ hsb:
       custom_dimensions: Swójske wotměry nastajić
       format: 'Format:'
       scale: 'Měritko:'
       custom_dimensions: Swójske wotměry nastajić
       format: 'Format:'
       scale: 'Měritko:'

-      image_dimensions: Wobraz standardnu runinu pola %{width} x %{height} pokaza
+      image_dimensions: Wobraz runinu %{layer} pola %{width} x %{height} pokaza

       download: Sćahnyć
       short_url: Krótki URL
       include_marker: Kartowu marku stajić
       download: Sćahnyć
       short_url: Krótki URL
       include_marker: Kartowu marku stajić

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 5bb77e70f17a68b074a16d6c41c8c97df21d7afa..6caa2faa431adefb4228613ccc86c3624a7e3c3c 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -2501,95 +2501,6 @@ hu:
         bicycle: Kerékpár
         car: Autó
         foot: Gyalog
         bicycle: Kerékpár
         car: Autó
         foot: Gyalog

-    key:
-      table:
-        entry:
-          motorway: Autópálya
-          main_road: Fő út
-          trunk: Autóút
-          primary: Főút
-          secondary: Összekötő út
-          unclassified: Egyéb út
-          pedestrian: Sétálóutca
-          track: Mezőgazdasági/erdészeti út
-          bridleway: Lovaglóút
-          cycleway: Kerékpárút
-          cycleway_national: Országos kerékpárút
-          cycleway_regional: Regionális kerékpárút
-          cycleway_local: Helyi kerékpárút
-          cycleway_mtb: Hegyikerékpáros útvonal
-          footway: Gyalogút
-          rail: Vasút
-          train: Vonat
-          subway: Metró
-          ferry: Komp
-          light_rail: HÉV
-          tram: Villamos
-          trolleybus: Trolibusz
-          bus: Busz
-          cable_car: Nagykabinos felvonó
-          chair_lift: Ülőlift
-          runway: Kifutópálya
-          taxiway: Gurulóút
-          apron: Forgalmi előtér
-          admin: Közigazgatási határ
-          capital: Főváros
-          city: Nagyváros
-          orchard: Gyümölcsös
-          vineyard: Szőlő
-          forest: Erdő
-          wood: Természetes erdő
-          farmland: Mezőgazdasági terület
-          grass: Fű
-          meadow: Rét
-          bare_rock: Csupasz szikla
-          sand: Homok
-          golf: Golfpálya
-          park: Park
-          common: Füves terület
-          built_up: Beépített terület
-          resident: Gyalogos övezet
-          retail: Kereskedelmi terület
-          industrial: Ipari terület
-          commercial: Kereskedelmi terület
-          heathland: Fenyér
-          scrubland: Bozót
-          lake: Tó
-          reservoir: Víztározó
-          intermittent_water: Időszakos víztest
-          glacier: Gleccser
-          reef: Zátony
-          wetland: Vizenyős terület
-          farm: Tanya
-          brownfield: Bontási terület
-          cemetery: Temető
-          allotments: Kiskertek
-          pitch: Sportpálya
-          centre: Sportközpont
-          beach: Természetes strand
-          reserve: Természetvédelmi terület
-          military: Katonai terület
-          school: Iskola; egyetem
-          university: Egyetem
-          hospital: Kórház
-          building: Fontosabb épület
-          station: Vasútállomás
-          railway_halt: Vasúti megálló
-          subway_station: Metrómegálló
-          tram_stop: Villamosmegálló
-          summit: Hegycsúcs
-          peak: Hegycsúcs
-          tunnel: Szaggatott szegély = alagút
-          bridge: Fekete szegély = híd
-          private: Behajtás csak engedéllyel
-          destination: Csak célforgalom
-          construction: Épülő utak
-          bus_stop: Buszmegálló
-          bicycle_shop: Kerékpárbolt
-          bicycle_rental: Kerékpárkölcsönzés
-          bicycle_parking: Kerékpártároló
-          bicycle_parking_small: Kis kerékpártároló
-          toilets: WC

     welcome:
       title: Üdvözlünk!
       introduction: Üdvözöl az OpenStreetMap - a szabad és szerkeszthető világtérkép
     welcome:
       title: Üdvözlünk!
       introduction: Üdvözöl az OpenStreetMap - a szabad és szerkeszthető világtérkép


@@ -2664,6 +2575,95 @@ hu:
           Ilyent bárki létrehozhat, vagy csatlakozhat ilyenhez. Bővebben a %{communities_wiki_link}in
           olvashatsz.
         communities_wiki: Közösségek wikioldala
           Ilyent bárki létrehozhat, vagy csatlakozhat ilyenhez. Bővebben a %{communities_wiki_link}in
           olvashatsz.
         communities_wiki: Közösségek wikioldala

+  map_keys:
+    show:
+      entries:
+        motorway: Autópálya
+        main_road: Fő út
+        trunk: Autóút
+        primary: Főút
+        secondary: Összekötő út
+        unclassified: Egyéb út
+        pedestrian: Sétálóutca
+        track: Mezőgazdasági/erdészeti út
+        bridleway: Lovaglóút
+        cycleway: Kerékpárút
+        cycleway_national: Országos kerékpárút
+        cycleway_regional: Regionális kerékpárút
+        cycleway_local: Helyi kerékpárút
+        cycleway_mtb: Hegyikerékpáros útvonal
+        footway: Gyalogút
+        rail: Vasút
+        train: Vonat
+        subway: Metró
+        ferry: Komp
+        light_rail: HÉV
+        tram: Villamos
+        trolleybus: Trolibusz
+        bus: Busz
+        cable_car: Nagykabinos felvonó
+        chair_lift: Ülőlift
+        runway: Kifutópálya
+        taxiway: Gurulóút
+        apron: Forgalmi előtér
+        admin: Közigazgatási határ
+        capital: Főváros
+        city: Nagyváros
+        orchard: Gyümölcsös
+        vineyard: Szőlő
+        forest: Erdő
+        wood: Természetes erdő
+        farmland: Mezőgazdasági terület
+        grass: Fű
+        meadow: Rét
+        bare_rock: Csupasz szikla
+        sand: Homok
+        golf: Golfpálya
+        park: Park
+        common: Füves terület
+        built_up: Beépített terület
+        resident: Gyalogos övezet
+        retail: Kereskedelmi terület
+        industrial: Ipari terület
+        commercial: Kereskedelmi terület
+        heathland: Fenyér
+        scrubland: Bozót
+        lake: Tó
+        reservoir: Víztározó
+        intermittent_water: Időszakos víztest
+        glacier: Gleccser
+        reef: Zátony
+        wetland: Vizenyős terület
+        farm: Tanya
+        brownfield: Bontási terület
+        cemetery: Temető
+        allotments: Kiskertek
+        pitch: Sportpálya
+        centre: Sportközpont
+        beach: Természetes strand
+        reserve: Természetvédelmi terület
+        military: Katonai terület
+        school: Iskola; egyetem
+        university: Egyetem
+        hospital: Kórház
+        building: Fontosabb épület
+        station: Vasútállomás
+        railway_halt: Vasúti megálló
+        subway_station: Metrómegálló
+        tram_stop: Villamosmegálló
+        summit: Hegycsúcs
+        peak: Hegycsúcs
+        tunnel: Szaggatott szegély = alagút
+        bridge: Fekete szegély = híd
+        private: Behajtás csak engedéllyel
+        destination: Csak célforgalom
+        construction: Épülő utak
+        bus_stop: Buszmegálló
+        bicycle_shop: Kerékpárbolt
+        bicycle_rental: Kerékpárkölcsönzés
+        bicycle_parking: Kerékpártároló
+        bicycle_parking_small: Kis kerékpártároló
+        toilets: WC

   traces:
     visibility:
       private: Magán (megosztva csak névtelenül, rendezetlen pontok)
   traces:
     visibility:
       private: Magán (megosztva csak névtelenül, rendezetlen pontok)

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 8c27e8c0e12249702c9bd6b38725931bea644b3f..7632f6011799c728f822d3ab99b1c4f302929f49 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -2380,95 +2380,6 @@ ia:
         bicycle: Bicycletta
         car: Auto
         foot: A pede
         bicycle: Bicycletta
         car: Auto
         foot: A pede

-    key:
-      table:
-        entry:
-          motorway: Autostrata
-          main_road: Strata principal
-          trunk: Via national
-          primary: Via primari
-          secondary: Via secundari
-          unclassified: Via non classificate
-          pedestrian: Via pro pedones
-          track: Pista
-          bridleway: Sentiero pro cavallos
-          cycleway: Via cyclabile
-          cycleway_national: Pista cyclabile national
-          cycleway_regional: Pista cyclabile regional
-          cycleway_local: Pista cyclabile local
-          cycleway_mtb: Percurso de bicycletta de montania
-          footway: Sentiero pro pedones
-          rail: Ferrovia
-          train: Traino
-          subway: Metro
-          ferry: Ferry-boat
-          light_rail: Ferrovia legier
-          tram: Tram
-          trolleybus: Trolleybus
-          bus: Autobus
-          cable_car: Telepherico
-          chair_lift: Telesedia
-          runway: Pista de aeroporto
-          taxiway: Via de circulation pro aviones
-          apron: Platteforma pro aviones
-          admin: Limite administrative
-          capital: Capital
-          city: Citate
-          orchard: Verdiero
-          vineyard: Vinia
-          forest: Foreste
-          wood: Bosco
-          farmland: Terra agricole
-          grass: Herba
-          meadow: Prato
-          bare_rock: Rocca nude
-          sand: Sablo
-          golf: Percurso de golf
-          park: Parco
-          common: Commun
-          built_up: Area edificate
-          resident: Area residential
-          retail: Zona de commercio al detalio
-          industrial: Area industrial
-          commercial: Area commercial
-          heathland: Landa
-          scrubland: Terreno de brossas
-          lake: Laco
-          reservoir: Reservoir
-          intermittent_water: Massa de aqua intermittente
-          glacier: Glaciero
-          reef: Scolio
-          wetland: Terra humide
-          farm: Ferma
-          brownfield: Terra in reposo
-          cemetery: Cemeterio
-          allotments: Jardines familial
-          pitch: Campo de sport
-          centre: Centro de sport
-          beach: Plagia
-          reserve: Reserva natural
-          military: Area militar
-          school: Schola
-          university: Universitate
-          hospital: Hospital
-          building: Edificio significante
-          station: Station ferroviari
-          railway_halt: Station facultative
-          subway_station: Station de metro
-          tram_stop: Halto de tram
-          summit: Summitate
-          peak: Picco
-          tunnel: Bordo a lineettas = tunnel
-          bridge: Bordo nigre = ponte
-          private: Accesso private
-          destination: Traffico local
-          construction: Vias in construction
-          bus_stop: Halto de autobus
-          bicycle_shop: Magazin de bicyclettas
-          bicycle_rental: Location de bicyclettas
-          bicycle_parking: Parcamento de bicyclettas
-          bicycle_parking_small: Micre spatio de parcamento pro bicyclettas
-          toilets: Toilettes

     welcome:
       title: Benvenite!
       introduction: Bevenite a OpenStreetMap, le carta libere e modificabile del mundo.
     welcome:
       title: Benvenite!
       introduction: Bevenite a OpenStreetMap, le carta libere e modificabile del mundo.


@@ -2542,6 +2453,95 @@ ia:
           Non es necessari stabilir formalmente un gruppo in le mesme mesura que le capitulos local.
           In effecto, multe gruppos existe con grande successo como reunion informal de personas o como un gruppo communitari. Omnes pote crear o adherer a tales. Lege plus sur le %{communities_wiki_link}.
         communities_wiki: pagina wiki sur communitates
           Non es necessari stabilir formalmente un gruppo in le mesme mesura que le capitulos local.
           In effecto, multe gruppos existe con grande successo como reunion informal de personas o como un gruppo communitari. Omnes pote crear o adherer a tales. Lege plus sur le %{communities_wiki_link}.
         communities_wiki: pagina wiki sur communitates

+  map_keys:
+    show:
+      entries:
+        motorway: Autostrata
+        main_road: Strata principal
+        trunk: Via national
+        primary: Via primari
+        secondary: Via secundari
+        unclassified: Via non classificate
+        pedestrian: Via pro pedones
+        track: Pista
+        bridleway: Sentiero pro cavallos
+        cycleway: Via cyclabile
+        cycleway_national: Pista cyclabile national
+        cycleway_regional: Pista cyclabile regional
+        cycleway_local: Pista cyclabile local
+        cycleway_mtb: Percurso de bicycletta de montania
+        footway: Sentiero pro pedones
+        rail: Ferrovia
+        train: Traino
+        subway: Metro
+        ferry: Ferry-boat
+        light_rail: Ferrovia legier
+        tram: Tram
+        trolleybus: Trolleybus
+        bus: Autobus
+        cable_car: Telepherico
+        chair_lift: Telesedia
+        runway: Pista de aeroporto
+        taxiway: Via de circulation pro aviones
+        apron: Platteforma pro aviones
+        admin: Limite administrative
+        capital: Capital
+        city: Citate
+        orchard: Verdiero
+        vineyard: Vinia
+        forest: Foreste
+        wood: Bosco
+        farmland: Terra agricole
+        grass: Herba
+        meadow: Prato
+        bare_rock: Rocca nude
+        sand: Sablo
+        golf: Percurso de golf
+        park: Parco
+        common: Commun
+        built_up: Area edificate
+        resident: Area residential
+        retail: Zona de commercio al detalio
+        industrial: Area industrial
+        commercial: Area commercial
+        heathland: Landa
+        scrubland: Terreno de brossas
+        lake: Laco
+        reservoir: Reservoir
+        intermittent_water: Massa de aqua intermittente
+        glacier: Glaciero
+        reef: Scolio
+        wetland: Terra humide
+        farm: Ferma
+        brownfield: Terra in reposo
+        cemetery: Cemeterio
+        allotments: Jardines familial
+        pitch: Campo de sport
+        centre: Centro de sport
+        beach: Plagia
+        reserve: Reserva natural
+        military: Area militar
+        school: Schola
+        university: Universitate
+        hospital: Hospital
+        building: Edificio significante
+        station: Station ferroviari
+        railway_halt: Station facultative
+        subway_station: Station de metro
+        tram_stop: Halto de tram
+        summit: Summitate
+        peak: Picco
+        tunnel: Bordo a lineettas = tunnel
+        bridge: Bordo nigre = ponte
+        private: Accesso private
+        destination: Traffico local
+        construction: Vias in construction
+        bus_stop: Halto de autobus
+        bicycle_shop: Magazin de bicyclettas
+        bicycle_rental: Location de bicyclettas
+        bicycle_parking: Parcamento de bicyclettas
+        bicycle_parking_small: Micre spatio de parcamento pro bicyclettas
+        toilets: Toilettes

   traces:
     visibility:
       private: Private (solmente condividite como anonymo, punctos non ordinate)
   traces:
     visibility:
       private: Private (solmente condividite como anonymo, punctos non ordinate)

diff --git a/config/locales/id.yml b/config/locales/id.yml
index 2146fa121391758697c5861f55794c4a070ec1ff..af74ecee214b0e1469311fb251bad6aa9bee70bf 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -123,10 +123,10 @@ id:
         url: URL Aplikasi Utama (diperlukan)
         callback_url: Panggilan kembali URL
         support_url: URL Dukungan
         url: URL Aplikasi Utama (diperlukan)
         callback_url: Panggilan kembali URL
         support_url: URL Dukungan

-        allow_read_prefs: Baca pengaturan mereka sebagai pengguna.
+        allow_read_prefs: membaca pengaturan pengguna mereka.

         allow_write_prefs: memodifikasi pengaturan mereka sebagai pengguna
         allow_write_prefs: memodifikasi pengaturan mereka sebagai pengguna

-        allow_write_diary: membuat entri buku harian, komentar dan berteman
-        allow_write_api: modifikasi peta
+        allow_write_diary: buat entri buku harian dan komentar
+        allow_write_api: memodifikasi peta

         allow_read_gpx: baca jejak GPS pribadi mereka
         allow_write_gpx: unggah jejak GPS
         allow_write_notes: memodifikasi catatan
         allow_read_gpx: baca jejak GPS pribadi mereka
         allow_write_gpx: unggah jejak GPS
         allow_write_notes: memodifikasi catatan


@@ -156,7 +156,7 @@ id:
         longitude: Garis Bujur
         public: Publik
         description: Deskripsi
         longitude: Garis Bujur
         public: Publik
         description: Deskripsi

-        gpx_file: 'Unggah File GPX:'
+        gpx_file: Pilih Berkas Jejak GPS

         visibility: Visibilitas
         tagstring: Label
       message:
         visibility: Visibilitas
         tagstring: Label
       message:


@@ -401,7 +401,7 @@ id:
         way: Way/Garis
         relation: Relasi
     containing_relation:
         way: Way/Garis
         relation: Relasi
     containing_relation:

-      entry_role_html: Relasi %{relation_name} (as %{relation_role})
+      entry_role_html: '%{relation_name} (sebagai %{relation_role})'

     not_found:
       title: Tidak Ditemukan
     timeout:
     not_found:
       title: Tidak Ditemukan
     timeout:


@@ -1418,16 +1418,16 @@ id:
           weir: Tanggul Sungai
           "yes": Jalur Air
       admin_levels:
           weir: Tanggul Sungai
           "yes": Jalur Air
       admin_levels:

-        level2: Batas Negara
-        level3: Batas Wilayah
-        level4: Batas Negara Bagian
-        level5: Batas Wilayah
-        level6: Batas Provinsi
-        level7: Batas Munisipalitas
-        level8: Batas Kota/Kabupaten
-        level9: Batas Desa
-        level10: Batas kota pinggiran
-        level11: Batas RT
+        level2: Batas Internasional
+        level3: Batas Administratif (Level 3)
+        level4: Batas Administratif (Level 4)
+        level5: Batas Administratif (Level 5)
+        level6: Batas Administratif (Level 6)
+        level7: Batas Administratif (Level 7)
+        level8: Batas Administratif (Level 8)
+        level9: Batas Administratif (Level 9)
+        level10: Batas Administratif (Level 10)
+        level11: Batas Administratif (Level 11)

     results:
       no_results: Tidak ada hasil yang ditemukan
       more_results: Hasil lainnya
     results:
       no_results: Tidak ada hasil yang ditemukan
       more_results: Hasil lainnya


@@ -1584,9 +1584,9 @@ id:
       see_their_profile_html: Anda dapat melihat profil mereka di %{userurl}.
     gpx_failure:
       hi: Halo %{to_user},
       see_their_profile_html: Anda dapat melihat profil mereka di %{userurl}.
     gpx_failure:
       hi: Halo %{to_user},

-      failed_to_import: 'gagal melakukan impor. Berikut ini adalah kesalahannya:'
+      failed_to_import: Sepertinya berkas Anda gagal diimpor sebagai jejak GPS.

       more_info: Informasi lebih lanjut tentang kegagalan impor GPX dan cara menghindarinya
       more_info: Informasi lebih lanjut tentang kegagalan impor GPX dan cara menghindarinya

-        bisa ditemukan di %{url}.
+        bisa ditemukan di %{url}

       more_info_html: Informasi lebih lanjut tentang kegagalan impor GPX dan cara
         menghindarinya bisa ditemukan di %{url}.
       subject: '[OpenStreetMap] gagal impor GPX'
       more_info_html: Informasi lebih lanjut tentang kegagalan impor GPX dan cara
         menghindarinya bisa ditemukan di %{url}.
       subject: '[OpenStreetMap] gagal impor GPX'


@@ -1663,8 +1663,8 @@ id:
           yang Anda komentari. Catatan ini dekat %{place}.'
         commented_note_html: '%{commenter} telah mengaktifkan kembali salah satu catatan
           peta yang Anda komentari. Catatannya terletak di dekat %{place}.'
           yang Anda komentari. Catatan ini dekat %{place}.'
         commented_note_html: '%{commenter} telah mengaktifkan kembali salah satu catatan
           peta yang Anda komentari. Catatannya terletak di dekat %{place}.'

-      details: Rincian lebih lanjut mengenai catatan dapat ditemukan di %{url}.
-      details_html: Rincian lebih lanjut mengenai catatan dapat ditemukan di %{url}.
+      details: Balas atau pelajari lebih lanjut tentang catatan di %{url}.
+      details_html: Balas atau pelajari lebih lanjut tentang catatan di %{url}.

     changeset_comment_notification:
       description: 'Set perubahan OpenStreetMap #%{id}'
       hi: Halo %{to_user},
     changeset_comment_notification:
       description: 'Set perubahan OpenStreetMap #%{id}'
       hi: Halo %{to_user},


@@ -1684,9 +1684,8 @@ id:
         partial_changeset_with_comment: dengan komentar '%{changeset_comment}'
         partial_changeset_with_comment_html: dengan komentar '%{changeset_comment}'
         partial_changeset_without_comment: tanpa komentar
         partial_changeset_with_comment: dengan komentar '%{changeset_comment}'
         partial_changeset_with_comment_html: dengan komentar '%{changeset_comment}'
         partial_changeset_without_comment: tanpa komentar

-      details: Rincian lebuh lanjut soal perubahan ini dapat dilihat di %{url}.
-      details_html: Rincian lebih lanjut tentang set perubahan ini dapat dilihat di
-        %{url}.
+      details: Balas atau pelajari lebih lanjut tentang set perubahan di %{url}.
+      details_html: Balas atau pelajari lebih lanjut tentang set perubahan di %{url}.

       unsubscribe: Anda dapat berhenti berlangganan pembaruan set perubahan ini di
         %{url}.
       unsubscribe_html: Anda dapat berhenti berlangganan pembaruan set perubahan ini
       unsubscribe: Anda dapat berhenti berlangganan pembaruan set perubahan ini di
         %{url}.
       unsubscribe_html: Anda dapat berhenti berlangganan pembaruan set perubahan ini


@@ -1860,13 +1859,13 @@ id:
       failure: Tidak dapat memperbarui profil.
   sessions:
     new:
       failure: Tidak dapat memperbarui profil.
   sessions:
     new:

-      tab_title: Masuk log
+      tab_title: Masuk Log

       email or username: Alamat Email atau Nama Pengguna
       password: Kata Sandi
       remember: Ingat saya
       lost password link: Kehilangan kata sandi Anda?
       login_button: Masuk log
       email or username: Alamat Email atau Nama Pengguna
       password: Kata Sandi
       remember: Ingat saya
       lost password link: Kehilangan kata sandi Anda?
       login_button: Masuk log

-      with external: 'Atau, gunakan pihak ketiga untuk masuk:'
+      with external: atau masuk log dengan pihak ketiga

       auth failure: Maaf, tidak bisa login dengan rincian tersebut.
     destroy:
       title: Logout
       auth failure: Maaf, tidak bisa login dengan rincian tersebut.
     destroy:
       title: Logout


@@ -2236,92 +2235,6 @@ id:
         bicycle: Sepeda
         car: Mobil
         foot: Jalan Kaki
         bicycle: Sepeda
         car: Mobil
         foot: Jalan Kaki

-    key:
-      table:
-        entry:
-          motorway: Jalan Tol
-          main_road: Jalan utama
-          trunk: Jalan nasional
-          primary: Jalan Primer
-          secondary: Jalan Sekunder
-          unclassified: Jalan Tidak Terklasifikasi
-          pedestrian: Jalur pejalan kaki
-          track: Trek
-          bridleway: Jalan Tanah
-          cycleway: Jalur Sepeda
-          cycleway_national: Jalur sepeda nasional
-          cycleway_regional: Jalur sepeda daerah
-          cycleway_local: Jalur sepeda lokal
-          cycleway_mtb: Rute sepeda gunung
-          footway: Jalan Setapak
-          rail: Rel Kereta
-          train: Kereta
-          subway: Kereta bawah tanah
-          ferry: Feri
-          light_rail: Kereta api ringan
-          tram: Trem
-          trolleybus: Kereta dorong
-          bus: Bus
-          cable_car: Kereta Kabel
-          chair_lift: Kereta gantung
-          runway: Landasan bandara
-          taxiway: Landas hubung
-          apron: Tempat Parkir Pesawat
-          admin: Batas administrasi
-          capital: Ibu kota
-          city: Kota
-          orchard: Kebun buah
-          vineyard: Kebun anggur
-          forest: Hutan
-          wood: Kayu
-          farmland: Lahan pertanian
-          grass: Rumput
-          meadow: Padang rumput
-          bare_rock: Daratan batu
-          sand: Pasir
-          golf: Lapangan Golf
-          park: Taman
-          common: Umum
-          built_up: Daerah yang dibangun
-          resident: Area Permukiman
-          retail: Area pertokoan
-          industrial: Kawasan industri
-          commercial: Area komersial
-          heathland: Semak
-          scrubland: Semak belukar
-          lake: Danau
-          reservoir: Wilayah Serapan (Reservoir)
-          intermittent_water: Perairan yang terputus-putus
-          glacier: Gletser
-          reef: Batu karang
-          wetland: Lahan basah
-          farm: Pertanian
-          brownfield: Lahan kosong
-          cemetery: Pemakaman
-          allotments: Tanah garap
-          pitch: Lapangan Olahraga
-          centre: Pusat Olahraga
-          beach: Pantai
-          reserve: Cagar Alam
-          military: Kawasan militer
-          school: Sekolah
-          university: Universitas
-          hospital: Rumah sakit
-          building: Bangunan Penting
-          station: Stasiun Kereta Api
-          summit: Puncak
-          peak: Puncak
-          tunnel: Dashed Casing = terowongan
-          bridge: Black casing = jembatan
-          private: Akses pribadi
-          destination: Akses tujuan
-          construction: Jalan sedang diperbaiki
-          bus_stop: Halte bus
-          bicycle_shop: Toko sepeda
-          bicycle_rental: Penyewaan sepeda
-          bicycle_parking: Tempat parkir sepeda
-          bicycle_parking_small: Parkir sepeda kecil
-          toilets: Toilet

     welcome:
       title: Selamat datang!
       introduction: Selamat datang di OpenStreetMap, peta dunia gratis dan dapat disunting.
     welcome:
       title: Selamat datang!
       introduction: Selamat datang di OpenStreetMap, peta dunia gratis dan dapat disunting.


@@ -2394,6 +2307,92 @@ id:
           biasa atau grup kontributor. Siapa saja boleh membuat kelompok atau bergabung
           dengan salah satunya. Simak %{communities_wiki_link}.
         communities_wiki: laman wiki Komunitas
           biasa atau grup kontributor. Siapa saja boleh membuat kelompok atau bergabung
           dengan salah satunya. Simak %{communities_wiki_link}.
         communities_wiki: laman wiki Komunitas

+  map_keys:
+    show:
+      entries:
+        motorway: Jalan Tol
+        main_road: Jalan utama
+        trunk: Jalan nasional
+        primary: Jalan Primer
+        secondary: Jalan Sekunder
+        unclassified: Jalan Tidak Terklasifikasi
+        pedestrian: Jalur pejalan kaki
+        track: Trek
+        bridleway: Jalan Tanah
+        cycleway: Jalur Sepeda
+        cycleway_national: Jalur sepeda nasional
+        cycleway_regional: Jalur sepeda daerah
+        cycleway_local: Jalur sepeda lokal
+        cycleway_mtb: Rute sepeda gunung
+        footway: Jalan Setapak
+        rail: Rel Kereta
+        train: Kereta
+        subway: Kereta bawah tanah
+        ferry: Feri
+        light_rail: Kereta api ringan
+        tram: Trem
+        trolleybus: Kereta dorong
+        bus: Bus
+        cable_car: Kereta Kabel
+        chair_lift: Kereta gantung
+        runway: Landasan bandara
+        taxiway: Landas hubung
+        apron: Tempat Parkir Pesawat
+        admin: Batas administrasi
+        capital: Ibu kota
+        city: Kota
+        orchard: Kebun buah
+        vineyard: Kebun anggur
+        forest: Hutan
+        wood: Kayu
+        farmland: Lahan pertanian
+        grass: Rumput
+        meadow: Padang rumput
+        bare_rock: Daratan batu
+        sand: Pasir
+        golf: Lapangan Golf
+        park: Taman
+        common: Umum
+        built_up: Daerah yang dibangun
+        resident: Area Permukiman
+        retail: Area pertokoan
+        industrial: Kawasan industri
+        commercial: Area komersial
+        heathland: Semak
+        scrubland: Semak belukar
+        lake: Danau
+        reservoir: Wilayah Serapan (Reservoir)
+        intermittent_water: Perairan yang terputus-putus
+        glacier: Gletser
+        reef: Batu karang
+        wetland: Lahan basah
+        farm: Pertanian
+        brownfield: Lahan kosong
+        cemetery: Pemakaman
+        allotments: Tanah garap
+        pitch: Lapangan Olahraga
+        centre: Pusat Olahraga
+        beach: Pantai
+        reserve: Cagar Alam
+        military: Kawasan militer
+        school: Sekolah
+        university: Universitas
+        hospital: Rumah sakit
+        building: Bangunan Penting
+        station: Stasiun Kereta Api
+        summit: Puncak
+        peak: Puncak
+        tunnel: Dashed Casing = terowongan
+        bridge: Black casing = jembatan
+        private: Akses pribadi
+        destination: Akses tujuan
+        construction: Jalan sedang diperbaiki
+        bus_stop: Halte bus
+        bicycle_shop: Toko sepeda
+        bicycle_rental: Penyewaan sepeda
+        bicycle_parking: Tempat parkir sepeda
+        bicycle_parking_small: Parkir sepeda kecil
+        toilets: Toilet

   traces:
     visibility:
       private: Pribadi (hanya berbagi sebagai anonim, poin tidak berurut)
   traces:
     visibility:
       private: Pribadi (hanya berbagi sebagai anonim, poin tidak berurut)


@@ -2501,11 +2500,11 @@ id:
     setup_user_auth:
       blocked_zero_hour: Anda mendapat pesan penting di situs web OpenStreetMap. Anda
         harus membaca pesan tersebut sebelum Anda bisa menyimpan suntingan Anda.
     setup_user_auth:
       blocked_zero_hour: Anda mendapat pesan penting di situs web OpenStreetMap. Anda
         harus membaca pesan tersebut sebelum Anda bisa menyimpan suntingan Anda.

-      blocked: Akses Anda ke API telah diblokir. Silahkan log-in ke antarmuka web
+      blocked: Akses Anda ke API telah diblokir. Silakan masuk log ke antarmuka web

         untuk mengetahui lebih lanjut.
         untuk mengetahui lebih lanjut.

-      need_to_see_terms: Akses Anda ke API untuk sementara ditangguhkan. Silahkan
-        log-in ke antarmuka web untuk melihat persyaratan kontributor. Anda tidak
-        perlu untuk setuju, tapi Anda harus melihat mereka.
+      need_to_see_terms: Akses Anda ke API untuk sementara ditangguhkan. Silakan masuk
+        log ke antarmuka web untuk melihat persyaratan kontributor. Anda tidak perlu
+        untuk setuju, tapi Anda harus melihat mereka.

     settings_menu:
       account_settings: Setelan Akun
       oauth2_applications: Aplikasi OAuth 2
     settings_menu:
       account_settings: Setelan Akun
       oauth2_applications: Aplikasi OAuth 2


@@ -2515,22 +2514,22 @@ id:
       openid_url: URL OpenID
       openid:
         title: Masuk log dengan OpenID
       openid_url: URL OpenID
       openid:
         title: Masuk log dengan OpenID

-        alt: Masuk log dengan URL OpenID
+        alt: Logo OpenID

       google:
         title: Masuk log dengan Google
       google:
         title: Masuk log dengan Google

-        alt: Masuk log dengan Google OpenID
+        alt: Logo Google

       facebook:
         title: Masuk log dengan Facebook
       facebook:
         title: Masuk log dengan Facebook

-        alt: Masuk log dengan akun Facebook
+        alt: Logo Facebook

       microsoft:
         title: Masuk log dengan Microsoft
       microsoft:
         title: Masuk log dengan Microsoft

-        alt: Masuk log dengan Akun Microsoft
+        alt: Logo Microsoft

       github:
         title: Masuk dengan GitHub.
       github:
         title: Masuk dengan GitHub.

-        alt: Masuk log dengan Akun GitHub.
+        alt: Logo GitHub.

       wikipedia:
         title: Masuk log dengan Wikipedia
       wikipedia:
         title: Masuk log dengan Wikipedia

-        alt: Masuk log dengan Akun Wikipedia
+        alt: Logo Wikipedia

   oauth:
     permissions:
       missing: Anda tidak mengizinkan akses aplikasi ke fasilitas ini
   oauth:
     permissions:
       missing: Anda tidak mengizinkan akses aplikasi ke fasilitas ini


@@ -2538,7 +2537,7 @@ id:
       openid: Masuk menggunakan OpenStreetMap
       read_prefs: Baca preferensi pengguna
       write_prefs: Ubah preferensi pengguna
       openid: Masuk menggunakan OpenStreetMap
       read_prefs: Baca preferensi pengguna
       write_prefs: Ubah preferensi pengguna

-      write_diary: Buat entri buku harian, komentar dan berteman
+      write_diary: Buat entri buku harian dan komentar

       write_api: Ubah peta
       read_gpx: Baca jejak GPS pribadi
       write_gpx: Unggah jejak GPS
       write_api: Ubah peta
       read_gpx: Baca jejak GPS pribadi
       write_gpx: Unggah jejak GPS


@@ -2606,12 +2605,11 @@ id:
         akun. Kami akan menanggapi permintaan Anda sesegera mungkin.
       support: bantuan
       about:
         akun. Kami akan menanggapi permintaan Anda sesegera mungkin.
       support: bantuan
       about:

-        header: Gratis dan dapat disunting
+        header: Bebas dan dapat disunting.

         paragraph_1: Tidak seperti peta lainnya, OpenStreetMap sepenuhnya dibangun
           oleh orang-orang seperti Anda. Siapa saja boleh memperbaiki, memperbarui,
           mengunduh, dan memanfaatkannya.
         paragraph_1: Tidak seperti peta lainnya, OpenStreetMap sepenuhnya dibangun
           oleh orang-orang seperti Anda. Siapa saja boleh memperbaiki, memperbarui,
           mengunduh, dan memanfaatkannya.

-        paragraph_2: Silakan mendaftar untuk berkontribusi. Kami akan kirimkan surat
-          elektronik untuk konfirmasi akun Anda.
+        paragraph_2: Silakan mendaftar untuk berkontribusi.

       display name description: Username Anda yang ditampilkan pada publik. Anda dapat
         mengubahnya dalam pengaturan.
       by_signing_up:
       display name description: Username Anda yang ditampilkan pada publik. Anda dapat
         mengubahnya dalam pengaturan.
       by_signing_up:


@@ -2622,7 +2620,7 @@ id:
       email_help:
         html: Alamat Anda tidak dapat dilihat publik. Lihat %{privacy_policy_link}
           kami untuk info lebih lanjut.
       email_help:
         html: Alamat Anda tidak dapat dilihat publik. Lihat %{privacy_policy_link}
           kami untuk info lebih lanjut.

-      use external auth: Atau, gunakan pihak ketiga untuk masuk
+      use external auth: Atau daftar menggunakan pihak ketiga

     no_such_user:
       title: Pengguna tersebut tidak ditemukan
       heading: Pengguna %{user} tidak dapat ditemukan
     no_such_user:
       title: Pengguna tersebut tidak ditemukan
       heading: Pengguna %{user} tidak dapat ditemukan


@@ -2750,17 +2748,17 @@ id:
         di pengaturan pengguna Anda.
   user_role:
     filter:
         di pengaturan pengguna Anda.
   user_role:
     filter:

-      not_a_role: String `%{role}' bukan merupakan peran yang valid.
+      not_a_role: String '%{role}' bukan merupakan peran yang valid.

       already_has_role: Pengguna telah memiliki peran %{role}.
       doesnt_have_role: Pengguna tidak memiliki peran %{role}.
       not_revoke_admin_current_user: Tidak bisa mencabut peran administrator dari
         pengguna ini.
     grant:
       already_has_role: Pengguna telah memiliki peran %{role}.
       doesnt_have_role: Pengguna tidak memiliki peran %{role}.
       not_revoke_admin_current_user: Tidak bisa mencabut peran administrator dari
         pengguna ini.
     grant:

-      are_you_sure: Apakah Anda yakin ingin memberikan peran `%{role}' kepada pengguna
-        `%{name}'?
+      are_you_sure: Apakah Anda yakin ingin memberikan peran '%{role}' kepada pengguna
+        '%{name}'?

     revoke:
     revoke:

-      are_you_sure: Apakah Anda yakin Anda ingin mencabut peran `%{role}' dari pengguna
-        `%{name}'?
+      are_you_sure: Apakah Anda yakin Anda ingin mencabut peran '%{role}' dari pengguna
+        '%{name}'?

   user_blocks:
     model:
       non_moderator_update: Harus merupakan moderator untuk membuat atau memperbarui
   user_blocks:
     model:
       non_moderator_update: Harus merupakan moderator untuk membuat atau memperbarui


@@ -2914,8 +2912,8 @@ id:
       custom_dimensions: Pengaturan dimensi
       format: 'Format:'
       scale: 'Skala:'
       custom_dimensions: Pengaturan dimensi
       format: 'Format:'
       scale: 'Skala:'

-      image_dimensions: Gambar akan menampilkan peta standar berukuran %{width} x
-        %{height}
+      image_dimensions: Gambar akan menampilkan lapisan %{layer} berukuran %{width}
+        x %{height}

       download: Unduh
       short_url: URL Singkat
       include_marker: Termasuk penanda
       download: Unduh
       short_url: URL Singkat
       include_marker: Termasuk penanda

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 12175f14a4701d925172e5a2544b66ecee4d2d06..ff27aa3cbc29681d5b9455a776037f8279a77dfb 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -2377,92 +2377,6 @@ is:
         bicycle: Hjólandi
         car: Akandi
         foot: Fótgangandi
         bicycle: Hjólandi
         car: Akandi
         foot: Fótgangandi

-    key:
-      table:
-        entry:
-          motorway: Hraðbraut
-          main_road: Aðalbraut
-          trunk: Stofnbraut (Hringvegurinn)
-          primary: Stofnvegur
-          secondary: Tengivegur
-          unclassified: Héraðsvegur
-          pedestrian: Gönguleið
-          track: Slóði
-          bridleway: Reiðstígur
-          cycleway: Hjólaleið
-          cycleway_national: Hjólaleið á landsneti
-          cycleway_regional: Svæðisbundin hjólaleið
-          cycleway_local: Staðbundin hjólaleið
-          cycleway_mtb: Fjallahjólaleið
-          footway: Gönguleið
-          rail: Lestarteinar
-          train: Lest
-          subway: Neðanjarðarlest
-          ferry: Ferja
-          light_rail: Léttlest
-          tram: Sporvagn
-          trolleybus: Rafknúinn strætisvagn
-          bus: Strætó
-          cable_car: Kláflyfta
-          chair_lift: Stólalyfta
-          runway: Flugbraut
-          taxiway: Akbraut flugvéla
-          apron: Flughlað
-          admin: Stjórnsýslumörk
-          capital: Höfuðborg
-          city: Borg
-          orchard: Trjágarður
-          vineyard: Vínekra
-          forest: Ræktaður skógur
-          wood: Skógur
-          farmland: Ræktarland
-          grass: Gras
-          meadow: Rjóður
-          bare_rock: Berar klappir
-          sand: Sandur
-          golf: Golfvöllur
-          park: Almenningsgarður
-          common: Almenningur
-          built_up: Byggt svæði
-          resident: Íbúðasvæði
-          retail: Smásölusvæði
-          industrial: Iðnaðarsvæði
-          commercial: Verslunarsvæði
-          heathland: Heiðalönd
-          scrubland: Kjarrlendi
-          lake: Vatn
-          reservoir: Uppistöðulón
-          intermittent_water: Ósamfellt vatnasvæði
-          glacier: Jökull
-          reef: Sker
-          wetland: Votlendi
-          farm: Bóndabær
-          brownfield: Nýbyggingarsvæði
-          cemetery: Grafreitur
-          allotments: Ræktuð svæði úthlutuð í einkaeigu
-          pitch: Íþróttavöllur
-          centre: Íþróttamiðstöð
-          beach: Strönd
-          reserve: Náttúruverndarsvæði
-          military: Hersvæði
-          school: Skóli
-          university: Háskóli
-          hospital: Sjúkrahús
-          building: Merkisbygging
-          station: Lestarstöð
-          summit: Fjallstindur
-          peak: Tindur
-          tunnel: Umkringt punktalínum = göng
-          bridge: Umkringt svartri línu = brú
-          private: Einkaaðgangur
-          destination: Umferð leyfileg á ákveðinn áfangastað
-          construction: Vegir í byggingu
-          bus_stop: Strætisvagnabiðstöð
-          bicycle_shop: Hjólaverslun
-          bicycle_rental: Reiðhjólaleiga
-          bicycle_parking: Reiðhjólastæði
-          bicycle_parking_small: Lítið reiðhjólastæði
-          toilets: Salerni

     welcome:
       title: Velkomin!
       introduction: |-
     welcome:
       title: Velkomin!
       introduction: |-


@@ -2543,6 +2457,92 @@ is:
           samfélagshópar. Allir geta sett upp eða tekið þátt í slíku. Lestu meira um þetta á %{communities_wiki_link}.
         communities_wiki: Wiki-síðunni um samfélögin
         communities_wiki_url: https://wiki.openstreetmap.org/wiki/User_group
           samfélagshópar. Allir geta sett upp eða tekið þátt í slíku. Lestu meira um þetta á %{communities_wiki_link}.
         communities_wiki: Wiki-síðunni um samfélögin
         communities_wiki_url: https://wiki.openstreetmap.org/wiki/User_group

+  map_keys:
+    show:
+      entries:
+        motorway: Hraðbraut
+        main_road: Aðalbraut
+        trunk: Stofnbraut (Hringvegurinn)
+        primary: Stofnvegur
+        secondary: Tengivegur
+        unclassified: Héraðsvegur
+        pedestrian: Gönguleið
+        track: Slóði
+        bridleway: Reiðstígur
+        cycleway: Hjólaleið
+        cycleway_national: Hjólaleið á landsneti
+        cycleway_regional: Svæðisbundin hjólaleið
+        cycleway_local: Staðbundin hjólaleið
+        cycleway_mtb: Fjallahjólaleið
+        footway: Gönguleið
+        rail: Lestarteinar
+        train: Lest
+        subway: Neðanjarðarlest
+        ferry: Ferja
+        light_rail: Léttlest
+        tram: Sporvagn
+        trolleybus: Rafknúinn strætisvagn
+        bus: Strætó
+        cable_car: Kláflyfta
+        chair_lift: Stólalyfta
+        runway: Flugbraut
+        taxiway: Akbraut flugvéla
+        apron: Flughlað
+        admin: Stjórnsýslumörk
+        capital: Höfuðborg
+        city: Borg
+        orchard: Trjágarður
+        vineyard: Vínekra
+        forest: Ræktaður skógur
+        wood: Skógur
+        farmland: Ræktarland
+        grass: Gras
+        meadow: Rjóður
+        bare_rock: Berar klappir
+        sand: Sandur
+        golf: Golfvöllur
+        park: Almenningsgarður
+        common: Almenningur
+        built_up: Byggt svæði
+        resident: Íbúðasvæði
+        retail: Smásölusvæði
+        industrial: Iðnaðarsvæði
+        commercial: Verslunarsvæði
+        heathland: Heiðalönd
+        scrubland: Kjarrlendi
+        lake: Vatn
+        reservoir: Uppistöðulón
+        intermittent_water: Ósamfellt vatnasvæði
+        glacier: Jökull
+        reef: Sker
+        wetland: Votlendi
+        farm: Bóndabær
+        brownfield: Nýbyggingarsvæði
+        cemetery: Grafreitur
+        allotments: Ræktuð svæði úthlutuð í einkaeigu
+        pitch: Íþróttavöllur
+        centre: Íþróttamiðstöð
+        beach: Strönd
+        reserve: Náttúruverndarsvæði
+        military: Hersvæði
+        school: Skóli
+        university: Háskóli
+        hospital: Sjúkrahús
+        building: Merkisbygging
+        station: Lestarstöð
+        summit: Fjallstindur
+        peak: Tindur
+        tunnel: Umkringt punktalínum = göng
+        bridge: Umkringt svartri línu = brú
+        private: Einkaaðgangur
+        destination: Umferð leyfileg á ákveðinn áfangastað
+        construction: Vegir í byggingu
+        bus_stop: Strætisvagnabiðstöð
+        bicycle_shop: Hjólaverslun
+        bicycle_rental: Reiðhjólaleiga
+        bicycle_parking: Reiðhjólastæði
+        bicycle_parking_small: Lítið reiðhjólastæði
+        toilets: Salerni

   traces:
     visibility:
       private: Prívat  (aðeins deilt sem óauðkennanlegum, óröðuðum punktum)
   traces:
     visibility:
       private: Prívat  (aðeins deilt sem óauðkennanlegum, óröðuðum punktum)

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 4f866e68ebc7ab45fc365df4cfa1e613852ae924..bb0438645e3d36ebe2e18fb1ace5e97938f2496c 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -2517,95 +2517,6 @@ it:
         bicycle: Bicicletta
         car: Auto
         foot: A piedi
         bicycle: Bicicletta
         car: Auto
         foot: A piedi

-    key:
-      table:
-        entry:
-          motorway: Autostrada
-          main_road: Strada principale
-          trunk: Superstrada
-          primary: Strada primaria
-          secondary: Strada secondaria
-          unclassified: Strada non classificata
-          pedestrian: Percorso pedonale
-          track: Strada forestale o agricola
-          bridleway: Percorso per equitazione
-          cycleway: Pista ciclabile
-          cycleway_national: Pista ciclabile nazionale
-          cycleway_regional: Pista ciclabile regionale
-          cycleway_local: Pista ciclabile locale
-          cycleway_mtb: Percorso in mountain bike
-          footway: Percorso pedonale
-          rail: Ferrovia
-          train: Treno
-          subway: Metropolitana
-          ferry: Traghetto
-          light_rail: Metropolitana leggera
-          tram: Tram
-          trolleybus: Filobus
-          bus: Autobus
-          cable_car: Funivia
-          chair_lift: Seggiovia
-          runway: Pista di decollo/atterraggio
-          taxiway: Pista di rullaggio
-          apron: Area di parcheggio aeroportuale
-          admin: Confine amministrativo
-          capital: Capitale
-          city: Città
-          orchard: Frutteto
-          vineyard: Vigneto
-          forest: Foresta
-          wood: Bosco
-          farmland: Terreno agricolo
-          grass: Prato
-          meadow: Prato
-          bare_rock: Roccia nuda
-          sand: Sabbia
-          golf: Campo da golf
-          park: Parco
-          common: Area comune
-          built_up: Area edificata
-          resident: Zona residenziale
-          retail: Zona con negozi
-          industrial: Zona industriale
-          commercial: Zona di uffici
-          heathland: Brughiera
-          scrubland: Macchia
-          lake: Lago
-          reservoir: Riserva idrica
-          intermittent_water: Corpo idrico intermittente
-          glacier: Ghiacciaio
-          reef: Scogliera
-          wetland: Zona umida
-          farm: Azienda agricola
-          brownfield: Area soggetta ad interventi di ridestinazione d'uso
-          cemetery: Cimitero
-          allotments: Area comune orti casalinghi
-          pitch: Campo sportivo
-          centre: Centro sportivo
-          beach: Spiaggia
-          reserve: Riserva naturale
-          military: Area militare
-          school: Scuola
-          university: Università
-          hospital: Ospedale
-          building: Edificio significativo
-          station: Stazione ferroviaria
-          railway_halt: Fermata ferroviaria
-          subway_station: Stazione della metropolitana
-          tram_stop: Fermata del tram
-          summit: Vetta
-          peak: Picco montuoso
-          tunnel: Linea tratteggiata = tunnel
-          bridge: Quadrettatura nera = ponte
-          private: Accesso privato
-          destination: Servitù di passaggio
-          construction: Strade in costruzione
-          bus_stop: Fermata dell'autobus
-          bicycle_shop: Negozio di biciclette
-          bicycle_rental: Noleggio biciclette
-          bicycle_parking: Parcheggio per biciclette
-          bicycle_parking_small: Piccolo parcheggio per biciclette
-          toilets: Bagni pubblici

     welcome:
       title: Benvenuto!
       introduction: Benvenuti in OpenStreetMap, la mappa del mondo libera e modificabile.
     welcome:
       title: Benvenuto!
       introduction: Benvenuti in OpenStreetMap, la mappa del mondo libera e modificabile.


@@ -2684,6 +2595,95 @@ it:
           Chiunque può crearne uno o unirsi ad uno già esistente. Per saperne di più
           consulta la %{communities_wiki_link}.
         communities_wiki: Pagina wiki delle comunità
           Chiunque può crearne uno o unirsi ad uno già esistente. Per saperne di più
           consulta la %{communities_wiki_link}.
         communities_wiki: Pagina wiki delle comunità

+  map_keys:
+    show:
+      entries:
+        motorway: Autostrada
+        main_road: Strada principale
+        trunk: Superstrada
+        primary: Strada primaria
+        secondary: Strada secondaria
+        unclassified: Strada non classificata
+        pedestrian: Percorso pedonale
+        track: Strada forestale o agricola
+        bridleway: Percorso per equitazione
+        cycleway: Pista ciclabile
+        cycleway_national: Pista ciclabile nazionale
+        cycleway_regional: Pista ciclabile regionale
+        cycleway_local: Pista ciclabile locale
+        cycleway_mtb: Percorso in mountain bike
+        footway: Percorso pedonale
+        rail: Ferrovia
+        train: Treno
+        subway: Metropolitana
+        ferry: Traghetto
+        light_rail: Metropolitana leggera
+        tram: Tram
+        trolleybus: Filobus
+        bus: Autobus
+        cable_car: Funivia
+        chair_lift: Seggiovia
+        runway: Pista di decollo/atterraggio
+        taxiway: Pista di rullaggio
+        apron: Area di parcheggio aeroportuale
+        admin: Confine amministrativo
+        capital: Capitale
+        city: Città
+        orchard: Frutteto
+        vineyard: Vigneto
+        forest: Foresta
+        wood: Bosco
+        farmland: Terreno agricolo
+        grass: Prato
+        meadow: Prato
+        bare_rock: Roccia nuda
+        sand: Sabbia
+        golf: Campo da golf
+        park: Parco
+        common: Area comune
+        built_up: Area edificata
+        resident: Zona residenziale
+        retail: Zona con negozi
+        industrial: Zona industriale
+        commercial: Zona di uffici
+        heathland: Brughiera
+        scrubland: Macchia
+        lake: Lago
+        reservoir: Riserva idrica
+        intermittent_water: Corpo idrico intermittente
+        glacier: Ghiacciaio
+        reef: Scogliera
+        wetland: Zona umida
+        farm: Azienda agricola
+        brownfield: Area soggetta ad interventi di ridestinazione d'uso
+        cemetery: Cimitero
+        allotments: Area comune orti casalinghi
+        pitch: Campo sportivo
+        centre: Centro sportivo
+        beach: Spiaggia
+        reserve: Riserva naturale
+        military: Area militare
+        school: Scuola
+        university: Università
+        hospital: Ospedale
+        building: Edificio significativo
+        station: Stazione ferroviaria
+        railway_halt: Fermata ferroviaria
+        subway_station: Stazione della metropolitana
+        tram_stop: Fermata del tram
+        summit: Vetta
+        peak: Picco montuoso
+        tunnel: Linea tratteggiata = tunnel
+        bridge: Quadrettatura nera = ponte
+        private: Accesso privato
+        destination: Servitù di passaggio
+        construction: Strade in costruzione
+        bus_stop: Fermata dell'autobus
+        bicycle_shop: Negozio di biciclette
+        bicycle_rental: Noleggio biciclette
+        bicycle_parking: Parcheggio per biciclette
+        bicycle_parking_small: Piccolo parcheggio per biciclette
+        toilets: Bagni pubblici

   traces:
     visibility:
       private: Privato (condiviso solamente come anonimo, punti non ordinati)
   traces:
     visibility:
       private: Privato (condiviso solamente come anonimo, punti non ordinati)

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index e6aff6ee8a970d27036bb05a2b2038a1d7e744db..6b3427793197c39c5652ff2178a10f6221e4a16a 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -2203,92 +2203,6 @@ ja:
         bicycle: 自転車
         car: 自動車
         foot: 徒歩
         bicycle: 自転車
         car: 自動車
         foot: 徒歩

-    key:
-      table:
-        entry:
-          motorway: 自動車専用道路
-          main_road: 主要道
-          trunk: 国道
-          primary: 主要地方道
-          secondary: 一般県道
-          unclassified: 一般道
-          pedestrian: 歩行者専用道路
-          track: 農道・林道
-          bridleway: 乗馬道
-          cycleway: 自転車道
-          cycleway_national: 国立自転車道路
-          cycleway_regional: 地方管轄の自転車道路
-          cycleway_local: 地域の自転車道路
-          cycleway_mtb: 山岳自転車コース
-          footway: 歩道
-          rail: 鉄道
-          train: 電車
-          subway: 地下鉄
-          ferry: フェリー
-          light_rail: ライトレール
-          tram: トラム
-          trolleybus: トロリーバス
-          bus: バス
-          cable_car: 交走式ロープウェイ
-          chair_lift: チェアリフト
-          runway: 空港滑走路
-          taxiway: 空港誘導路
-          apron: 空港ビル
-          admin: 行政境界
-          capital: 首都
-          city: 都市
-          orchard: 果樹園
-          vineyard: ブドウ園
-          forest: 森
-          wood: 森林
-          farmland: 農地
-          grass: 草地
-          meadow: 草原
-          bare_rock: 露岩
-          sand: 砂地
-          golf: ゴルフ場
-          park: 公園
-          common: 共有地
-          built_up: 市街地
-          resident: 住宅地
-          retail: 小売業地域
-          industrial: 工業地域
-          commercial: オフィス地域
-          heathland: 荒地
-          scrubland: 低木地帯
-          lake: 湖
-          reservoir: 貯水池
-          intermittent_water: 間欠性水路
-          glacier: 氷河
-          reef: 暗礁
-          wetland: 湿地帯
-          farm: 農牧場
-          brownfield: 褐色地
-          cemetery: 墓地
-          allotments: 家庭菜園
-          pitch: 運動場
-          centre: スポーツセンター
-          beach: 砂浜
-          reserve: 自然保護区
-          military: 軍用地域
-          school: 学校
-          university: 大学
-          hospital: 病院
-          building: 重要建造物
-          station: 鉄道駅
-          summit: 山脈
-          peak: 山頂
-          tunnel: 点線の枠 = トンネル
-          bridge: 黒枠 = 橋梁
-          private: 私的通行
-          destination: 目的通行
-          construction: 建設中の道路
-          bus_stop: バス停
-          bicycle_shop: 自転車販売店
-          bicycle_rental: 自転車レンタル
-          bicycle_parking: 駐輪場
-          bicycle_parking_small: 小規模駐輪場
-          toilets: トイレ

     welcome:
       title: ようこそ!
       introduction: フリーで編集可能な世界地図、OpenStreetMapへようこそ。サインアップが完了し、マッピングの準備はすべて整いました。知っておかなければならない重要事項を簡単に説明します。
     welcome:
       title: ようこそ!
       introduction: フリーで編集可能な世界地図、OpenStreetMapへようこそ。サインアップが完了し、マッピングの準備はすべて整いました。知っておかなければならない重要事項を簡単に説明します。


@@ -2339,6 +2253,92 @@ ja:
           実際に多くのグループが非公式な集まりとして、または
           コミュニティグループとして非常にうまく存続しています。誰でもこれらを設定または参加できます。 %{communities_wiki_link} で詳細をお読みください。
         communities_wiki: コミュニティウィキのページ
           実際に多くのグループが非公式な集まりとして、または
           コミュニティグループとして非常にうまく存続しています。誰でもこれらを設定または参加できます。 %{communities_wiki_link} で詳細をお読みください。
         communities_wiki: コミュニティウィキのページ

+  map_keys:
+    show:
+      entries:
+        motorway: 自動車専用道路
+        main_road: 主要道
+        trunk: 国道
+        primary: 主要地方道
+        secondary: 一般県道
+        unclassified: 一般道
+        pedestrian: 歩行者専用道路
+        track: 農道・林道
+        bridleway: 乗馬道
+        cycleway: 自転車道
+        cycleway_national: 国立自転車道路
+        cycleway_regional: 地方管轄の自転車道路
+        cycleway_local: 地域の自転車道路
+        cycleway_mtb: 山岳自転車コース
+        footway: 歩道
+        rail: 鉄道
+        train: 電車
+        subway: 地下鉄
+        ferry: フェリー
+        light_rail: ライトレール
+        tram: トラム
+        trolleybus: トロリーバス
+        bus: バス
+        cable_car: 交走式ロープウェイ
+        chair_lift: チェアリフト
+        runway: 空港滑走路
+        taxiway: 空港誘導路
+        apron: 空港ビル
+        admin: 行政境界
+        capital: 首都
+        city: 都市
+        orchard: 果樹園
+        vineyard: ブドウ園
+        forest: 森
+        wood: 森林
+        farmland: 農地
+        grass: 草地
+        meadow: 草原
+        bare_rock: 露岩
+        sand: 砂地
+        golf: ゴルフ場
+        park: 公園
+        common: 共有地
+        built_up: 市街地
+        resident: 住宅地
+        retail: 小売業地域
+        industrial: 工業地域
+        commercial: オフィス地域
+        heathland: 荒地
+        scrubland: 低木地帯
+        lake: 湖
+        reservoir: 貯水池
+        intermittent_water: 間欠性水路
+        glacier: 氷河
+        reef: 暗礁
+        wetland: 湿地帯
+        farm: 農牧場
+        brownfield: 褐色地
+        cemetery: 墓地
+        allotments: 家庭菜園
+        pitch: 運動場
+        centre: スポーツセンター
+        beach: 砂浜
+        reserve: 自然保護区
+        military: 軍用地域
+        school: 学校
+        university: 大学
+        hospital: 病院
+        building: 重要建造物
+        station: 鉄道駅
+        summit: 山脈
+        peak: 山頂
+        tunnel: 点線の枠 = トンネル
+        bridge: 黒枠 = 橋梁
+        private: 私的通行
+        destination: 目的通行
+        construction: 建設中の道路
+        bus_stop: バス停
+        bicycle_shop: 自転車販売店
+        bicycle_rental: 自転車レンタル
+        bicycle_parking: 駐輪場
+        bicycle_parking_small: 小規模駐輪場
+        toilets: トイレ

   traces:
     visibility:
       private: 非公開 (匿名、点は順不同)
   traces:
     visibility:
       private: 非公開 (匿名、点は順不同)

diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 7b2f81fa601227a5bc5fcbb4d01a8ce7240c2000..3fd8395de5a5a188e31d51e7bfde014c8f3283e7 100644 (file)
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -869,41 +869,41 @@ ka:
       search: ძიება
       where_am_i: სად ვარ მე?
       submit_text: Ok
       search: ძიება
       where_am_i: სად ვარ მე?
       submit_text: Ok

-    key:
-      table:
-        entry:
-          motorway: ავტომაგისტრალი
-          primary: მაგისტრალური საერთაშორისო მნიშვნელობის გზა
-          secondary: სახელმწიფო მნიშვნელობის გზა
-          unclassified: ადგილობრივი მნიშვნელობის გზა
-          track: სოფლის გზა
-          bridleway: საცხენოსნო გზა
-          cycleway: ველოსიპედის გზა
-          footway: საფეხმავლო გზა
-          rail: რკინიგზა
-          subway: მეტრო
-          cable_car: საბაგირო გზა
-          runway: აეროპორტის ასაფრენ-დასაფრენი ბილიკი
-          admin: ადმინისტრაციული საზღვარი
-          forest: ტყე
-          wood: ტყე
-          golf: გოლფის მოედანი
-          park: პარკი
-          resident: საცხოვრებელი ტერიტორია
-          commercial: კომერციული ტერიტორია
-          lake: ტბა
-          reservoir: წყალსაცავი
-          farm: ფერმა
-          cemetery: სასაფლაო
-          pitch: სპორტული მოედანი
-          centre: სპორტული ცენტრი
-          reserve: ნაკრძალი
-          military: სამხედრო ტერიტორია
-          school: სკოლა
-          university: უნივერსიტეტი
-          station: რკინიგზის სადგური
-          summit: მწვერვალი
-          peak: პიკი
+  map_keys:
+    show:
+      entries:
+        motorway: ავტომაგისტრალი
+        primary: მაგისტრალური საერთაშორისო მნიშვნელობის გზა
+        secondary: სახელმწიფო მნიშვნელობის გზა
+        unclassified: ადგილობრივი მნიშვნელობის გზა
+        track: სოფლის გზა
+        bridleway: საცხენოსნო გზა
+        cycleway: ველოსიპედის გზა
+        footway: საფეხმავლო გზა
+        rail: რკინიგზა
+        subway: მეტრო
+        cable_car: საბაგირო გზა
+        runway: აეროპორტის ასაფრენ-დასაფრენი ბილიკი
+        admin: ადმინისტრაციული საზღვარი
+        forest: ტყე
+        wood: ტყე
+        golf: გოლფის მოედანი
+        park: პარკი
+        resident: საცხოვრებელი ტერიტორია
+        commercial: კომერციული ტერიტორია
+        lake: ტბა
+        reservoir: წყალსაცავი
+        farm: ფერმა
+        cemetery: სასაფლაო
+        pitch: სპორტული მოედანი
+        centre: სპორტული ცენტრი
+        reserve: ნაკრძალი
+        military: სამხედრო ტერიტორია
+        school: სკოლა
+        university: უნივერსიტეტი
+        station: რკინიგზის სადგური
+        summit: მწვერვალი
+        peak: პიკი

   traces:
     new:
       visibility_help: ეს რას ნიშნავს?
   traces:
     new:
       visibility_help: ეს რას ნიშნავს?

diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index ee83fae708db54bba009677b4b1be358cf939565..3859f9412f82e0bf7e25e3cfe8290e58d045ad36 100644 (file)
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -1010,19 +1010,19 @@ kab:
       modes:
         car: S tkeṛṛust
         foot: Ɣef uḍaṛ
       modes:
         car: S tkeṛṛust
         foot: Ɣef uḍaṛ

-    key:
-      table:
-        entry:
-          forest: Tiẓgi
-          lake: Amdun
-          school: Aɣerbaz
-          university: Tasdawit

     welcome:
       title: Anṣuf!
       whats_on_the_map:
         title: Ayen yellan di tkarḍa
       rules:
         title: Ilugan!
     welcome:
       title: Anṣuf!
       whats_on_the_map:
         title: Ayen yellan di tkarḍa
       rules:
         title: Ilugan!

+  map_keys:
+    show:
+      entries:
+        forest: Tiẓgi
+        lake: Amdun
+        school: Aɣerbaz
+        university: Tasdawit

   traces:
     new:
       help: Tallelt
   traces:
     new:
       help: Tallelt

diff --git a/config/locales/kk-cyrl.yml b/config/locales/kk-cyrl.yml
index 7e34502daf2322ef9149dee6b42a8c884792e61b..ceef862acd381d743be6edabc216c82461805963 100644 (file)
--- a/config/locales/kk-cyrl.yml
+++ b/config/locales/kk-cyrl.yml
@@ -1055,43 +1055,6 @@ kk-cyrl:
       modes:
         bicycle: Велосипед
         foot: Жаяу
       modes:
         bicycle: Велосипед
         foot: Жаяу

-    key:
-      table:
-        entry:
-          motorway: Автокүрежол
-          main_road: Бас жол
-          trunk: Тас жол
-          primary: Бірінші дәрежелі жол
-          secondary: Екінші дәрежелі жол
-          unclassified: Жергілікті жол
-          rail: Темір жол
-          train: Пойыз
-          subway: Метро
-          bus: Автобус
-          apron: Әуежай перроны
-          admin: Әкімшілік шекара
-          forest: Орман
-          golf: Гольф алаңы
-          park: Саябақ
-          resident: Тұрғын аудан
-          retail: Сауда аймағы
-          industrial: Өнеркәсіп аймағы
-          lake: Көл
-          farm: Ферма
-          cemetery: Зират
-          allotments: Саяжайлар
-          pitch: Спорт алаңы
-          centre: Спорт орталығы
-          military: Әскери аймақ
-          school: Мектеп
-          university: Университет
-          building: Елеулі ғимарат
-          station: Темір жол бекеті
-          peak: Шың
-          bus_stop: Автобус аялдамасы
-          bicycle_shop: Велосипед дүкені
-          bicycle_parking: Велосипед тұрағы
-          toilets: Дәретхана

     welcome:
       title: Қош келдіңіз!
       basic_terms:
     welcome:
       title: Қош келдіңіз!
       basic_terms:


@@ -1101,6 +1064,43 @@ kk-cyrl:
         title: Ережелерi!
     communities:
       title: Қауымдастықтар
         title: Ережелерi!
     communities:
       title: Қауымдастықтар

+  map_keys:
+    show:
+      entries:
+        motorway: Автокүрежол
+        main_road: Бас жол
+        trunk: Тас жол
+        primary: Бірінші дәрежелі жол
+        secondary: Екінші дәрежелі жол
+        unclassified: Жергілікті жол
+        rail: Темір жол
+        train: Пойыз
+        subway: Метро
+        bus: Автобус
+        apron: Әуежай перроны
+        admin: Әкімшілік шекара
+        forest: Орман
+        golf: Гольф алаңы
+        park: Саябақ
+        resident: Тұрғын аудан
+        retail: Сауда аймағы
+        industrial: Өнеркәсіп аймағы
+        lake: Көл
+        farm: Ферма
+        cemetery: Зират
+        allotments: Саяжайлар
+        pitch: Спорт алаңы
+        centre: Спорт орталығы
+        military: Әскери аймақ
+        school: Мектеп
+        university: Университет
+        building: Елеулі ғимарат
+        station: Темір жол бекеті
+        peak: Шың
+        bus_stop: Автобус аялдамасы
+        bicycle_shop: Велосипед дүкені
+        bicycle_parking: Велосипед тұрағы
+        toilets: Дәретхана

   traces:
     new:
       help: Анықтама
   traces:
     new:
       help: Анықтама

diff --git a/config/locales/km.yml b/config/locales/km.yml
index 5dec5ba77c57d2f59c0b453c4e11a8a8de4c5754..e25e0ff078f61dfa2dd6652688fa567632571e67 100644 (file)
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -651,25 +651,25 @@ km:
       search: ស្វែងរក​
       where_am_i: ខ្ញុំនៅទីណា​?
       submit_text: ទៅ​
       search: ស្វែងរក​
       where_am_i: ខ្ញុំនៅទីណា​?
       submit_text: ទៅ​

-    key:
-      table:
-        entry:
-          motorway: ផ្លូវល្បឿនលឿន
-          main_road: ផ្លូវធំ
-          cycleway: ផ្លូវទោចក្រយាន
-          cycleway_national: ផ្លូវទោចក្រយានជាតិ
-          cycleway_local: ផ្លូវទោចក្រយានតំបន់
-          rail: ផ្លូវដែក
-          subway: ផ្លូវដែកក្រោមដី
-          admin: ព្រំដែនរដ្ឋបាល
-          forest: ព្រៃឈើ​
-          park: ឧទ្យាន​
-          industrial: តំបន់ឧស្សាហកម្ម​
-          farm: កសិដ្ឋាន​
-          centre: មជ្ឈមណ្ឌល​កីឡា​
-          school: សាលារៀន​
-          university: សាកលវិទ្យាល័យ​
-          station: ស្ថានីយ៍ផ្លូវដែក
+  map_keys:
+    show:
+      entries:
+        motorway: ផ្លូវល្បឿនលឿន
+        main_road: ផ្លូវធំ
+        cycleway: ផ្លូវទោចក្រយាន
+        cycleway_national: ផ្លូវទោចក្រយានជាតិ
+        cycleway_local: ផ្លូវទោចក្រយានតំបន់
+        rail: ផ្លូវដែក
+        subway: ផ្លូវដែកក្រោមដី
+        admin: ព្រំដែនរដ្ឋបាល
+        forest: ព្រៃឈើ​
+        park: ឧទ្យាន​
+        industrial: តំបន់ឧស្សាហកម្ម​
+        farm: កសិដ្ឋាន​
+        centre: មជ្ឈមណ្ឌល​កីឡា​
+        school: សាលារៀន​
+        university: សាកលវិទ្យាល័យ​
+        station: ស្ថានីយ៍ផ្លូវដែក

   traces:
     new:
       visibility_help: តើនេះមានន័យ​ដូចម្ដេច​?
   traces:
     new:
       visibility_help: តើនេះមានន័យ​ដូចម្ដេច​?

diff --git a/config/locales/kn.yml b/config/locales/kn.yml
index 73f363445fb63ee4432fa90a856c40044b148ea0..6dd977ab13db5a9087c726b4da3fd4da05724788 100644 (file)
--- a/config/locales/kn.yml
+++ b/config/locales/kn.yml
@@ -26,7 +26,7 @@ kn:
       diary_comment:
         create: ಟಿಪ್ಪಣಿ
       diary_entry:
       diary_comment:
         create: ಟಿಪ್ಪಣಿ
       diary_entry:

-        create: ಪà³\8dರà²\95à²\9fಿಸà³\81
+        create: ಪà³\8dರà²\95à²\9fಿಸಿ

         update: ನವೀಕರಿಸಿ
       issue_comment:
         create: ಅಭಿಪ್ರಾಯ ದಾಖಲಿಸಿರಿ
         update: ನವೀಕರಿಸಿ
       issue_comment:
         create: ಅಭಿಪ್ರಾಯ ದಾಖಲಿಸಿರಿ


@@ -791,20 +791,6 @@ kn:
       to: ಗೆ
       where_am_i: ಇದು ಎಲ್ಲಿದೆ?
       submit_text: ಹೋಗು
       to: ಗೆ
       where_am_i: ಇದು ಎಲ್ಲಿದೆ?
       submit_text: ಹೋಗು

-    key:
-      table:
-        entry:
-          main_road: ಮುಖ್ಯ ರಸ್ತೆ
-          forest: ಅರಣ್ಯ
-          park: ಉದ್ಯಾನ
-          resident: ವಾಸ ಮಾಡುವ ಸ್ಥಳ
-          lake: ಕೆರೆ
-          reservoir: ಅಣೆಕಟ್ಟು
-          farm: ಒಕ್ಕಲು ಜಮೀನು
-          cemetery: ಸ್ಮಾಶಾಣ
-          school: ಪಾಠಶಾಲೆ
-          university: ವಿಶ್ವವಿದ್ಯಾಲಯ
-          station: ರೈಲು ನಿಲ್ದಾಣ

     welcome:
       title: ಸುಸ್ವಾಗತ!
       whats_on_the_map:
     welcome:
       title: ಸುಸ್ವಾಗತ!
       whats_on_the_map:


@@ -812,6 +798,20 @@ kn:
       start_mapping: ನಕ್ಷೆಯನ್ನು ಸಂಪಾದಿಸಿಲು ಪ್ರಾರಂಭಿಸಿ
       add_a_note:
         title: ನಕ್ಷೆಯನ್ನು ಸಂಪಾದಿಸಿಲು ಸಮಯವಿಲ್ಲವೇ? ಟಿಪ್ಪಣಿಯನ್ನು ಸೇರಿಸಿರಿ!
       start_mapping: ನಕ್ಷೆಯನ್ನು ಸಂಪಾದಿಸಿಲು ಪ್ರಾರಂಭಿಸಿ
       add_a_note:
         title: ನಕ್ಷೆಯನ್ನು ಸಂಪಾದಿಸಿಲು ಸಮಯವಿಲ್ಲವೇ? ಟಿಪ್ಪಣಿಯನ್ನು ಸೇರಿಸಿರಿ!

+  map_keys:
+    show:
+      entries:
+        main_road: ಮುಖ್ಯ ರಸ್ತೆ
+        forest: ಅರಣ್ಯ
+        park: ಉದ್ಯಾನ
+        resident: ವಾಸ ಮಾಡುವ ಸ್ಥಳ
+        lake: ಕೆರೆ
+        reservoir: ಅಣೆಕಟ್ಟು
+        farm: ಒಕ್ಕಲು ಜಮೀನು
+        cemetery: ಸ್ಮಾಶಾಣ
+        school: ಪಾಠಶಾಲೆ
+        university: ವಿಶ್ವವಿದ್ಯಾಲಯ
+        station: ರೈಲು ನಿಲ್ದಾಣ

   traces:
     new:
       help: ಸಹಾಯ
   traces:
     new:
       help: ಸಹಾಯ

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 2a26e092d82d9b1e7f4de14b00d123662e59c698..ca5ff2659e62b540b600b519de7ad4c62178055a 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -41,6 +41,7 @@
 # Author: Twotwo2019
 # Author: Wehwei
 # Author: Wrightbus
 # Author: Twotwo2019
 # Author: Wehwei
 # Author: Wrightbus

+# Author: YeBoy371

 # Author: Ykhwong
 # Author: Ysjbserver
 # Author: 予弦
 # Author: Ykhwong
 # Author: Ysjbserver
 # Author: 予弦


@@ -133,7 +134,7 @@ ko:
         support_url: 지원 URL
         allow_read_prefs: 사용자 환경 설정을 읽습니다
         allow_write_prefs: 사용자 환경 설정을 수정합니다
         support_url: 지원 URL
         allow_read_prefs: 사용자 환경 설정을 읽습니다
         allow_write_prefs: 사용자 환경 설정을 수정합니다

-        allow_write_diary: 일기 항목을 생성하고 댓글을 남기며 친구를 만듭니다
+        allow_write_diary: 일기 항목 및 댓글 작성

         allow_write_api: 지도를 수정합니다
         allow_read_gpx: 비공개 GPS 궤적을 읽습니다
         allow_write_gpx: GPS 궤적을 업로드합니다
         allow_write_api: 지도를 수정합니다
         allow_read_gpx: 비공개 GPS 궤적을 읽습니다
         allow_write_gpx: GPS 궤적을 업로드합니다


@@ -2180,95 +2181,6 @@ ko:
         bicycle: 자전거
         car: 자동차
         foot: 도보
         bicycle: 자전거
         car: 자동차
         foot: 도보

-    key:
-      table:
-        entry:
-          motorway: 고속도로
-          main_road: 간선 도로
-          trunk: 고속화도로
-          primary: 1차 도로
-          secondary: 2차 도로
-          unclassified: 4차 도로(연결 도로)
-          pedestrian: 보도
-          track: 농·임도
-          bridleway: 승마로
-          cycleway: 자전거 도로
-          cycleway_national: 국립 자전거 도로
-          cycleway_regional: 지역별 자전거 도로
-          cycleway_local: 일반 자전거 도로
-          cycleway_mtb: 산악자전거 코스
-          footway: 보도
-          rail: 철도
-          train: 기차
-          subway: 지하철
-          ferry: 페리
-          light_rail: 경전철
-          tram: 노면 전차
-          trolleybus: 무궤도 전차
-          bus: 버스
-          cable_car: 케이블 카
-          chair_lift: 체어 리프트
-          runway: 공항 활주로
-          taxiway: 공항 유도로
-          apron: 공항 계류장
-          admin: 행정 구역 경계
-          capital: 수도
-          city: 도시
-          orchard: 과수원
-          vineyard: 포도밭
-          forest: 숲
-          wood: 산림
-          farmland: 농지
-          grass: 잔디
-          meadow: 목초지
-          bare_rock: 노출 암반
-          sand: 모래
-          golf: 골프장
-          park: 공원
-          common: 공유지
-          built_up: 시가지
-          resident: 주거 지역
-          retail: 소매 지역
-          industrial: 산업 지역
-          commercial: 상업/관공서 지역
-          heathland: 황무지
-          scrubland: 관목지
-          lake: 호수
-          reservoir: 저수지
-          intermittent_water: 간헐적인 수역
-          glacier: 빙하
-          reef: 암초
-          wetland: 습지
-          farm: 농장
-          brownfield: 재개발지역
-          cemetery: 묘역
-          allotments: 텃밭
-          pitch: 운동장
-          centre: 스포츠 센터
-          beach: 해변
-          reserve: 자연 보호구역
-          military: 군사 지역
-          school: 학교
-          university: 대학
-          hospital: 병원
-          building: 주요 건물
-          station: 철도역
-          railway_halt: 철도 간이역
-          subway_station: 지하철역
-          tram_stop: 전차 정거장
-          summit: 산꼭대기
-          peak: 봉우리
-          tunnel: 점선 테두리 = 터널
-          bridge: 검은 테두리 = 다리
-          private: 개인 통행
-          destination: 목적 통행
-          construction: 공사 중인 도로
-          bus_stop: 버스 정류장
-          bicycle_shop: 자전거 가게
-          bicycle_rental: 자전거 대여
-          bicycle_parking: 자전거 주차장
-          bicycle_parking_small: 소형 자전거 주차장
-          toilets: 화장실

     welcome:
       title: 환영합니다!
       introduction: 누구나 편집 가능한 세계 지도, 오픈스트리트맵에 오신 것을 환영합니다. 이제 가입이 완료된 이상 지도 제작에 나설
     welcome:
       title: 환영합니다!
       introduction: 누구나 편집 가능한 세계 지도, 오픈스트리트맵에 오신 것을 환영합니다. 이제 가입이 완료된 이상 지도 제작에 나설


@@ -2329,6 +2241,95 @@ ko:
           그룹으로 잘 꾸려지고 있습니다. 누구나 이러한 그룹을 만들거나 가입할 수 있습니다. 커뮤니티 위키에 대한 자세한 내용은 %{communities_wiki_link}를
           보시기 바랍니다.
         communities_wiki: 커뮤니티 위키 페이지
           그룹으로 잘 꾸려지고 있습니다. 누구나 이러한 그룹을 만들거나 가입할 수 있습니다. 커뮤니티 위키에 대한 자세한 내용은 %{communities_wiki_link}를
           보시기 바랍니다.
         communities_wiki: 커뮤니티 위키 페이지

+  map_keys:
+    show:
+      entries:
+        motorway: 고속도로
+        main_road: 간선 도로
+        trunk: 고속화도로
+        primary: 1차 도로
+        secondary: 2차 도로
+        unclassified: 4차 도로(연결 도로)
+        pedestrian: 보도
+        track: 농·임도
+        bridleway: 승마로
+        cycleway: 자전거 도로
+        cycleway_national: 국립 자전거 도로
+        cycleway_regional: 지역별 자전거 도로
+        cycleway_local: 일반 자전거 도로
+        cycleway_mtb: 산악자전거 코스
+        footway: 보도
+        rail: 철도
+        train: 기차
+        subway: 지하철
+        ferry: 페리
+        light_rail: 경전철
+        tram: 노면 전차
+        trolleybus: 무궤도 전차
+        bus: 버스
+        cable_car: 케이블 카
+        chair_lift: 체어 리프트
+        runway: 공항 활주로
+        taxiway: 공항 유도로
+        apron: 공항 계류장
+        admin: 행정 구역 경계
+        capital: 수도
+        city: 도시
+        orchard: 과수원
+        vineyard: 포도밭
+        forest: 숲
+        wood: 산림
+        farmland: 농지
+        grass: 잔디
+        meadow: 목초지
+        bare_rock: 노출 암반
+        sand: 모래
+        golf: 골프장
+        park: 공원
+        common: 공유지
+        built_up: 시가지
+        resident: 주거 지역
+        retail: 소매 지역
+        industrial: 산업 지역
+        commercial: 상업/관공서 지역
+        heathland: 황무지
+        scrubland: 관목지
+        lake: 호수
+        reservoir: 저수지
+        intermittent_water: 간헐적인 수역
+        glacier: 빙하
+        reef: 암초
+        wetland: 습지
+        farm: 농장
+        brownfield: 재개발지역
+        cemetery: 묘역
+        allotments: 텃밭
+        pitch: 운동장
+        centre: 스포츠 센터
+        beach: 해변
+        reserve: 자연 보호구역
+        military: 군사 지역
+        school: 학교
+        university: 대학
+        hospital: 병원
+        building: 주요 건물
+        station: 철도역
+        railway_halt: 철도 간이역
+        subway_station: 지하철역
+        tram_stop: 전차 정거장
+        summit: 산꼭대기
+        peak: 봉우리
+        tunnel: 점선 테두리 = 터널
+        bridge: 검은 테두리 = 다리
+        private: 개인 통행
+        destination: 목적 통행
+        construction: 공사 중인 도로
+        bus_stop: 버스 정류장
+        bicycle_shop: 자전거 가게
+        bicycle_rental: 자전거 대여
+        bicycle_parking: 자전거 주차장
+        bicycle_parking_small: 소형 자전거 주차장
+        toilets: 화장실

   traces:
     visibility:
       private: 비공개(익명으로 공유됨, 정렬되지 않은 점)
   traces:
     visibility:
       private: 비공개(익명으로 공유됨, 정렬되지 않은 점)


@@ -2483,10 +2484,10 @@ ko:
     permissions:
       missing: 이 애플리케이션이 이 기능을 사용할 수 있도록 승인하지 않았습니다
     scopes:
     permissions:
       missing: 이 애플리케이션이 이 기능을 사용할 수 있도록 승인하지 않았습니다
     scopes:

-      openid: ì\98¤í\94\88ì\8a¤í\8a¸ë¦¬í\8a¸ë§µì\9c¼ë¡\9c 로그인
+      openid: ì\98¤í\94\88ì\8a¤í\8a¸ë¦¬í\8a¸ë§µì\9d\84 ì\82¬ì\9a©í\95\98ì\97¬ 로그인

       read_prefs: 사용자 환경 설정 읽기
       write_prefs: 사용자 환경 설정 수정
       read_prefs: 사용자 환경 설정 읽기
       write_prefs: 사용자 환경 설정 수정

-      write_diary: 일기 항목과 댓글을 생성하고 친구를 추가합니다.
+      write_diary: 일기 항목 및 댓글 작성

       write_api: 지도 수정
       read_gpx: 비공개 GPS 궤적 읽기
       write_gpx: GPS 궤적 업로드
       write_api: 지도 수정
       read_gpx: 비공개 GPS 궤적 읽기
       write_gpx: GPS 궤적 업로드

diff --git a/config/locales/ksh.yml b/config/locales/ksh.yml
index dd6365aba0ecb1ffb0e84aed5e48e22018a9019d..f0dd48d9c6bc89ab221d72b5146c6c0b981648ed 100644 (file)
--- a/config/locales/ksh.yml
+++ b/config/locales/ksh.yml
@@ -235,60 +235,60 @@ ksh:
       where_am_i: Woh ben esch?
       where_am_i_title: Beschriev dä aktälle Plaz övver en Söhkmaschiin
       submit_text: Lohß Jonn!
       where_am_i: Woh ben esch?
       where_am_i_title: Beschriev dä aktälle Plaz övver en Söhkmaschiin
       submit_text: Lohß Jonn!

-    key:
-      table:
-        entry:
-          motorway: Autobahn
-          trunk: Autoschnellstrohß
-          primary: Bundesstrohß
-          secondary: Land- un Kreisschtrohß
-          unclassified: Schtrohß
-          track: Wald- un Feldwääsch
-          bridleway: Wääsch för ze Rigge
-          cycleway: Farratwääsch
-          footway: Fohßwääsch udder Päddsche
-          rail: Eiserbahn
-          subway: U-Bahn
-          cable_car: Seilbahn
-          chair_lift: Sässelbahn
-          runway: Startbahn, Landebahn
-          taxiway: Rollwääsch om Fluchhaaven
-          apron: Halldepläz om Fluchveäld
-          admin: Verwalldongsjränz
-          forest: Wald, Bösch
-          wood: Urwald
-          golf: Jolfplaz
-          park: Park
-          common: öffentlesch Land
-          resident: Wohnjebeet
-          retail: Einkaufszentrum
-          industrial: Industriejebeet
-          commercial: Jewerbejebeet
-          heathland: Heed
-          lake: See, Wejer
-          reservoir: Stausee
-          farm: Buurehoff
-          brownfield: Industriebrachland
-          cemetery: Friedhoff
-          allotments: Schreberjaade
-          pitch: Schpochtplaz
-          centre: Schpochtzäntom
-          reserve: Naturschozjebeet
-          military: Jebeet vum Kammiß
-          school: Scholl
-          university: Univäsität
-          building: Weeschtesch Bouwärk
-          station: Bahnhoff
-          summit: Bärschspez
-          peak: Bärschspez
-          tunnel: Rand jeschtreschelt = Tunnell
-          bridge: Fätte Rand = Bröck
-          private: Der Zohjang es prėvaat
-          destination: Bloß för Aanliejer
-          construction: Schtrohß em Bou

     welcome:
       rules:
         title: Rääjelle!
     welcome:
       rules:
         title: Rääjelle!

+  map_keys:
+    show:
+      entries:
+        motorway: Autobahn
+        trunk: Autoschnellstrohß
+        primary: Bundesstrohß
+        secondary: Land- un Kreisschtrohß
+        unclassified: Schtrohß
+        track: Wald- un Feldwääsch
+        bridleway: Wääsch för ze Rigge
+        cycleway: Farratwääsch
+        footway: Fohßwääsch udder Päddsche
+        rail: Eiserbahn
+        subway: U-Bahn
+        cable_car: Seilbahn
+        chair_lift: Sässelbahn
+        runway: Startbahn, Landebahn
+        taxiway: Rollwääsch om Fluchhaaven
+        apron: Halldepläz om Fluchveäld
+        admin: Verwalldongsjränz
+        forest: Wald, Bösch
+        wood: Urwald
+        golf: Jolfplaz
+        park: Park
+        common: öffentlesch Land
+        resident: Wohnjebeet
+        retail: Einkaufszentrum
+        industrial: Industriejebeet
+        commercial: Jewerbejebeet
+        heathland: Heed
+        lake: See, Wejer
+        reservoir: Stausee
+        farm: Buurehoff
+        brownfield: Industriebrachland
+        cemetery: Friedhoff
+        allotments: Schreberjaade
+        pitch: Schpochtplaz
+        centre: Schpochtzäntom
+        reserve: Naturschozjebeet
+        military: Jebeet vum Kammiß
+        school: Scholl
+        university: Univäsität
+        building: Weeschtesch Bouwärk
+        station: Bahnhoff
+        summit: Bärschspez
+        peak: Bärschspez
+        tunnel: Rand jeschtreschelt = Tunnell
+        bridge: Fätte Rand = Bröck
+        private: Der Zohjang es prėvaat
+        destination: Bloß för Aanliejer
+        construction: Schtrohß em Bou

   traces:
     new:
       help: Hölp
   traces:
     new:
       help: Hölp

diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 52d715badb9c70d57384e6cf3d80c4487a5b6a11..8fc1aa5548e41777fc1df61cb47a1422b71422d5 100644 (file)
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -1984,64 +1984,6 @@ ku-Latn:
         bicycle: Bisiklêt
         car: Erebe
         foot: Peyade
         bicycle: Bisiklêt
         car: Erebe
         foot: Peyade

-    key:
-      table:
-        entry:
-          motorway: Otorê
-          main_road: Rêya sereke
-          trunk: Rêya sereke
-          primary: Rêya bi dereceya yekem
-          secondary: Rêya bi dereceya duyem
-          unclassified: Rêya nesinifandî
-          track: Rêya ji xweliyê
-          bridleway: Rêyên siwaran
-          cycleway: Rêya bisiklêtê
-          cycleway_national: Rêya bisiklêtê ya neteweyî
-          cycleway_regional: Rêya bisiklêtê ya herêmî
-          cycleway_local: Rêya bisiklêtê ya mehelî
-          footway: Rêya peyayan
-          rail: Rêhesin
-          subway: Metro
-          cable_car: Teleferîk
-          chair_lift: Teleferîk
-          runway: Pîsta balafirgehê
-          taxiway: Rêya balafirgehê yê çûnûhatinê
-          apron: Aprona balafirgehê
-          admin: Sînorê îdarî
-          forest: Daristan
-          wood: Daristan (bêçavdêrî, wek-xwe-hêlayî)
-          golf: Cihê golfê
-          park: Park
-          common: Erda mişterek
-          resident: Cihê îkametê
-          retail: Saheya Perakendeyê (Maxazayan)
-          industrial: Cihê endustriyê
-          commercial: Herêma bazirganiyê
-          heathland: Erdê qeraç
-          lake: Gol
-          reservoir: Gola sûnî
-          farm: Cotgeh
-          brownfield: Erdê vala
-          cemetery: Gorristan
-          allotments: Bax û bostan
-          pitch: Saheya sporê
-          centre: Navenda sporê
-          reserve: Herêma muhefezekirî ya tebîetê
-          military: Qada eskerî
-          school: Dibistan
-          university: Unîversîte
-          building: Avahiya girîng
-          station: Stasyona trênê
-          summit: Lûtke
-          peak: Lûtke
-          tunnel: Xeta qutqutî = tûnel
-          bridge: Xeta reş = pir
-          private: Têketina taybet
-          destination: Cihê gihiştinê
-          construction: Rêyên di merheleya çêkirinê de ne
-          bicycle_shop: Bisiklêtfiroş
-          bicycle_parking: Parka bisiklêtê
-          toilets: Tiwalet

     welcome:
       title: Tu bi xêr hatî!
       introduction: Tu bi xêr hatî OpenStreetMapê, nexşeya dinyayê yê azad û yê ku
     welcome:
       title: Tu bi xêr hatî!
       introduction: Tu bi xêr hatî OpenStreetMapê, nexşeya dinyayê yê azad û yê ku


@@ -2073,6 +2015,64 @@ ku-Latn:
         title: Beşên Lokal
       other_groups:
         title: Komên din
         title: Beşên Lokal
       other_groups:
         title: Komên din

+  map_keys:
+    show:
+      entries:
+        motorway: Otorê
+        main_road: Rêya sereke
+        trunk: Rêya sereke
+        primary: Rêya bi dereceya yekem
+        secondary: Rêya bi dereceya duyem
+        unclassified: Rêya nesinifandî
+        track: Rêya ji xweliyê
+        bridleway: Rêyên siwaran
+        cycleway: Rêya bisiklêtê
+        cycleway_national: Rêya bisiklêtê ya neteweyî
+        cycleway_regional: Rêya bisiklêtê ya herêmî
+        cycleway_local: Rêya bisiklêtê ya mehelî
+        footway: Rêya peyayan
+        rail: Rêhesin
+        subway: Metro
+        cable_car: Teleferîk
+        chair_lift: Teleferîk
+        runway: Pîsta balafirgehê
+        taxiway: Rêya balafirgehê yê çûnûhatinê
+        apron: Aprona balafirgehê
+        admin: Sînorê îdarî
+        forest: Daristan
+        wood: Daristan (bêçavdêrî, wek-xwe-hêlayî)
+        golf: Cihê golfê
+        park: Park
+        common: Erda mişterek
+        resident: Cihê îkametê
+        retail: Saheya Perakendeyê (Maxazayan)
+        industrial: Cihê endustriyê
+        commercial: Herêma bazirganiyê
+        heathland: Erdê qeraç
+        lake: Gol
+        reservoir: Gola sûnî
+        farm: Cotgeh
+        brownfield: Erdê vala
+        cemetery: Gorristan
+        allotments: Bax û bostan
+        pitch: Saheya sporê
+        centre: Navenda sporê
+        reserve: Herêma muhefezekirî ya tebîetê
+        military: Qada eskerî
+        school: Dibistan
+        university: Unîversîte
+        building: Avahiya girîng
+        station: Stasyona trênê
+        summit: Lûtke
+        peak: Lûtke
+        tunnel: Xeta qutqutî = tûnel
+        bridge: Xeta reş = pir
+        private: Têketina taybet
+        destination: Cihê gihiştinê
+        construction: Rêyên di merheleya çêkirinê de ne
+        bicycle_shop: Bisiklêtfiroş
+        bicycle_parking: Parka bisiklêtê
+        toilets: Tiwalet

   traces:
     visibility:
       private: Xisûsî (tenê wekî nuqteyên anonîm û nerêzkirî tê belavkirin)
   traces:
     visibility:
       private: Xisûsî (tenê wekî nuqteyên anonîm û nerêzkirî tê belavkirin)

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index b89a8816be0dd4ecd6995312cd22c0c4681e81ea..2d556e1eb4e6621ad8e679b07011c460c8eeaaab 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -2086,78 +2086,6 @@ lb:
         bicycle: Mam Vëlo
         car: Auto
         foot: Zu Fouss
         bicycle: Mam Vëlo
         car: Auto
         foot: Zu Fouss

-    key:
-      table:
-        entry:
-          motorway: Autobunn
-          main_road: Haaptstrooss
-          secondary: Niewestrooss
-          unclassified: Net klasséiert Strooss
-          pedestrian: Foussgängerwee
-          track: Spuer
-          bridleway: Wee fir Päerd
-          cycleway: Vëlospiste
-          cycleway_national: Nationale Vëloswee
-          cycleway_regional: Regionale Vëloswee
-          cycleway_local: Lokale Vëloswee
-          footway: Fousswee
-          rail: Eisebunn
-          train: Zuch
-          subway: Metro
-          ferry: Fär
-          tram: Tram
-          bus: Bus
-          cable_car: Seelbunn
-          chair_lift: Sessellift
-          runway: Start- a Landebunn
-          taxiway: Rullbunn
-          admin: Verwaltungsgrenz
-          capital: Haaptstad
-          city: Stad
-          orchard: Bongert
-          vineyard: Wéngert
-          forest: Bësch
-          wood: Bësch
-          farmland: Akerland
-          grass: Wiss
-          meadow: Wiss
-          bare_rock: Plakege Fiels
-          sand: Sand
-          golf: Golfterrain
-          park: Park
-          common: ëffentlech Gréngfläch (brit.)
-          resident: Wunngéigend
-          retail: Akaafszentrum
-          industrial: Industriezone
-          commercial: Commercëgebitt
-          heathland: Heed
-          lake: Séi
-          reservoir: Reservoir
-          glacier: Gletscher
-          wetland: Fiichtgebitt
-          farm: Bauerenhaff
-          brownfield: Broochland
-          cemetery: Kierfecht
-          allotments: Klenggäert
-          pitch: Sportsterrain
-          centre: Sportszenter
-          beach: Plage
-          reserve: Naturschutzgebitt
-          military: Militärgebitt
-          school: Schoul
-          university: Universitéit
-          hospital: Spidol
-          building: Bedeitend Gebai
-          station: Gare (Eisebunn)
-          tram_stop: Tramshalt
-          summit: Spëtzt
-          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

     welcome:
       title: Wëllkomm!
       whats_on_the_map:
     welcome:
       title: Wëllkomm!
       whats_on_the_map:


@@ -2175,6 +2103,78 @@ lb:
         title: Lokal Chapteren
       other_groups:
         title: Aner Gruppen
         title: Lokal Chapteren
       other_groups:
         title: Aner Gruppen

+  map_keys:
+    show:
+      entries:
+        motorway: Autobunn
+        main_road: Haaptstrooss
+        secondary: Niewestrooss
+        unclassified: Net klasséiert Strooss
+        pedestrian: Foussgängerwee
+        track: Spuer
+        bridleway: Wee fir Päerd
+        cycleway: Vëlospiste
+        cycleway_national: Nationale Vëloswee
+        cycleway_regional: Regionale Vëloswee
+        cycleway_local: Lokale Vëloswee
+        footway: Fousswee
+        rail: Eisebunn
+        train: Zuch
+        subway: Metro
+        ferry: Fär
+        tram: Tram
+        bus: Bus
+        cable_car: Seelbunn
+        chair_lift: Sessellift
+        runway: Start- a Landebunn
+        taxiway: Rullbunn
+        admin: Verwaltungsgrenz
+        capital: Haaptstad
+        city: Stad
+        orchard: Bongert
+        vineyard: Wéngert
+        forest: Bësch
+        wood: Bësch
+        farmland: Akerland
+        grass: Wiss
+        meadow: Wiss
+        bare_rock: Plakege Fiels
+        sand: Sand
+        golf: Golfterrain
+        park: Park
+        common: ëffentlech Gréngfläch (brit.)
+        resident: Wunngéigend
+        retail: Akaafszentrum
+        industrial: Industriezone
+        commercial: Commercëgebitt
+        heathland: Heed
+        lake: Séi
+        reservoir: Reservoir
+        glacier: Gletscher
+        wetland: Fiichtgebitt
+        farm: Bauerenhaff
+        brownfield: Broochland
+        cemetery: Kierfecht
+        allotments: Klenggäert
+        pitch: Sportsterrain
+        centre: Sportszenter
+        beach: Plage
+        reserve: Naturschutzgebitt
+        military: Militärgebitt
+        school: Schoul
+        university: Universitéit
+        hospital: Spidol
+        building: Bedeitend Gebai
+        station: Gare (Eisebunn)
+        tram_stop: Tramshalt
+        summit: Spëtzt
+        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

   traces:
     visibility:
       public: Ëffentlech (gëtt an der Spuerlëscht ugewisen, allerdéngs nëmmen als
   traces:
     visibility:
       public: Ëffentlech (gëtt an der Spuerlëscht ugewisen, allerdéngs nëmmen als

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index e179d5fcb30c2d8e33c356a2be14ecaade2efebe..32a3ffd71ed2d4ca537c57dde5fafbcae2459ce8 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -2290,95 +2290,6 @@ lt:
         bicycle: Dviračiu
         car: Automobiliu
         foot: Pėsčiomis
         bicycle: Dviračiu
         car: Automobiliu
         foot: Pėsčiomis

-    key:
-      table:
-        entry:
-          motorway: Autostrada
-          main_road: Kelias, gatvė
-          trunk: Magistralinis kelias (kai kur – greitkelis)
-          primary: Pirmosios reikšmės kelias
-          secondary: Antros reikšmės kelias
-          unclassified: Neklasifikuotas kelias
-          pedestrian: Pėsčiųjų kelias
-          track: Pėdsakas
-          bridleway: Raitųjų takas
-          cycleway: Dviračių takas
-          cycleway_national: Nacionalinis dviračių takas
-          cycleway_regional: Regioninis dviračių takas
-          cycleway_local: Vietinis dviračių takas
-          cycleway_mtb: Kalnų dviračių maršrutas
-          footway: Pėsčiųjų takas
-          rail: Geležinkelis
-          train: Traukinys
-          subway: Metropoliteno linija
-          ferry: Keltas
-          light_rail: Greitasis traukinys
-          tram: Tramvajus
-          trolleybus: Troleibusas
-          bus: Autobusas
-          cable_car: Lyno keltuvas
-          chair_lift: Keltuvas
-          runway: Kilimo takas
-          taxiway: Riedėjimo takas
-          apron: Oro uosto lėktuvų aikštelė
-          admin: Administracinės ribos
-          capital: Sostinė
-          city: Miestas
-          orchard: Vaismedžių plantacija
-          vineyard: Vynuogynas
-          forest: Miškas
-          wood: Miškas
-          farmland: Pasėliai
-          grass: Žolės
-          meadow: Pieva
-          bare_rock: Plikos uolos
-          sand: Smėlynas
-          golf: Golfo laukas
-          park: Parkas
-          common: Bendras
-          built_up: Užstatyta teritorija
-          resident: Gyvenamoji zona
-          retail: Mažmeninis rajonas
-          industrial: Pramoninė zona
-          commercial: Komericinis plotas
-          heathland: Šilynas
-          scrubland: Krūmynai
-          lake: Ežeras
-          reservoir: Tvenkinys
-          intermittent_water: Išdžiūstantis vandentakis
-          glacier: Ledynas
-          reef: Rifas
-          wetland: Šlapynė
-          farm: Ūkis
-          brownfield: Apleista teritorija
-          cemetery: Kapinės
-          allotments: Sodai
-          pitch: Sportinis laukas
-          centre: Sporto centras
-          beach: Paplūdimys
-          reserve: Gamtos rezervatas
-          military: Karinis rajonas
-          school: Mokykla
-          university: Universitetas
-          hospital: Ligoninė
-          building: Didelis pastatas
-          station: Geležinkelio stotis
-          railway_halt: Geležinkelio sustojimas
-          subway_station: Metro stotis
-          tram_stop: Tramvajaus stotelė
-          summit: Viršūnė
-          peak: Viršukalnė
-          tunnel: Punktyriniai kraštai = tiltas
-          bridge: Tamsūs kraštai = tiltas
-          private: Privati prieiga
-          destination: Atvykimo susisiekimas
-          construction: Statomi keliai
-          bus_stop: Autobusų stotelė
-          bicycle_shop: Dviračių parduotuvė
-          bicycle_rental: Dviračių nuoma
-          bicycle_parking: Dviračių stovėjimo aikštelė
-          bicycle_parking_small: Maža dviračių stovėjimo aikštelė
-          toilets: Tualetai

     welcome:
       title: Sveiki atvykę!
       introduction: Sveikiname prisijungus prie OpenStreetMap - laisvo ir redaguojamo
     welcome:
       title: Sveiki atvykę!
       introduction: Sveikiname prisijungus prie OpenStreetMap - laisvo ir redaguojamo


@@ -2427,6 +2338,95 @@ lt:
       other_groups:
         title: Kitos grupės
         communities_wiki: Bendruomenių viki puslapis
       other_groups:
         title: Kitos grupės
         communities_wiki: Bendruomenių viki puslapis

+  map_keys:
+    show:
+      entries:
+        motorway: Autostrada
+        main_road: Kelias, gatvė
+        trunk: Magistralinis kelias (kai kur – greitkelis)
+        primary: Pirmosios reikšmės kelias
+        secondary: Antros reikšmės kelias
+        unclassified: Neklasifikuotas kelias
+        pedestrian: Pėsčiųjų kelias
+        track: Pėdsakas
+        bridleway: Raitųjų takas
+        cycleway: Dviračių takas
+        cycleway_national: Nacionalinis dviračių takas
+        cycleway_regional: Regioninis dviračių takas
+        cycleway_local: Vietinis dviračių takas
+        cycleway_mtb: Kalnų dviračių maršrutas
+        footway: Pėsčiųjų takas
+        rail: Geležinkelis
+        train: Traukinys
+        subway: Metropoliteno linija
+        ferry: Keltas
+        light_rail: Greitasis traukinys
+        tram: Tramvajus
+        trolleybus: Troleibusas
+        bus: Autobusas
+        cable_car: Lyno keltuvas
+        chair_lift: Keltuvas
+        runway: Kilimo takas
+        taxiway: Riedėjimo takas
+        apron: Oro uosto lėktuvų aikštelė
+        admin: Administracinės ribos
+        capital: Sostinė
+        city: Miestas
+        orchard: Vaismedžių plantacija
+        vineyard: Vynuogynas
+        forest: Miškas
+        wood: Miškas
+        farmland: Pasėliai
+        grass: Žolės
+        meadow: Pieva
+        bare_rock: Plikos uolos
+        sand: Smėlynas
+        golf: Golfo laukas
+        park: Parkas
+        common: Bendras
+        built_up: Užstatyta teritorija
+        resident: Gyvenamoji zona
+        retail: Mažmeninis rajonas
+        industrial: Pramoninė zona
+        commercial: Komericinis plotas
+        heathland: Šilynas
+        scrubland: Krūmynai
+        lake: Ežeras
+        reservoir: Tvenkinys
+        intermittent_water: Išdžiūstantis vandentakis
+        glacier: Ledynas
+        reef: Rifas
+        wetland: Šlapynė
+        farm: Ūkis
+        brownfield: Apleista teritorija
+        cemetery: Kapinės
+        allotments: Sodai
+        pitch: Sportinis laukas
+        centre: Sporto centras
+        beach: Paplūdimys
+        reserve: Gamtos rezervatas
+        military: Karinis rajonas
+        school: Mokykla
+        university: Universitetas
+        hospital: Ligoninė
+        building: Didelis pastatas
+        station: Geležinkelio stotis
+        railway_halt: Geležinkelio sustojimas
+        subway_station: Metro stotis
+        tram_stop: Tramvajaus stotelė
+        summit: Viršūnė
+        peak: Viršukalnė
+        tunnel: Punktyriniai kraštai = tiltas
+        bridge: Tamsūs kraštai = tiltas
+        private: Privati prieiga
+        destination: Atvykimo susisiekimas
+        construction: Statomi keliai
+        bus_stop: Autobusų stotelė
+        bicycle_shop: Dviračių parduotuvė
+        bicycle_rental: Dviračių nuoma
+        bicycle_parking: Dviračių stovėjimo aikštelė
+        bicycle_parking_small: Maža dviračių stovėjimo aikštelė
+        toilets: Tualetai

   traces:
     visibility:
       private: Privatus (dalinamas tik kaip anonimiškas, taškai nesurikiuoti)
   traces:
     visibility:
       private: Privatus (dalinamas tik kaip anonimiškas, taškai nesurikiuoti)

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index e65b2aa0c9e9b4fa0e87c1b8e1e3308c303b3780..7fe0bf2781b762dd9fe681e1e51752ae62b013b9 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1593,64 +1593,6 @@ lv:
         bicycle: Ar velosipēdu
         car: Ar mašīnu
         foot: Ar kājām
         bicycle: Ar velosipēdu
         car: Ar mašīnu
         foot: Ar kājām

-    key:
-      table:
-        entry:
-          motorway: Automaģistrāle
-          main_road: Galvenais ceļš
-          trunk: Maģistrālais ceļš
-          primary: Galvenais valsts ceļš
-          secondary: Sekundāras nozīmes ceļš
-          unclassified: Neklasificēts ceļš
-          track: Zemesceļš
-          bridleway: Izjādes taka
-          cycleway: Veloceliņš
-          cycleway_national: Valsts velosipēdceļš
-          cycleway_regional: Reģionālais velosipēdceļš
-          cycleway_local: Vietējais velosipēdceļš
-          footway: Gājēju ceļš
-          rail: Dzelzceļš
-          subway: Metro
-          cable_car: Trošu ceļš
-          chair_lift: krēslu pacēlājs
-          runway: Lidostas skrejceļš
-          taxiway: manevrēšanas ceļš
-          apron: Lidostas rampa
-          admin: Administratīvā robeža
-          forest: Mežs
-          wood: Pirmatnējs mežs
-          golf: Golfa laukums
-          park: Parks
-          common: Koplietošanas zeme
-          resident: Dzīvojamā zona
-          retail: Mazumtirdzniecības zona
-          industrial: Rūpniecības zona
-          commercial: Tirdzniecības zona
-          heathland: Tīrelis
-          lake: Ezeri
-          reservoir: ūdenskrātuves
-          farm: Saimniecība
-          brownfield: Nekopta vieta
-          cemetery: Kapsēta
-          allotments: Mazdārziņi
-          pitch: Sporta laukums
-          centre: Sporta centrs
-          reserve: Dabas rezervāts
-          military: Militārā zona
-          school: Skola
-          university: universitāte
-          building: Ēka
-          station: Dzelzceļa stacija
-          summit: Virsotne
-          peak: smaile
-          tunnel: Tunelis
-          bridge: Tilts
-          private: Privāta pieeja
-          destination: Galamērķa pieeja
-          construction: Ceļi būvniecības stadijā
-          bicycle_shop: Velosipēdu veikals
-          bicycle_parking: Velosipēdu novietne
-          toilets: Tualetes

     welcome:
       title: Laipni lūdzam!
       introduction: Sveicināts OpenStreetMap, bezmaksas un rediģējamā pasaules karte.
     welcome:
       title: Laipni lūdzam!
       introduction: Sveicināts OpenStreetMap, bezmaksas un rediģējamā pasaules karte.


@@ -1687,6 +1629,64 @@ lv:
           Nav nepieciešams formāli izveidot grupu tādā pašā apjomā kā vietējās nodaļas.
           Patiešām, daudzas grupas ļoti veiksmīgi pastāv kā neformāla cilvēku pulcēšanās vai kā
           kopienas grupa. Tās var izveidot vai pievienoties ikviens. Vairāk lasiet %{communities_wiki_link}.
           Nav nepieciešams formāli izveidot grupu tādā pašā apjomā kā vietējās nodaļas.
           Patiešām, daudzas grupas ļoti veiksmīgi pastāv kā neformāla cilvēku pulcēšanās vai kā
           kopienas grupa. Tās var izveidot vai pievienoties ikviens. Vairāk lasiet %{communities_wiki_link}.

+  map_keys:
+    show:
+      entries:
+        motorway: Automaģistrāle
+        main_road: Galvenais ceļš
+        trunk: Maģistrālais ceļš
+        primary: Galvenais valsts ceļš
+        secondary: Sekundāras nozīmes ceļš
+        unclassified: Neklasificēts ceļš
+        track: Zemesceļš
+        bridleway: Izjādes taka
+        cycleway: Veloceliņš
+        cycleway_national: Valsts velosipēdceļš
+        cycleway_regional: Reģionālais velosipēdceļš
+        cycleway_local: Vietējais velosipēdceļš
+        footway: Gājēju ceļš
+        rail: Dzelzceļš
+        subway: Metro
+        cable_car: Trošu ceļš
+        chair_lift: krēslu pacēlājs
+        runway: Lidostas skrejceļš
+        taxiway: manevrēšanas ceļš
+        apron: Lidostas rampa
+        admin: Administratīvā robeža
+        forest: Mežs
+        wood: Pirmatnējs mežs
+        golf: Golfa laukums
+        park: Parks
+        common: Koplietošanas zeme
+        resident: Dzīvojamā zona
+        retail: Mazumtirdzniecības zona
+        industrial: Rūpniecības zona
+        commercial: Tirdzniecības zona
+        heathland: Tīrelis
+        lake: Ezeri
+        reservoir: ūdenskrātuves
+        farm: Saimniecība
+        brownfield: Nekopta vieta
+        cemetery: Kapsēta
+        allotments: Mazdārziņi
+        pitch: Sporta laukums
+        centre: Sporta centrs
+        reserve: Dabas rezervāts
+        military: Militārā zona
+        school: Skola
+        university: universitāte
+        building: Ēka
+        station: Dzelzceļa stacija
+        summit: Virsotne
+        peak: smaile
+        tunnel: Tunelis
+        bridge: Tilts
+        private: Privāta pieeja
+        destination: Galamērķa pieeja
+        construction: Ceļi būvniecības stadijā
+        bicycle_shop: Velosipēdu veikals
+        bicycle_parking: Velosipēdu novietne
+        toilets: Tualetes

   traces:
     visibility:
       private: Privāts (kopīgots kā anonīms, nesakārtoti punkti)
   traces:
     visibility:
       private: Privāts (kopīgots kā anonīms, nesakārtoti punkti)

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 95367842bc2dbb2363d6ec666d0059164fa52257..ae9fd533079fea0a4e9a71cb767767413adb8bef 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -2357,95 +2357,6 @@ mk:
         bicycle: Велосипед
         car: Автомобил
         foot: Пешки
         bicycle: Велосипед
         car: Автомобил
         foot: Пешки

-    key:
-      table:
-        entry:
-          motorway: Автопат
-          main_road: Главен пат
-          trunk: Главна сообраќајна артерија
-          primary: Главен пат
-          secondary: Спореден пат
-          unclassified: Некласификуван пат
-          pedestrian: Пешачки пат
-          track: Патека
-          bridleway: Пешачко-влечен пат
-          cycleway: Велосипедска патека
-          cycleway_national: Државна велосипедска патека
-          cycleway_regional: Регионална велосипедска патека
-          cycleway_local: Месна велосипедска патека
-          cycleway_mtb: Пат за планински велосипедизам
-          footway: Пешачка патека
-          rail: Железница
-          train: Воз
-          subway: Метро
-          ferry: Траект
-          light_rail: Лека железница
-          tram: Трамвај
-          trolleybus: Тролејбус
-          bus: Автобус
-          cable_car: Клупна жичница
-          chair_lift: Клупна жичница
-          runway: Аеродромска писта
-          taxiway: Рулажна патека
-          apron: Аеродромска платформа
-          admin: Административна граница
-          capital: Главен град
-          city: Град
-          orchard: Овоштарник
-          vineyard: Лозје
-          forest: Шума
-          wood: Шума
-          farmland: Земјоделско земјиште
-          grass: Трева
-          meadow: Ливада
-          bare_rock: Гола карпа
-          sand: Песок
-          golf: Голф-терен
-          park: Парк
-          common: Општествена земја
-          built_up: Изградено подрачје
-          resident: Станбено подрачје
-          retail: Трговско подрачје
-          industrial: Индустриско подрачје
-          commercial: Комерцијално подрачје
-          heathland: Вресиште
-          scrubland: Шикара
-          lake: Езеро
-          reservoir: Резервоар
-          intermittent_water: Повремена водна површина
-          glacier: Ледник
-          reef: Гребен
-          wetland: Моклиште
-          farm: Фарма
-          brownfield: Запуштено подрачје
-          cemetery: Гробишта
-          allotments: Парцели
-          pitch: Спортски терен
-          centre: Спортски центар
-          beach: Плажа
-          reserve: Природен резерват
-          military: Воено подрачје
-          school: Училиште
-          university: Универзитет
-          hospital: Болница
-          building: Значајно здание
-          station: Железничка станица
-          railway_halt: Железничка постојка
-          subway_station: Метростаница
-          tram_stop: Трамвајска постојка
-          summit: Врв
-          peak: Врв
-          tunnel: Испрекината линија = тунел
-          bridge: Црна линија = мост
-          private: Доверлив пристап
-          destination: Пристап до одредницата
-          construction: Патишта во изградба
-          bus_stop: Автобуска постојка
-          bicycle_shop: Точкар
-          bicycle_rental: Изнајмување велосипеди
-          bicycle_parking: Паркирање велосипеди
-          bicycle_parking_small: Мал паркинг за велосипеди
-          toilets: Тоалет

     welcome:
       title: Добре дојдовте!
       introduction: Добре дојдовте на OpenStreetMap — слободна и уредлива карта на
     welcome:
       title: Добре дојдовте!
       introduction: Добре дојдовте на OpenStreetMap — слободна и уредлива карта на


@@ -2516,6 +2427,95 @@ mk:
           Нема потреба од формално основање на група како што тоа важи за месните ограноци.
           Многу групи работат мошне успешно со неформални собири на учесници или како заедница. Секој може да отпочне ваква група или да се приклучи кон постоечка. Повеќе за нив ќе прочитате на %{communities_wiki_link}.
         communities_wiki: викистраницата за Заедници
           Нема потреба од формално основање на група како што тоа важи за месните ограноци.
           Многу групи работат мошне успешно со неформални собири на учесници или како заедница. Секој може да отпочне ваква група или да се приклучи кон постоечка. Повеќе за нив ќе прочитате на %{communities_wiki_link}.
         communities_wiki: викистраницата за Заедници

+  map_keys:
+    show:
+      entries:
+        motorway: Автопат
+        main_road: Главен пат
+        trunk: Главна сообраќајна артерија
+        primary: Главен пат
+        secondary: Спореден пат
+        unclassified: Некласификуван пат
+        pedestrian: Пешачки пат
+        track: Патека
+        bridleway: Пешачко-влечен пат
+        cycleway: Велосипедска патека
+        cycleway_national: Државна велосипедска патека
+        cycleway_regional: Регионална велосипедска патека
+        cycleway_local: Месна велосипедска патека
+        cycleway_mtb: Пат за планински велосипедизам
+        footway: Пешачка патека
+        rail: Железница
+        train: Воз
+        subway: Метро
+        ferry: Траект
+        light_rail: Лека железница
+        tram: Трамвај
+        trolleybus: Тролејбус
+        bus: Автобус
+        cable_car: Клупна жичница
+        chair_lift: Клупна жичница
+        runway: Аеродромска писта
+        taxiway: Рулажна патека
+        apron: Аеродромска платформа
+        admin: Административна граница
+        capital: Главен град
+        city: Град
+        orchard: Овоштарник
+        vineyard: Лозје
+        forest: Шума
+        wood: Шума
+        farmland: Земјоделско земјиште
+        grass: Трева
+        meadow: Ливада
+        bare_rock: Гола карпа
+        sand: Песок
+        golf: Голф-терен
+        park: Парк
+        common: Општествена земја
+        built_up: Изградено подрачје
+        resident: Станбено подрачје
+        retail: Трговско подрачје
+        industrial: Индустриско подрачје
+        commercial: Комерцијално подрачје
+        heathland: Вресиште
+        scrubland: Шикара
+        lake: Езеро
+        reservoir: Резервоар
+        intermittent_water: Повремена водна површина
+        glacier: Ледник
+        reef: Гребен
+        wetland: Моклиште
+        farm: Фарма
+        brownfield: Запуштено подрачје
+        cemetery: Гробишта
+        allotments: Парцели
+        pitch: Спортски терен
+        centre: Спортски центар
+        beach: Плажа
+        reserve: Природен резерват
+        military: Воено подрачје
+        school: Училиште
+        university: Универзитет
+        hospital: Болница
+        building: Значајно здание
+        station: Железничка станица
+        railway_halt: Железничка постојка
+        subway_station: Метростаница
+        tram_stop: Трамвајска постојка
+        summit: Врв
+        peak: Врв
+        tunnel: Испрекината линија = тунел
+        bridge: Црна линија = мост
+        private: Доверлив пристап
+        destination: Пристап до одредницата
+        construction: Патишта во изградба
+        bus_stop: Автобуска постојка
+        bicycle_shop: Точкар
+        bicycle_rental: Изнајмување велосипеди
+        bicycle_parking: Паркирање велосипеди
+        bicycle_parking_small: Мал паркинг за велосипеди
+        toilets: Тоалет

   traces:
     visibility:
       private: Доверливо (споделено само како анонимни, неподредени точки)
   traces:
     visibility:
       private: Доверливо (споделено само како анонимни, неподредени точки)

diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index 4bc754305914f5cd5c0412791a03c01d218bbff5..2971c6003c5ca03663b1d6d5d3a287b86d20731d 100644 (file)
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -1086,57 +1086,6 @@ mr:
       where_am_i: मी कुठे आहे?
       submit_text: जा
       reverse_directions_text: दिशा उलटावा
       where_am_i: मी कुठे आहे?
       submit_text: जा
       reverse_directions_text: दिशा उलटावा

-    key:
-      table:
-        entry:
-          motorway: द्रुतगतीमार्ग
-          trunk: महामार्ग
-          primary: प्राथमिक रस्ता
-          secondary: दुय्यम रस्ता
-          unclassified: अवर्गीकृत रस्ता
-          track: वाट
-          bridleway: अश्वमार्ग
-          cycleway: सायकल मार्ग
-          footway: पदपथ
-          rail: लोहमार्ग
-          subway: मेट्रो
-          cable_car: रज्जुमार्ग
-          chair_lift: खुर्ची उद्वाहन
-          runway: विमानतळ धावपट्टी
-          taxiway: खेचमार्ग
-          apron: विमानतळावरील भरणतळ
-          admin: प्रशासकीय सीमा
-          forest: वन
-          wood: जंगल
-          golf: गोल्फ कोर्स
-          park: उद्यान
-          common: सार्वजनिक जमीन
-          resident: निवासी क्षेत्र
-          retail: विक्री क्षेत्र
-          industrial: औद्योगिक क्षेत्र
-          commercial: वाणिज्यिक क्षेत्र
-          lake: तलाव
-          reservoir: जलाशय
-          farm: मळा
-          cemetery: दफनभूमी
-          allotments: वाटप
-          pitch: खेळमैदान
-          centre: क्रीडाकेंद्र
-          reserve: अभयारण्य
-          military: लष्करी क्षेत्र
-          school: शाळा
-          university: विद्यापीठ
-          building: महत्वपूर्ण इमारत
-          station: रेल्वे स्थानक
-          summit: शिखर
-          peak: शिखर
-          tunnel: तुटक कड = बोगदा
-          bridge: काळी कड = पूल
-          private: खाजगी प्रवेश
-          destination: केवळ गंतव्यासाठी प्रवेश
-          construction: निर्माणाधीन रस्ते
-          bicycle_shop: सायकल दुकान
-          toilets: स्वच्छतागृह

     welcome:
       title: सुस्वागतम्‌!
       whats_on_the_map:
     welcome:
       title: सुस्वागतम्‌!
       whats_on_the_map:


@@ -1159,6 +1108,57 @@ mr:
           तर एक टिप्पणी जोडणे सोपे आहे.
     communities:
       title: समुदाय
           तर एक टिप्पणी जोडणे सोपे आहे.
     communities:
       title: समुदाय

+  map_keys:
+    show:
+      entries:
+        motorway: द्रुतगतीमार्ग
+        trunk: महामार्ग
+        primary: प्राथमिक रस्ता
+        secondary: दुय्यम रस्ता
+        unclassified: अवर्गीकृत रस्ता
+        track: वाट
+        bridleway: अश्वमार्ग
+        cycleway: सायकल मार्ग
+        footway: पदपथ
+        rail: लोहमार्ग
+        subway: मेट्रो
+        cable_car: रज्जुमार्ग
+        chair_lift: खुर्ची उद्वाहन
+        runway: विमानतळ धावपट्टी
+        taxiway: खेचमार्ग
+        apron: विमानतळावरील भरणतळ
+        admin: प्रशासकीय सीमा
+        forest: वन
+        wood: जंगल
+        golf: गोल्फ कोर्स
+        park: उद्यान
+        common: सार्वजनिक जमीन
+        resident: निवासी क्षेत्र
+        retail: विक्री क्षेत्र
+        industrial: औद्योगिक क्षेत्र
+        commercial: वाणिज्यिक क्षेत्र
+        lake: तलाव
+        reservoir: जलाशय
+        farm: मळा
+        cemetery: दफनभूमी
+        allotments: वाटप
+        pitch: खेळमैदान
+        centre: क्रीडाकेंद्र
+        reserve: अभयारण्य
+        military: लष्करी क्षेत्र
+        school: शाळा
+        university: विद्यापीठ
+        building: महत्वपूर्ण इमारत
+        station: रेल्वे स्थानक
+        summit: शिखर
+        peak: शिखर
+        tunnel: तुटक कड = बोगदा
+        bridge: काळी कड = पूल
+        private: खाजगी प्रवेश
+        destination: केवळ गंतव्यासाठी प्रवेश
+        construction: निर्माणाधीन रस्ते
+        bicycle_shop: सायकल दुकान
+        toilets: स्वच्छतागृह

   traces:
     visibility:
       private: खाजगी (फक्त अनामिक म्हणून सामायिक केलेले, अक्रमित बिंदू)
   traces:
     visibility:
       private: खाजगी (फक्त अनामिक म्हणून सामायिक केलेले, अक्रमित बिंदू)

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 810c0dba8c39ea27cff93db80ceae7c9fc335792..921a45bcdc42fd7bef342eae51bc3018a8b9e213 100644 (file)
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1600,61 +1600,6 @@ ms:
         bicycle: Basikal
         car: Kereta
         foot: Jalan kaki
         bicycle: Basikal
         car: Kereta
         foot: Jalan kaki

-    key:
-      table:
-        entry:
-          motorway: Lebuhraya
-          main_road: Jalan besar
-          trunk: Jalan utama
-          primary: Jalan utama
-          secondary: Jalan sekunder
-          unclassified: Jalan tidak terkelas
-          track: Laluan
-          bridleway: Lorong kuda
-          cycleway: Lorong basikal
-          footway: Laluan pejalan kaki
-          rail: Landasan keretapi
-          subway: Landasan bawah tanah
-          cable_car: Kereta kabel
-          chair_lift: lif kerusi
-          runway: Landasan kapal terbang
-          taxiway: jalan rayap
-          apron: Kawasan gerak lapangan terbang
-          admin: Sempadan pentadbiran
-          forest: Hutan
-          wood: Hutan kecil
-          golf: Padang golf
-          park: Taman
-          common: Tanah awam
-          resident: Kawasan perumahan
-          retail: Kawasan peruncitan
-          industrial: Kawasan perindustrian
-          commercial: Kawasan perdagangan
-          heathland: Kawasan rawa
-          lake: Tasik
-          reservoir: takungan
-          farm: Ladang
-          brownfield: Tanah terbiar
-          cemetery: Perkuburan
-          allotments: Taman petak
-          pitch: Padang sukan
-          centre: Pusat sukan
-          reserve: Cagar alam
-          military: Kawasan tentera
-          school: Sekolah
-          university: universiti
-          building: Bangunan penting
-          station: Stesen keretapi
-          summit: Kemuncak
-          peak: puncak
-          tunnel: Kasing bertitik-titik = terowong
-          bridge: Kasing hitam = jambatan
-          private: Jalan masuk persendirian
-          destination: Jalan masuk destinasi
-          construction: Jalan dalam pembinaan
-          bicycle_shop: Kedai Basikal
-          bicycle_parking: Tempat letak basikal
-          toilets: Tandas

     welcome:
       title: Selamat datang!
       introduction: Selamat datang ke OpenStreetMap, peta dunia yang bebas disunting
     welcome:
       title: Selamat datang!
       introduction: Selamat datang ke OpenStreetMap, peta dunia yang bebas disunting


@@ -1681,6 +1626,61 @@ ms:
     communities:
       other_groups:
         communities_wiki: Laman wiki komuniti
     communities:
       other_groups:
         communities_wiki: Laman wiki komuniti

+  map_keys:
+    show:
+      entries:
+        motorway: Lebuhraya
+        main_road: Jalan besar
+        trunk: Jalan utama
+        primary: Jalan utama
+        secondary: Jalan sekunder
+        unclassified: Jalan tidak terkelas
+        track: Laluan
+        bridleway: Lorong kuda
+        cycleway: Lorong basikal
+        footway: Laluan pejalan kaki
+        rail: Landasan keretapi
+        subway: Landasan bawah tanah
+        cable_car: Kereta kabel
+        chair_lift: lif kerusi
+        runway: Landasan kapal terbang
+        taxiway: jalan rayap
+        apron: Kawasan gerak lapangan terbang
+        admin: Sempadan pentadbiran
+        forest: Hutan
+        wood: Hutan kecil
+        golf: Padang golf
+        park: Taman
+        common: Tanah awam
+        resident: Kawasan perumahan
+        retail: Kawasan peruncitan
+        industrial: Kawasan perindustrian
+        commercial: Kawasan perdagangan
+        heathland: Kawasan rawa
+        lake: Tasik
+        reservoir: takungan
+        farm: Ladang
+        brownfield: Tanah terbiar
+        cemetery: Perkuburan
+        allotments: Taman petak
+        pitch: Padang sukan
+        centre: Pusat sukan
+        reserve: Cagar alam
+        military: Kawasan tentera
+        school: Sekolah
+        university: universiti
+        building: Bangunan penting
+        station: Stesen keretapi
+        summit: Kemuncak
+        peak: puncak
+        tunnel: Kasing bertitik-titik = terowong
+        bridge: Kasing hitam = jambatan
+        private: Jalan masuk persendirian
+        destination: Jalan masuk destinasi
+        construction: Jalan dalam pembinaan
+        bicycle_shop: Kedai Basikal
+        bicycle_parking: Tempat letak basikal
+        toilets: Tandas

   traces:
     visibility:
       private: Peribadi (hanya dikongsikan sebagai titik yang tidak tersusun secara
   traces:
     visibility:
       private: Peribadi (hanya dikongsikan sebagai titik yang tidak tersusun secara

diff --git a/config/locales/my.yml b/config/locales/my.yml
index 06e58eebe299e372c5704ff6958c773016c729df..f920d32590e1f4291dc9838cbbcce353cf7726b9 100644 (file)
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -644,23 +644,6 @@ my:
       from: မှ
       to: သို့
       submit_text: သွားပါ
       from: မှ
       to: သို့
       submit_text: သွားပါ

-    key:
-      table:
-        entry:
-          primary: ပင်မလမ်း
-          bridleway: မြင်းစီးလမ်း
-          cycleway: စက်ဘီးသွားလမ်း
-          rail: ရထားလမ်း
-          runway: လေယာဉ်ကွင်းပြေးလမ်း
-          forest: သစ်တော
-          park: ပန်းခြံ
-          lake: ရေကန်
-          cemetery: သုဿန်
-          school: ကျောင်း
-          university: တက္ကသိုလ်
-          station: ရထားဘူတာ
-          construction: ဖောက်နေဆဲ လမ်းများ
-          toilets: အိမ်သာများ

     welcome:
       title: ကြိုဆိုပါသည်!
       rules:
     welcome:
       title: ကြိုဆိုပါသည်!
       rules:


@@ -669,6 +652,23 @@ my:
     communities:
       other_groups:
         title: အခြားအုပ်စုများ
     communities:
       other_groups:
         title: အခြားအုပ်စုများ

+  map_keys:
+    show:
+      entries:
+        primary: ပင်မလမ်း
+        bridleway: မြင်းစီးလမ်း
+        cycleway: စက်ဘီးသွားလမ်း
+        rail: ရထားလမ်း
+        runway: လေယာဉ်ကွင်းပြေးလမ်း
+        forest: သစ်တော
+        park: ပန်းခြံ
+        lake: ရေကန်
+        cemetery: သုဿန်
+        school: ကျောင်း
+        university: တက္ကသိုလ်
+        station: ရထားဘူတာ
+        construction: ဖောက်နေဆဲ လမ်းများ
+        toilets: အိမ်သာများ

   traces:
     new:
       visibility_help: ဒါက ဘာကိုဆိုလိုတာပါလိမ့်
   traces:
     new:
       visibility_help: ဒါက ဘာကိုဆိုလိုတာပါလိမ့်

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index d1a7575b96e248e45000f0d76fe6bed341e4d337..5814560c83697c3adadf6bd139c6e30bfc271cfa 100644 (file)
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -1796,74 +1796,6 @@ nb:
         bicycle: Sykkel
         car: Bil
         foot: Til fots
         bicycle: Sykkel
         car: Bil
         foot: Til fots

-    key:
-      table:
-        entry:
-          motorway: Motorvei
-          main_road: Hovedvei
-          trunk: Hovedvei
-          primary: Primær vei
-          secondary: Sekundær vei
-          unclassified: Uklassifisert vei
-          track: Spor
-          bridleway: Ridevei
-          cycleway: Sykkelvei
-          cycleway_national: Nasjonal sykkelsti
-          cycleway_regional: Regional sykkelsti
-          cycleway_local: Lokal sykkelsti
-          footway: Gangvei
-          rail: Jernbane
-          subway: Undergrunnsbane
-          cable_car: Kabelvogn
-          chair_lift: stolheis
-          runway: Flystripe
-          taxiway: taksebane
-          apron: terminal
-          admin: Administrativ grense
-          capital: Hovedstad
-          city: Storby
-          forest: Skog
-          wood: Ved
-          golf: Golfbane
-          park: Park
-          common: Vanlig
-          resident: Boligområde
-          retail: Detaljsalgområde
-          industrial: Industriområde
-          commercial: Kommersielt område
-          heathland: Heilandskap
-          lake: Innsjø
-          reservoir: reservoar
-          glacier: Isbre
-          reef: Rev
-          wetland: Våtmark
-          farm: Gård
-          brownfield: Tidligere industriområde
-          cemetery: Gravplass
-          allotments: Kolonihager
-          pitch: Sportsarena
-          centre: Sportssenter
-          beach: Strand
-          reserve: Naturreservat
-          military: Militært område
-          school: Skole
-          university: Universitet
-          hospital: Sykehus
-          building: Viktig bygning
-          station: Jernbanestasjon
-          summit: Topp
-          peak: Fjelltopp
-          tunnel: Streket kant = tunnel
-          bridge: Sort kant = bru
-          private: Privat tilgang
-          destination: Destinasjonstilgang
-          construction: Veier under konstruksjon
-          bus_stop: Busstopp
-          bicycle_shop: Sykkelbutikk
-          bicycle_rental: Sykkelutleie
-          bicycle_parking: Sykkelparkering
-          bicycle_parking_small: Liten sykkelparkering
-          toilets: Toaletter

     welcome:
       title: Velkommen!
       introduction: Velkommen til OpenStreetMap, det fri brukerredigerte verdenskartet.
     welcome:
       title: Velkommen!
       introduction: Velkommen til OpenStreetMap, det fri brukerredigerte verdenskartet.


@@ -1903,6 +1835,74 @@ nb:
           Det er ikke nødvendig å formelt etablere en gruppe i samme grad som de lokale avdelingene.
           Mange grupper eksisterer faktisk svært vellykket som en uformell samling av mennesker eller som en
           fellesskapsgruppe. Alle kan sette opp eller bli med i disse. Les mer på %{communities_wiki_link}.
           Det er ikke nødvendig å formelt etablere en gruppe i samme grad som de lokale avdelingene.
           Mange grupper eksisterer faktisk svært vellykket som en uformell samling av mennesker eller som en
           fellesskapsgruppe. Alle kan sette opp eller bli med i disse. Les mer på %{communities_wiki_link}.

+  map_keys:
+    show:
+      entries:
+        motorway: Motorvei
+        main_road: Hovedvei
+        trunk: Hovedvei
+        primary: Primær vei
+        secondary: Sekundær vei
+        unclassified: Uklassifisert vei
+        track: Spor
+        bridleway: Ridevei
+        cycleway: Sykkelvei
+        cycleway_national: Nasjonal sykkelsti
+        cycleway_regional: Regional sykkelsti
+        cycleway_local: Lokal sykkelsti
+        footway: Gangvei
+        rail: Jernbane
+        subway: Undergrunnsbane
+        cable_car: Kabelvogn
+        chair_lift: stolheis
+        runway: Flystripe
+        taxiway: taksebane
+        apron: terminal
+        admin: Administrativ grense
+        capital: Hovedstad
+        city: Storby
+        forest: Skog
+        wood: Ved
+        golf: Golfbane
+        park: Park
+        common: Vanlig
+        resident: Boligområde
+        retail: Detaljsalgområde
+        industrial: Industriområde
+        commercial: Kommersielt område
+        heathland: Heilandskap
+        lake: Innsjø
+        reservoir: reservoar
+        glacier: Isbre
+        reef: Rev
+        wetland: Våtmark
+        farm: Gård
+        brownfield: Tidligere industriområde
+        cemetery: Gravplass
+        allotments: Kolonihager
+        pitch: Sportsarena
+        centre: Sportssenter
+        beach: Strand
+        reserve: Naturreservat
+        military: Militært område
+        school: Skole
+        university: Universitet
+        hospital: Sykehus
+        building: Viktig bygning
+        station: Jernbanestasjon
+        summit: Topp
+        peak: Fjelltopp
+        tunnel: Streket kant = tunnel
+        bridge: Sort kant = bru
+        private: Privat tilgang
+        destination: Destinasjonstilgang
+        construction: Veier under konstruksjon
+        bus_stop: Busstopp
+        bicycle_shop: Sykkelbutikk
+        bicycle_rental: Sykkelutleie
+        bicycle_parking: Sykkelparkering
+        bicycle_parking_small: Liten sykkelparkering
+        toilets: Toaletter

   traces:
     visibility:
       private: Privat (bare delt som anononyme, usorterte punkter)
   traces:
     visibility:
       private: Privat (bare delt som anononyme, usorterte punkter)

diff --git a/config/locales/nds.yml b/config/locales/nds.yml
index 59b90862db8b91c6358cecc91f108ba884ee5d6a..7d78243e6d52d40b0850ca8fe40d16ef9d89d2e3 100644 (file)
--- a/config/locales/nds.yml
+++ b/config/locales/nds.yml
@@ -457,56 +457,56 @@ nds:
       search: Söken
       where_am_i: Woneem bün ik?
       submit_text: Los
       search: Söken
       where_am_i: Woneem bün ik?
       submit_text: Los

-    key:
-      table:
-        entry:
-          motorway: Autobahn
-          trunk: Snellstraat
-          primary: wichtige Landstraat
-          secondary: lüttjere Landstraat
-          unclassified: Straat
-          track: Feldweg
-          bridleway: Riedpadd
-          cycleway: Fohrradpadd
-          footway: Footpadd
-          rail: Iesenbahn
-          subway: U-Bahn
-          cable_car: Kavelbahn
-          chair_lift: Skilift
-          runway: Fleger-Lannbahn
-          taxiway: Fleger-Rullweg
-          apron: Terminal
-          admin: Grenz
-          forest: Forst
-          wood: Woold
-          golf: Golfplatz
-          park: Park
-          common: Wisch
-          resident: Wahnrebeed
-          retail: Ladenrebeed
-          industrial: Industrierebeed
-          commercial: Hannelsrebeed
-          heathland: Heid
-          lake: See
-          reservoir: Stausee
-          farm: Buurnhoff
-          brownfield: Industrie-Braakland
-          cemetery: Karkhoff
-          allotments: Schrebergoorns
-          pitch: Sportfeld
-          centre: Sportzentrum
-          reserve: Naturpark
-          military: Militärrebeed
-          school: School
-          university: Universität
-          building: Wichtig Bowark
-          station: Bahnhoff
-          summit: Bargtopp
-          peak: Bargtopp
-          tunnel: Strekel-Rand = Tunnel
-          bridge: Fett Rand = Brügg
-          private: Privat Togang
-          construction: Straat, an de noch boot warrt
+  map_keys:
+    show:
+      entries:
+        motorway: Autobahn
+        trunk: Snellstraat
+        primary: wichtige Landstraat
+        secondary: lüttjere Landstraat
+        unclassified: Straat
+        track: Feldweg
+        bridleway: Riedpadd
+        cycleway: Fohrradpadd
+        footway: Footpadd
+        rail: Iesenbahn
+        subway: U-Bahn
+        cable_car: Kavelbahn
+        chair_lift: Skilift
+        runway: Fleger-Lannbahn
+        taxiway: Fleger-Rullweg
+        apron: Terminal
+        admin: Grenz
+        forest: Forst
+        wood: Woold
+        golf: Golfplatz
+        park: Park
+        common: Wisch
+        resident: Wahnrebeed
+        retail: Ladenrebeed
+        industrial: Industrierebeed
+        commercial: Hannelsrebeed
+        heathland: Heid
+        lake: See
+        reservoir: Stausee
+        farm: Buurnhoff
+        brownfield: Industrie-Braakland
+        cemetery: Karkhoff
+        allotments: Schrebergoorns
+        pitch: Sportfeld
+        centre: Sportzentrum
+        reserve: Naturpark
+        military: Militärrebeed
+        school: School
+        university: Universität
+        building: Wichtig Bowark
+        station: Bahnhoff
+        summit: Bargtopp
+        peak: Bargtopp
+        tunnel: Strekel-Rand = Tunnel
+        bridge: Fett Rand = Brügg
+        private: Privat Togang
+        construction: Straat, an de noch boot warrt

   traces:
     new:
       help: Hülp
   traces:
     new:
       help: Hülp

diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 630541bde1313f0dd3b2550661171cf737265979..b676cb7403964d1bc9efb1dca7f490a05ae99634 100644 (file)
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -1249,51 +1249,6 @@ ne:
       from: बाट
       to: लाई
       submit_text: जानुहोस्
       from: बाट
       to: लाई
       submit_text: जानुहोस्

-    key:
-      table:
-        entry:
-          motorway: मोटरमार्ग
-          main_road: मुख्य सडक
-          trunk: ट्रङ्क सडक
-          primary: प्राथमिक सडक
-          secondary: माध्यमिक सडक
-          unclassified: वर्गिकरण नगरिएको सडक
-          track: ट्रयाक
-          cycleway: साइकल मार्ग
-          rail: रेलमार्ग
-          subway: सबवे
-          cable_car: केबल कार
-          chair_lift: कुर्सी लिफ्ट
-          taxiway: ट्याक्सीको बाटो
-          city: शहर
-          vineyard: अङ्गुर-बगैँचा
-          forest: वन
-          wood: कुञ्ज
-          farmland: खेतीयोग्य जमिन
-          grass: घाँस
-          meadow: घाँसेमैदान
-          sand: बालुवा
-          golf: गल्फ कोर्स
-          park: उद्यान
-          resident: आवासीय क्षेत्र
-          lake: ताल
-          reservoir: जलाशय
-          glacier: हिमनदी
-          wetland: सिमसार
-          farm: खेती
-          cemetery: अन्त्यष्टी स्थल
-          beach: समुद्र किनारा
-          school: विद्यालय
-          university: विश्वविद्यालय
-          hospital: अस्पताल
-          summit: शिखर
-          peak: शिखर
-          bus_stop: बस बिसौनी
-          bicycle_shop: साइकल पसल
-          bicycle_rental: साइकल भाडामा
-          bicycle_parking: साकल पार्किङ
-          bicycle_parking_small: सानो साइकल पार्किङ
-          toilets: शौचालय

     welcome:
       title: स्वागत!
       whats_on_the_map:
     welcome:
       title: स्वागत!
       whats_on_the_map:


@@ -1309,6 +1264,51 @@ ne:
       start_mapping: म्यापिङ गर्न सुरु गर्नुहोस्
     communities:
       title: समुदायहरू
       start_mapping: म्यापिङ गर्न सुरु गर्नुहोस्
     communities:
       title: समुदायहरू

+  map_keys:
+    show:
+      entries:
+        motorway: मोटरमार्ग
+        main_road: मुख्य सडक
+        trunk: ट्रङ्क सडक
+        primary: प्राथमिक सडक
+        secondary: माध्यमिक सडक
+        unclassified: वर्गिकरण नगरिएको सडक
+        track: ट्रयाक
+        cycleway: साइकल मार्ग
+        rail: रेलमार्ग
+        subway: सबवे
+        cable_car: केबल कार
+        chair_lift: कुर्सी लिफ्ट
+        taxiway: ट्याक्सीको बाटो
+        city: शहर
+        vineyard: अङ्गुर-बगैँचा
+        forest: वन
+        wood: कुञ्ज
+        farmland: खेतीयोग्य जमिन
+        grass: घाँस
+        meadow: घाँसेमैदान
+        sand: बालुवा
+        golf: गल्फ कोर्स
+        park: उद्यान
+        resident: आवासीय क्षेत्र
+        lake: ताल
+        reservoir: जलाशय
+        glacier: हिमनदी
+        wetland: सिमसार
+        farm: खेती
+        cemetery: अन्त्यष्टी स्थल
+        beach: समुद्र किनारा
+        school: विद्यालय
+        university: विश्वविद्यालय
+        hospital: अस्पताल
+        summit: शिखर
+        peak: शिखर
+        bus_stop: बस बिसौनी
+        bicycle_shop: साइकल पसल
+        bicycle_rental: साइकल भाडामा
+        bicycle_parking: साकल पार्किङ
+        bicycle_parking_small: सानो साइकल पार्किङ
+        toilets: शौचालय

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

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index e77b978f831726b6b8c76a1f0a284d3000ad9331..1e9bb3ef1ba10e68c68501c018bd4bba512fd83a 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1643,7 +1643,9 @@ nl:
       title: Problemen
       select_status: Selecteer Status
       select_type: Selecteer Type
       title: Problemen
       select_status: Selecteer Status
       select_type: Selecteer Type

+      select_last_managed_by: Selecteer Laatst beheerd door

       reported_user: Gerapporteerde gebruiker
       reported_user: Gerapporteerde gebruiker

+      not_managed: Niet beheerd

       search: Zoeken
       search_guidance: 'Problemen zoeken:'
       states:
       search: Zoeken
       search_guidance: 'Problemen zoeken:'
       states:


@@ -1657,6 +1659,8 @@ nl:
       status: Status
       reports: Rapportages
       last_updated: Laatst Bijgewerkt
       status: Status
       reports: Rapportages
       last_updated: Laatst Bijgewerkt

+      last_managed: Laatst beheerd
+      reporting_users: Gebruikers melden

       reports_count:
         one: '%{count} rapport'
         other: '%{count} rapporten'
       reports_count:
         one: '%{count} rapport'
         other: '%{count} rapporten'


@@ -1694,6 +1698,8 @@ nl:
       reopened: De status van het probleem is ingesteld op 'Open'
     comments:
       comment_from_html: Reactie van %{user_link} op %{comment_created_at}
       reopened: De status van het probleem is ingesteld op 'Open'
     comments:
       comment_from_html: Reactie van %{user_link} op %{comment_created_at}

+      reassign_to_moderators: Probleem opnieuw toewijzen aan moderators
+      reassign_to_administrators: Probleem opnieuw toewijzen aan beheerders

     reports:
       reported_by_html: Als %{category} gerapporteerd door %{user} op %{updated_at}
     helper:
     reports:
       reported_by_html: Als %{category} gerapporteerd door %{user} op %{updated_at}
     helper:


@@ -2150,6 +2156,9 @@ nl:
       preview: Voorvertoning
       help: Hulp
     pagination:
       preview: Voorvertoning
       help: Hulp
     pagination:

+      changeset_comments:
+        older: Oudere opmerkingen
+        newer: Nieuwere opmerkingen

       diary_comments:
         older: Oudere reacties
         newer: Nieuwere reacties
       diary_comments:
         older: Oudere reacties
         newer: Nieuwere reacties


@@ -2531,95 +2540,6 @@ nl:
         bicycle: Fiets
         car: Auto
         foot: Te voet
         bicycle: Fiets
         car: Auto
         foot: Te voet

-    key:
-      table:
-        entry:
-          motorway: Autosnelweg
-          main_road: Hoofdweg
-          trunk: Autoweg
-          primary: Primaire weg
-          secondary: Secundaire weg
-          unclassified: Lokale weg
-          pedestrian: Voetpad
-          track: Veld- of bosweg
-          bridleway: Ruiterpad
-          cycleway: Fietspad
-          cycleway_national: Nationale fietsroute
-          cycleway_regional: Regionale fietsroute
-          cycleway_local: Lokale fietsroute
-          cycleway_mtb: Mountainbikeroute
-          footway: Voetpad
-          rail: Spoorweg
-          train: Trein
-          subway: Metro
-          ferry: Veerboot
-          light_rail: Lightrail
-          tram: Tram
-          trolleybus: Trolleybus
-          bus: Bus
-          cable_car: Kabelbaan
-          chair_lift: Stoeltjeslift
-          runway: Start- en landingsbaan
-          taxiway: Taxibaan
-          apron: Luchthavenplatform
-          admin: Bestuurlijke grens
-          capital: Hoofdstad
-          city: Stad
-          orchard: Boomgaard
-          vineyard: Wijngaard
-          forest: Bos
-          wood: Bos
-          farmland: Landbouwgrond
-          grass: Gras
-          meadow: Weide
-          bare_rock: Kale rots
-          sand: Zand
-          golf: Golfbaan
-          park: Park
-          common: Gemene grond
-          built_up: Bebouwde kom
-          resident: Woongebied
-          retail: Winkelgebied
-          industrial: Industriegebied
-          commercial: Commercieel gebied
-          heathland: Heide
-          scrubland: Struikgewas
-          lake: Meer
-          reservoir: Reservoir
-          intermittent_water: Onderbroken waterlichaam
-          glacier: Gletsjer
-          reef: Rif
-          wetland: Moeras
-          farm: Boerderij
-          brownfield: Braakliggend terrein
-          cemetery: Begraafplaats
-          allotments: Volkstuinen
-          pitch: Sportveld
-          centre: Sportcentrum
-          beach: Strand
-          reserve: Natuurreservaat
-          military: Militair gebied
-          school: School; universiteit
-          university: Universiteit
-          hospital: Ziekenhuis
-          building: Belangrijk gebouw
-          station: Spoorwegstation
-          railway_halt: Spoorweghalte
-          subway_station: Metrostation
-          tram_stop: Tramhalte
-          summit: Top
-          peak: Piek
-          tunnel: Tunnel
-          bridge: Brug
-          private: Privétoegang
-          destination: Bestemmingsverkeer
-          construction: Weg in aanleg
-          bus_stop: Bushalte
-          bicycle_shop: Fietsenwinkel
-          bicycle_rental: Fietsverhuur
-          bicycle_parking: Fietsenstalling
-          bicycle_parking_small: Kleine fietsenstalling
-          toilets: Toiletten

     welcome:
       title: Welkom!
       introduction: Welkom bij OpenStreetMap, de open en te bewerken kaart van de
     welcome:
       title: Welkom!
       introduction: Welkom bij OpenStreetMap, de open en te bewerken kaart van de


@@ -2692,6 +2612,95 @@ nl:
           als informele bijeenkomst van mensen of als gemeenschapsgroep. Iedereen
           kan deze opzetten of er lid van worden. Lees meer op de %{communities_wiki_link}.
         communities_wiki: Wiki-pagina community's
           als informele bijeenkomst van mensen of als gemeenschapsgroep. Iedereen
           kan deze opzetten of er lid van worden. Lees meer op de %{communities_wiki_link}.
         communities_wiki: Wiki-pagina community's

+  map_keys:
+    show:
+      entries:
+        motorway: Autosnelweg
+        main_road: Hoofdweg
+        trunk: Autoweg
+        primary: Primaire weg
+        secondary: Secundaire weg
+        unclassified: Lokale weg
+        pedestrian: Voetpad
+        track: Veld- of bosweg
+        bridleway: Ruiterpad
+        cycleway: Fietspad
+        cycleway_national: Nationale fietsroute
+        cycleway_regional: Regionale fietsroute
+        cycleway_local: Lokale fietsroute
+        cycleway_mtb: Mountainbikeroute
+        footway: Voetpad
+        rail: Spoorweg
+        train: Trein
+        subway: Metro
+        ferry: Veerboot
+        light_rail: Lightrail
+        tram: Tram
+        trolleybus: Trolleybus
+        bus: Bus
+        cable_car: Kabelbaan
+        chair_lift: Stoeltjeslift
+        runway: Start- en landingsbaan
+        taxiway: Taxibaan
+        apron: Luchthavenplatform
+        admin: Bestuurlijke grens
+        capital: Hoofdstad
+        city: Stad
+        orchard: Boomgaard
+        vineyard: Wijngaard
+        forest: Bos
+        wood: Bos
+        farmland: Landbouwgrond
+        grass: Gras
+        meadow: Weide
+        bare_rock: Kale rots
+        sand: Zand
+        golf: Golfbaan
+        park: Park
+        common: Gemene grond
+        built_up: Bebouwde kom
+        resident: Woongebied
+        retail: Winkelgebied
+        industrial: Industriegebied
+        commercial: Commercieel gebied
+        heathland: Heide
+        scrubland: Struikgewas
+        lake: Meer
+        reservoir: Reservoir
+        intermittent_water: Onderbroken waterlichaam
+        glacier: Gletsjer
+        reef: Rif
+        wetland: Moeras
+        farm: Boerderij
+        brownfield: Braakliggend terrein
+        cemetery: Begraafplaats
+        allotments: Volkstuinen
+        pitch: Sportveld
+        centre: Sportcentrum
+        beach: Strand
+        reserve: Natuurreservaat
+        military: Militair gebied
+        school: School; universiteit
+        university: Universiteit
+        hospital: Ziekenhuis
+        building: Belangrijk gebouw
+        station: Spoorwegstation
+        railway_halt: Spoorweghalte
+        subway_station: Metrostation
+        tram_stop: Tramhalte
+        summit: Top
+        peak: Piek
+        tunnel: Tunnel
+        bridge: Brug
+        private: Privétoegang
+        destination: Bestemmingsverkeer
+        construction: Weg in aanleg
+        bus_stop: Bushalte
+        bicycle_shop: Fietsenwinkel
+        bicycle_rental: Fietsverhuur
+        bicycle_parking: Fietsenstalling
+        bicycle_parking_small: Kleine fietsenstalling
+        toilets: Toiletten

   traces:
     visibility:
       private: Persoonlijk (alleen gedeeld als anoniem; ongeordende punten)
   traces:
     visibility:
       private: Persoonlijk (alleen gedeeld als anoniem; ongeordende punten)


@@ -2975,6 +2984,7 @@ nl:
       my notes: Mijn opmerkingen
       my messages: Mijn berichten
       my profile: Mijn profiel
       my notes: Mijn opmerkingen
       my messages: Mijn berichten
       my profile: Mijn profiel

+      my_account: Mijn account

       my comments: Mijn reacties
       my_preferences: Mijn voorkeuren
       my_dashboard: Mijn dashboard
       my comments: Mijn reacties
       my_preferences: Mijn voorkeuren
       my_dashboard: Mijn dashboard


@@ -3054,6 +3064,19 @@ nl:
       show:
         title: Gebruikers
         heading: Gebruikers
       show:
         title: Gebruikers
         heading: Gebruikers

+        select_status: Selecteer Status
+        states:
+          pending: In behandeling
+          active: Actief
+          confirmed: Bevestigd
+          suspended: Opgeschort
+          deleted: Verwijderd
+        name_or_email: Naam of e-mail
+        ip_address: IP-adres
+        edits: Bewerkingen?
+        has_edits: Heeft bewerkingen
+        no_edits: Geen bewerkingen
+        search: Zoeken

       page:
         found_users:
           one: '%{count} gebruiker gevonden'
       page:
         found_users:
           one: '%{count} gebruiker gevonden'


@@ -3066,8 +3089,10 @@ nl:
         summary_no_ip_html: '%{name} aangemaakt op %{date}'
     comments:
       index:
         summary_no_ip_html: '%{name} aangemaakt op %{date}'
     comments:
       index:

+        heading_html: Opmerkingen van %{user}

         changesets: Wijzigingensets
         diary_entries: Dagboekberichten
         changesets: Wijzigingensets
         diary_entries: Dagboekberichten

+        no_comments: Geen opmerkingen

     changeset_comments:
       page:
         changeset: Wijzigingenset
     changeset_comments:
       page:
         changeset: Wijzigingenset


@@ -3079,6 +3104,7 @@ nl:
       page:
         post: Dagboekbericht
         when: Wanneer
       page:
         post: Dagboekbericht
         when: Wanneer

+        comment: Opmerking

     suspended:
       title: Gebruiker opgeschort
       heading: Account opgeschort
     suspended:
       title: Gebruiker opgeschort
       heading: Account opgeschort


@@ -3256,6 +3282,8 @@ nl:
       open_title: 'Onopgeloste opmerking #%{note_name}'
       closed_title: 'Opgeloste opmerking #%{note_name}'
       hidden_title: 'Verborgen opmerking #%{note_name}'
       open_title: 'Onopgeloste opmerking #%{note_name}'
       closed_title: 'Opgeloste opmerking #%{note_name}'
       hidden_title: 'Verborgen opmerking #%{note_name}'

+      description_when_author_is_deleted: verwijderd
+      description_when_there_is_no_opening_comment: onbekend

       event_opened_by_html: '%{time_ago} aangemaakt door %{user}'
       event_opened_by_anonymous_html: '%{time_ago} anoniem aangemaakt'
       event_commented_by_html: Reactie van %{user}, %{time_ago}
       event_opened_by_html: '%{time_ago} aangemaakt door %{user}'
       event_opened_by_anonymous_html: '%{time_ago} anoniem aangemaakt'
       event_commented_by_html: Reactie van %{user}, %{time_ago}


@@ -3480,6 +3508,8 @@ nl:
           ninth: 9e
           tenth: 10e
       time: Tijd
           ninth: 9e
           tenth: 10e
       time: Tijd

+      download: Download route als GeoJSON
+      filename: route

     query:
       node: Knooppunt
       way: Weg
     query:
       node: Knooppunt
       way: Weg


@@ -3494,6 +3524,15 @@ nl:
       show_address: Adres weergeven
       query_features: Kaartelementen opvragen
       centre_map: De kaart hier centreren
       show_address: Adres weergeven
       query_features: Kaartelementen opvragen
       centre_map: De kaart hier centreren

+    home:
+      marker_title: Mijn thuislocatie
+      not_set: De thuislocatie is niet ingesteld voor uw account
+    heatmap:
+      tooltip:
+        no_contributions: Geen bijdragen op %{date}
+        contributions:
+          one: '%{count} bijdrage op %{date}'
+          other: '% {count} bijdragen op %{date}'

   redactions:
     edit:
       heading: Redigering bewerken
   redactions:
     edit:
       heading: Redigering bewerken

diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 264b98504d4c643537e02bfe051fb6021967dffe..461dc3ed7ef1c8eee7b065ca18c48afbd2c7f545 100644 (file)
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -2029,64 +2029,6 @@ nn:
         bicycle: Sykkel
         car: Bil
         foot: Til fots
         bicycle: Sykkel
         car: Bil
         foot: Til fots

-    key:
-      table:
-        entry:
-          motorway: Motorveg
-          main_road: Hovudveg
-          trunk: Hovedveg
-          primary: Primærveg
-          secondary: Sekundærveg
-          unclassified: Uklassifisert veg
-          track: Spor
-          bridleway: Rideveg
-          cycleway: Sykkelveg
-          cycleway_national: Nasjonal sykkelsti
-          cycleway_regional: Regional sykkelsti
-          cycleway_local: Lokal sykkelsti
-          footway: Gangveg
-          rail: Jernbane
-          subway: Undergrunnsbane
-          cable_car: Kabelvogn
-          chair_lift: stolheis
-          runway: Flystripe
-          taxiway: taksebane
-          apron: terminal
-          admin: Administrativ grense
-          forest: Skog
-          wood: Ved
-          golf: Golfbane
-          park: Park
-          common: Vanleg
-          resident: Boligområde
-          retail: Detaljsalgområde
-          industrial: Industriområde
-          commercial: Kommersielt område
-          heathland: Heilandskap
-          lake: Innsjø
-          reservoir: reservoar
-          farm: Gard
-          brownfield: Tidlegare industriområde
-          cemetery: Gravplass
-          allotments: Kolonihagar
-          pitch: Sportsarena
-          centre: Sportssenter
-          reserve: Naturreservat
-          military: Militært område
-          school: Skule
-          university: universitet
-          building: Viktig bygning
-          station: Jernbanestasjon
-          summit: Topp
-          peak: fjelltopp
-          tunnel: Streka kant = tunnel
-          bridge: Sort kant = bru
-          private: Privat tilgjenge
-          destination: Destinasjonstilgang
-          construction: Vegar under konstruksjon
-          bicycle_shop: Sykkelbutikk
-          bicycle_parking: Sykkelparkering
-          toilets: Toalett

     welcome:
       title: Velkomen!
       whats_on_the_map:
     welcome:
       title: Velkomen!
       whats_on_the_map:


@@ -2098,6 +2040,64 @@ nn:
       start_mapping: Start kartlegging
       add_a_note:
         title: Ikkje tid til å kartleggje sjølv? Legg inn ein merknad.
       start_mapping: Start kartlegging
       add_a_note:
         title: Ikkje tid til å kartleggje sjølv? Legg inn ein merknad.

+  map_keys:
+    show:
+      entries:
+        motorway: Motorveg
+        main_road: Hovudveg
+        trunk: Hovedveg
+        primary: Primærveg
+        secondary: Sekundærveg
+        unclassified: Uklassifisert veg
+        track: Spor
+        bridleway: Rideveg
+        cycleway: Sykkelveg
+        cycleway_national: Nasjonal sykkelsti
+        cycleway_regional: Regional sykkelsti
+        cycleway_local: Lokal sykkelsti
+        footway: Gangveg
+        rail: Jernbane
+        subway: Undergrunnsbane
+        cable_car: Kabelvogn
+        chair_lift: stolheis
+        runway: Flystripe
+        taxiway: taksebane
+        apron: terminal
+        admin: Administrativ grense
+        forest: Skog
+        wood: Ved
+        golf: Golfbane
+        park: Park
+        common: Vanleg
+        resident: Boligområde
+        retail: Detaljsalgområde
+        industrial: Industriområde
+        commercial: Kommersielt område
+        heathland: Heilandskap
+        lake: Innsjø
+        reservoir: reservoar
+        farm: Gard
+        brownfield: Tidlegare industriområde
+        cemetery: Gravplass
+        allotments: Kolonihagar
+        pitch: Sportsarena
+        centre: Sportssenter
+        reserve: Naturreservat
+        military: Militært område
+        school: Skule
+        university: universitet
+        building: Viktig bygning
+        station: Jernbanestasjon
+        summit: Topp
+        peak: fjelltopp
+        tunnel: Streka kant = tunnel
+        bridge: Sort kant = bru
+        private: Privat tilgjenge
+        destination: Destinasjonstilgang
+        construction: Vegar under konstruksjon
+        bicycle_shop: Sykkelbutikk
+        bicycle_parking: Sykkelparkering
+        toilets: Toalett

   traces:
     visibility:
       private: Privat (berre delt som anononyme, usorterte punkt)
   traces:
     visibility:
       private: Privat (berre delt som anononyme, usorterte punkt)

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 494cb94866bf08b56a9ce3e2597df812e899e0c9..f75e4b371c4b9f797b8248848c06b12bf327faa1 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -1409,40 +1409,6 @@ nqo:
         bicycle: ߣߍ߰ߛߏ
         car: ߞߐ߲߬ߛߏ
         foot: ߛߋ߲߬ߡߊ߬ߟߊ
         bicycle: ߣߍ߰ߛߏ
         car: ߞߐ߲߬ߛߏ
         foot: ߛߋ߲߬ߡߊ߬ߟߊ

-    key:
-      table:
-        entry:
-          motorway: ߝߏ߲߬ߘߏ
-          main_road: ߛߌߟߊ߫ ߓߊߖߎߡߊ
-          primary: ߛߌߟߊ ߓߊߖߎߟߞߊ
-          unclassified: ߛߌߟߊ߫ ߛߙߊߛߌ߰ߓߊߟߌ
-          footway: ߛߋ߲߬ߡߊ߬ߛߌߟߊ
-          rail: ߣߍ߰ߛߌߟߊ
-          subway: ߘߎ߰ߞߘߐ߬ߛߌߟߊ
-          cable_car: ߘߎ߲ߞߎߟߎ߲
-          runway: ߛߊ߲ߡߊߘߊ߲ ߓߏ߬ߙߌ߬ ߛߌߟߊ
-          taxiway: ߥߊߟߌߥߊߟߌ ߫ ߛߌߟߊ
-          admin: ߓߐߕߏ߲߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ߬ߞߊ
-          forest: ߕߎ
-          wood: ߦߙߌ
-          common: ߘߍ߬ߒ߬ߡߊ߬ ߞߣߍ
-          resident: ߡߐ߰ߘߐ߬ ߛߌߟߊ
-          retail: ߖߎ߬ߟߦߊ߬ ߞߣߍ
-          industrial: ߘߍ߲߰ߦߊ߬ߟߌ ߕߌ߲߬ߞߎߘߎ߲
-          commercial: ߖߊ߬ߥߏ ߘߌ߲߬ߞߌߙߊ
-          lake: ߞߐ߰ߖߌ߬ߘߟߊ
-          farm: ߝߏ߬ߘߏ
-          cemetery: ߞߊߓߙߎߟߏ
-          centre: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ ߕߊ߲ߓߊ߲
-          reserve: ߛߎ߲ߞߎ߲ ߦߙߐ߫ ߟߊߕߏߣߍ߲
-          military: ߣߊ߲߬ߕߌ߰ ߕߌ߲ߞߎߘߎ߲
-          school: ߞߊ߬ߙߊ߲߬ߕߊ
-          university: ߖߊ߯ߓߘߊ
-          station: ߣߍ߰ߛߌߟߊ ߟߐ߬ߘߊ߮
-          construction: ߛߌߟߊ ߡߍ߲ ߟߊ ߦߴߌ ߘߐ߫
-          bicycle_shop: ߣߍ߰ߛߏ߬ ߝߎ߲ߞߎ߲
-          bicycle_parking: ߣߍ߰ߛߏ߬ ߟߐ߬ߘߊ߮
-          toilets: ߢߍ߲߮

     welcome:
       title: ߊߟߎ߫ ߣߌ߫ ߛߣߍ߫߹
       whats_on_the_map:
     welcome:
       title: ߊߟߎ߫ ߣߌ߫ ߛߣߍ߫߹
       whats_on_the_map:


@@ -1450,6 +1416,40 @@ nqo:
       start_mapping: ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߌ ߘߊߡߌ߬ߣߊ߫
       add_a_note:
         title: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߕߎ߬ߡߊ߬ ߕߴߦߋ߲߬؟ ߦߟߌߣߐ ߘߏ߫ ߝߙߊ߬߹
       start_mapping: ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߌ ߘߊߡߌ߬ߣߊ߫
       add_a_note:
         title: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߕߎ߬ߡߊ߬ ߕߴߦߋ߲߬؟ ߦߟߌߣߐ ߘߏ߫ ߝߙߊ߬߹

+  map_keys:
+    show:
+      entries:
+        motorway: ߝߏ߲߬ߘߏ
+        main_road: ߛߌߟߊ߫ ߓߊߖߎߡߊ
+        primary: ߛߌߟߊ ߓߊߖߎߟߞߊ
+        unclassified: ߛߌߟߊ߫ ߛߙߊߛߌ߰ߓߊߟߌ
+        footway: ߛߋ߲߬ߡߊ߬ߛߌߟߊ
+        rail: ߣߍ߰ߛߌߟߊ
+        subway: ߘߎ߰ߞߘߐ߬ߛߌߟߊ
+        cable_car: ߘߎ߲ߞߎߟߎ߲
+        runway: ߛߊ߲ߡߊߘߊ߲ ߓߏ߬ߙߌ߬ ߛߌߟߊ
+        taxiway: ߥߊߟߌߥߊߟߌ ߫ ߛߌߟߊ
+        admin: ߓߐߕߏ߲߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ߬ߞߊ
+        forest: ߕߎ
+        wood: ߦߙߌ
+        common: ߘߍ߬ߒ߬ߡߊ߬ ߞߣߍ
+        resident: ߡߐ߰ߘߐ߬ ߛߌߟߊ
+        retail: ߖߎ߬ߟߦߊ߬ ߞߣߍ
+        industrial: ߘߍ߲߰ߦߊ߬ߟߌ ߕߌ߲߬ߞߎߘߎ߲
+        commercial: ߖߊ߬ߥߏ ߘߌ߲߬ߞߌߙߊ
+        lake: ߞߐ߰ߖߌ߬ߘߟߊ
+        farm: ߝߏ߬ߘߏ
+        cemetery: ߞߊߓߙߎߟߏ
+        centre: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ ߕߊ߲ߓߊ߲
+        reserve: ߛߎ߲ߞߎ߲ ߦߙߐ߫ ߟߊߕߏߣߍ߲
+        military: ߣߊ߲߬ߕߌ߰ ߕߌ߲ߞߎߘߎ߲
+        school: ߞߊ߬ߙߊ߲߬ߕߊ
+        university: ߖߊ߯ߓߘߊ
+        station: ߣߍ߰ߛߌߟߊ ߟߐ߬ߘߊ߮
+        construction: ߛߌߟߊ ߡߍ߲ ߟߊ ߦߴߌ ߘߐ߫
+        bicycle_shop: ߣߍ߰ߛߏ߬ ߝߎ߲ߞߎ߲
+        bicycle_parking: ߣߍ߰ߛߏ߬ ߟߐ߬ߘߊ߮
+        toilets: ߢߍ߲߮

   traces:
     new:
       upload_trace: GPS ߜߋ߬ߙߋ ߟߊߞߎߘߦߊ߫
   traces:
     new:
       upload_trace: GPS ߜߋ߬ߙߋ ߟߊߞߎߘߦߊ߫

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 940ba1d39aa50cbc874957dda53900fed7090fb7..c5321e6376bfec5f48f15f4a1cddf2713310df1c 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -1883,64 +1883,6 @@ oc:
         bicycle: Bicicleta
         car: Amb la veitura
         foot: A pè
         bicycle: Bicicleta
         car: Amb la veitura
         foot: A pè

-    key:
-      table:
-        entry:
-          motorway: Autorota
-          main_road: Rota principala
-          trunk: Via exprèssa
-          primary: Rota principala
-          secondary: Rota segondària
-          unclassified: Rota pas classificada
-          track: Pista
-          bridleway: Camin per cavalièrs
-          cycleway: Via ciclabla
-          cycleway_national: Via ciclista nacionala
-          cycleway_regional: Via ciclista regionala
-          cycleway_local: Via ciclista locala
-          footway: Via pietonièra
-          rail: Via ferrada
-          subway: Linha de mètro
-          cable_car: Teleferic
-          chair_lift: telesèti
-          runway: Pista d'aeropòrt
-          taxiway: via de circulacion d'aeropòrt
-          apron: Estacionament d'avions
-          admin: Limit administratiu
-          forest: Sèuva
-          wood: Bòsc
-          golf: Percors de gòlf
-          park: Pargue
-          common: Espaci comun
-          resident: Zòna residenciala
-          retail: Zòna de comèrci
-          industrial: Zòna industriala
-          commercial: Zòna terciària
-          heathland: Landa
-          lake: Lac
-          reservoir: Sèrva
-          farm: Zòna agricòla
-          brownfield: Zòna rasada
-          cemetery: Cementèri
-          allotments: Òrts familials
-          pitch: Terren d'espòrt
-          centre: Centre esportiu
-          reserve: Resèrva naturala
-          military: Zòna militara
-          school: Escòla
-          university: universitat
-          building: Bastissa significativa
-          station: Gara ferroviària
-          summit: Som
-          peak: pic
-          tunnel: Bòrd en puntilhats = tunèl
-          bridge: Bòrd negre = pont
-          private: Accès privat
-          destination: Reservat als ribairencs
-          construction: Rotas en construccion
-          bicycle_shop: Magazin de bicicletas
-          bicycle_parking: Parcatge de bicicleta
-          toilets: Comuns

     welcome:
       title: Benvenguda !
       introduction: Vos donam la benvenguda a OpenStreetMap, la mapa liura e editabla
     welcome:
       title: Benvenguda !
       introduction: Vos donam la benvenguda a OpenStreetMap, la mapa liura e editabla


@@ -1960,6 +1902,64 @@ oc:
         para_1: Se volètz solament far una pichona modificacion mai dispausatz pas
           de temps per vos enregistrar e aprene coma editar, laissatz una nòta a la
           mapa.
         para_1: Se volètz solament far una pichona modificacion mai dispausatz pas
           de temps per vos enregistrar e aprene coma editar, laissatz una nòta a la
           mapa.

+  map_keys:
+    show:
+      entries:
+        motorway: Autorota
+        main_road: Rota principala
+        trunk: Via exprèssa
+        primary: Rota principala
+        secondary: Rota segondària
+        unclassified: Rota pas classificada
+        track: Pista
+        bridleway: Camin per cavalièrs
+        cycleway: Via ciclabla
+        cycleway_national: Via ciclista nacionala
+        cycleway_regional: Via ciclista regionala
+        cycleway_local: Via ciclista locala
+        footway: Via pietonièra
+        rail: Via ferrada
+        subway: Linha de mètro
+        cable_car: Teleferic
+        chair_lift: telesèti
+        runway: Pista d'aeropòrt
+        taxiway: via de circulacion d'aeropòrt
+        apron: Estacionament d'avions
+        admin: Limit administratiu
+        forest: Sèuva
+        wood: Bòsc
+        golf: Percors de gòlf
+        park: Pargue
+        common: Espaci comun
+        resident: Zòna residenciala
+        retail: Zòna de comèrci
+        industrial: Zòna industriala
+        commercial: Zòna terciària
+        heathland: Landa
+        lake: Lac
+        reservoir: Sèrva
+        farm: Zòna agricòla
+        brownfield: Zòna rasada
+        cemetery: Cementèri
+        allotments: Òrts familials
+        pitch: Terren d'espòrt
+        centre: Centre esportiu
+        reserve: Resèrva naturala
+        military: Zòna militara
+        school: Escòla
+        university: universitat
+        building: Bastissa significativa
+        station: Gara ferroviària
+        summit: Som
+        peak: pic
+        tunnel: Bòrd en puntilhats = tunèl
+        bridge: Bòrd negre = pont
+        private: Accès privat
+        destination: Reservat als ribairencs
+        construction: Rotas en construccion
+        bicycle_shop: Magazin de bicicletas
+        bicycle_parking: Parcatge de bicicleta
+        toilets: Comuns

   traces:
     visibility:
       private: Privat (partejat anonimament, punts pas ordenats)
   traces:
     visibility:
       private: Privat (partejat anonimament, punts pas ordenats)

diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index ce908d6614a9c9340b916855a3d134b2be4008fd..d57c930370e12ca08e8cd3eb49253bb64274b2b0 100644 (file)
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -1710,67 +1710,6 @@ pa:
         bicycle: ਸੈਕਲ
         car: ਕਾਰ
         foot: ਪੈਦਲ
         bicycle: ਸੈਕਲ
         car: ਕਾਰ
         foot: ਪੈਦਲ

-    key:
-      table:
-        entry:
-          motorway: ਮੋਟਰਵੇਅ
-          main_road: ਮੁੱਢਲੀ ਸੜਕ
-          trunk: ਟਰੰਕ ਸੜਕ
-          primary: ਮੁੱਢਲੀ ਸੜਕ
-          secondary: ਸਕੈਂਡਰੀ ਸੜਕ
-          pedestrian: ਪੈਦਲ ਜਾਣ ਲਈ ਰਾਹ
-          track: ਟਰੈਕ
-          bridleway: ਘੋੜ-ਰਾਹ
-          cycleway: ਸਾਈਕਲ ਦਾ ਰਾਹ
-          footway: ਪੈਦਲ ਰਾਹ
-          rail: ਰੇਲਵੇ
-          train: ਰੇਲਗੱਡੀ
-          subway: ਸਬ-ਵੇਅ
-          ferry: ਕਿਸ਼ਤੀ
-          light_rail: ਹਲਕੀ ਰੇਲ
-          bus: ਬੱਸ
-          cable_car: ਕੇਬਲ ਕਾਰ
-          chair_lift: ਕੁਰਸੀ ਲਿਫ਼ਟ
-          runway: ਹਵਾਈ ਅੱਡੇ ਦੀ ਉਡਾਣ ਪੱਟੀ
-          taxiway: ਟੈਕਸੀਵੇਅ
-          apron: ਹਵਾਈ ਅੱਡੇ ਦਾ ਐਪਰਨ
-          admin: ਪ੍ਰਬੰਧਕੀ ਸਰਹੱਦ
-          capital: ਰਾਜਧਾਨੀ
-          city: ਸ਼ਹਿਰ
-          orchard: ਬਗ਼ੀਚਾ
-          vineyard: ਅੰਗੂਰਾਂ ਦਾ ਬਾਗ਼
-          forest: ਜੰਗਲ
-          wood: ਲੱਕੜ
-          farmland: ਖੇਤੀਬਾੜੀ ਦੀ ਜ਼ਮੀਨ
-          grass: ਘਾਹ
-          meadow: ਚਰਗਾਹ
-          sand: ਰੇਤ
-          golf: ਗੋਲਫ਼ ਮੈਦਾਨ
-          park: ਪਾਰਕ
-          common: ਸ਼ਾਮਲਾਟ
-          resident: ਰਿਹਾਇਸ਼ੀ ਇਲਾਕਾ
-          retail: ਪਰਚੂਨ ਖੇਤਰ
-          industrial: ਉਦਯੋਗਿਕ ਖੇਤਰ
-          commercial: ਵਪਾਰਕ ਖੇਤਰ
-          lake: ਝੀਲ
-          reservoir: ਸਰੋਵਰ
-          glacier: ਬਰਫ਼ਾਨੀ ਦਰਿਆ
-          farm: ਖੇਤ
-          cemetery: ਸ਼ਮਸ਼ਾਨ
-          pitch: ਖੇਡ ਦੀ ਪਿੱਚ
-          centre: ਖੇਡ ਕੇਂਦਰ
-          reserve: ਕੁਦਰਤੀ ਰੱਖ
-          military: ਫ਼ੌਜੀ ਇਲਾਕਾ
-          school: ਸਕੂਲ
-          university: ਯੂਨੀਵਰਸਿਟੀ
-          hospital: ਹਸਪਤਾਲ
-          building: ਮਹੱਤਵਪੂਰਨ ਇਮਾਰਤ
-          station: ਰੇਲਵੇ ਸਟੇਸ਼ਨ
-          summit: ਸਿਖਰ
-          peak: ਸਿਖਰ
-          private: ਨਿੱਜੀ ਲਾਂਘਾ
-          construction: ਉਸਾਰੀ ਹੇਠ ਸੜਕਾਂ
-          bicycle_rental: ਸਾਈਕਲ ਕਿਰਾਏ 'ਤੇ

     welcome:
       title: ਜੀ ਆਇਆਂ ਨੂੰ!
       whats_on_the_map:
     welcome:
       title: ਜੀ ਆਇਆਂ ਨੂੰ!
       whats_on_the_map:


@@ -1795,6 +1734,67 @@ pa:
       other_groups:
         title: ਹੋਰ ਸਮੂਹ
         communities_wiki: ਭਾਈਚਾਰੇ ਵਿਕੀ ਸਫ਼ਾ
       other_groups:
         title: ਹੋਰ ਸਮੂਹ
         communities_wiki: ਭਾਈਚਾਰੇ ਵਿਕੀ ਸਫ਼ਾ

+  map_keys:
+    show:
+      entries:
+        motorway: ਮੋਟਰਵੇਅ
+        main_road: ਮੁੱਢਲੀ ਸੜਕ
+        trunk: ਟਰੰਕ ਸੜਕ
+        primary: ਮੁੱਢਲੀ ਸੜਕ
+        secondary: ਸਕੈਂਡਰੀ ਸੜਕ
+        pedestrian: ਪੈਦਲ ਜਾਣ ਲਈ ਰਾਹ
+        track: ਟਰੈਕ
+        bridleway: ਘੋੜ-ਰਾਹ
+        cycleway: ਸਾਈਕਲ ਦਾ ਰਾਹ
+        footway: ਪੈਦਲ ਰਾਹ
+        rail: ਰੇਲਵੇ
+        train: ਰੇਲਗੱਡੀ
+        subway: ਸਬ-ਵੇਅ
+        ferry: ਕਿਸ਼ਤੀ
+        light_rail: ਹਲਕੀ ਰੇਲ
+        bus: ਬੱਸ
+        cable_car: ਕੇਬਲ ਕਾਰ
+        chair_lift: ਕੁਰਸੀ ਲਿਫ਼ਟ
+        runway: ਹਵਾਈ ਅੱਡੇ ਦੀ ਉਡਾਣ ਪੱਟੀ
+        taxiway: ਟੈਕਸੀਵੇਅ
+        apron: ਹਵਾਈ ਅੱਡੇ ਦਾ ਐਪਰਨ
+        admin: ਪ੍ਰਬੰਧਕੀ ਸਰਹੱਦ
+        capital: ਰਾਜਧਾਨੀ
+        city: ਸ਼ਹਿਰ
+        orchard: ਬਗ਼ੀਚਾ
+        vineyard: ਅੰਗੂਰਾਂ ਦਾ ਬਾਗ਼
+        forest: ਜੰਗਲ
+        wood: ਲੱਕੜ
+        farmland: ਖੇਤੀਬਾੜੀ ਦੀ ਜ਼ਮੀਨ
+        grass: ਘਾਹ
+        meadow: ਚਰਗਾਹ
+        sand: ਰੇਤ
+        golf: ਗੋਲਫ਼ ਮੈਦਾਨ
+        park: ਪਾਰਕ
+        common: ਸ਼ਾਮਲਾਟ
+        resident: ਰਿਹਾਇਸ਼ੀ ਇਲਾਕਾ
+        retail: ਪਰਚੂਨ ਖੇਤਰ
+        industrial: ਉਦਯੋਗਿਕ ਖੇਤਰ
+        commercial: ਵਪਾਰਕ ਖੇਤਰ
+        lake: ਝੀਲ
+        reservoir: ਸਰੋਵਰ
+        glacier: ਬਰਫ਼ਾਨੀ ਦਰਿਆ
+        farm: ਖੇਤ
+        cemetery: ਸ਼ਮਸ਼ਾਨ
+        pitch: ਖੇਡ ਦੀ ਪਿੱਚ
+        centre: ਖੇਡ ਕੇਂਦਰ
+        reserve: ਕੁਦਰਤੀ ਰੱਖ
+        military: ਫ਼ੌਜੀ ਇਲਾਕਾ
+        school: ਸਕੂਲ
+        university: ਯੂਨੀਵਰਸਿਟੀ
+        hospital: ਹਸਪਤਾਲ
+        building: ਮਹੱਤਵਪੂਰਨ ਇਮਾਰਤ
+        station: ਰੇਲਵੇ ਸਟੇਸ਼ਨ
+        summit: ਸਿਖਰ
+        peak: ਸਿਖਰ
+        private: ਨਿੱਜੀ ਲਾਂਘਾ
+        construction: ਉਸਾਰੀ ਹੇਠ ਸੜਕਾਂ
+        bicycle_rental: ਸਾਈਕਲ ਕਿਰਾਏ 'ਤੇ

   traces:
     visibility:
       private: ਨਿੱਜੀ (ਸਿਰਫ਼ ਅਗਿਆਤ, ਬਿਨਾਂ ਕ੍ਰਮਬੱਧ ਬਿੰਦੂਆਂ ਵਜੋਂ ਸਾਂਝਾ ਕੀਤਾ ਗਿਆ)
   traces:
     visibility:
       private: ਨਿੱਜੀ (ਸਿਰਫ਼ ਅਗਿਆਤ, ਬਿਨਾਂ ਕ੍ਰਮਬੱਧ ਬਿੰਦੂਆਂ ਵਜੋਂ ਸਾਂਝਾ ਕੀਤਾ ਗਿਆ)

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 6aa8b844bf38490954a7b748255b8d137a4f7d58..79e8140cb6893b01d890b5174863e2e0a7f72c3f 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -2637,95 +2637,6 @@ pl:
         bicycle: Rower
         car: Samochód
         foot: Pieszo
         bicycle: Rower
         car: Samochód
         foot: Pieszo

-    key:
-      table:
-        entry:
-          motorway: Autostrada
-          main_road: Główna droga
-          trunk: Droga główna
-          primary: Droga pierwszorzędna
-          secondary: Droga drugorzędna
-          unclassified: Droga czwartorzędna
-          pedestrian: Droga dla pieszych
-          track: Droga polna lub leśna
-          bridleway: Droga dla koni
-          cycleway: Droga rowerowa
-          cycleway_national: Droga rowerowa znaczenia państwowego
-          cycleway_regional: Droga rowerowa znaczenia regionalnego
-          cycleway_local: Droga rowerowa znaczenia lokalnego
-          cycleway_mtb: Górska trasa rowerowa
-          footway: Droga dla pieszych
-          rail: Tor kolejowy
-          train: Kolej
-          subway: Metro
-          ferry: Prom
-          light_rail: Kolej miejska
-          tram: Tramwaj
-          trolleybus: Trolejbus
-          bus: Autobus
-          cable_car: Kolej linowa
-          chair_lift: Wyciąg krzesełkowy
-          runway: Pas startowy
-          taxiway: Droga kołowania
-          apron: Płyta lotniska
-          admin: Granica
-          capital: Stolica
-          city: Miasto
-          orchard: Sad
-          vineyard: Winnica
-          forest: Las
-          wood: Lasek
-          farmland: Grunty rolne
-          grass: Trawnik
-          meadow: Łąka
-          bare_rock: Odkryte skały
-          sand: Piaski
-          golf: Pole golfowe
-          park: Park
-          common: Pole
-          built_up: Obszar zabudowany
-          resident: Teren mieszkalny
-          retail: Zabudowa handlowo-usługowa
-          industrial: Teren przemysłowy
-          commercial: Teren komercyjny
-          heathland: Wrzosowisko
-          scrubland: Zarośla
-          lake: Jezioro
-          reservoir: Zbiornik
-          intermittent_water: Okresowy ciek
-          glacier: Lodowiec
-          reef: Rafa
-          wetland: Mokradła
-          farm: Gospodarstwo rolne
-          brownfield: Teren powyburzeniowy
-          cemetery: Cmentarz
-          allotments: Ogródki działkowe
-          pitch: Boisko sportowe
-          centre: Centrum sportowe
-          beach: Plaża
-          reserve: Rezerwat przyrody
-          military: Teren wojskowy
-          school: Szkoła
-          university: Uniwersytet
-          hospital: Szpital
-          building: Ważny budynek
-          station: Stacja kolejowa
-          railway_halt: Przystanek kolejowy
-          subway_station: Stacja metra
-          tram_stop: Przystanek tramwajowy
-          summit: Góra
-          peak: Szczyt
-          tunnel: Kreskowany obrys – tunel
-          bridge: Czarny obrys – most
-          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_rental: Wypożyczalnia rowerów
-          bicycle_parking: Parking dla rowerów
-          bicycle_parking_small: Mały parking dla rowerów
-          toilets: Toalety

     welcome:
       title: Witamy!
       introduction: Witamy w OpenStreetMap, wolnej mapie świata. Teraz, gdy masz już
     welcome:
       title: Witamy!
       introduction: Witamy w OpenStreetMap, wolnej mapie świata. Teraz, gdy masz już


@@ -2798,6 +2709,95 @@ pl:
           W rzeczywistości wiele grup istnieje z powodzeniem jako nieformalne zgromadzenie ludzi lub jako grupa społeczna. Każdy może je założyć lub do nich dołączyć. Dowiedz się więcej na %{communities_wiki_link}.
         communities_wiki: stronie Wiki
         communities_wiki_url: https://wiki.openstreetmap.org/wiki/User_group
           W rzeczywistości wiele grup istnieje z powodzeniem jako nieformalne zgromadzenie ludzi lub jako grupa społeczna. Każdy może je założyć lub do nich dołączyć. Dowiedz się więcej na %{communities_wiki_link}.
         communities_wiki: stronie Wiki
         communities_wiki_url: https://wiki.openstreetmap.org/wiki/User_group

+  map_keys:
+    show:
+      entries:
+        motorway: Autostrada
+        main_road: Główna droga
+        trunk: Droga główna
+        primary: Droga pierwszorzędna
+        secondary: Droga drugorzędna
+        unclassified: Droga czwartorzędna
+        pedestrian: Droga dla pieszych
+        track: Droga polna lub leśna
+        bridleway: Droga dla koni
+        cycleway: Droga rowerowa
+        cycleway_national: Droga rowerowa znaczenia państwowego
+        cycleway_regional: Droga rowerowa znaczenia regionalnego
+        cycleway_local: Droga rowerowa znaczenia lokalnego
+        cycleway_mtb: Górska trasa rowerowa
+        footway: Droga dla pieszych
+        rail: Tor kolejowy
+        train: Kolej
+        subway: Metro
+        ferry: Prom
+        light_rail: Kolej miejska
+        tram: Tramwaj
+        trolleybus: Trolejbus
+        bus: Autobus
+        cable_car: Kolej linowa
+        chair_lift: Wyciąg krzesełkowy
+        runway: Pas startowy
+        taxiway: Droga kołowania
+        apron: Płyta lotniska
+        admin: Granica
+        capital: Stolica
+        city: Miasto
+        orchard: Sad
+        vineyard: Winnica
+        forest: Las
+        wood: Lasek
+        farmland: Grunty rolne
+        grass: Trawnik
+        meadow: Łąka
+        bare_rock: Odkryte skały
+        sand: Piaski
+        golf: Pole golfowe
+        park: Park
+        common: Pole
+        built_up: Obszar zabudowany
+        resident: Teren mieszkalny
+        retail: Zabudowa handlowo-usługowa
+        industrial: Teren przemysłowy
+        commercial: Teren komercyjny
+        heathland: Wrzosowisko
+        scrubland: Zarośla
+        lake: Jezioro
+        reservoir: Zbiornik
+        intermittent_water: Okresowy ciek
+        glacier: Lodowiec
+        reef: Rafa
+        wetland: Mokradła
+        farm: Gospodarstwo rolne
+        brownfield: Teren powyburzeniowy
+        cemetery: Cmentarz
+        allotments: Ogródki działkowe
+        pitch: Boisko sportowe
+        centre: Centrum sportowe
+        beach: Plaża
+        reserve: Rezerwat przyrody
+        military: Teren wojskowy
+        school: Szkoła
+        university: Uniwersytet
+        hospital: Szpital
+        building: Ważny budynek
+        station: Stacja kolejowa
+        railway_halt: Przystanek kolejowy
+        subway_station: Stacja metra
+        tram_stop: Przystanek tramwajowy
+        summit: Góra
+        peak: Szczyt
+        tunnel: Kreskowany obrys – tunel
+        bridge: Czarny obrys – most
+        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_rental: Wypożyczalnia rowerów
+        bicycle_parking: Parking dla rowerów
+        bicycle_parking_small: Mały parking dla rowerów
+        toilets: Toalety

   traces:
     visibility:
       private: Prywatny (udostępniany jedynie jako anonimowy, nieuporządkowane punkty)
   traces:
     visibility:
       private: Prywatny (udostępniany jedynie jako anonimowy, nieuporządkowane punkty)

diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml
index adfa2ecb59baee6ee5404f8870b0114d17cd260a..4a302675c4d793b2b75b62e2580dcf2de842aa35 100644 (file)
--- a/config/locales/pnb.yml
+++ b/config/locales/pnb.yml
@@ -1525,64 +1525,6 @@ pnb:
       providers:
         fossgis_osrm: اوایس‌آرایم
         graphhopper: گریف ہپر
       providers:
         fossgis_osrm: اوایس‌آرایم
         graphhopper: گریف ہپر

-    key:
-      table:
-        entry:
-          motorway: موٹروے
-          main_road: مُکھ سڑکاں
-          trunk: ترنک سڑک
-          primary: مُڈھلی سڑک
-          secondary: سکینڈری سڑک
-          unclassified: سڑک نہیں قِسم
-          track: ٹرَیک
-          bridleway: گھڑے دے ڈگرے
-          cycleway: سائیکل‌وے
-          cycleway_national: راشٹری سائیکل‌وے
-          cycleway_regional: کھیتری سائیکل‌وے
-          cycleway_local: ستھانک سائیکل‌وے
-          footway: فُت‌وے
-          rail: ریلوے
-          subway: سبوے
-          cable_car: کیبل کار
-          chair_lift: کُرسی لِفٹ
-          runway: ہوائی اڈے اُڈاݨ پٹی
-          taxiway: ٹیکسی‌وے
-          apron: ہوائی اڈے دا ایپرن
-          admin: پرشاسکی سرحد
-          forest: رکھّ
-          wood: جنگل
-          golf: گولف مَیدان
-          park: پارک
-          common: شاملاٹ
-          resident: رہائشی کھیتر
-          retail: پرچون کھیتر
-          industrial: سناتی کھیتر
-          commercial: وپارک کھیتر
-          heathland: ہیتھ
-          lake: جھیل
-          reservoir: کُنڈ
-          farm: کھیت
-          brownfield: براؤنفیلڈ
-          cemetery: شمشان
-          allotments: واڑیاں دیاں ونڈیاں (الاٹ‌منٹاں)
-          pitch: کھیڈ دی بیڑ
-          centre: کھیڈ کیندر
-          reserve: کُدرتی رکھّ
-          military: فَوجی کھیتر
-          school: سکول
-          university: یونیورستی
-          building: مہتوپورن عمارت
-          station: ریلوے سٹیشن
-          summit: سکھر
-          peak: چوٹی
-          tunnel: سُرنگ (ڈیش لائیناں)
-          bridge: پُل (کالیاں لائیناں)
-          private: نِجی ورتوں
-          destination: صرف خاص منزل دی یاترا لئی
-          construction: اُساری ہیٹھ سڑکاں
-          bicycle_shop: سائیکل دی دکان
-          bicycle_parking: سائیکل پارکنگ
-          toilets: ٹوئیلٹ

     welcome:
       title: جی آیاں نوں!
       whats_on_the_map:
     welcome:
       title: جی آیاں نوں!
       whats_on_the_map:


@@ -1596,6 +1538,64 @@ pnb:
         title: سودھ کرن دی وہل نہیں اے؟ کجھ نوٹ پا سکیو!
     communities:
       title: مجلساں
         title: سودھ کرن دی وہل نہیں اے؟ کجھ نوٹ پا سکیو!
     communities:
       title: مجلساں

+  map_keys:
+    show:
+      entries:
+        motorway: موٹروے
+        main_road: مُکھ سڑکاں
+        trunk: ترنک سڑک
+        primary: مُڈھلی سڑک
+        secondary: سکینڈری سڑک
+        unclassified: سڑک نہیں قِسم
+        track: ٹرَیک
+        bridleway: گھڑے دے ڈگرے
+        cycleway: سائیکل‌وے
+        cycleway_national: راشٹری سائیکل‌وے
+        cycleway_regional: کھیتری سائیکل‌وے
+        cycleway_local: ستھانک سائیکل‌وے
+        footway: فُت‌وے
+        rail: ریلوے
+        subway: سبوے
+        cable_car: کیبل کار
+        chair_lift: کُرسی لِفٹ
+        runway: ہوائی اڈے اُڈاݨ پٹی
+        taxiway: ٹیکسی‌وے
+        apron: ہوائی اڈے دا ایپرن
+        admin: پرشاسکی سرحد
+        forest: رکھّ
+        wood: جنگل
+        golf: گولف مَیدان
+        park: پارک
+        common: شاملاٹ
+        resident: رہائشی کھیتر
+        retail: پرچون کھیتر
+        industrial: سناتی کھیتر
+        commercial: وپارک کھیتر
+        heathland: ہیتھ
+        lake: جھیل
+        reservoir: کُنڈ
+        farm: کھیت
+        brownfield: براؤنفیلڈ
+        cemetery: شمشان
+        allotments: واڑیاں دیاں ونڈیاں (الاٹ‌منٹاں)
+        pitch: کھیڈ دی بیڑ
+        centre: کھیڈ کیندر
+        reserve: کُدرتی رکھّ
+        military: فَوجی کھیتر
+        school: سکول
+        university: یونیورستی
+        building: مہتوپورن عمارت
+        station: ریلوے سٹیشن
+        summit: سکھر
+        peak: چوٹی
+        tunnel: سُرنگ (ڈیش لائیناں)
+        bridge: پُل (کالیاں لائیناں)
+        private: نِجی ورتوں
+        destination: صرف خاص منزل دی یاترا لئی
+        construction: اُساری ہیٹھ سڑکاں
+        bicycle_shop: سائیکل دی دکان
+        bicycle_parking: سائیکل پارکنگ
+        toilets: ٹوئیلٹ

   traces:
     visibility:
       private: نجی (صرف انام جاݨکاری ویکھدے، پوئینٹاں لئی کوئی لڑی نہیں اے)
   traces:
     visibility:
       private: نجی (صرف انام جاݨکاری ویکھدے، پوئینٹاں لئی کوئی لڑی نہیں اے)

diff --git a/config/locales/ps.yml b/config/locales/ps.yml
index 23d53f006918386f55a364037a5b812736dde695..f6ab524f569170cbcc2e3b54877d9072c744ae67 100644 (file)
--- a/config/locales/ps.yml
+++ b/config/locales/ps.yml
@@ -332,18 +332,18 @@ ps:
       search: پلټل
       where_am_i: زه چېرته يم؟
       submit_text: ورځه
       search: پلټل
       where_am_i: زه چېرته يم؟
       submit_text: ورځه

-    key:
-      table:
-        entry:
-          forest: ځنگل
-          park: پارک
-          lake: ډنډ
-          reservoir: زېرمتون
-          farm: کرونده
-          cemetery: هديره
-          military: پوځي سيمه
-          school: ښوونځی
-          university: پوهنتون
+  map_keys:
+    show:
+      entries:
+        forest: ځنگل
+        park: پارک
+        lake: ډنډ
+        reservoir: زېرمتون
+        farm: کرونده
+        cemetery: هديره
+        military: پوځي سيمه
+        school: ښوونځی
+        university: پوهنتون

   traces:
     new:
       visibility_help: دا څه مانا لري؟
   traces:
     new:
       visibility_help: دا څه مانا لري؟

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 91d9930b3f10ea6cd8e85e1b8c1899d06938e2c7..5bf8611e7b3172fc04d50a7482e3e9c24990315a 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -2526,95 +2526,6 @@ pt-PT:
         bicycle: De bicicleta
         car: De carro
         foot: A pé
         bicycle: De bicicleta
         car: De carro
         foot: A pé

-    key:
-      table:
-        entry:
-          motorway: Autoestrada
-          main_road: Estrada principal
-          trunk: Via rápida
-          primary: Estrada primária
-          secondary: Estrada secundária
-          unclassified: Estrada sem classificação
-          pedestrian: Caminho pedestre
-          track: Estrada florestal ou agrícola
-          bridleway: Via equestre
-          cycleway: Ciclovia
-          cycleway_national: Ciclovia nacional
-          cycleway_regional: Ciclovia regional
-          cycleway_local: Ciclovia local
-          cycleway_mtb: Rota de bicicleta de montanha
-          footway: Via pedonal
-          rail: Ferrovia
-          train: Comboio
-          subway: Metropolitano
-          ferry: Ferry
-          light_rail: Comboio ligeiro
-          tram: Elétrico
-          trolleybus: Troleicarro
-          bus: Autocarro
-          cable_car: Teleférico
-          chair_lift: Teleférico
-          runway: Pista de aviação
-          taxiway: Via de circulação
-          apron: Estacionamento de aviões
-          admin: Fronteira administrativa
-          capital: Capital
-          city: Cidade
-          orchard: Pomar
-          vineyard: Vinha
-          forest: Floresta gerida
-          wood: Bosque
-          farmland: Terreno agrícola
-          grass: Relva
-          meadow: Prado
-          bare_rock: Rocha exposta
-          sand: Areia
-          golf: Campo de golfe
-          park: Parque público
-          common: Terrenos comunitários
-          built_up: Zona edificada
-          resident: Área residencial
-          retail: Área de retalho
-          industrial: Área industrial
-          commercial: Área comercial
-          heathland: Charneca
-          scrubland: Matagal
-          lake: Lago
-          reservoir: Reservatório
-          intermittent_water: Corpo de água intermitente
-          glacier: Glaciar
-          reef: Recife
-          wetland: Zona húmida
-          farm: Quinta
-          brownfield: Baldio industrial
-          cemetery: Cemitério
-          allotments: Hortas urbanas
-          pitch: Campo desportivo
-          centre: Centro desportivo
-          beach: Praia
-          reserve: Reserva natural
-          military: Área militar
-          school: Escola
-          university: Universidade
-          hospital: Hospital
-          building: Edifício importante
-          station: Estação ferroviária
-          railway_halt: Paragem ferroviária
-          subway_station: Estação de metro
-          tram_stop: Paragem de elétrico
-          summit: Cume
-          peak: Pico
-          tunnel: Linha tracejada = túnel
-          bridge: Linha cheia = ponte
-          private: Acesso privado
-          destination: Acesso explícito ao local
-          construction: Estradas em construção
-          bus_stop: Paragem de autocarro
-          bicycle_shop: Loja de bicicletas
-          bicycle_rental: Aluguer de bicicletas
-          bicycle_parking: Estacionamento de bicicletas
-          bicycle_parking_small: Estacionamento para bicicletas
-          toilets: Casas de banho

     welcome:
       title: Bem-vind@!
       introduction: Bem-vindo(a) ao OpenStreetMap, o mapa do mundo, grátis e editável.
     welcome:
       title: Bem-vind@!
       introduction: Bem-vindo(a) ao OpenStreetMap, o mapa do mundo, grátis e editável.


@@ -2686,6 +2597,95 @@ pt-PT:
           Não há necessidade de estabelecer formalmente um grupo como os Capítulos Locais.
           Na verdade, há muitos grupos de sucesso que funcionam como encontros informais de pessoas ou como grupos comunitários. Qualquer pessoa pode criar um ou juntar-se a um que já exista. Lê mais na %{communities_wiki_link}.
         communities_wiki: página wiki das comunidades
           Não há necessidade de estabelecer formalmente um grupo como os Capítulos Locais.
           Na verdade, há muitos grupos de sucesso que funcionam como encontros informais de pessoas ou como grupos comunitários. Qualquer pessoa pode criar um ou juntar-se a um que já exista. Lê mais na %{communities_wiki_link}.
         communities_wiki: página wiki das comunidades

+  map_keys:
+    show:
+      entries:
+        motorway: Autoestrada
+        main_road: Estrada principal
+        trunk: Via rápida
+        primary: Estrada primária
+        secondary: Estrada secundária
+        unclassified: Estrada sem classificação
+        pedestrian: Caminho pedestre
+        track: Estrada florestal ou agrícola
+        bridleway: Via equestre
+        cycleway: Ciclovia
+        cycleway_national: Ciclovia nacional
+        cycleway_regional: Ciclovia regional
+        cycleway_local: Ciclovia local
+        cycleway_mtb: Rota de bicicleta de montanha
+        footway: Via pedonal
+        rail: Ferrovia
+        train: Comboio
+        subway: Metropolitano
+        ferry: Ferry
+        light_rail: Comboio ligeiro
+        tram: Elétrico
+        trolleybus: Troleicarro
+        bus: Autocarro
+        cable_car: Teleférico
+        chair_lift: Teleférico
+        runway: Pista de aviação
+        taxiway: Via de circulação
+        apron: Estacionamento de aviões
+        admin: Fronteira administrativa
+        capital: Capital
+        city: Cidade
+        orchard: Pomar
+        vineyard: Vinha
+        forest: Floresta gerida
+        wood: Bosque
+        farmland: Terreno agrícola
+        grass: Relva
+        meadow: Prado
+        bare_rock: Rocha exposta
+        sand: Areia
+        golf: Campo de golfe
+        park: Parque público
+        common: Terrenos comunitários
+        built_up: Zona edificada
+        resident: Área residencial
+        retail: Área de retalho
+        industrial: Área industrial
+        commercial: Área comercial
+        heathland: Charneca
+        scrubland: Matagal
+        lake: Lago
+        reservoir: Reservatório
+        intermittent_water: Corpo de água intermitente
+        glacier: Glaciar
+        reef: Recife
+        wetland: Zona húmida
+        farm: Quinta
+        brownfield: Baldio industrial
+        cemetery: Cemitério
+        allotments: Hortas urbanas
+        pitch: Campo desportivo
+        centre: Centro desportivo
+        beach: Praia
+        reserve: Reserva natural
+        military: Área militar
+        school: Escola
+        university: Universidade
+        hospital: Hospital
+        building: Edifício importante
+        station: Estação ferroviária
+        railway_halt: Paragem ferroviária
+        subway_station: Estação de metro
+        tram_stop: Paragem de elétrico
+        summit: Cume
+        peak: Pico
+        tunnel: Linha tracejada = túnel
+        bridge: Linha cheia = ponte
+        private: Acesso privado
+        destination: Acesso explícito ao local
+        construction: Estradas em construção
+        bus_stop: Paragem de autocarro
+        bicycle_shop: Loja de bicicletas
+        bicycle_rental: Aluguer de bicicletas
+        bicycle_parking: Estacionamento de bicicletas
+        bicycle_parking_small: Estacionamento para bicicletas
+        toilets: Casas de banho

   traces:
     visibility:
       private: Privado (apenas partilhado como anónimo, pontos não ordenados)
   traces:
     visibility:
       private: Privado (apenas partilhado como anónimo, pontos não ordenados)


@@ -2944,9 +2944,9 @@ pt-PT:
       display name description: O nome de utilizador ficará visível publicamente.
         Poderás alterar o nome posteriormente nas configurações do teu perfil.
       by_signing_up:
       display name description: O nome de utilizador ficará visível publicamente.
         Poderás alterar o nome posteriormente nas configurações do teu perfil.
       by_signing_up:

-        html: Ao registares-te, aceitas os nossos %{tou_link}, %{privacy_policy_link}
-          e %{contributor_terms_link}.
-        privacy_policy: política de privacidade
+        html: Ao registares-te, aceitas as nossas %{tou_link}, a %{privacy_policy_link}
+          e os %{contributor_terms_link}.
+        privacy_policy: Política de Privacidade

         privacy_policy_title: Política de privacidade da OSMF incluindo secção sobre
           endereços de correio eletrónico
         contributor_terms: Termos de Contribuidor
         privacy_policy_title: Política de privacidade da OSMF incluindo secção sobre
           endereços de correio eletrónico
         contributor_terms: Termos de Contribuidor


@@ -2955,7 +2955,7 @@ pt-PT:
         privacy_policy: política de privacidade
         privacy_policy_title: Política de privacidade da OSMF incluindo seção sobre
           endereços de email
         privacy_policy: política de privacidade
         privacy_policy_title: Política de privacidade da OSMF incluindo seção sobre
           endereços de email

-        html: O seu endereço não é mostrado publicamente. Consulte a nossa %{privacy_policy_link}
+        html: O teu endereço não será mostrado publicamente. Consulta a nossa %{privacy_policy_link}

           para mais informações.
       or: ou
       use external auth: ou regista-te com um serviço externo
           para mais informações.
       or: ou
       use external auth: ou regista-te com um serviço externo


@@ -3258,17 +3258,17 @@ pt-PT:
       heading: Notas de %{user}
       subheading_html: Notas %{submitted} ou %{commented} por %{user}
       subheading_submitted: enviadas
       heading: Notas de %{user}
       subheading_html: Notas %{submitted} ou %{commented} por %{user}
       subheading_submitted: enviadas

-      subheading_commented: comentadas em
+      subheading_commented: comentadas

       no_notes: Sem notas
       id: Id
       no_notes: Sem notas
       id: Id

-      creator: Criador
+      creator: Criada por

       description: Descrição
       description: Descrição

-      created_at: Criada em
-      last_changed: Última alteração
+      created_at: Criada
+      last_changed: Alterada

       apply: Aplicar
       all: Todas
       apply: Aplicar
       all: Todas

-      open: Abrir
-      closed: Encerrada
+      open: Abertas
+      closed: Encerradas

       status: Estado
     show:
       title: 'Nota: %{id}'
       status: Estado
     show:
       title: 'Nota: %{id}'


@@ -3336,7 +3336,7 @@ pt-PT:
         encontra em modo de leitura.
     notes_paging_nav:
       showing_page: Página %{page}
         encontra em modo de leitura.
     notes_paging_nav:
       showing_page: Página %{page}

-      next: Próxima
+      next: Seguinte

       previous: Anterior
     not_found_message:
       sorry: 'Lamentamos, mas não foi possível encontrar a nota #%{id}.'
       previous: Anterior
     not_found_message:
       sorry: 'Lamentamos, mas não foi possível encontrar a nota #%{id}.'


@@ -3543,7 +3543,7 @@ pt-PT:
       description: 'Descrição:'
       heading: A mostrar a supressão "%{title}"
       title: A mostrar a supressão
       description: 'Descrição:'
       heading: A mostrar a supressão "%{title}"
       title: A mostrar a supressão

-      user: 'Criador:'
+      user: 'Criada por:'

       edit: Editar esta supressão
       destroy: Remover esta supressão
       confirm: Tem a certeza?
       edit: Editar esta supressão
       destroy: Remover esta supressão
       confirm: Tem a certeza?

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index a02b3bf2dbec1116cd0aa8c40530e901ed6edd78..39f52b999f1649b7db5f37b3d345ed0fd7db8f62 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -2482,95 +2482,6 @@ pt:
       where_am_i_title: Descrever a localidade atual usando o motor de busca
       submit_text: Ir
       reverse_directions_text: Sentido contrário
       where_am_i_title: Descrever a localidade atual usando o motor de busca
       submit_text: Ir
       reverse_directions_text: Sentido contrário

-    key:
-      table:
-        entry:
-          motorway: Autoestrada
-          main_road: Estrada principal
-          trunk: Via troncal
-          primary: Via primária
-          secondary: Via secundária
-          unclassified: Via não classificada
-          pedestrian: Calçadão
-          track: Estrada rústica
-          bridleway: Hipovia
-          cycleway: Ciclovia
-          cycleway_national: Ciclovia nacional
-          cycleway_regional: Ciclovia regional
-          cycleway_local: Ciclovia local
-          cycleway_mtb: Rota de bicicleta de montanha
-          footway: Caminho de pedestre
-          rail: Ferrovia
-          train: Trem
-          subway: Metrô
-          ferry: Balsa
-          light_rail: VLT
-          tram: Bonde
-          trolleybus: Trólebus
-          bus: Ônibus
-          cable_car: Bonde aéreo
-          chair_lift: Teleférico
-          runway: Pista de pouso
-          taxiway: Pista de taxiamento
-          apron: Pátio de aeródromo
-          admin: Limite administrativo
-          capital: Capital
-          city: Cidade
-          orchard: Pomar
-          vineyard: Vinha
-          forest: Floresta manejada
-          wood: Bosque nativo
-          farmland: Terreno agrícola
-          grass: Grama
-          meadow: Prado
-          bare_rock: Rocha exposta
-          sand: Areia
-          golf: Campo de golfe
-          park: Parque
-          common: Baldio comunitário
-          built_up: Zona edificada
-          resident: Área residencial
-          retail: Área de varejo
-          industrial: Área industrial
-          commercial: Área de negócios
-          heathland: Urzal
-          scrubland: Matagal
-          lake: Lago
-          reservoir: Reservatório
-          intermittent_water: Corpo de água intermitente
-          glacier: Geleira
-          reef: Recife
-          wetland: Pântano
-          farm: Lavoura
-          brownfield: Terreno abandonado
-          cemetery: Cemitério secular
-          allotments: Horta urbana
-          pitch: Quadra esportiva
-          centre: Centro/clube esportivo
-          beach: Praia
-          reserve: Reserva ambiental
-          military: Área militar
-          school: Escola/Universidade
-          university: Universidade
-          hospital: Hospital
-          building: Edifício importante
-          station: Estação ferroviária
-          railway_halt: Estação de trem
-          subway_station: Estação de metrô
-          tram_stop: Ponto de bonde
-          summit: Cume
-          peak: cume
-          tunnel: Túnel (contorno tracejado)
-          bridge: Ponte/viaduto (contorno contínuo)
-          private: Acesso restrito
-          destination: Acesso local apenas
-          construction: Vias em construção
-          bus_stop: Ponto de ônibus
-          bicycle_shop: Loja de bicicletas
-          bicycle_rental: Aluguel de bicicletas
-          bicycle_parking: Bicicletário
-          bicycle_parking_small: Estacionamento pequeno para bicicletas
-          toilets: Banheiros

     welcome:
       title: Bem-vindo(a)!
       introduction: Bem-vindo(a) ao OpenStreetMap, o mapa livre e editável do mundo.
     welcome:
       title: Bem-vindo(a)!
       introduction: Bem-vindo(a) ao OpenStreetMap, o mapa livre e editável do mundo.


@@ -2644,6 +2555,95 @@ pt:
           Não há necessidade de estabelecer formalmente um grupo na mesma medida que os Capítulos Locais.
           De fato, muitos grupos existem com muito sucesso como uma reunião informal de pessoas ou como um grupo comunitário. Qualquer um pode criar ou se juntar a eles. Leia mais em %{communities_wiki_link}.
         communities_wiki: Páginas wiki de comunidades
           Não há necessidade de estabelecer formalmente um grupo na mesma medida que os Capítulos Locais.
           De fato, muitos grupos existem com muito sucesso como uma reunião informal de pessoas ou como um grupo comunitário. Qualquer um pode criar ou se juntar a eles. Leia mais em %{communities_wiki_link}.
         communities_wiki: Páginas wiki de comunidades

+  map_keys:
+    show:
+      entries:
+        motorway: Autoestrada
+        main_road: Estrada principal
+        trunk: Via troncal
+        primary: Via primária
+        secondary: Via secundária
+        unclassified: Via não classificada
+        pedestrian: Calçadão
+        track: Estrada rústica
+        bridleway: Hipovia
+        cycleway: Ciclovia
+        cycleway_national: Ciclovia nacional
+        cycleway_regional: Ciclovia regional
+        cycleway_local: Ciclovia local
+        cycleway_mtb: Rota de bicicleta de montanha
+        footway: Caminho de pedestre
+        rail: Ferrovia
+        train: Trem
+        subway: Metrô
+        ferry: Balsa
+        light_rail: VLT
+        tram: Bonde
+        trolleybus: Trólebus
+        bus: Ônibus
+        cable_car: Bonde aéreo
+        chair_lift: Teleférico
+        runway: Pista de pouso
+        taxiway: Pista de taxiamento
+        apron: Pátio de aeródromo
+        admin: Limite administrativo
+        capital: Capital
+        city: Cidade
+        orchard: Pomar
+        vineyard: Vinha
+        forest: Floresta manejada
+        wood: Bosque nativo
+        farmland: Terreno agrícola
+        grass: Grama
+        meadow: Prado
+        bare_rock: Rocha exposta
+        sand: Areia
+        golf: Campo de golfe
+        park: Parque
+        common: Baldio comunitário
+        built_up: Zona edificada
+        resident: Área residencial
+        retail: Área de varejo
+        industrial: Área industrial
+        commercial: Área de negócios
+        heathland: Urzal
+        scrubland: Matagal
+        lake: Lago
+        reservoir: Reservatório
+        intermittent_water: Corpo de água intermitente
+        glacier: Geleira
+        reef: Recife
+        wetland: Pântano
+        farm: Lavoura
+        brownfield: Terreno abandonado
+        cemetery: Cemitério secular
+        allotments: Horta urbana
+        pitch: Quadra esportiva
+        centre: Centro/clube esportivo
+        beach: Praia
+        reserve: Reserva ambiental
+        military: Área militar
+        school: Escola/Universidade
+        university: Universidade
+        hospital: Hospital
+        building: Edifício importante
+        station: Estação ferroviária
+        railway_halt: Estação de trem
+        subway_station: Estação de metrô
+        tram_stop: Ponto de bonde
+        summit: Cume
+        peak: cume
+        tunnel: Túnel (contorno tracejado)
+        bridge: Ponte/viaduto (contorno contínuo)
+        private: Acesso restrito
+        destination: Acesso local apenas
+        construction: Vias em construção
+        bus_stop: Ponto de ônibus
+        bicycle_shop: Loja de bicicletas
+        bicycle_rental: Aluguel de bicicletas
+        bicycle_parking: Bicicletário
+        bicycle_parking_small: Estacionamento pequeno para bicicletas
+        toilets: Banheiros

   traces:
     visibility:
       private: Privado (compartilhado apenas como pontos anônimos e não ordenados)
   traces:
     visibility:
       private: Privado (compartilhado apenas como pontos anônimos e não ordenados)

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 3c73c00ffb4010d9d00367f0cce544c501d20189..f800f3216386bd2a712d14db065eca6505a4f7c4 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -2343,93 +2343,6 @@ ro:
         bicycle: Bicicletă
         car: Mașină
         foot: Mers
         bicycle: Bicicletă
         car: Mașină
         foot: Mers

-    key:
-      table:
-        entry:
-          motorway: Autostradă
-          main_road: Drum principal
-          trunk: Drum strategic
-          primary: Drum primar
-          secondary: Drum secundar
-          unclassified: Drum neclasificat
-          pedestrian: Cale pietonală
-          track: Înregistrare GPS
-          bridleway: Traseu de călărie
-          cycleway: Pistă de biciclete
-          cycleway_national: Rețeaua națională de ciclism
-          cycleway_regional: Rețeaua regională de ciclism
-          cycleway_local: Rețeaua locală de ciclism
-          cycleway_mtb: Rută pentru biciclete de munte
-          footway: Trotuar
-          rail: Cale ferată
-          train: Tren
-          subway: Stație de metrou
-          ferry: Feribot
-          light_rail: Metrou
-          tram: Tramvai
-          trolleybus: Troleibuz
-          bus: Autobuz
-          cable_car: Telecabină
-          chair_lift: Telescaun
-          runway: Pistă de Aeroport
-          taxiway: Pistă de taxi avioane
-          apron: Aeronavă
-          admin: Graniță administrativă
-          capital: Capitală
-          city: Oraș
-          orchard: Livadă
-          vineyard: Podgorie
-          forest: Pădure
-          wood: Lemn
-          farmland: Teren agricol
-          grass: Iarbă
-          meadow: Luncă
-          bare_rock: Stâncă goală
-          sand: Nisip
-          golf: Teren de golf
-          park: Parc
-          common: Comun
-          built_up: Zonă construită
-          resident: Zonă rezidențială
-          retail: Spațiul de retail
-          industrial: Zonă industrială
-          commercial: Zonă comercială
-          heathland: Landă
-          lake: Lac
-          reservoir: Rezervor
-          intermittent_water: Corp de apă intermitent
-          glacier: Ghețar
-          reef: Recif
-          farm: Fermă
-          brownfield: Terenuri industriale dezafectate
-          cemetery: Cimitir
-          allotments: Repartizările
-          pitch: Teren de sport
-          centre: Centru de sport
-          beach: Plajă
-          reserve: Rezervație naturală
-          military: Zonă militară
-          school: School; university
-          university: Universitate
-          hospital: Spital
-          building: Clădire importantă
-          station: Gară
-          railway_halt: Haltă
-          subway_station: Stație metrou
-          tram_stop: Stație tramvai
-          summit: Vârf de munte
-          peak: Vârf
-          tunnel: Dashed casing = tunel
-          bridge: Black casing = pod
-          private: Acces privat
-          destination: Accesul la destinație
-          construction: Drumuri în construcție
-          bus_stop: Stație de autobuz
-          bicycle_shop: Magazin de biciclete
-          bicycle_rental: Închiriere biciclete
-          bicycle_parking: Parcare pentru biciclete
-          bicycle_parking_small: Parcare mică pentru biciclete
-          toilets: Toalete

     welcome:
       title: Bun-venit!
       introduction: Bun-venit la OpenStreetMap, harta liberă și editabilă a lumii.
     welcome:
       title: Bun-venit!
       introduction: Bun-venit la OpenStreetMap, harta liberă și editabilă a lumii.


@@ -2503,6 +2416,93 @@ ro:
           Nu este nevoie să se înființeze în mod oficial un grup în aceeași măsură ca și Capitolele locale.
           Într-adevăr, multe grupuri există cu mare succes ca o adunare informală de oameni sau ca un grup comunitar. Oricine le poate configura sau se poate alătura. Citiți mai multe pe %{communities_wiki_link}.
         communities_wiki: Pagina wiki comunități
           Nu este nevoie să se înființeze în mod oficial un grup în aceeași măsură ca și Capitolele locale.
           Într-adevăr, multe grupuri există cu mare succes ca o adunare informală de oameni sau ca un grup comunitar. Oricine le poate configura sau se poate alătura. Citiți mai multe pe %{communities_wiki_link}.
         communities_wiki: Pagina wiki comunități

+  map_keys:
+    show:
+      entries:
+        motorway: Autostradă
+        main_road: Drum principal
+        trunk: Drum strategic
+        primary: Drum primar
+        secondary: Drum secundar
+        unclassified: Drum neclasificat
+        pedestrian: Cale pietonală
+        track: Înregistrare GPS
+        bridleway: Traseu de călărie
+        cycleway: Pistă de biciclete
+        cycleway_national: Rețeaua națională de ciclism
+        cycleway_regional: Rețeaua regională de ciclism
+        cycleway_local: Rețeaua locală de ciclism
+        cycleway_mtb: Rută pentru biciclete de munte
+        footway: Trotuar
+        rail: Cale ferată
+        train: Tren
+        subway: Stație de metrou
+        ferry: Feribot
+        light_rail: Metrou
+        tram: Tramvai
+        trolleybus: Troleibuz
+        bus: Autobuz
+        cable_car: Telecabină
+        chair_lift: Telescaun
+        runway: Pistă de Aeroport
+        taxiway: Pistă de taxi avioane
+        apron: Aeronavă
+        admin: Graniță administrativă
+        capital: Capitală
+        city: Oraș
+        orchard: Livadă
+        vineyard: Podgorie
+        forest: Pădure
+        wood: Lemn
+        farmland: Teren agricol
+        grass: Iarbă
+        meadow: Luncă
+        bare_rock: Stâncă goală
+        sand: Nisip
+        golf: Teren de golf
+        park: Parc
+        common: Comun
+        built_up: Zonă construită
+        resident: Zonă rezidențială
+        retail: Spațiul de retail
+        industrial: Zonă industrială
+        commercial: Zonă comercială
+        heathland: Landă
+        lake: Lac
+        reservoir: Rezervor
+        intermittent_water: Corp de apă intermitent
+        glacier: Ghețar
+        reef: Recif
+        farm: Fermă
+        brownfield: Terenuri industriale dezafectate
+        cemetery: Cimitir
+        allotments: Repartizările
+        pitch: Teren de sport
+        centre: Centru de sport
+        beach: Plajă
+        reserve: Rezervație naturală
+        military: Zonă militară
+        school: School; university
+        university: Universitate
+        hospital: Spital
+        building: Clădire importantă
+        station: Gară
+        railway_halt: Haltă
+        subway_station: Stație metrou
+        tram_stop: Stație tramvai
+        summit: Vârf de munte
+        peak: Vârf
+        tunnel: Dashed casing = tunel
+        bridge: Black casing = pod
+        private: Acces privat
+        destination: Accesul la destinație
+        construction: Drumuri în construcție
+        bus_stop: Stație de autobuz
+        bicycle_shop: Magazin de biciclete
+        bicycle_rental: Închiriere biciclete
+        bicycle_parking: Parcare pentru biciclete
+        bicycle_parking_small: Parcare mică pentru biciclete
+        toilets: Toalete

   traces:
     visibility:
       private: Privat (partajat ca puncte anonime, neordonate)
   traces:
     visibility:
       private: Privat (partajat ca puncte anonime, neordonate)

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 1c2abcb0e59d610cd679cd36846c78f69780ba1e..d2e322be7afda6312e2e2fd3e7cee4c6298b5c0b 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -2460,95 +2460,6 @@ ru:
         bicycle: На велосипеде
         car: На машине
         foot: Пешком
         bicycle: На велосипеде
         car: На машине
         foot: Пешком

-    key:
-      table:
-        entry:
-          motorway: Автомагистраль
-          main_road: Главная дорога
-          trunk: Шоссе
-          primary: Магистральная дорога
-          secondary: Второстепенная дорога
-          unclassified: Дорога местного значения
-          pedestrian: Пешеходная дорога
-          track: Просёлочная дорога
-          bridleway: Дорога для верховой езды
-          cycleway: Велосипедная дорога
-          cycleway_national: Национальная велодорожка
-          cycleway_regional: Региональная велодорожка
-          cycleway_local: Велодорожка местного значения
-          cycleway_mtb: Маршрут для горного велосипеда
-          footway: Пешеходная дорожка
-          rail: Железная дорога
-          train: Поезд
-          subway: Линия метро
-          ferry: Паром
-          light_rail: Легкорельсовый транспорт
-          tram: Трамвай
-          trolleybus: Троллейбус
-          bus: Автобус
-          cable_car: Канатная дорога
-          chair_lift: кресельный подъёмник
-          runway: Взлётно-посадочная полоса аэропорта
-          taxiway: Рулёжная дорожка
-          apron: Перрон аэродрома
-          admin: Административная граница
-          capital: Столица
-          city: Город
-          orchard: Фруктовый сад
-          vineyard: Виноградник
-          forest: Лес
-          wood: Роща
-          farmland: Сельхозугодья
-          grass: Трава
-          meadow: Луг
-          bare_rock: Голая скала
-          sand: Песок
-          golf: Площадка для гольфа
-          park: Парк
-          common: Общественная земля
-          built_up: Площадь застройки
-          resident: Жилой район
-          retail: Торговый район
-          industrial: Промышленный район
-          commercial: Коммерческий район
-          heathland: Вересковая пустошь
-          scrubland: Скрэб
-          lake: Озеро
-          reservoir: Водохранилище
-          intermittent_water: Пересыхающий водоём
-          glacier: Ледник
-          reef: Риф
-          wetland: Заболоченная территория
-          farm: Ферма
-          brownfield: Расчистка под застройку
-          cemetery: Кладбище
-          allotments: Сады-огороды, дачные участки
-          pitch: Спортивная площадка
-          centre: Спортивный центр
-          beach: Пляж
-          reserve: Заповедник
-          military: Военная территория
-          school: Школа, университет
-          university: Университет
-          hospital: Больница
-          building: Значительное здание
-          station: Железнодорожная станция
-          railway_halt: Железнодорожная остановка
-          subway_station: Станция метро
-          tram_stop: Трамвайная остановка
-          summit: Вершина
-          peak: Вершина горы
-          tunnel: Туннель (пунктир)
-          bridge: Мост (жирная линия)
-          private: Частный доступ
-          destination: Целевой доступ
-          construction: Строительство дороги
-          bus_stop: Автобусная остановка
-          bicycle_shop: Магазин велосипедов
-          bicycle_rental: Прокат велосипедов
-          bicycle_parking: Парковка для велосипедов
-          bicycle_parking_small: Небольшая велопарковка
-          toilets: Туалет

     welcome:
       title: Добро пожаловать!
       introduction: Добро пожаловать на OpenStreetMap, открытую и свободную карту
     welcome:
       title: Добро пожаловать!
       introduction: Добро пожаловать на OpenStreetMap, открытую и свободную карту


@@ -2625,6 +2536,95 @@ ru:
           Действительно, многие группы существуют очень успешно как неформальные собрания людей или как
           общинные группы. Любой может настроить или присоединиться к ним. Подробнее читайте на %{communities_wiki_link}.
         communities_wiki: Вики-странице сообщества
           Действительно, многие группы существуют очень успешно как неформальные собрания людей или как
           общинные группы. Любой может настроить или присоединиться к ним. Подробнее читайте на %{communities_wiki_link}.
         communities_wiki: Вики-странице сообщества

+  map_keys:
+    show:
+      entries:
+        motorway: Автомагистраль
+        main_road: Главная дорога
+        trunk: Шоссе
+        primary: Магистральная дорога
+        secondary: Второстепенная дорога
+        unclassified: Дорога местного значения
+        pedestrian: Пешеходная дорога
+        track: Просёлочная дорога
+        bridleway: Дорога для верховой езды
+        cycleway: Велосипедная дорога
+        cycleway_national: Национальная велодорожка
+        cycleway_regional: Региональная велодорожка
+        cycleway_local: Велодорожка местного значения
+        cycleway_mtb: Маршрут для горного велосипеда
+        footway: Пешеходная дорожка
+        rail: Железная дорога
+        train: Поезд
+        subway: Линия метро
+        ferry: Паром
+        light_rail: Легкорельсовый транспорт
+        tram: Трамвай
+        trolleybus: Троллейбус
+        bus: Автобус
+        cable_car: Канатная дорога
+        chair_lift: кресельный подъёмник
+        runway: Взлётно-посадочная полоса аэропорта
+        taxiway: Рулёжная дорожка
+        apron: Перрон аэродрома
+        admin: Административная граница
+        capital: Столица
+        city: Город
+        orchard: Фруктовый сад
+        vineyard: Виноградник
+        forest: Лес
+        wood: Роща
+        farmland: Сельхозугодья
+        grass: Трава
+        meadow: Луг
+        bare_rock: Голая скала
+        sand: Песок
+        golf: Площадка для гольфа
+        park: Парк
+        common: Общественная земля
+        built_up: Площадь застройки
+        resident: Жилой район
+        retail: Торговый район
+        industrial: Промышленный район
+        commercial: Коммерческий район
+        heathland: Вересковая пустошь
+        scrubland: Скрэб
+        lake: Озеро
+        reservoir: Водохранилище
+        intermittent_water: Пересыхающий водоём
+        glacier: Ледник
+        reef: Риф
+        wetland: Заболоченная территория
+        farm: Ферма
+        brownfield: Расчистка под застройку
+        cemetery: Кладбище
+        allotments: Сады-огороды, дачные участки
+        pitch: Спортивная площадка
+        centre: Спортивный центр
+        beach: Пляж
+        reserve: Заповедник
+        military: Военная территория
+        school: Школа, университет
+        university: Университет
+        hospital: Больница
+        building: Значительное здание
+        station: Железнодорожная станция
+        railway_halt: Железнодорожная остановка
+        subway_station: Станция метро
+        tram_stop: Трамвайная остановка
+        summit: Вершина
+        peak: Вершина горы
+        tunnel: Туннель (пунктир)
+        bridge: Мост (жирная линия)
+        private: Частный доступ
+        destination: Целевой доступ
+        construction: Строительство дороги
+        bus_stop: Автобусная остановка
+        bicycle_shop: Магазин велосипедов
+        bicycle_rental: Прокат велосипедов
+        bicycle_parking: Парковка для велосипедов
+        bicycle_parking_small: Небольшая велопарковка
+        toilets: Туалет

   traces:
     visibility:
       private: Частный (доступно только анонимно, неупорядоченные точки)
   traces:
     visibility:
       private: Частный (доступно только анонимно, неупорядоченные точки)

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index 35c58d1c43269a20b36b73fafb5d7762746c9e6f..10c9778a68881671761354fd3ef476159996f981 100644 (file)
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -540,17 +540,6 @@ sat:
         bicycle: ᱵᱟᱭᱥᱟᱭᱠᱤᱞ
         car: ᱠᱟᱨ
         foot: ᱛᱟᱲᱟᱢ
         bicycle: ᱵᱟᱭᱥᱟᱭᱠᱤᱞ
         car: ᱠᱟᱨ
         foot: ᱛᱟᱲᱟᱢ

-    key:
-      table:
-        entry:
-          footway: ᱛᱟᱲᱟᱢᱦᱚᱨ
-          forest: ᱵᱤᱨ
-          wood: ᱠᱟᱴᱷ
-          park: ᱵᱟᱜᱟᱱ
-          school: ᱤᱛᱩᱱ ᱟᱥᱲᱟ
-          bicycle_shop: ᱥᱟᱭᱠᱤᱞ ᱫᱩᱠᱟᱹᱱ
-          bicycle_parking: ᱥᱟᱭᱠᱤᱞ ᱯᱟᱨᱠᱤᱝ
-          toilets: ᱴᱚᱭᱞᱮᱴᱠᱚ

     welcome:
       title: ᱥᱟᱹᱜᱩᱱ ᱫᱟᱨᱟᱢ!
       whats_on_the_map:
     welcome:
       title: ᱥᱟᱹᱜᱩᱱ ᱫᱟᱨᱟᱢ!
       whats_on_the_map:


@@ -558,6 +547,17 @@ sat:
       rules:
         title: ᱱᱤᱭᱚᱢᱠᱚ!
       start_mapping: ᱱᱚᱠᱥᱟ ᱛᱮᱭᱟᱨ ᱮᱦᱚᱵ ᱢᱮ
       rules:
         title: ᱱᱤᱭᱚᱢᱠᱚ!
       start_mapping: ᱱᱚᱠᱥᱟ ᱛᱮᱭᱟᱨ ᱮᱦᱚᱵ ᱢᱮ

+  map_keys:
+    show:
+      entries:
+        footway: ᱛᱟᱲᱟᱢᱦᱚᱨ
+        forest: ᱵᱤᱨ
+        wood: ᱠᱟᱴᱷ
+        park: ᱵᱟᱜᱟᱱ
+        school: ᱤᱛᱩᱱ ᱟᱥᱲᱟ
+        bicycle_shop: ᱥᱟᱭᱠᱤᱞ ᱫᱩᱠᱟᱹᱱ
+        bicycle_parking: ᱥᱟᱭᱠᱤᱞ ᱯᱟᱨᱠᱤᱝ
+        toilets: ᱴᱚᱭᱞᱮᱴᱠᱚ

   traces:
     new:
       visibility_help: ᱱᱚᱶᱟ ᱨᱮᱭᱟᱜ ᱢᱟᱱᱮ ᱫᱚ ᱪᱮᱫ?
   traces:
     new:
       visibility_help: ᱱᱚᱶᱟ ᱨᱮᱭᱟᱜ ᱢᱟᱱᱮ ᱫᱚ ᱪᱮᱫ?

diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index a9d1d8a51d31cce0126ad283341f2497e720c195..aa01875176a1cb6e7627b686467b5c723e23125b 100644 (file)
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -2225,81 +2225,6 @@ sc:
         bicycle: Bitzicleta
         car: Màchina
         foot: A pee
         bicycle: Bitzicleta
         car: Màchina
         foot: A pee

-    key:
-      table:
-        entry:
-          motorway: Autostrada
-          main_road: Caminu printzipale
-          trunk: Caminu lestru (Superstrada)
-          primary: Caminu printzipale
-          secondary: Carrera segundària
-          unclassified: Carrera chene classificatzione
-          track: Sestadu
-          bridleway: Caminu pro caddos
-          cycleway: Pista tziclàbile
-          cycleway_national: Pista tziclàbile natzionale
-          cycleway_regional: Pista tziclàbile regionale
-          cycleway_local: Pista tziclàbile locale
-          footway: Caminu pro pedones
-          rail: Ferrovia
-          train: Trenu
-          subway: Metropolitana
-          light_rail: Trenu lèbiu/metropolitana lèbia
-          tram: Tram
-          bus: Postale
-          cable_car: Funivia
-          chair_lift: Ascensore carrutzina
-          runway: Pista de aeroportu
-          taxiway: carrera de furriada
-          apron: Àrea de parchègiu de sos aèreos
-          admin: Làcana amministrativa
-          capital: Capitale
-          city: Tzitade
-          vineyard: Bìngia
-          forest: Litu
-          wood: Buscu
-          farmland: Terras de coltivu
-          grass: Erba
-          meadow: Pradu
-          bare_rock: Roca nuda
-          sand: Arena
-          golf: Campu de golf
-          park: Parcu
-          common: Comunu
-          built_up: Zona fraigada
-          resident: Àrea de residèntzia
-          retail: Àrea cummertziale
-          industrial: Àrea industriale
-          commercial: Àrea cummertziale
-          heathland: Istruvina
-          lake: Lagu
-          reservoir: Riserva de abba
-          farm: Fatoria
-          brownfield: Terrinu industriale abbandonadu
-          cemetery: Campusantu
-          allotments: Giardinos familiares
-          pitch: Campu isportivu
-          centre: Tzentru isportivu
-          beach: Marina
-          reserve: Reserva naturale
-          military: Zona militare
-          school: Iscola
-          university: Universidade
-          hospital: Ispidale
-          building: Edifìtziu significativu
-          station: Istatzione ferroviària
-          tram_stop: Firmada de su tram
-          summit: Cùcuru de monte
-          peak: Cùcuru
-          tunnel: Lìnia trategiada = galleria
-          bridge: Oros nieddos = ponte
-          private: Atzessu privadu
-          destination: Atzessu pro sa destinatzione
-          construction: Caminos in costrutzione
-          bus_stop: Firmada de su postale
-          bicycle_shop: Butega de bitzicletas
-          bicycle_parking: Parchègiu pro bitzicletas
-          toilets: Còmodu

     welcome:
       title: Bene bènnidu!
       introduction: |-
     welcome:
       title: Bene bènnidu!
       introduction: |-


@@ -2378,6 +2303,81 @@ sc:
           Difatis medas grupos esistint, cun sutzessu mannu, comente agrupamentos informales de persones o comente
           grupos de comunidades. Totus nde podent creare o bi si podent aunire. Leghe àteras informatziones in sa %{communities_wiki_link}.
         communities_wiki: Pàgina wiki de sas comunidades
           Difatis medas grupos esistint, cun sutzessu mannu, comente agrupamentos informales de persones o comente
           grupos de comunidades. Totus nde podent creare o bi si podent aunire. Leghe àteras informatziones in sa %{communities_wiki_link}.
         communities_wiki: Pàgina wiki de sas comunidades

+  map_keys:
+    show:
+      entries:
+        motorway: Autostrada
+        main_road: Caminu printzipale
+        trunk: Caminu lestru (Superstrada)
+        primary: Caminu printzipale
+        secondary: Carrera segundària
+        unclassified: Carrera chene classificatzione
+        track: Sestadu
+        bridleway: Caminu pro caddos
+        cycleway: Pista tziclàbile
+        cycleway_national: Pista tziclàbile natzionale
+        cycleway_regional: Pista tziclàbile regionale
+        cycleway_local: Pista tziclàbile locale
+        footway: Caminu pro pedones
+        rail: Ferrovia
+        train: Trenu
+        subway: Metropolitana
+        light_rail: Trenu lèbiu/metropolitana lèbia
+        tram: Tram
+        bus: Postale
+        cable_car: Funivia
+        chair_lift: Ascensore carrutzina
+        runway: Pista de aeroportu
+        taxiway: carrera de furriada
+        apron: Àrea de parchègiu de sos aèreos
+        admin: Làcana amministrativa
+        capital: Capitale
+        city: Tzitade
+        vineyard: Bìngia
+        forest: Litu
+        wood: Buscu
+        farmland: Terras de coltivu
+        grass: Erba
+        meadow: Pradu
+        bare_rock: Roca nuda
+        sand: Arena
+        golf: Campu de golf
+        park: Parcu
+        common: Comunu
+        built_up: Zona fraigada
+        resident: Àrea de residèntzia
+        retail: Àrea cummertziale
+        industrial: Àrea industriale
+        commercial: Àrea cummertziale
+        heathland: Istruvina
+        lake: Lagu
+        reservoir: Riserva de abba
+        farm: Fatoria
+        brownfield: Terrinu industriale abbandonadu
+        cemetery: Campusantu
+        allotments: Giardinos familiares
+        pitch: Campu isportivu
+        centre: Tzentru isportivu
+        beach: Marina
+        reserve: Reserva naturale
+        military: Zona militare
+        school: Iscola
+        university: Universidade
+        hospital: Ispidale
+        building: Edifìtziu significativu
+        station: Istatzione ferroviària
+        tram_stop: Firmada de su tram
+        summit: Cùcuru de monte
+        peak: Cùcuru
+        tunnel: Lìnia trategiada = galleria
+        bridge: Oros nieddos = ponte
+        private: Atzessu privadu
+        destination: Atzessu pro sa destinatzione
+        construction: Caminos in costrutzione
+        bus_stop: Firmada de su postale
+        bicycle_shop: Butega de bitzicletas
+        bicycle_parking: Parchègiu pro bitzicletas
+        toilets: Còmodu

   traces:
     visibility:
       private: Privadu (cumpartzidu petzi comente puntos anònimos no ordinados)
   traces:
     visibility:
       private: Privadu (cumpartzidu petzi comente puntos anònimos no ordinados)

diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index baae498ef26146dffc29afb25c188574421f9e8c..8066bf5525ab71ae551b4f183ad6121cbf6cba4f 100644 (file)
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -1438,59 +1438,6 @@ scn:
         bicycle: Câ bicicretta
         car: Câ màchina
         foot: A pedi
         bicycle: Câ bicicretta
         car: Câ màchina
         foot: A pedi

-    key:
-      table:
-        entry:
-          motorway: Autustrata
-          trunk: Supirstrata
-          primary: Strata primaria
-          secondary: Strata sicunnaria
-          unclassified: Strata senza classificazzioni
-          track: Trazzera
-          bridleway: Caminu pî cavaddi
-          cycleway: Pista ciclàbbili
-          footway: Caminu pidunali
-          rail: Ferruvìa
-          subway: Mitrupulitana
-          cable_car: Funivìa
-          chair_lift: seggiuvìa
-          runway: Pista d’attirraggiu
-          taxiway: pista di rullaggiu
-          apron: Ària di parcheggiu ariupurtuali
-          admin: Cunfini amministrativu
-          capital: Capitali
-          forest: Furesta
-          wood: Voscu
-          sand: Rina
-          golf: Campu di golf
-          park: Villa
-          common: Cumuni
-          resident: Zona risidinziali
-          retail: Zona di nigozzî
-          industrial: Zona nnustriali
-          commercial: Zona cummirciali
-          heathland: Brughiera
-          lake: Lacu
-          reservoir: lacu artificiali
-          farm: Massarìa
-          brownfield: Zona di bunìfica
-          cemetery: Cimiteru
-          allotments: Tirritorî agrìculi o ricriativi
-          pitch: Campu di jocu
-          centre: Centru spurtivu
-          reserve: Riserva naturali
-          military: Zona militari
-          school: Scola
-          university: univirsità
-          building: Edificiu mpurtanti
-          station: Stazzioni dâ ferruvìa
-          summit: Muntagna
-          peak: Muntagna
-          tunnel: Cuntornu trattiatu = jallarìa
-          bridge: Cuntornu niurittu = ponti
-          private: Accessu privatu
-          destination: Sirvitù di passaggiu
-          construction: Strati n custruzzioni

     welcome:
       title: Bimminuti!
       introduction: Bimminuti nta OpenStreetMap, la cartina dû munnu lìbbira e canciàbbili.
     welcome:
       title: Bimminuti!
       introduction: Bimminuti nta OpenStreetMap, la cartina dû munnu lìbbira e canciàbbili.


@@ -1510,6 +1457,59 @@ scn:
         para_1: |-
           Si voi sulamenti cunzata quarchi cosa piccidda, e nun hai lu tempu pi scrivìriti e nzignàriti a mappari, è
           cchiù fàcili lassari na nota.
         para_1: |-
           Si voi sulamenti cunzata quarchi cosa piccidda, e nun hai lu tempu pi scrivìriti e nzignàriti a mappari, è
           cchiù fàcili lassari na nota.

+  map_keys:
+    show:
+      entries:
+        motorway: Autustrata
+        trunk: Supirstrata
+        primary: Strata primaria
+        secondary: Strata sicunnaria
+        unclassified: Strata senza classificazzioni
+        track: Trazzera
+        bridleway: Caminu pî cavaddi
+        cycleway: Pista ciclàbbili
+        footway: Caminu pidunali
+        rail: Ferruvìa
+        subway: Mitrupulitana
+        cable_car: Funivìa
+        chair_lift: seggiuvìa
+        runway: Pista d’attirraggiu
+        taxiway: pista di rullaggiu
+        apron: Ària di parcheggiu ariupurtuali
+        admin: Cunfini amministrativu
+        capital: Capitali
+        forest: Furesta
+        wood: Voscu
+        sand: Rina
+        golf: Campu di golf
+        park: Villa
+        common: Cumuni
+        resident: Zona risidinziali
+        retail: Zona di nigozzî
+        industrial: Zona nnustriali
+        commercial: Zona cummirciali
+        heathland: Brughiera
+        lake: Lacu
+        reservoir: lacu artificiali
+        farm: Massarìa
+        brownfield: Zona di bunìfica
+        cemetery: Cimiteru
+        allotments: Tirritorî agrìculi o ricriativi
+        pitch: Campu di jocu
+        centre: Centru spurtivu
+        reserve: Riserva naturali
+        military: Zona militari
+        school: Scola
+        university: univirsità
+        building: Edificiu mpurtanti
+        station: Stazzioni dâ ferruvìa
+        summit: Muntagna
+        peak: Muntagna
+        tunnel: Cuntornu trattiatu = jallarìa
+        bridge: Cuntornu niurittu = ponti
+        private: Accessu privatu
+        destination: Sirvitù di passaggiu
+        construction: Strati n custruzzioni

   traces:
     visibility:
       private: Privata (cunnivisu sulu comu anònimu, òrdini dî punti nun mantinutu)
   traces:
     visibility:
       private: Privata (cunnivisu sulu comu anònimu, òrdini dî punti nun mantinutu)

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index d940d3f56abf61ed25b3d8b26e151a432ff671d8..9b1cdfe7d9e59e27a340299aa72aab341cdf9962 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -838,22 +838,6 @@ sco:
       where_am_i: Whaur am I?
       where_am_i_title: Descrive the current location uisin the sairch ingine
       submit_text: Gae
       where_am_i: Whaur am I?
       where_am_i_title: Descrive the current location uisin the sairch ingine
       submit_text: Gae

-    key:
-      table:
-        entry:
-          wood: Wid
-          golf: Gowf coorse
-          park: Pairk
-          resident: Residential area
-          retail: Retail area
-          industrial: Industrial aurie
-          commercial: Commercial aurie
-          lake: Loch
-          farm: Ferm
-          military: Militar aurie
-          school: Schuil
-          university: varsity
-          building: Signeeficant biggin

     welcome:
       title: Walcome!
       introduction: |-
     welcome:
       title: Walcome!
       introduction: |-


@@ -862,6 +846,22 @@ sco:
         hings ye'll need tae ken.
       whats_on_the_map:
         title: Whit's on the Cairt
         hings ye'll need tae ken.
       whats_on_the_map:
         title: Whit's on the Cairt

+  map_keys:
+    show:
+      entries:
+        wood: Wid
+        golf: Gowf coorse
+        park: Pairk
+        resident: Residential area
+        retail: Retail area
+        industrial: Industrial aurie
+        commercial: Commercial aurie
+        lake: Loch
+        farm: Ferm
+        military: Militar aurie
+        school: Schuil
+        university: varsity
+        building: Signeeficant biggin

   traces:
     create:
       upload_trace: Uplaid GPS Trace
   traces:
     create:
       upload_trace: Uplaid GPS Trace

diff --git a/config/locales/sh.yml b/config/locales/sh.yml
index 78e7e528c650004780750448c67358da54277177..6dcbd44cdeb48721dd6456f9684f7f54b21566b9 100644 (file)
--- a/config/locales/sh.yml
+++ b/config/locales/sh.yml
@@ -631,56 +631,6 @@ sh:
         body: 'Područje je preveliko da bi se izvezlo kao XML-podaci. Molimo povećajte
           prikaz ili izaberite manju površinu. Možete koristiti jedan od izvora navedenih
           ispod za masovno preuzimanje:'
         body: 'Područje je preveliko da bi se izvezlo kao XML-podaci. Molimo povećajte
           prikaz ili izaberite manju površinu. Možete koristiti jedan od izvora navedenih
           ispod za masovno preuzimanje:'

-    key:
-      table:
-        entry:
-          motorway: Autoput
-          main_road: Glavna cesta
-          trunk: Brza cesta
-          primary: Primarna cesta
-          secondary: Sekundarna cesta
-          unclassified: Nerazvrstana cesta
-          track: Staza
-          bridleway: Konjička staza
-          cycleway: Biciklistička staza
-          cycleway_national: Državna biciklistička staza
-          cycleway_regional: Regionalna biciklistička staza
-          cycleway_local: Lokalna biciklistička staza
-          footway: Pješačka staza
-          rail: Željeznica
-          subway: Podzemna željeznica
-          cable_car: Kabinska žičara
-          chair_lift: sedežnica
-          runway: Aerodromska pista
-          taxiway: rulna staza
-          apron: Parking za avione
-          admin: Administrativna granica
-          forest: Šuma
-          wood: Šume (prirodne, neodržavane)
-          golf: Golf teren
-          park: Park
-          common: Travnjaci
-          resident: Stambeno područje
-          retail: Maloprodajno područje
-          industrial: Industrijsko područje
-          commercial: Poslovno područje
-          heathland: Vriština
-          lake: Jezero
-          reservoir: rezervoar
-          farm: Farma
-          brownfield: Gradilište
-          cemetery: Groblje
-          allotments: Vrtovi
-          pitch: Sportski teren
-          centre: Sportski centar
-          reserve: Rezervat prirode
-          military: Vojno područje
-          school: Škola
-          university: univerzitet
-          building: Značajna zgrada
-          station: Željeznička stanica
-          summit: Vrh
-          peak: vrh

     welcome:
       title: Dobrodošli!
       introduction: Dobrodošli u OpenStreetMap — slobodnu i uredljivu kartu svijeta.
     welcome:
       title: Dobrodošli!
       introduction: Dobrodošli u OpenStreetMap — slobodnu i uredljivu kartu svijeta.


@@ -700,6 +650,56 @@ sh:
       basic_terms:
         title: Osnovni pojmovi za mapiranje
         editor: uređivač
       basic_terms:
         title: Osnovni pojmovi za mapiranje
         editor: uređivač

+  map_keys:
+    show:
+      entries:
+        motorway: Autoput
+        main_road: Glavna cesta
+        trunk: Brza cesta
+        primary: Primarna cesta
+        secondary: Sekundarna cesta
+        unclassified: Nerazvrstana cesta
+        track: Staza
+        bridleway: Konjička staza
+        cycleway: Biciklistička staza
+        cycleway_national: Državna biciklistička staza
+        cycleway_regional: Regionalna biciklistička staza
+        cycleway_local: Lokalna biciklistička staza
+        footway: Pješačka staza
+        rail: Željeznica
+        subway: Podzemna željeznica
+        cable_car: Kabinska žičara
+        chair_lift: sedežnica
+        runway: Aerodromska pista
+        taxiway: rulna staza
+        apron: Parking za avione
+        admin: Administrativna granica
+        forest: Šuma
+        wood: Šume (prirodne, neodržavane)
+        golf: Golf teren
+        park: Park
+        common: Travnjaci
+        resident: Stambeno područje
+        retail: Maloprodajno područje
+        industrial: Industrijsko područje
+        commercial: Poslovno područje
+        heathland: Vriština
+        lake: Jezero
+        reservoir: rezervoar
+        farm: Farma
+        brownfield: Gradilište
+        cemetery: Groblje
+        allotments: Vrtovi
+        pitch: Sportski teren
+        centre: Sportski centar
+        reserve: Rezervat prirode
+        military: Vojno područje
+        school: Škola
+        university: univerzitet
+        building: Značajna zgrada
+        station: Željeznička stanica
+        summit: Vrh
+        peak: vrh

   application:
     settings_menu:
       account_settings: Podešavanja računa
   application:
     settings_menu:
       account_settings: Podešavanja računa

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index f4054a7f0ac3a00c5b9b5e4d7f95cd7b282c6f76..dc95391f91686936d3ba4dded8d599ccced23ab7 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -2513,95 +2513,6 @@ sk:
         bicycle: Bicykel
         car: Automobil
         foot: Pešo
         bicycle: Bicykel
         car: Automobil
         foot: Pešo

-    key:
-      table:
-        entry:
-          motorway: Diaľnica
-          main_road: Hlavná cesta
-          trunk: Cesta pre motorové vozidlá
-          primary: Cesta prvej triedy
-          secondary: Cesta druhej triedy
-          unclassified: Neklasifikovaná cesta
-          pedestrian: Chodník pre chodcov
-          track: Lesná/poľná cesta
-          bridleway: Chodník pre kone
-          cycleway: Cyklotrasa
-          cycleway_national: Národná cyklotrasa
-          cycleway_regional: Regionálna cyklotrasa
-          cycleway_local: Miestna cyklotrasa
-          cycleway_mtb: Trasa pre horské bicykle
-          footway: Chodník pre peších
-          rail: Železnica
-          train: Vlak
-          subway: Metro
-          ferry: Trajekt
-          light_rail: Ľahké metro
-          tram: Električka
-          trolleybus: Trolejbus
-          bus: Autobus
-          cable_car: Lanovka
-          chair_lift: Sedačková lanovka
-          runway: Letisková dráha
-          taxiway: Pojazdová dráha
-          apron: Letisková odbavovacia plocha
-          admin: Administratívne hranice
-          capital: Hlavné mesto
-          city: Mesto
-          orchard: Sad
-          vineyard: Vinica
-          forest: Les (udržiavaný)
-          wood: Les
-          farmland: Poľnohospodárska pôda
-          grass: Tráva
-          meadow: Lúka
-          bare_rock: Holá skala
-          sand: Piesok
-          golf: Golfové ihrisko
-          park: Park
-          common: Pastvina
-          built_up: Zastavaná plocha
-          resident: Obytná oblasť
-          retail: Nákupná oblasť
-          industrial: Priemyselná oblasť
-          commercial: Komerčná oblasť
-          heathland: Vresovisko
-          scrubland: Kroviny
-          lake: Jazero
-          reservoir: Nádrž
-          intermittent_water: Občasná vodná plocha
-          glacier: Ľadovec
-          reef: Útes
-          wetland: Mokrina
-          farm: Farma
-          brownfield: Zborenisko
-          cemetery: Cintorín
-          allotments: Záhradkárska kolónia
-          pitch: Športové ihrisko
-          centre: Športové centrum
-          beach: Pláž
-          reserve: Prírodná rezervácia
-          military: Vojenský priestor
-          school: Škola
-          university: Univerzita
-          hospital: Nemocnica
-          building: Významná budova
-          station: Železničná stanica
-          railway_halt: Železničná zastávka
-          subway_station: Stanica metra
-          tram_stop: Zastávka električky
-          summit: Vrchol
-          peak: Vrchol
-          tunnel: Čiarkovaný obrys = tunel
-          bridge: Čierny obrys = most
-          private: Súkromný prístup
-          destination: Prejazd zakázaný
-          construction: Cesta vo výstavbe
-          bus_stop: Zastávka autobusu
-          bicycle_shop: Obchod s bicyklami
-          bicycle_rental: Požičovňa bicyklov
-          bicycle_parking: Parkovanie pre bicykle
-          bicycle_parking_small: Malé parkovisko pre bicykle
-          toilets: WC

     welcome:
       title: Vitajte!
       introduction: Vitajte na OpenStreetMap, slobodnej a upravovateľnej mape sveta.
     welcome:
       title: Vitajte!
       introduction: Vitajte na OpenStreetMap, slobodnej a upravovateľnej mape sveta.


@@ -2673,6 +2584,95 @@ sk:
           ako neformálne zoskupenie ľudí alebo ako komunitná skupina. Ktokoľvek ich
           môže zostaviť alebo sa k nim pripojiť. Prečítajte si viac na %{communities_wiki_link}.
         communities_wiki: Wiki stránke o komunitách
           ako neformálne zoskupenie ľudí alebo ako komunitná skupina. Ktokoľvek ich
           môže zostaviť alebo sa k nim pripojiť. Prečítajte si viac na %{communities_wiki_link}.
         communities_wiki: Wiki stránke o komunitách

+  map_keys:
+    show:
+      entries:
+        motorway: Diaľnica
+        main_road: Hlavná cesta
+        trunk: Cesta pre motorové vozidlá
+        primary: Cesta prvej triedy
+        secondary: Cesta druhej triedy
+        unclassified: Neklasifikovaná cesta
+        pedestrian: Chodník pre chodcov
+        track: Lesná/poľná cesta
+        bridleway: Chodník pre kone
+        cycleway: Cyklotrasa
+        cycleway_national: Národná cyklotrasa
+        cycleway_regional: Regionálna cyklotrasa
+        cycleway_local: Miestna cyklotrasa
+        cycleway_mtb: Trasa pre horské bicykle
+        footway: Chodník pre peších
+        rail: Železnica
+        train: Vlak
+        subway: Metro
+        ferry: Trajekt
+        light_rail: Ľahké metro
+        tram: Električka
+        trolleybus: Trolejbus
+        bus: Autobus
+        cable_car: Lanovka
+        chair_lift: Sedačková lanovka
+        runway: Letisková dráha
+        taxiway: Pojazdová dráha
+        apron: Letisková odbavovacia plocha
+        admin: Administratívne hranice
+        capital: Hlavné mesto
+        city: Mesto
+        orchard: Sad
+        vineyard: Vinica
+        forest: Les (udržiavaný)
+        wood: Les
+        farmland: Poľnohospodárska pôda
+        grass: Tráva
+        meadow: Lúka
+        bare_rock: Holá skala
+        sand: Piesok
+        golf: Golfové ihrisko
+        park: Park
+        common: Pastvina
+        built_up: Zastavaná plocha
+        resident: Obytná oblasť
+        retail: Nákupná oblasť
+        industrial: Priemyselná oblasť
+        commercial: Komerčná oblasť
+        heathland: Vresovisko
+        scrubland: Kroviny
+        lake: Jazero
+        reservoir: Nádrž
+        intermittent_water: Občasná vodná plocha
+        glacier: Ľadovec
+        reef: Útes
+        wetland: Mokrina
+        farm: Farma
+        brownfield: Zborenisko
+        cemetery: Cintorín
+        allotments: Záhradkárska kolónia
+        pitch: Športové ihrisko
+        centre: Športové centrum
+        beach: Pláž
+        reserve: Prírodná rezervácia
+        military: Vojenský priestor
+        school: Škola
+        university: Univerzita
+        hospital: Nemocnica
+        building: Významná budova
+        station: Železničná stanica
+        railway_halt: Železničná zastávka
+        subway_station: Stanica metra
+        tram_stop: Zastávka električky
+        summit: Vrchol
+        peak: Vrchol
+        tunnel: Čiarkovaný obrys = tunel
+        bridge: Čierny obrys = most
+        private: Súkromný prístup
+        destination: Prejazd zakázaný
+        construction: Cesta vo výstavbe
+        bus_stop: Zastávka autobusu
+        bicycle_shop: Obchod s bicyklami
+        bicycle_rental: Požičovňa bicyklov
+        bicycle_parking: Parkovanie pre bicykle
+        bicycle_parking_small: Malé parkovisko pre bicykle
+        toilets: WC

   traces:
     visibility:
       private: Súkromné (iba zdieľané ako anonymné, neusporiadané body)
   traces:
     visibility:
       private: Súkromné (iba zdieľané ako anonymné, neusporiadané body)

diff --git a/config/locales/skr-arab.yml b/config/locales/skr-arab.yml
index 0acdef2513a2d2b351d8e59f27e05eed235c2556..c6e53884e19680e38092d5b79bc1273da07c65cc 100644 (file)
--- a/config/locales/skr-arab.yml
+++ b/config/locales/skr-arab.yml
@@ -1200,48 +1200,6 @@ skr-arab:
         foot: پیدل
       providers:
         fossgis_valhalla: ول ہلا
         foot: پیدل
       providers:
         fossgis_valhalla: ول ہلا

-    key:
-      table:
-        entry:
-          motorway: موٹروے
-          track: ٹرَیک
-          rail: ریلوے
-          train: ڳَݙی
-          subway: سب وے
-          light_rail: لائٹ ریل
-          tram: ٹرام
-          trolleybus: ٹرالی بس
-          bus: بس
-          cable_car: کیبل کار
-          chair_lift: چیئر لفٹ
-          taxiway: ٹیکسی دا راہ
-          capital: دار الحکومت
-          city: شَہر
-          orchard: بغیچا
-          forest: جنگل
-          wood: لکڑ
-          grass: گھا
-          meadow: چراگاہ
-          sand: ریت
-          golf: گولف مَیدان
-          park: پارک
-          common: وقف
-          retail: پرچون علاقہ
-          industrial: صنعتی علاقہ
-          commercial: کمرشل ایریا
-          lake: جھیل
-          reservoir: ذخائر
-          glacier: گلیشیئر
-          farm: کھیت
-          beach: ساحل
-          school: سکول
-          university: یونی ورسٹی
-          hospital: ہسپتال
-          station: ریلوے ٹیشݨ
-          railway_halt: ریلوے ہالٹ
-          peak: چوٹی
-          bus_stop: بساں دا اݙا
-          toilets: بیت الخلاء

     welcome:
       title: ست بسم اللہ!
       basic_terms:
     welcome:
       title: ست بسم اللہ!
       basic_terms:


@@ -1255,6 +1213,48 @@ skr-arab:
         the_map: نقشہ
     communities:
       title: برادریاں
         the_map: نقشہ
     communities:
       title: برادریاں

+  map_keys:
+    show:
+      entries:
+        motorway: موٹروے
+        track: ٹرَیک
+        rail: ریلوے
+        train: ڳَݙی
+        subway: سب وے
+        light_rail: لائٹ ریل
+        tram: ٹرام
+        trolleybus: ٹرالی بس
+        bus: بس
+        cable_car: کیبل کار
+        chair_lift: چیئر لفٹ
+        taxiway: ٹیکسی دا راہ
+        capital: دار الحکومت
+        city: شَہر
+        orchard: بغیچا
+        forest: جنگل
+        wood: لکڑ
+        grass: گھا
+        meadow: چراگاہ
+        sand: ریت
+        golf: گولف مَیدان
+        park: پارک
+        common: وقف
+        retail: پرچون علاقہ
+        industrial: صنعتی علاقہ
+        commercial: کمرشل ایریا
+        lake: جھیل
+        reservoir: ذخائر
+        glacier: گلیشیئر
+        farm: کھیت
+        beach: ساحل
+        school: سکول
+        university: یونی ورسٹی
+        hospital: ہسپتال
+        station: ریلوے ٹیشݨ
+        railway_halt: ریلوے ہالٹ
+        peak: چوٹی
+        bus_stop: بساں دا اݙا
+        toilets: بیت الخلاء

   traces:
     new:
       help: مدد
   traces:
     new:
       help: مدد

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 60b6397a595fddc6cb67a2cf79e8985a95d56b0c..410ebded43239f44897fb6b417386b193b392826 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -2308,92 +2308,6 @@ sl:
         bicycle: Kolo
         car: Avto
         foot: Hoja
         bicycle: Kolo
         car: Avto
         foot: Hoja

-    key:
-      table:
-        entry:
-          motorway: Avtocesta
-          main_road: Glavna cesta
-          trunk: Hitra cesta
-          primary: Glavna cesta
-          secondary: Regionalna cesta
-          unclassified: Ostale ceste izven naselij
-          pedestrian: Pot za pešce
-          track: Kolovoz
-          bridleway: Jahalna pot
-          cycleway: Kolesarska steza
-          cycleway_national: Nacionalna kolesarska steza
-          cycleway_regional: Regionalna kolesarska steza
-          cycleway_local: Krajevna kolesarska steza
-          cycleway_mtb: Gorskokolesarska pot
-          footway: Pešpot
-          rail: Železnica
-          train: Vlak
-          subway: Podzemna železnica
-          ferry: Trajekt
-          light_rail: Lahka železnica
-          tram: Tramvaj
-          trolleybus: Trolejbus
-          bus: Avtobus
-          cable_car: Nihalka
-          chair_lift: Sedežnica
-          runway: Vzletno-pristajalna steza
-          taxiway: Vozna steza
-          apron: Letališka ploščad
-          admin: Upravna razmejitev
-          capital: Glavno mesto
-          city: Mesto
-          orchard: Sadovnjak
-          vineyard: Vinograd
-          forest: Gozd
-          wood: Gozd
-          farmland: Kmetijsko zemljišče
-          grass: Trava
-          meadow: Travnik
-          bare_rock: Gola skala
-          sand: Pesek
-          golf: Igrišče za golf
-          park: Park
-          common: Travniki
-          built_up: Pozidano območje
-          resident: Naselje
-          retail: Trgovinsko območje
-          industrial: Industrijsko območje
-          commercial: Poslovno območje
-          heathland: Grmičevje
-          scrubland: Grmičevje
-          lake: Jezero
-          reservoir: Vodni zbiralnik
-          intermittent_water: Presihajoče vodno telo
-          glacier: Ledenik
-          reef: Greben
-          wetland: Mokrišče
-          farm: Kmetija
-          brownfield: Gradbišče
-          cemetery: Pokopališče
-          allotments: Vrtički
-          pitch: Športno igrišče
-          centre: Športni center
-          beach: Plaža
-          reserve: Naravni rezervat
-          military: Vojaško območje
-          school: Šola; univerza
-          university: Univerza
-          hospital: Bolnišnica
-          building: Pomembna stavba
-          station: Železniška postaja
-          summit: Vrh
-          peak: Vrh
-          tunnel: Črtkana obroba = predor
-          bridge: Krepka obroba = most
-          private: Zasebni dostop
-          destination: Dostop za dostavo
-          construction: Ceste v gradnji
-          bus_stop: Avtobusno postajališče
-          bicycle_shop: Kolesarska trgovina
-          bicycle_rental: Izposoja koles
-          bicycle_parking: Parkirišče za kolesa
-          bicycle_parking_small: Majhno parkirišče za kolesa
-          toilets: Stranišče

     welcome:
       title: Pozdravljeni!
       introduction: Pozdravljeni v OpenStreetMap, brezplačnem zemljevidu sveta, ki
     welcome:
       title: Pozdravljeni!
       introduction: Pozdravljeni v OpenStreetMap, brezplačnem zemljevidu sveta, ki


@@ -2465,6 +2379,92 @@ sl:
           obstajajo kot neformalno srečevanje ali kot skupina v skupnosti. Vsakdo
           jih lahko ustanovi ali se jim pridruži. Preberite več na %{communities_wiki_link}.
         communities_wiki: Vikistran skupnosti
           obstajajo kot neformalno srečevanje ali kot skupina v skupnosti. Vsakdo
           jih lahko ustanovi ali se jim pridruži. Preberite več na %{communities_wiki_link}.
         communities_wiki: Vikistran skupnosti

+  map_keys:
+    show:
+      entries:
+        motorway: Avtocesta
+        main_road: Glavna cesta
+        trunk: Hitra cesta
+        primary: Glavna cesta
+        secondary: Regionalna cesta
+        unclassified: Ostale ceste izven naselij
+        pedestrian: Pot za pešce
+        track: Kolovoz
+        bridleway: Jahalna pot
+        cycleway: Kolesarska steza
+        cycleway_national: Nacionalna kolesarska steza
+        cycleway_regional: Regionalna kolesarska steza
+        cycleway_local: Krajevna kolesarska steza
+        cycleway_mtb: Gorskokolesarska pot
+        footway: Pešpot
+        rail: Železnica
+        train: Vlak
+        subway: Podzemna železnica
+        ferry: Trajekt
+        light_rail: Lahka železnica
+        tram: Tramvaj
+        trolleybus: Trolejbus
+        bus: Avtobus
+        cable_car: Nihalka
+        chair_lift: Sedežnica
+        runway: Vzletno-pristajalna steza
+        taxiway: Vozna steza
+        apron: Letališka ploščad
+        admin: Upravna razmejitev
+        capital: Glavno mesto
+        city: Mesto
+        orchard: Sadovnjak
+        vineyard: Vinograd
+        forest: Gozd
+        wood: Gozd
+        farmland: Kmetijsko zemljišče
+        grass: Trava
+        meadow: Travnik
+        bare_rock: Gola skala
+        sand: Pesek
+        golf: Igrišče za golf
+        park: Park
+        common: Travniki
+        built_up: Pozidano območje
+        resident: Naselje
+        retail: Trgovinsko območje
+        industrial: Industrijsko območje
+        commercial: Poslovno območje
+        heathland: Grmičevje
+        scrubland: Grmičevje
+        lake: Jezero
+        reservoir: Vodni zbiralnik
+        intermittent_water: Presihajoče vodno telo
+        glacier: Ledenik
+        reef: Greben
+        wetland: Mokrišče
+        farm: Kmetija
+        brownfield: Gradbišče
+        cemetery: Pokopališče
+        allotments: Vrtički
+        pitch: Športno igrišče
+        centre: Športni center
+        beach: Plaža
+        reserve: Naravni rezervat
+        military: Vojaško območje
+        school: Šola; univerza
+        university: Univerza
+        hospital: Bolnišnica
+        building: Pomembna stavba
+        station: Železniška postaja
+        summit: Vrh
+        peak: Vrh
+        tunnel: Črtkana obroba = predor
+        bridge: Krepka obroba = most
+        private: Zasebni dostop
+        destination: Dostop za dostavo
+        construction: Ceste v gradnji
+        bus_stop: Avtobusno postajališče
+        bicycle_shop: Kolesarska trgovina
+        bicycle_rental: Izposoja koles
+        bicycle_parking: Parkirišče za kolesa
+        bicycle_parking_small: Majhno parkirišče za kolesa
+        toilets: Stranišče

   traces:
     visibility:
       private: Zasebna (v skupni rabi kot anonimna, neurejene točke)
   traces:
     visibility:
       private: Zasebna (v skupni rabi kot anonimna, neurejene točke)

diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index a090b409a51d723381e454a7a3720025712f18d7..8c5afa48092e6212f901fb9272152fcaf2417d91 100644 (file)
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1100,17 +1100,6 @@ sq:
       from: Prej
       to: Për
       where_am_i: Ku është kjo?
       from: Prej
       to: Për
       where_am_i: Ku është kjo?

-    key:
-      table:
-        entry:
-          centre: Qendër sportive
-          military: Zonë ushtarake
-          school: Shkollë
-          university: Universitet
-          building: Ndërtesë
-          station: Stacioni hekurudhor
-          summit: Samit
-          peak: majë

     welcome:
       title: Mirësevjen
       whats_on_the_map:
     welcome:
       title: Mirësevjen
       whats_on_the_map:


@@ -1124,6 +1113,17 @@ sq:
       start_mapping: Fillo hartografimin
       add_a_note:
         title: Nuk ke kohë për të redaktuar? Shto një shënim!
       start_mapping: Fillo hartografimin
       add_a_note:
         title: Nuk ke kohë për të redaktuar? Shto një shënim!

+  map_keys:
+    show:
+      entries:
+        centre: Qendër sportive
+        military: Zonë ushtarake
+        school: Shkollë
+        university: Universitet
+        building: Ndërtesë
+        station: Stacioni hekurudhor
+        summit: Samit
+        peak: majë

   traces:
     visibility:
       private: Privat (ndahet vetëm si anonim, pika të parenditura)
   traces:
     visibility:
       private: Privat (ndahet vetëm si anonim, pika të parenditura)

diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index ac21d6539dafc0c886ab99a967f8fcbdbfa43422..55a221532ec34a19a4a65c9f924a6046c2e4f7c0 100644 (file)
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -935,57 +935,57 @@ sr-Latn:
       where_am_i: Gde sam?
       where_am_i_title: Ustanovite trenutnu lokaciju pomoću pretraživača
       submit_text: Idi
       where_am_i: Gde sam?
       where_am_i_title: Ustanovite trenutnu lokaciju pomoću pretraživača
       submit_text: Idi

-    key:
-      table:
-        entry:
-          motorway: Auto-put
-          trunk: Magistralni put
-          primary: Glavni put
-          secondary: Sporedni put
-          unclassified: Nekategorisani put
-          track: Makadam
-          bridleway: Konjička staza
-          cycleway: Biciklistička staza
-          footway: Pešačka staza
-          rail: Železnička pruga
-          subway: Podzemna železnica
-          cable_car: Žičara
-          chair_lift: sedišnica
-          runway: Aerodromska pista
-          taxiway: rulne staze
-          apron: Aerodromski peron
-          admin: Administrativna granica
-          forest: Šuma
-          wood: Šuma
-          golf: Golf teren
-          park: Park
-          common: Poljana
-          resident: Stambeno područje
-          retail: Maloprodajno područje
-          industrial: Industrijsko područje
-          commercial: Poslovno područje
-          heathland: Pustoš
-          lake: Jezero
-          reservoir: rezervoar
-          farm: Farma
-          brownfield: Građevinsko zemljište
-          cemetery: Groblje
-          allotments: Bašte
-          pitch: Sportsko igralište
-          centre: Sportski centar
-          reserve: Rezervat prirode
-          military: Vojno područje
-          school: Škola
-          university: univerzitet
-          building: Značajna zgrada
-          station: Železnička stanica
-          summit: Uzvišenje
-          peak: vrh
-          tunnel: Isprekidan okvir – tunel
-          bridge: Crni okvir – most
-          private: Privatni posed
-          destination: Pristup odredištu
-          construction: Putevi u izgradnji
+  map_keys:
+    show:
+      entries:
+        motorway: Auto-put
+        trunk: Magistralni put
+        primary: Glavni put
+        secondary: Sporedni put
+        unclassified: Nekategorisani put
+        track: Makadam
+        bridleway: Konjička staza
+        cycleway: Biciklistička staza
+        footway: Pešačka staza
+        rail: Železnička pruga
+        subway: Podzemna železnica
+        cable_car: Žičara
+        chair_lift: sedišnica
+        runway: Aerodromska pista
+        taxiway: rulne staze
+        apron: Aerodromski peron
+        admin: Administrativna granica
+        forest: Šuma
+        wood: Šuma
+        golf: Golf teren
+        park: Park
+        common: Poljana
+        resident: Stambeno područje
+        retail: Maloprodajno područje
+        industrial: Industrijsko područje
+        commercial: Poslovno područje
+        heathland: Pustoš
+        lake: Jezero
+        reservoir: rezervoar
+        farm: Farma
+        brownfield: Građevinsko zemljište
+        cemetery: Groblje
+        allotments: Bašte
+        pitch: Sportsko igralište
+        centre: Sportski centar
+        reserve: Rezervat prirode
+        military: Vojno područje
+        school: Škola
+        university: univerzitet
+        building: Značajna zgrada
+        station: Železnička stanica
+        summit: Uzvišenje
+        peak: vrh
+        tunnel: Isprekidan okvir – tunel
+        bridge: Crni okvir – most
+        private: Privatni posed
+        destination: Pristup odredištu
+        construction: Putevi u izgradnji

   traces:
     visibility:
       private: Privatni (prikazuje se kao anonimne, neraspoređene tačke)
   traces:
     visibility:
       private: Privatni (prikazuje se kao anonimne, neraspoređene tačke)

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 49a3ada6f6694b0e122d983b32622660de3baa2f..d8a3de70507b5d8e7132c090d091576e7baabb0c 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1878,91 +1878,6 @@ sr:
         bicycle: Бициклом
         car: Ауто
         foot: Пешке
         bicycle: Бициклом
         car: Ауто
         foot: Пешке

-    key:
-      table:
-        entry:
-          motorway: Ауто-пут
-          main_road: Главни пут
-          trunk: Ауто-пут
-          primary: Магистрални пут
-          secondary: Споредни пут
-          unclassified: Локални пут
-          pedestrian: Пешачка стаза
-          track: Макадам
-          bridleway: Коњичка стаза
-          cycleway: Бициклистичка стаза
-          cycleway_national: Национална бициклистичка стаза
-          cycleway_regional: Регионална бициклистичка стаза
-          cycleway_local: Локална бициклистичка стаза
-          footway: Пешачка стаза
-          rail: Железничка пруга
-          train: Воз
-          subway: Подземна железница
-          ferry: Трајект
-          light_rail: Лака железница
-          tram: Трамвај
-          trolleybus: Тролејбус
-          bus: Аутобус
-          cable_car: Жичара
-          chair_lift: Жичара са седиштима
-          runway: Аеродромска писта
-          taxiway: Рулна стаза
-          apron: Аеродромски перон
-          admin: Административна граница
-          capital: Престоница
-          city: Град
-          orchard: Воћњак
-          vineyard: Виноград
-          forest: Шума
-          wood: Шума
-          farmland: Обрадиво земљиште
-          grass: Трава
-          meadow: Ливада
-          bare_rock: Голи камен
-          sand: Песак
-          golf: Голф терен
-          park: Парк
-          common: Пољана
-          resident: Стамбено подручје
-          retail: Малопродајно подручје
-          industrial: Индустријско подручје
-          commercial: Пословно подручје
-          heathland: Пустош
-          lake: Језеро
-          reservoir: Резервоар
-          glacier: Глечер
-          reef: Гребен
-          wetland: Мочварно подручје
-          farm: Фарма
-          brownfield: Грађевинско земљиште
-          cemetery: Гробље
-          allotments: Баште
-          pitch: Спортско игралиште
-          centre: Спортски центар
-          beach: Плажа
-          reserve: Резерват природе
-          military: Војно подручје
-          school: Школа
-          university: Универзитет
-          hospital: Болница
-          building: Значајна зграда
-          station: Железничка станица
-          railway_halt: Ранжирна станица
-          subway_station: Станица метроа
-          tram_stop: Трамвајско стајалиште
-          summit: Узвишење
-          peak: Врх
-          tunnel: Испрекидан оквир – тунел
-          bridge: Црни оквир – мост
-          private: Приватни посед
-          destination: Приступ одредишту
-          construction: Путеви у изградњи
-          bus_stop: Аутобуска станица
-          bicycle_shop: Продавница бицикала
-          bicycle_rental: Изнајмљивање бицикала
-          bicycle_parking: Паркинг за бицикле
-          bicycle_parking_small: Мали паркинг за бицикле
-          toilets: Тоалети

     welcome:
       title: Добро дошли!
       introduction: Добро дошли на OpenStreetMap, бесплатну изменљиву карту света.
     welcome:
       title: Добро дошли!
       introduction: Добро дошли на OpenStreetMap, бесплатну изменљиву карту света.


@@ -1990,6 +1905,91 @@ sr:
         title: Локални огранци
       other_groups:
         title: Друге групе
         title: Локални огранци
       other_groups:
         title: Друге групе

+  map_keys:
+    show:
+      entries:
+        motorway: Ауто-пут
+        main_road: Главни пут
+        trunk: Ауто-пут
+        primary: Магистрални пут
+        secondary: Споредни пут
+        unclassified: Локални пут
+        pedestrian: Пешачка стаза
+        track: Макадам
+        bridleway: Коњичка стаза
+        cycleway: Бициклистичка стаза
+        cycleway_national: Национална бициклистичка стаза
+        cycleway_regional: Регионална бициклистичка стаза
+        cycleway_local: Локална бициклистичка стаза
+        footway: Пешачка стаза
+        rail: Железничка пруга
+        train: Воз
+        subway: Подземна железница
+        ferry: Трајект
+        light_rail: Лака железница
+        tram: Трамвај
+        trolleybus: Тролејбус
+        bus: Аутобус
+        cable_car: Жичара
+        chair_lift: Жичара са седиштима
+        runway: Аеродромска писта
+        taxiway: Рулна стаза
+        apron: Аеродромски перон
+        admin: Административна граница
+        capital: Престоница
+        city: Град
+        orchard: Воћњак
+        vineyard: Виноград
+        forest: Шума
+        wood: Шума
+        farmland: Обрадиво земљиште
+        grass: Трава
+        meadow: Ливада
+        bare_rock: Голи камен
+        sand: Песак
+        golf: Голф терен
+        park: Парк
+        common: Пољана
+        resident: Стамбено подручје
+        retail: Малопродајно подручје
+        industrial: Индустријско подручје
+        commercial: Пословно подручје
+        heathland: Пустош
+        lake: Језеро
+        reservoir: Резервоар
+        glacier: Глечер
+        reef: Гребен
+        wetland: Мочварно подручје
+        farm: Фарма
+        brownfield: Грађевинско земљиште
+        cemetery: Гробље
+        allotments: Баште
+        pitch: Спортско игралиште
+        centre: Спортски центар
+        beach: Плажа
+        reserve: Резерват природе
+        military: Војно подручје
+        school: Школа
+        university: Универзитет
+        hospital: Болница
+        building: Значајна зграда
+        station: Железничка станица
+        railway_halt: Ранжирна станица
+        subway_station: Станица метроа
+        tram_stop: Трамвајско стајалиште
+        summit: Узвишење
+        peak: Врх
+        tunnel: Испрекидан оквир – тунел
+        bridge: Црни оквир – мост
+        private: Приватни посед
+        destination: Приступ одредишту
+        construction: Путеви у изградњи
+        bus_stop: Аутобуска станица
+        bicycle_shop: Продавница бицикала
+        bicycle_rental: Изнајмљивање бицикала
+        bicycle_parking: Паркинг за бицикле
+        bicycle_parking_small: Мали паркинг за бицикле
+        toilets: Тоалети

   traces:
     visibility:
       private: Приватни (приказује се као анонимне, непоређане тачке)
   traces:
     visibility:
       private: Приватни (приказује се као анонимне, непоређане тачке)

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index b249ed2a5cd3c80101bfb03d42e5d5ef9f0b1fec..1c5b0a30b0e47019c4dcd0619c6518122c95e2f3 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -2472,95 +2472,6 @@ sv:
         bicycle: Cykel
         car: Bil
         foot: Till fots
         bicycle: Cykel
         car: Bil
         foot: Till fots

-    key:
-      table:
-        entry:
-          motorway: Motorväg
-          main_road: Huvudväg
-          trunk: Nationell stamväg/motortrafikled
-          primary: Primär väg (riksväg)
-          secondary: Sekundär väg (större länsväg)
-          unclassified: Oklassificerad väg
-          pedestrian: Gågata
-          track: Traktorväg
-          bridleway: Ridstig
-          cycleway: Cykelväg
-          cycleway_national: Nationell cykelväg
-          cycleway_regional: Regional cykelväg
-          cycleway_local: Lokal cykelväg
-          cycleway_mtb: Mountainbike-led
-          footway: Gångväg
-          rail: Järnväg
-          train: Tåg
-          subway: Tunnelbana
-          ferry: Färja
-          light_rail: Snabbspårväg
-          tram: Spårvagn
-          trolleybus: Trådbuss
-          bus: Buss
-          cable_car: Linbana
-          chair_lift: Stollift
-          runway: Landningsbana
-          taxiway: Taxibana
-          apron: Flygplatsplatta
-          admin: Administrativ gräns
-          capital: Huvudstad
-          city: Stad
-          orchard: Fruktträdgård
-          vineyard: Vingård
-          forest: Kulturskog
-          wood: Naturskog
-          farmland: Jordbruksmark
-          grass: Gräs
-          meadow: Äng
-          bare_rock: Klippa
-          sand: Sand
-          golf: Golfbana
-          park: Park
-          common: Allmänning
-          built_up: Bebyggt område
-          resident: Bostadsområde
-          retail: Område för Detaljhandel
-          industrial: Industriellt område
-          commercial: Kommersiellt område
-          heathland: Hed
-          scrubland: Buskskog
-          lake: Sjö
-          reservoir: Vattenmagasin
-          intermittent_water: Intermittent vattenkropp
-          glacier: Glaciär
-          reef: Rev
-          wetland: Våtmark
-          farm: Bondgård
-          brownfield: Förfallen industritomt
-          cemetery: Begravningsplats
-          allotments: Koloniträdgårdar
-          pitch: Idrottsplan
-          centre: Idrottsanläggning
-          beach: Strand
-          reserve: Naturreservat
-          military: Militärområde
-          school: Skola
-          university: Universitet
-          hospital: Sjukhus
-          building: Viktig byggnad
-          station: Järnvägsstation
-          railway_halt: Järnvägsstopp
-          subway_station: Tunnelbanestation
-          tram_stop: Spårvagnshållplats
-          summit: Höjd
-          peak: Topp
-          tunnel: Streckade kanter = tunnel
-          bridge: Svarta kanter = bro
-          private: Privat tillgång
-          destination: Förbjuden genomfart
-          construction: Vägar under konstruktion
-          bus_stop: Busshållplats
-          bicycle_shop: Cykelaffär
-          bicycle_rental: Cykeluthyrning
-          bicycle_parking: Cykelparkering
-          bicycle_parking_small: Liten cykelparkering
-          toilets: Toaletter

     welcome:
       title: Välkommen!
       introduction: Välkommen till OpenStreetMap, den fria och redigerbara kartan
     welcome:
       title: Välkommen!
       introduction: Välkommen till OpenStreetMap, den fria och redigerbara kartan


@@ -2633,6 +2544,95 @@ sv:
           Det finns inget behov av att formellt bilda en grupp i samma utsträckning som de lokala avdelningarna.
           Många grupper existerar faktiskt mycket framgångsrikt som en informell sammankomst av människor eller som en gemenskapsgrupp. Vem som helst kan ställa in eller gå med i dessa. Läs mer på %{communities_wiki_link}.
         communities_wiki: Gemenskapswikisida
           Det finns inget behov av att formellt bilda en grupp i samma utsträckning som de lokala avdelningarna.
           Många grupper existerar faktiskt mycket framgångsrikt som en informell sammankomst av människor eller som en gemenskapsgrupp. Vem som helst kan ställa in eller gå med i dessa. Läs mer på %{communities_wiki_link}.
         communities_wiki: Gemenskapswikisida

+  map_keys:
+    show:
+      entries:
+        motorway: Motorväg
+        main_road: Huvudväg
+        trunk: Nationell stamväg/motortrafikled
+        primary: Primär väg (riksväg)
+        secondary: Sekundär väg (större länsväg)
+        unclassified: Oklassificerad väg
+        pedestrian: Gågata
+        track: Traktorväg
+        bridleway: Ridstig
+        cycleway: Cykelväg
+        cycleway_national: Nationell cykelväg
+        cycleway_regional: Regional cykelväg
+        cycleway_local: Lokal cykelväg
+        cycleway_mtb: Mountainbike-led
+        footway: Gångväg
+        rail: Järnväg
+        train: Tåg
+        subway: Tunnelbana
+        ferry: Färja
+        light_rail: Snabbspårväg
+        tram: Spårvagn
+        trolleybus: Trådbuss
+        bus: Buss
+        cable_car: Linbana
+        chair_lift: Stollift
+        runway: Landningsbana
+        taxiway: Taxibana
+        apron: Flygplatsplatta
+        admin: Administrativ gräns
+        capital: Huvudstad
+        city: Stad
+        orchard: Fruktträdgård
+        vineyard: Vingård
+        forest: Kulturskog
+        wood: Naturskog
+        farmland: Jordbruksmark
+        grass: Gräs
+        meadow: Äng
+        bare_rock: Klippa
+        sand: Sand
+        golf: Golfbana
+        park: Park
+        common: Allmänning
+        built_up: Bebyggt område
+        resident: Bostadsområde
+        retail: Område för Detaljhandel
+        industrial: Industriellt område
+        commercial: Kommersiellt område
+        heathland: Hed
+        scrubland: Buskskog
+        lake: Sjö
+        reservoir: Vattenmagasin
+        intermittent_water: Intermittent vattenkropp
+        glacier: Glaciär
+        reef: Rev
+        wetland: Våtmark
+        farm: Bondgård
+        brownfield: Förfallen industritomt
+        cemetery: Begravningsplats
+        allotments: Koloniträdgårdar
+        pitch: Idrottsplan
+        centre: Idrottsanläggning
+        beach: Strand
+        reserve: Naturreservat
+        military: Militärområde
+        school: Skola
+        university: Universitet
+        hospital: Sjukhus
+        building: Viktig byggnad
+        station: Järnvägsstation
+        railway_halt: Järnvägsstopp
+        subway_station: Tunnelbanestation
+        tram_stop: Spårvagnshållplats
+        summit: Höjd
+        peak: Topp
+        tunnel: Streckade kanter = tunnel
+        bridge: Svarta kanter = bro
+        private: Privat tillgång
+        destination: Förbjuden genomfart
+        construction: Vägar under konstruktion
+        bus_stop: Busshållplats
+        bicycle_shop: Cykelaffär
+        bicycle_rental: Cykeluthyrning
+        bicycle_parking: Cykelparkering
+        bicycle_parking_small: Liten cykelparkering
+        toilets: Toaletter

   traces:
     visibility:
       private: Privat (spåret delas anonymt och utan ordning)
   traces:
     visibility:
       private: Privat (spåret delas anonymt och utan ordning)

diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index bface5a2654f9058092269193786e52d1c366e5e..db84461c5a4740a3575d90168d4a8811cc56e016 100644 (file)
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -685,50 +685,50 @@ ta:
     search:
       search: தேடு
       submit_text: செல்
     search:
       search: தேடு
       submit_text: செல்

-    key:
-      table:
-        entry:
-          primary: முதன்மையான சாலை
-          secondary: இரண்டாம் நிலை சாலை
-          unclassified: வகைப்படுத்தாத சாலை
-          cycleway_mtb: மலையீருருளிப் பாதை
-          rail: இரயில்வே
-          capital: தலைநகரம்
-          city: நகரம்
-          vineyard: திராட்சைத் தோட்டம்
-          forest: காடு
-          wood: விறகு
-          farmland: பண்ணை நிலம்
-          meadow: புல்வெளி
-          bare_rock: வெற்றுப் பாறை
-          sand: மணல்
-          park: பூங்கா
-          common: பொதுவான
-          built_up: கட்டடப் பகுதி
-          industrial: தொழிற்சாலை பகுதி
-          commercial: வணிக பகுதி
-          scrubland: புதர் நிலம்
-          lake: ஏரி
-          reservoir: நீர்நிலை
-          glacier: பனிப்பாறை
-          wetland: ஈரநிலம்
-          farm: பண்ணை
-          centre: விளையாட்டு மையம்
-          military: ராணுவ பகுதி
-          school: பள்ளி
-          university: பல்கலைக்கழகம்
-          hospital: மருத்துவமனை
-          building: குறிப்பிடத்தக்க கட்டிடம்
-          station: தொடர்வண்டி நிலையம்
-          summit: உச்சி மாநாடு
-          peak: உச்சி
-          private: தனியார் அனுமதி
-          construction: சாலைகளில்  கட்டுமானப் பணிகள் நடந்து வருகின்றன.
-          toilets: கழிவறைகள்

     welcome:
       title: வருக!
       rules:
         title: விதிமுறைகள்!
     welcome:
       title: வருக!
       rules:
         title: விதிமுறைகள்!

+  map_keys:
+    show:
+      entries:
+        primary: முதன்மையான சாலை
+        secondary: இரண்டாம் நிலை சாலை
+        unclassified: வகைப்படுத்தாத சாலை
+        cycleway_mtb: மலையீருருளிப் பாதை
+        rail: இரயில்வே
+        capital: தலைநகரம்
+        city: நகரம்
+        vineyard: திராட்சைத் தோட்டம்
+        forest: காடு
+        wood: விறகு
+        farmland: பண்ணை நிலம்
+        meadow: புல்வெளி
+        bare_rock: வெற்றுப் பாறை
+        sand: மணல்
+        park: பூங்கா
+        common: பொதுவான
+        built_up: கட்டடப் பகுதி
+        industrial: தொழிற்சாலை பகுதி
+        commercial: வணிக பகுதி
+        scrubland: புதர் நிலம்
+        lake: ஏரி
+        reservoir: நீர்நிலை
+        glacier: பனிப்பாறை
+        wetland: ஈரநிலம்
+        farm: பண்ணை
+        centre: விளையாட்டு மையம்
+        military: ராணுவ பகுதி
+        school: பள்ளி
+        university: பல்கலைக்கழகம்
+        hospital: மருத்துவமனை
+        building: குறிப்பிடத்தக்க கட்டிடம்
+        station: தொடர்வண்டி நிலையம்
+        summit: உச்சி மாநாடு
+        peak: உச்சி
+        private: தனியார் அனுமதி
+        construction: சாலைகளில்  கட்டுமானப் பணிகள் நடந்து வருகின்றன.
+        toilets: கழிவறைகள்

   traces:
     new:
       visibility_help: இது எதைக் குறிக்கிறது?
   traces:
     new:
       visibility_help: இது எதைக் குறிக்கிறது?

diff --git a/config/locales/te.yml b/config/locales/te.yml
index 35a9aad6245dc27859e44ccce05e67c5cb3d5e99..f970473286991279b0fe3c7e810769cbbafa410b 100644 (file)
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -1849,57 +1849,6 @@ te:
         bicycle: సైకిలు
         car: కారు
         foot: నడక
         bicycle: సైకిలు
         car: కారు
         foot: నడక

-    key:
-      table:
-        entry:
-          motorway: మోటార్‌వే
-          main_road: మెయిన్ రోడ్డు
-          trunk: ట్రంకు రోడ్డు
-          primary: ప్రధాన రహదారి
-          secondary: ద్వితీయ శ్రేణి రహదారి
-          unclassified: వర్గీకరించని రోడ్డు
-          track: ట్రాకు
-          cycleway: సైకిలు దారి
-          cycleway_national: జాతీయ సైకిలు దారి
-          cycleway_regional: ప్రాంతీయ సైకిలు దారి
-          cycleway_local: స్థానిక సైకిలు దారి
-          footway: కాల్దారి
-          rail: రైలుమార్గం
-          subway: కిందారి
-          cable_car: కేబుల్ కారు
-          chair_lift: చెయిర్ లిఫ్ట్
-          runway: విమానాశ్రయం రన్‌వే
-          taxiway: టాక్సీ వే
-          apron: విమానాశ్రయం ఏప్రాన్
-          admin: పరిపాలనా సరిహద్దు
-          forest: అడవి
-          wood: కలప
-          golf: గోల్ఫ్ కోర్సు
-          park: పార్కు
-          common: పచ్చికబయలు
-          resident: నివాస ప్రాంతం
-          retail: రిటెయిల్ ప్రదేశం
-          industrial: పారిశ్రామిక ప్రదేశం
-          commercial: వాణిజ్య ప్రదేశం
-          lake: సరస్సు
-          reservoir: జలాశయం
-          farm: పొలాలు
-          brownfield: బ్రౌన్‌ఫీల్డ్ స్థలం
-          cemetery: స్మశానం
-          pitch: క్రీడల పిచ్
-          centre: క్రీడా కేంద్రం
-          reserve: ప్రకృతి సంరక్షణ కేంద్రం
-          military: మిలిటరీ ప్రదేశం
-          school: పాఠశాల
-          university: విశ్వవిద్యాలయం
-          building: ప్రముఖ కట్టడము
-          station: రైల్వే స్టేషన్
-          peak: శిఖరం
-          bridge: Black casing = వంతెన
-          construction: నిర్మాణంలో ఉన్న రహదార్లు
-          bicycle_shop: సైకిలు దుకాణం
-          bicycle_parking: సైకిలు పార్కింగు
-          toilets: మరుగుదొడ్లు

     welcome:
       title: స్వాగతం!
       whats_on_the_map:
     welcome:
       title: స్వాగతం!
       whats_on_the_map:


@@ -1919,6 +1868,57 @@ te:
           ఇక్కడ నమోదు చేసుకుని, దిద్దుబాట్లు ఎలా చెయ్యాలో నేర్చుకుని పనిచేసేందుకు
           తగినంత సమయం లేదు. అలాంటపుడు ఒక గమనిక చేరిస్తే సరిపోతుంది.
         the_map: పటము
           ఇక్కడ నమోదు చేసుకుని, దిద్దుబాట్లు ఎలా చెయ్యాలో నేర్చుకుని పనిచేసేందుకు
           తగినంత సమయం లేదు. అలాంటపుడు ఒక గమనిక చేరిస్తే సరిపోతుంది.
         the_map: పటము

+  map_keys:
+    show:
+      entries:
+        motorway: మోటార్‌వే
+        main_road: మెయిన్ రోడ్డు
+        trunk: ట్రంకు రోడ్డు
+        primary: ప్రధాన రహదారి
+        secondary: ద్వితీయ శ్రేణి రహదారి
+        unclassified: వర్గీకరించని రోడ్డు
+        track: ట్రాకు
+        cycleway: సైకిలు దారి
+        cycleway_national: జాతీయ సైకిలు దారి
+        cycleway_regional: ప్రాంతీయ సైకిలు దారి
+        cycleway_local: స్థానిక సైకిలు దారి
+        footway: కాల్దారి
+        rail: రైలుమార్గం
+        subway: కిందారి
+        cable_car: కేబుల్ కారు
+        chair_lift: చెయిర్ లిఫ్ట్
+        runway: విమానాశ్రయం రన్‌వే
+        taxiway: టాక్సీ వే
+        apron: విమానాశ్రయం ఏప్రాన్
+        admin: పరిపాలనా సరిహద్దు
+        forest: అడవి
+        wood: కలప
+        golf: గోల్ఫ్ కోర్సు
+        park: పార్కు
+        common: పచ్చికబయలు
+        resident: నివాస ప్రాంతం
+        retail: రిటెయిల్ ప్రదేశం
+        industrial: పారిశ్రామిక ప్రదేశం
+        commercial: వాణిజ్య ప్రదేశం
+        lake: సరస్సు
+        reservoir: జలాశయం
+        farm: పొలాలు
+        brownfield: బ్రౌన్‌ఫీల్డ్ స్థలం
+        cemetery: స్మశానం
+        pitch: క్రీడల పిచ్
+        centre: క్రీడా కేంద్రం
+        reserve: ప్రకృతి సంరక్షణ కేంద్రం
+        military: మిలిటరీ ప్రదేశం
+        school: పాఠశాల
+        university: విశ్వవిద్యాలయం
+        building: ప్రముఖ కట్టడము
+        station: రైల్వే స్టేషన్
+        peak: శిఖరం
+        bridge: Black casing = వంతెన
+        construction: నిర్మాణంలో ఉన్న రహదార్లు
+        bicycle_shop: సైకిలు దుకాణం
+        bicycle_parking: సైకిలు పార్కింగు
+        toilets: మరుగుదొడ్లు

   traces:
     visibility:
       private: ప్రైవేటు (అజ్ఞాత పేరిట మాత్రమే కనిపిస్తుంది, ఆర్డరు చేయని పాయింట్లతో)
   traces:
     visibility:
       private: ప్రైవేటు (అజ్ఞాత పేరిట మాత్రమే కనిపిస్తుంది, ఆర్డరు చేయని పాయింట్లతో)

diff --git a/config/locales/th.yml b/config/locales/th.yml
index ffa203f12ca99143b81c6fde5e7b2ab599c4e343..bb21c674563b4c8114b79f43f6ab3b6256c2eeda 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1937,76 +1937,6 @@ th:
         bicycle: จักยาน
         car: รถยนต์
         foot: เดินเท้า
         bicycle: จักยาน
         car: รถยนต์
         foot: เดินเท้า

-    key:
-      table:
-        entry:
-          motorway: ทางหลวงพิเศษ
-          main_road: ถนนสายหลัก
-          trunk: ถนนสายประธาน
-          primary: ถนนสายหลัก
-          secondary: ถนนสายรอง
-          unclassified: ถนนที่มิได้จำแนก
-          track: รอยทาง
-          bridleway: ทางเกวียน
-          cycleway: ทางจักรยาน
-          cycleway_national: ทางจักรยานระดับประเทศ
-          cycleway_regional: ทางจักรยานระดับภูมิภาค
-          cycleway_local: ทางจักรยานระดับท้องถิ่น
-          footway: ทางเดินเท้า
-          rail: ทางรถไฟ
-          subway: รถไฟใต้ดิน
-          cable_car: รถกระเช้า
-          chair_lift: รถกระเช้าเปลือย
-          runway: ทางวิ่งสนามบิน
-          taxiway: ทางขับเครื่องบิน
-          apron: โรงซ่อมบำรุงเครื่องบิน
-          admin: ขอบเขตการปกครอง
-          capital: เมืองหลวง
-          city: เมือง
-          orchard: สวนผลไม้
-          forest: ป่า
-          wood: ไม้
-          golf: สนามกอล์ฟ
-          park: สวน
-          common: ที่ส่วนกลาง
-          resident: เขตที่พักอาศัย
-          retail: พื้นที่พาณิชยกรรม
-          industrial: พื้นที่อุตสาหกรรม
-          commercial: พื้นที่พาณิชยกรรม
-          heathland: ทุ่งไม้พุ่ม
-          lake: ทะเลสาบ
-          reservoir: อ่างเก็บน้ำ
-          glacier: ธารน้ำแข็ง
-          wetland: พื้นที่ชุ่มน้ำ
-          farm: ไร่นา
-          brownfield: พื้นที่อุตสาหกรรมเดิม
-          cemetery: สุสาน
-          allotments: ที่ดินแบ่งใช้
-          pitch: ลานกีฬา
-          centre: ศูนย์กีฬา
-          beach: ชายหาด
-          reserve: พื้นที่สงวนธรรมชาติ
-          military: เขตทหาร
-          school: โรงเรียน
-          university: มหาวิทยาลัย
-          hospital: โรงพยาบาล
-          building: อาคารสำคัญ
-          station: สถานีรถไฟ
-          railway_halt: ที่หยุดรถไฟ
-          subway_station: สถานีรถไฟใต้ดิน
-          tram_stop: ที่หยุดรถราง
-          summit: ยอดเขา
-          peak: ยอดเขา
-          tunnel: เส้นประ = อุโมงค์
-          bridge: เส้นทึบ = สะพาน
-          private: พื้นที่ส่วนบุคคล
-          destination: การเข้าถึงที่จุดปลายทาง
-          construction: ถนนกำลังก่อสร้าง
-          bus_stop: ป้ายหยุดรถประจำทาง
-          bicycle_shop: ร้านขายและเช่าจักรยาน
-          bicycle_rental: บริการให้เช่าจักรยาน
-          bicycle_parking: ที่จอดจักรยาน
-          toilets: ห้องน้ำ

     welcome:
       title: ยินดีต้อนรับ!
       introduction: 'ยินดิต้อนรับสู่ OpenStreetMap, แผนที่โลกแบบเสรีที่ทุกคนสามารถแก้ไขได้
     welcome:
       title: ยินดีต้อนรับ!
       introduction: 'ยินดิต้อนรับสู่ OpenStreetMap, แผนที่โลกแบบเสรีที่ทุกคนสามารถแก้ไขได้


@@ -2024,6 +1954,76 @@ th:
         title: ไม่มีเวลาแก้ไขใช่ไหม? ใส่หมายเหตุไว้แทนได้!
         para_1: หากคุณต้องการจะแก้ไขแค่เล็กน้อย และไม่มีเวลาเข้าใช้ระบบและเรียนรู้วิธีแก้ไขด้วยตัวเอง
           คุณสามารถจะเขียนหมายเหตุแปะเอาไว้บนจุดที่คุณอยากแก้ไขแทน
         title: ไม่มีเวลาแก้ไขใช่ไหม? ใส่หมายเหตุไว้แทนได้!
         para_1: หากคุณต้องการจะแก้ไขแค่เล็กน้อย และไม่มีเวลาเข้าใช้ระบบและเรียนรู้วิธีแก้ไขด้วยตัวเอง
           คุณสามารถจะเขียนหมายเหตุแปะเอาไว้บนจุดที่คุณอยากแก้ไขแทน

+  map_keys:
+    show:
+      entries:
+        motorway: ทางหลวงพิเศษ
+        main_road: ถนนสายหลัก
+        trunk: ถนนสายประธาน
+        primary: ถนนสายหลัก
+        secondary: ถนนสายรอง
+        unclassified: ถนนที่มิได้จำแนก
+        track: รอยทาง
+        bridleway: ทางเกวียน
+        cycleway: ทางจักรยาน
+        cycleway_national: ทางจักรยานระดับประเทศ
+        cycleway_regional: ทางจักรยานระดับภูมิภาค
+        cycleway_local: ทางจักรยานระดับท้องถิ่น
+        footway: ทางเดินเท้า
+        rail: ทางรถไฟ
+        subway: รถไฟใต้ดิน
+        cable_car: รถกระเช้า
+        chair_lift: รถกระเช้าเปลือย
+        runway: ทางวิ่งสนามบิน
+        taxiway: ทางขับเครื่องบิน
+        apron: โรงซ่อมบำรุงเครื่องบิน
+        admin: ขอบเขตการปกครอง
+        capital: เมืองหลวง
+        city: เมือง
+        orchard: สวนผลไม้
+        forest: ป่า
+        wood: ไม้
+        golf: สนามกอล์ฟ
+        park: สวน
+        common: ที่ส่วนกลาง
+        resident: เขตที่พักอาศัย
+        retail: พื้นที่พาณิชยกรรม
+        industrial: พื้นที่อุตสาหกรรม
+        commercial: พื้นที่พาณิชยกรรม
+        heathland: ทุ่งไม้พุ่ม
+        lake: ทะเลสาบ
+        reservoir: อ่างเก็บน้ำ
+        glacier: ธารน้ำแข็ง
+        wetland: พื้นที่ชุ่มน้ำ
+        farm: ไร่นา
+        brownfield: พื้นที่อุตสาหกรรมเดิม
+        cemetery: สุสาน
+        allotments: ที่ดินแบ่งใช้
+        pitch: ลานกีฬา
+        centre: ศูนย์กีฬา
+        beach: ชายหาด
+        reserve: พื้นที่สงวนธรรมชาติ
+        military: เขตทหาร
+        school: โรงเรียน
+        university: มหาวิทยาลัย
+        hospital: โรงพยาบาล
+        building: อาคารสำคัญ
+        station: สถานีรถไฟ
+        railway_halt: ที่หยุดรถไฟ
+        subway_station: สถานีรถไฟใต้ดิน
+        tram_stop: ที่หยุดรถราง
+        summit: ยอดเขา
+        peak: ยอดเขา
+        tunnel: เส้นประ = อุโมงค์
+        bridge: เส้นทึบ = สะพาน
+        private: พื้นที่ส่วนบุคคล
+        destination: การเข้าถึงที่จุดปลายทาง
+        construction: ถนนกำลังก่อสร้าง
+        bus_stop: ป้ายหยุดรถประจำทาง
+        bicycle_shop: ร้านขายและเช่าจักรยาน
+        bicycle_rental: บริการให้เช่าจักรยาน
+        bicycle_parking: ที่จอดจักรยาน
+        toilets: ห้องน้ำ

   traces:
     visibility:
       private: ส่วนตัว (เผยแพร่ในนามผู้ไม่ประสงค์ออกนาม แต่ละจุดไม่เรียงลำดับ)
   traces:
     visibility:
       private: ส่วนตัว (เผยแพร่ในนามผู้ไม่ประสงค์ออกนาม แต่ละจุดไม่เรียงลำดับ)

diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 3c34722421551bd60b9d3cc81700828494c6fad9..52e34f4ba1905e4ef8c780c93cc376ddef079ea1 100644 (file)
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -1554,64 +1554,6 @@ tl:
       modes:
         bicycle: Bisikleta
         car: Kotse
       modes:
         bicycle: Bisikleta
         car: Kotse

-    key:
-      table:
-        entry:
-          motorway: Daanan ng Sasakyang may Motor
-          main_road: Pangunahing daan
-          trunk: Punong Kalsada
-          primary: Pangunahing kalsada
-          secondary: Pampangalawang kalsada
-          unclassified: Kalsadang walang kaurian
-          track: Bakas
-          bridleway: Daanan ng Kabayo
-          cycleway: Daanan ng bisikleta
-          cycleway_national: Pambansang daanan ng bisikleta
-          cycleway_regional: Panrehiyong daanan ng bisikleta
-          cycleway_local: Pampook na daanan ng bisikleta
-          footway: Lakaran ng tao
-          rail: Daambakal
-          subway: Daanang pang-ilalim
-          cable_car: Kotse ng kable
-          chair_lift: upuang inaangat
-          runway: Rampa ng Paliparan
-          taxiway: daanan ng taksi
-          apron: Tapis ng paliparan
-          admin: Hangganang pampangangasiwa
-          forest: Gubat
-          wood: Kahoy
-          golf: Kurso ng golp
-          park: Liwasan
-          common: Karaniwan
-          resident: Pook na panuluyan
-          retail: Lugar na tingian
-          industrial: Pook na pang-industriya
-          commercial: Pook na pangkalakalan
-          heathland: Lupain ng halamang erika
-          lake: Lawa
-          reservoir: tinggalan ng tubig
-          farm: Bukid
-          brownfield: Pook ng kayumangging bukirin
-          cemetery: Libingan
-          allotments: Mga Laang Bahagi
-          pitch: Hagisang pampalakasan
-          centre: Lunduyang pampalakasan
-          reserve: Lupaing laan sa kalikasan
-          military: Pook ng militar
-          school: Paaralan
-          university: pamantasan
-          building: Makabuluhang gusali
-          station: Himpilan ng daambakal
-          summit: Taluktok
-          peak: tugatog
-          tunnel: Ginitlingang pambalot = lagusan
-          bridge: Itim na pambalot = tulay
-          private: Pribadong pagpunta
-          destination: Pagpapapunta sa patutunguhan
-          construction: Mga kalsadang ginagawa
-          bicycle_shop: Tindahan ng Bisikleta
-          bicycle_parking: Paradahan ng bisikleta
-          toilets: Mga banyo

     welcome:
       title: Maligayang pagdating!
       whats_on_the_map:
     welcome:
       title: Maligayang pagdating!
       whats_on_the_map:


@@ -1621,6 +1563,64 @@ tl:
       rules:
         title: Mga Patakaran!
       start_mapping: Simulan ang Pagmamapa
       rules:
         title: Mga Patakaran!
       start_mapping: Simulan ang Pagmamapa

+  map_keys:
+    show:
+      entries:
+        motorway: Daanan ng Sasakyang may Motor
+        main_road: Pangunahing daan
+        trunk: Punong Kalsada
+        primary: Pangunahing kalsada
+        secondary: Pampangalawang kalsada
+        unclassified: Kalsadang walang kaurian
+        track: Bakas
+        bridleway: Daanan ng Kabayo
+        cycleway: Daanan ng bisikleta
+        cycleway_national: Pambansang daanan ng bisikleta
+        cycleway_regional: Panrehiyong daanan ng bisikleta
+        cycleway_local: Pampook na daanan ng bisikleta
+        footway: Lakaran ng tao
+        rail: Daambakal
+        subway: Daanang pang-ilalim
+        cable_car: Kotse ng kable
+        chair_lift: upuang inaangat
+        runway: Rampa ng Paliparan
+        taxiway: daanan ng taksi
+        apron: Tapis ng paliparan
+        admin: Hangganang pampangangasiwa
+        forest: Gubat
+        wood: Kahoy
+        golf: Kurso ng golp
+        park: Liwasan
+        common: Karaniwan
+        resident: Pook na panuluyan
+        retail: Lugar na tingian
+        industrial: Pook na pang-industriya
+        commercial: Pook na pangkalakalan
+        heathland: Lupain ng halamang erika
+        lake: Lawa
+        reservoir: tinggalan ng tubig
+        farm: Bukid
+        brownfield: Pook ng kayumangging bukirin
+        cemetery: Libingan
+        allotments: Mga Laang Bahagi
+        pitch: Hagisang pampalakasan
+        centre: Lunduyang pampalakasan
+        reserve: Lupaing laan sa kalikasan
+        military: Pook ng militar
+        school: Paaralan
+        university: pamantasan
+        building: Makabuluhang gusali
+        station: Himpilan ng daambakal
+        summit: Taluktok
+        peak: tugatog
+        tunnel: Ginitlingang pambalot = lagusan
+        bridge: Itim na pambalot = tulay
+        private: Pribadong pagpunta
+        destination: Pagpapapunta sa patutunguhan
+        construction: Mga kalsadang ginagawa
+        bicycle_shop: Tindahan ng Bisikleta
+        bicycle_parking: Paradahan ng bisikleta
+        toilets: Mga banyo

   traces:
     visibility:
       private: Pribado (ipinamamahagi lang bilang hindi nagpapakilala, hindi nakaayos
   traces:
     visibility:
       private: Pribado (ipinamamahagi lang bilang hindi nagpapakilala, hindi nakaayos

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 40e967b26665361d72a864153e931e06063553df..d1c81c7e0f41b3b291aaa1dea20bb838dd32d504 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -2509,95 +2509,6 @@ tr:
         bicycle: Bisikletle
         car: Arabayla
         foot: Yürüyerek
         bicycle: Bisikletle
         car: Arabayla
         foot: Yürüyerek

-    key:
-      table:
-        entry:
-          motorway: Otoyol
-          main_road: Ana yol
-          trunk: Bölünmüş anayol
-          primary: Devlet Yolu
-          secondary: İl yolu
-          unclassified: Sınıflandırılmamış yol
-          pedestrian: Yaya yolu
-          track: Toprak yolu
-          bridleway: Binici yolu
-          cycleway: Bisiklet yolu
-          cycleway_national: Ulusal Bisiklet Yolu
-          cycleway_regional: Bölgesel Bisiklet Yolu
-          cycleway_local: Yerel Bisiklet Yolu
-          cycleway_mtb: Dağ bisikleti rotası
-          footway: Yaya yolu
-          rail: Demiryolu
-          train: Tren
-          subway: Metro
-          ferry: Feribot
-          light_rail: Hafif raylı
-          tram: Tramvay
-          trolleybus: Troleybüs
-          bus: Otobüs
-          cable_car: Teleferik
-          chair_lift: Telesiyej
-          runway: Uçuş pisti
-          taxiway: Taksi yolu
-          apron: Havaalanı apronu
-          admin: İdari sınırı
-          capital: Başkent
-          city: Şehir
-          orchard: Meyve bahçesi
-          vineyard: Üzüm bağı
-          forest: Orman
-          wood: Koru
-          farmland: Tarım arazisi
-          grass: Çimen
-          meadow: Çayır
-          bare_rock: Çıplak kaya
-          sand: Kum
-          golf: Golf sahası
-          park: Park
-          common: Çimen
-          built_up: İnşa alanı
-          resident: Yerleşim bölgesi
-          retail: Alışveriş merkezi
-          industrial: Sanayi alanı
-          commercial: Ticari ve hizmet alanı
-          heathland: Fundalık
-          scrubland: Çalılık
-          lake: Göl
-          reservoir: Rezervuar
-          intermittent_water: Aralıklı su birikintisi
-          glacier: Buzul
-          reef: Resif
-          wetland: Sulak alan
-          farm: Çiftlik
-          brownfield: Çıplak arazi
-          cemetery: Mezarlık
-          allotments: Bostan
-          pitch: Spor sahası
-          centre: Spor merkezi
-          beach: Plaj
-          reserve: Doğa koruma alanı
-          military: Askeri bölge
-          school: Okul
-          university: Üniversite
-          hospital: Hastane
-          building: Önemli yapı
-          station: Gar
-          railway_halt: Demiryolu durağı
-          subway_station: Metro istasyonu
-          tram_stop: Tramvay durağı
-          summit: Zirve
-          peak: Zirve
-          tunnel: çizgili kenar = tünel
-          bridge: Siyah kenar = köprü
-          private: Özel giriş
-          destination: Hedef noktası
-          construction: yapım aşamasındaki yollar
-          bus_stop: Otobüs durağı
-          bicycle_shop: Bisikletçi
-          bicycle_rental: Bisiklet kiralama
-          bicycle_parking: Bisiklet parkı
-          bicycle_parking_small: Küçük bisiklet parkı
-          toilets: Tuvaletler

     welcome:
       title: Hoş geldiniz!
       introduction: Dünyanın düzenlenebilir ve ücretsiz haritası OpenStreetMap'e hoş
     welcome:
       title: Hoş geldiniz!
       introduction: Dünyanın düzenlenebilir ve ücretsiz haritası OpenStreetMap'e hoş


@@ -2674,6 +2585,95 @@ tr:
           oluşturabilir veya bunlara katılabilir. %{communities_wiki_link} kısmında
           daha fazlasını okuyun.
         communities_wiki: Topluluklar için viki sayfası
           oluşturabilir veya bunlara katılabilir. %{communities_wiki_link} kısmında
           daha fazlasını okuyun.
         communities_wiki: Topluluklar için viki sayfası

+  map_keys:
+    show:
+      entries:
+        motorway: Otoyol
+        main_road: Ana yol
+        trunk: Bölünmüş anayol
+        primary: Devlet Yolu
+        secondary: İl yolu
+        unclassified: Sınıflandırılmamış yol
+        pedestrian: Yaya yolu
+        track: Toprak yolu
+        bridleway: Binici yolu
+        cycleway: Bisiklet yolu
+        cycleway_national: Ulusal Bisiklet Yolu
+        cycleway_regional: Bölgesel Bisiklet Yolu
+        cycleway_local: Yerel Bisiklet Yolu
+        cycleway_mtb: Dağ bisikleti rotası
+        footway: Yaya yolu
+        rail: Demiryolu
+        train: Tren
+        subway: Metro
+        ferry: Feribot
+        light_rail: Hafif raylı
+        tram: Tramvay
+        trolleybus: Troleybüs
+        bus: Otobüs
+        cable_car: Teleferik
+        chair_lift: Telesiyej
+        runway: Uçuş pisti
+        taxiway: Taksi yolu
+        apron: Havaalanı apronu
+        admin: İdari sınırı
+        capital: Başkent
+        city: Şehir
+        orchard: Meyve bahçesi
+        vineyard: Üzüm bağı
+        forest: Orman
+        wood: Koru
+        farmland: Tarım arazisi
+        grass: Çimen
+        meadow: Çayır
+        bare_rock: Çıplak kaya
+        sand: Kum
+        golf: Golf sahası
+        park: Park
+        common: Çimen
+        built_up: İnşa alanı
+        resident: Yerleşim bölgesi
+        retail: Alışveriş merkezi
+        industrial: Sanayi alanı
+        commercial: Ticari ve hizmet alanı
+        heathland: Fundalık
+        scrubland: Çalılık
+        lake: Göl
+        reservoir: Rezervuar
+        intermittent_water: Aralıklı su birikintisi
+        glacier: Buzul
+        reef: Resif
+        wetland: Sulak alan
+        farm: Çiftlik
+        brownfield: Çıplak arazi
+        cemetery: Mezarlık
+        allotments: Bostan
+        pitch: Spor sahası
+        centre: Spor merkezi
+        beach: Plaj
+        reserve: Doğa koruma alanı
+        military: Askeri bölge
+        school: Okul
+        university: Üniversite
+        hospital: Hastane
+        building: Önemli yapı
+        station: Gar
+        railway_halt: Demiryolu durağı
+        subway_station: Metro istasyonu
+        tram_stop: Tramvay durağı
+        summit: Zirve
+        peak: Zirve
+        tunnel: çizgili kenar = tünel
+        bridge: Siyah kenar = köprü
+        private: Özel giriş
+        destination: Hedef noktası
+        construction: yapım aşamasındaki yollar
+        bus_stop: Otobüs durağı
+        bicycle_shop: Bisikletçi
+        bicycle_rental: Bisiklet kiralama
+        bicycle_parking: Bisiklet parkı
+        bicycle_parking_small: Küçük bisiklet parkı
+        toilets: Tuvaletler

   traces:
     visibility:
       private: Kişiye özel (sadece anonim ve sıralanmamış noktalar olarak paylaşılır)
   traces:
     visibility:
       private: Kişiye özel (sadece anonim ve sıralanmamış noktalar olarak paylaşılır)

diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index b593630513c1bd60dc05089f615a0e987f2fe54d..c6140c54273a01895c179c83e69b60ca3df9f830 100644 (file)
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -838,37 +838,37 @@ tt:
         foot: Җәяү
       providers:
         fossgis_valhalla: Валхалла
         foot: Җәяү
       providers:
         fossgis_valhalla: Валхалла

-    key:
-      table:
-        entry:
-          main_road: Баш юл
-          primary: Беренче дәрәҗәдәге юл
-          secondary: Икенче дәрәҗәдәге юл
-          unclassified: Җирле юл
-          track: Авылара юл
-          cycleway: Әйләнаяк юлы
-          rail: Тимер юл
-          subway: Метро
-          cable_car: Канат юлы
-          admin: Административ чик
-          forest: Урман
-          wood: Агачлык
-          park: Парк
-          resident: Торак районы
-          industrial: Сәнәгый район
-          heathland: Буш җир
-          lake: Күл
-          reservoir: сусаклагыч
-          farm: Ферма
-          cemetery: Зират
-          pitch: Спорт мәйданчыгы
-          centre: Спорт үзәге
-          reserve: Тыюлык
-          military: Хәрби зона
-          school: Мәктәп
-          university: университет
-          station: Тимер юл станциясе
-          toilets: Бәдрәф
+  map_keys:
+    show:
+      entries:
+        main_road: Баш юл
+        primary: Беренче дәрәҗәдәге юл
+        secondary: Икенче дәрәҗәдәге юл
+        unclassified: Җирле юл
+        track: Авылара юл
+        cycleway: Әйләнаяк юлы
+        rail: Тимер юл
+        subway: Метро
+        cable_car: Канат юлы
+        admin: Административ чик
+        forest: Урман
+        wood: Агачлык
+        park: Парк
+        resident: Торак районы
+        industrial: Сәнәгый район
+        heathland: Буш җир
+        lake: Күл
+        reservoir: сусаклагыч
+        farm: Ферма
+        cemetery: Зират
+        pitch: Спорт мәйданчыгы
+        centre: Спорт үзәге
+        reserve: Тыюлык
+        military: Хәрби зона
+        school: Мәктәп
+        university: университет
+        station: Тимер юл станциясе
+        toilets: Бәдрәф

   traces:
     show:
       download: күчереп алу
   traces:
     show:
       download: күчереп алу

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 8f87c6b4eddff28f9e62141a51b2cd29450c9915..d2589f499be4c778cd0f2653c0fe3671a2c56dd7 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1645,6 +1645,33 @@ uk:
           Адміністративна межа (9-й рівень)
         level10: Адміністративна межа району міста
         level11: Адміністративна межа (11-й рівень)
           Адміністративна межа (9-й рівень)
         level10: Адміністративна межа району міста
         level11: Адміністративна межа (11-й рівень)

+      border_types:
+        arrondissement: Арондісман
+        borough: Міський район
+        cercle: Сакель
+        city: Межа міста
+        comarca: Комарка
+        county: Межа округу
+        departement: Департамент
+        department: Департамент
+        district: Округ
+        distrito: Округ
+        freguesia: Фрагезія
+        local_authority: Межа місцевої влади
+        municipality: Муніципальна межа
+        municipi: Муніципальна межа
+        município: Муніципальна межа
+        nation: Державний кордон
+        national: Державний кордон
+        neighbourhood: Межа мікрорайону
+        parish: Границя парафії
+        province: Межа провінції
+        região: Обласна границя
+        region: Обласна границя
+        state: Межа області
+        town: Межа міста
+        township: Межа селища
+        village: Межа села

     results:
       no_results: Нічого не знайдено
       more_results: Більше результатів
     results:
       no_results: Нічого не знайдено
       more_results: Більше результатів


@@ -1656,7 +1683,9 @@ uk:
       title: Звернення
       select_status: Вибрати статус
       select_type: Вибрати тип
       title: Звернення
       select_status: Вибрати статус
       select_type: Вибрати тип

+      select_last_managed_by: Вибрати в останнє змінювалось <ким>

       reported_user: Мапер, на якого поскаржились
       reported_user: Мапер, на якого поскаржились

+      not_managed: Не змінювалось

       search: Пошук
       search_guidance: 'Пошук Звернень:'
       states:
       search: Пошук
       search_guidance: 'Пошук Звернень:'
       states:


@@ -1670,6 +1699,7 @@ uk:
       status: Статус
       reports: Скарги
       last_updated: Останнє оновлення
       status: Статус
       reports: Скарги
       last_updated: Останнє оновлення

+      last_managed: В останнє змінювалось

       reporting_users: Повідомлення про користувачів
       reports_count:
         one: '%{count} Скарга'
       reporting_users: Повідомлення про користувачів
       reports_count:
         one: '%{count} Скарга'


@@ -1720,7 +1750,16 @@ uk:
       reportable_title:
         diary_comment: '%{entry_title}, коментар #%{comment_id}'
         note: 'Нотатка #%{note_id}'
       reportable_title:
         diary_comment: '%{entry_title}, коментар #%{comment_id}'
         note: 'Нотатка #%{note_id}'

+      reportable_heading:
+        diary_comment_html: Коментар допису щоденника %{title} від %{datetime_created},
+          оновлено %{datetime_updated}
+        diary_entry_html: Допис щоденника %{title} створений %{datetime_created},
+          оновлено%{datetime_updated}
+        note_html: '%{title} %{datetime_created}, оновлено %{datetime_updated}'
+        user_html: Користувач %{title} створений %{datetime_created}

     reporters:
     reporters:

+      index:
+        title: 'Звернення #%{issue_id}'

       reporters:
         more_reporters: і ще %{count}
   issue_comments:
       reporters:
         more_reporters: і ще %{count}
   issue_comments:


@@ -2540,95 +2579,6 @@ uk:
         bicycle: Велосипед
         car: Машина
         foot: Пішки
         bicycle: Велосипед
         car: Машина
         foot: Пішки

-    key:
-      table:
-        entry:
-          motorway: Автомагістраль
-          main_road: Важливі дороги
-          trunk: Шосе
-          primary: Головна дорога
-          secondary: Другорядна дорога
-          unclassified: Дорога без класифікації
-          pedestrian: Пішохідна доріжка
-          track: Путівець
-          bridleway: Дорога для їзди кіньми
-          cycleway: Велодоріжка
-          cycleway_national: Національні велошляхи
-          cycleway_regional: Регіональні велошляхи
-          cycleway_local: Місцеві велошляхи
-          cycleway_mtb: Маршрут для гірських велосипедів
-          footway: Пішохідна доріжка
-          rail: Залізниця
-          train: Поїзд
-          subway: Лінія метро
-          ferry: Паром
-          light_rail: Швидкісний трамвай
-          tram: Трамвай
-          trolleybus: Тролейбус
-          bus: Автобус
-          cable_car: Канатна дорога
-          chair_lift: Крісельний підйомник
-          runway: Злітно-посадкова смуга аеропорту
-          taxiway: Руліжна доріжка
-          apron: Перон аеропорту
-          admin: Адміністративна межа
-          capital: Столиця
-          city: Місто
-          orchard: Сад
-          vineyard: Виноградник
-          forest: Ліс
-          wood: Дерева
-          farmland: Поле
-          grass: Трава
-          meadow: Левада
-          bare_rock: Голі скелі
-          sand: Пісок
-          golf: Поле для гольфу
-          park: Парк
-          common: Суспільні землі
-          built_up: Забудована територія
-          resident: Жила зона
-          retail: Торговельний район
-          industrial: Промисловий район
-          commercial: Бізнесова зона
-          heathland: Пустище
-          scrubland: Чагарник
-          lake: Озеро
-          reservoir: Водосховище
-          intermittent_water: Водойма, що пересихає
-          glacier: Льодовик
-          reef: Риф
-          wetland: Заболочені землі
-          farm: Ферма
-          brownfield: Покинута зона
-          cemetery: Кладовище
-          allotments: Сади-городи, дачні ділянки
-          pitch: Спортмайданчик
-          centre: Спортивний центр
-          beach: Пляж
-          reserve: Заповідник
-          military: Військова зона
-          school: Школа
-          university: Університет
-          hospital: Лікарня
-          building: Значна споруда
-          station: Залізнична станція
-          railway_halt: Залізнична зупинка
-          subway_station: Станція метро
-          tram_stop: Трамвайна зупинка
-          summit: Вершина
-          peak: Пік
-          tunnel: Тунель (пунктиром)
-          bridge: Міст (жирна лінія)
-          private: Приватний доступ
-          destination: Цільовий доступ
-          construction: Будівництво дороги
-          bus_stop: Автобусна зупинка
-          bicycle_shop: Веломагазин
-          bicycle_rental: Прокат велосипедів
-          bicycle_parking: Велопарковка
-          bicycle_parking_small: Невелика велопарковка
-          toilets: Туалети

     welcome:
       title: Ласкаво просимо!
       introduction: Ласкаво просимо до OpenStreetMap, вільної мапи світу, покращувати
     welcome:
       title: Ласкаво просимо!
       introduction: Ласкаво просимо до OpenStreetMap, вільної мапи світу, покращувати


@@ -2704,6 +2654,95 @@ uk:
           це докладніше на сторінці %{communities_wiki_link}
         communities_wiki: Групи користувачів OpenStreetMap
         communities_wiki_url: https://wiki.openstreetmap.org/wiki/Uk:User_group
           це докладніше на сторінці %{communities_wiki_link}
         communities_wiki: Групи користувачів OpenStreetMap
         communities_wiki_url: https://wiki.openstreetmap.org/wiki/Uk:User_group

+  map_keys:
+    show:
+      entries:
+        motorway: Автомагістраль
+        main_road: Важливі дороги
+        trunk: Шосе
+        primary: Головна дорога
+        secondary: Другорядна дорога
+        unclassified: Дорога без класифікації
+        pedestrian: Пішохідна доріжка
+        track: Путівець
+        bridleway: Дорога для їзди кіньми
+        cycleway: Велодоріжка
+        cycleway_national: Національні велошляхи
+        cycleway_regional: Регіональні велошляхи
+        cycleway_local: Місцеві велошляхи
+        cycleway_mtb: Маршрут для гірських велосипедів
+        footway: Пішохідна доріжка
+        rail: Залізниця
+        train: Поїзд
+        subway: Лінія метро
+        ferry: Паром
+        light_rail: Швидкісний трамвай
+        tram: Трамвай
+        trolleybus: Тролейбус
+        bus: Автобус
+        cable_car: Канатна дорога
+        chair_lift: Крісельний підйомник
+        runway: Злітно-посадкова смуга аеропорту
+        taxiway: Руліжна доріжка
+        apron: Перон аеропорту
+        admin: Адміністративна межа
+        capital: Столиця
+        city: Місто
+        orchard: Сад
+        vineyard: Виноградник
+        forest: Ліс
+        wood: Дерева
+        farmland: Поле
+        grass: Трава
+        meadow: Левада
+        bare_rock: Голі скелі
+        sand: Пісок
+        golf: Поле для гольфу
+        park: Парк
+        common: Суспільні землі
+        built_up: Забудована територія
+        resident: Жила зона
+        retail: Торговельний район
+        industrial: Промисловий район
+        commercial: Бізнесова зона
+        heathland: Пустище
+        scrubland: Чагарник
+        lake: Озеро
+        reservoir: Водосховище
+        intermittent_water: Водойма, що пересихає
+        glacier: Льодовик
+        reef: Риф
+        wetland: Заболочені землі
+        farm: Ферма
+        brownfield: Покинута зона
+        cemetery: Кладовище
+        allotments: Сади-городи, дачні ділянки
+        pitch: Спортмайданчик
+        centre: Спортивний центр
+        beach: Пляж
+        reserve: Заповідник
+        military: Військова зона
+        school: Школа
+        university: Університет
+        hospital: Лікарня
+        building: Значна споруда
+        station: Залізнична станція
+        railway_halt: Залізнична зупинка
+        subway_station: Станція метро
+        tram_stop: Трамвайна зупинка
+        summit: Вершина
+        peak: Пік
+        tunnel: Тунель (пунктиром)
+        bridge: Міст (жирна лінія)
+        private: Приватний доступ
+        destination: Цільовий доступ
+        construction: Будівництво дороги
+        bus_stop: Автобусна зупинка
+        bicycle_shop: Веломагазин
+        bicycle_rental: Прокат велосипедів
+        bicycle_parking: Велопарковка
+        bicycle_parking_small: Невелика велопарковка
+        toilets: Туалети

   traces:
     visibility:
       private: Приватний (доступний тільки як анонімний, невпорядковані точки)
   traces:
     visibility:
       private: Приватний (доступний тільки як анонімний, невпорядковані точки)


@@ -2823,10 +2862,10 @@ uk:
     setup_user_auth:
       blocked_zero_hour: У вас є нагальне повідомлення на вебсайті OpenStreetMap.
         Вам потрібно прочитати повідомлення, перш ніж ви зможете зберегти ваші зміни.
     setup_user_auth:
       blocked_zero_hour: У вас є нагальне повідомлення на вебсайті OpenStreetMap.
         Вам потрібно прочитати повідомлення, перш ніж ви зможете зберегти ваші зміни.

-      blocked: Ваш доступ до API заблоковано. Будь ласка, увійдіть через веб-інтерфейс,
+      blocked: Ваш доступ до API заблоковано. Будь ласка, увійдіть через вебінтерфейс,

         щоб дізнатися подробиці.
       need_to_see_terms: Ваш доступ до API тимчасово призупинено. Будь ласка, увійдіть
         щоб дізнатися подробиці.
       need_to_see_terms: Ваш доступ до API тимчасово призупинено. Будь ласка, увійдіть

-        в систему, через веб-інтерфейс для перегляду Умов Участі. Вам не обов’язково
+        в систему, через вебінтерфейс для перегляду Умов Участі. Вам не обов’язково

         погоджуватись, але ви повинні переглянути їх.
     settings_menu:
       account_settings: Налаштування облікового запису
         погоджуватись, але ви повинні переглянути їх.
     settings_menu:
       account_settings: Налаштування облікового запису


@@ -3094,6 +3133,9 @@ uk:
           deleted: Вилучено
         name_or_email: Імʼя або електронна пошта
         ip_address: IP-адреса
           deleted: Вилучено
         name_or_email: Імʼя або електронна пошта
         ip_address: IP-адреса

+        edits: Редагування?
+        has_edits: Є правки
+        no_edits: Немає правок

         search: Пошук
       page:
         found_users:
         search: Пошук
       page:
         found_users:


@@ -3564,6 +3606,14 @@ uk:
     home:
       marker_title: Моє розташування
       not_set: Для вашого облікового запису не вказано його розташування
     home:
       marker_title: Моє розташування
       not_set: Для вашого облікового запису не вказано його розташування

+    heatmap:
+      tooltip:
+        no_contributions: Немає внесків станом на %{date}
+        contributions:
+          one: '%{count} внесок станом на %{date}'
+          few: '%{count} внески станом на %{date}'
+          many: '%{count} внесків станом на %{date}'
+          other: ' станом на %{date}'

   redactions:
     edit:
       heading: Змінити редакцію
   redactions:
     edit:
       heading: Змінити редакцію

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index a63e6e47b913da201c940db0bf98737b4403417e..b6ad936bff7559e3d211e0b0d4cf7d29191e5d78 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -2317,92 +2317,6 @@ vi:
         bicycle: Xe đạp
         car: Xe hơi
         foot: Đi bộ
         bicycle: Xe đạp
         car: Xe hơi
         foot: Đi bộ

-    key:
-      table:
-        entry:
-          motorway: Đường cao tốc
-          main_road: Đại lộ
-          trunk: Xa lộ
-          primary: Đường chính
-          secondary: Đường lớn
-          unclassified: Đường không phân loại
-          pedestrian: Đường dành cho người đi bộ
-          track: Đường mòn
-          bridleway: Đường cưỡi ngựa
-          cycleway: Đường xe đạp
-          cycleway_national: Quốc lộ xe đạp
-          cycleway_regional: Xa lộ xe đạp
-          cycleway_local: Đường xe đạp địa phương
-          cycleway_mtb: Tuyến đường xe đạp leo núi
-          footway: Đường đi bộ
-          rail: Đường sắt
-          train: Xe lửa
-          subway: Đường ngầm
-          ferry: Phà
-          light_rail: Đường sắt nhẹ
-          tram: Xe điện
-          trolleybus: Xe điện bánh hơi
-          bus: Xe buýt
-          cable_car: Đường xe cáp
-          chair_lift: Ghế cáp treo
-          runway: Đường băng
-          taxiway: Đường băng
-          apron: Sân đậu máy bay
-          admin: Biên giới hành chính
-          capital: Thủ đô
-          city: Thành phố
-          orchard: Vườn cây
-          vineyard: Vườn nho
-          forest: Rừng trồng cây
-          wood: Rừng
-          farmland: Trại
-          grass: Cỏ
-          meadow: Đồng cỏ
-          sand: Cát
-          golf: Sân golf
-          park: Công viên
-          common: Đất công
-          built_up: Khu vực thành thị
-          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
-          heathland: Vùng cây bụi
-          lake: Hồ
-          reservoir: Hồ chứa nước
-          intermittent_water: Thủy vực lúc đầy lúc cạn
-          glacier: Sông băng
-          reef: Rạn san hô
-          wetland: Đầm lầy
-          farm: Ruộng
-          brownfield: Cánh đồng nâu
-          cemetery: Nghĩa địa
-          allotments: Khu vườn gia đình
-          pitch: Sân cỏ
-          centre: Trung tâm thể thao
-          beach: Bãi biển
-          reserve: Khu bảo tồn thiên niên
-          military: Khu vực quân sự
-          school: Trường học
-          university: Đại học
-          hospital: Bệnh viện
-          building: Kiến trúc quan trọng
-          station: Nhà ga
-          railway_halt: Ga xép
-          subway_station: Trạm tàu điện ngầm
-          tram_stop: Ga xép điện
-          summit: Đỉnh núi
-          peak: Đỉnh
-          tunnel: Đường đứt nét = đường hầm
-          bridge: Đường rắn = cầu
-          private: Đường riêng
-          destination: Chỉ giao thông địa phương
-          construction: Đường đang xây
-          bus_stop: Điểm dừng xe buýt
-          bicycle_shop: Tiệm xe đạp
-          bicycle_rental: Cho thuê xe đạp
-          bicycle_parking: Chỗ đậu xe đạp
-          toilets: Vệ sinh

     welcome:
       title: Hoan nghênh!
       introduction: Chào mừng bạn đã đến OpenStreetMap, bản đồ thế giới có dữ liệu
     welcome:
       title: Hoan nghênh!
       introduction: Chào mừng bạn đã đến OpenStreetMap, bản đồ thế giới có dữ liệu


@@ -2475,6 +2389,92 @@ vi:
           rất thành công tuy chỉ là cuộc họp mặt thoải mái. Ai có thể tổ chức một
           nhóm cộng đồng bình thường như thế. Để biết thêm chi tiết, xem %{communities_wiki_link}.
         communities_wiki: trang wiki về nhóm người dùng
           rất thành công tuy chỉ là cuộc họp mặt thoải mái. Ai có thể tổ chức một
           nhóm cộng đồng bình thường như thế. Để biết thêm chi tiết, xem %{communities_wiki_link}.
         communities_wiki: trang wiki về nhóm người dùng

+  map_keys:
+    show:
+      entries:
+        motorway: Đường cao tốc
+        main_road: Đại lộ
+        trunk: Xa lộ
+        primary: Đường chính
+        secondary: Đường lớn
+        unclassified: Đường không phân loại
+        pedestrian: Đường dành cho người đi bộ
+        track: Đường mòn
+        bridleway: Đường cưỡi ngựa
+        cycleway: Đường xe đạp
+        cycleway_national: Quốc lộ xe đạp
+        cycleway_regional: Xa lộ xe đạp
+        cycleway_local: Đường xe đạp địa phương
+        cycleway_mtb: Tuyến đường xe đạp leo núi
+        footway: Đường đi bộ
+        rail: Đường sắt
+        train: Xe lửa
+        subway: Đường ngầm
+        ferry: Phà
+        light_rail: Đường sắt nhẹ
+        tram: Xe điện
+        trolleybus: Xe điện bánh hơi
+        bus: Xe buýt
+        cable_car: Đường xe cáp
+        chair_lift: Ghế cáp treo
+        runway: Đường băng
+        taxiway: Đường băng
+        apron: Sân đậu máy bay
+        admin: Biên giới hành chính
+        capital: Thủ đô
+        city: Thành phố
+        orchard: Vườn cây
+        vineyard: Vườn nho
+        forest: Rừng trồng cây
+        wood: Rừng
+        farmland: Trại
+        grass: Cỏ
+        meadow: Đồng cỏ
+        sand: Cát
+        golf: Sân golf
+        park: Công viên
+        common: Đất công
+        built_up: Khu vực thành thị
+        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
+        heathland: Vùng cây bụi
+        lake: Hồ
+        reservoir: Hồ chứa nước
+        intermittent_water: Thủy vực lúc đầy lúc cạn
+        glacier: Sông băng
+        reef: Rạn san hô
+        wetland: Đầm lầy
+        farm: Ruộng
+        brownfield: Cánh đồng nâu
+        cemetery: Nghĩa địa
+        allotments: Khu vườn gia đình
+        pitch: Sân cỏ
+        centre: Trung tâm thể thao
+        beach: Bãi biển
+        reserve: Khu bảo tồn thiên niên
+        military: Khu vực quân sự
+        school: Trường học
+        university: Đại học
+        hospital: Bệnh viện
+        building: Kiến trúc quan trọng
+        station: Nhà ga
+        railway_halt: Ga xép
+        subway_station: Trạm tàu điện ngầm
+        tram_stop: Ga xép điện
+        summit: Đỉnh núi
+        peak: Đỉnh
+        tunnel: Đường đứt nét = đường hầm
+        bridge: Đường rắn = cầu
+        private: Đường riêng
+        destination: Chỉ giao thông địa phương
+        construction: Đường đang xây
+        bus_stop: Điểm dừng xe buýt
+        bicycle_shop: Tiệm xe đạp
+        bicycle_rental: Cho thuê xe đạp
+        bicycle_parking: Chỗ đậu xe đạp
+        toilets: Vệ sinh

   traces:
     visibility:
       private: Bí mật (chỉ hiển thị các điểm vô danh không có thứ tự)
   traces:
     visibility:
       private: Bí mật (chỉ hiển thị các điểm vô danh không có thứ tự)

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index c0089d8b2782670e32e1e9e250c831cb882d2666..9b5620901d86b26b40bee2cd2474e76d8bdb769e 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -2287,95 +2287,6 @@ zh-CN:
         foot: 步行
       providers:
         fossgis_valhalla: 瓦尔哈拉
         foot: 步行
       providers:
         fossgis_valhalla: 瓦尔哈拉

-    key:
-      table:
-        entry:
-          motorway: 高速公路
-          main_road: 主干道
-          trunk: 主干道路
-          primary: 一级道路
-          secondary: 二级道路
-          unclassified: 等外道路
-          pedestrian: 人行道
-          track: 小路
-          bridleway: 马道
-          cycleway: 自行车道
-          cycleway_national: 国家自行车道
-          cycleway_regional: 地区自行车道
-          cycleway_local: 本地自行车道
-          cycleway_mtb: 山地自行车路线
-          footway: 步道
-          rail: 铁路
-          train: 火车
-          subway: 地铁
-          ferry: 渡船
-          light_rail: 轻轨
-          tram: 有轨电车
-          trolleybus: 无轨电车
-          bus: 公共汽车
-          cable_car: 缆车
-          chair_lift: 吊椅缆车
-          runway: 机场跑道
-          taxiway: 滑行道
-          apron: 机场停机坪
-          admin: 行政区边界
-          capital: 首都
-          city: 城市
-          orchard: 果园
-          vineyard: 葡萄园
-          forest: 森林
-          wood: 树林
-          farmland: 农田
-          grass: 草坪
-          meadow: 草甸
-          bare_rock: 裸岩
-          sand: 沙地
-          golf: 高尔夫球场
-          park: 公园
-          common: 公地
-          built_up: 建成区
-          resident: 居住区
-          retail: 零售区
-          industrial: 工业区
-          commercial: 商业区
-          heathland: 欧石楠荒地
-          scrubland: 灌木丛林地
-          lake: 湖
-          reservoir: 水库
-          intermittent_water: 间歇性水体
-          glacier: 冰川
-          reef: 礁
-          wetland: 湿地
-          farm: 农场
-          brownfield: 棕地
-          cemetery: 坟场
-          allotments: 小块园地
-          pitch: 体育场
-          centre: 体育馆
-          beach: 海滩
-          reserve: 自然保护区
-          military: 军事区
-          school: 学校
-          university: 大学
-          hospital: 医院
-          building: 特殊建筑物
-          station: 火车站
-          railway_halt: 铁路乘降所
-          subway_station: 地铁站
-          tram_stop: 有轨电车站
-          summit: 山峰
-          peak: 山峰
-          tunnel: 双虚线=隧道
-          bridge: 双实线=桥
-          private: 私人通行
-          destination: 目的地通行
-          construction: 在建道路
-          bus_stop: 公共汽车站
-          bicycle_shop: 自行车店
-          bicycle_rental: 自行车租赁
-          bicycle_parking: 自行车停车场
-          bicycle_parking_small: 小型自行车停车场
-          toilets: 厕所

     welcome:
       title: 欢迎！
       introduction: 欢迎访问 OpenStreeMap，自由且可编辑的世界地图。您已经登录，可以开始绘制地图。这里是含有您需要知道的最重要的信息的快速指南。
     welcome:
       title: 欢迎！
       introduction: 欢迎访问 OpenStreeMap，自由且可编辑的世界地图。您已经登录，可以开始绘制地图。这里是含有您需要知道的最重要的信息的快速指南。


@@ -2428,6 +2339,95 @@ zh-CN:
           没有必要正式建立一个与地方分会同等规模的团体。
           事实上，许多团体作为非正式的聚会或社区团体非常成功地存在。任何人都可以创设或加入这些团体。在%{communities_wiki_link}上阅读更多内容。
         communities_wiki: 社区 wiki 页面
           没有必要正式建立一个与地方分会同等规模的团体。
           事实上，许多团体作为非正式的聚会或社区团体非常成功地存在。任何人都可以创设或加入这些团体。在%{communities_wiki_link}上阅读更多内容。
         communities_wiki: 社区 wiki 页面

+  map_keys:
+    show:
+      entries:
+        motorway: 高速公路
+        main_road: 主干道
+        trunk: 主干道路
+        primary: 一级道路
+        secondary: 二级道路
+        unclassified: 等外道路
+        pedestrian: 人行道
+        track: 小路
+        bridleway: 马道
+        cycleway: 自行车道
+        cycleway_national: 国家自行车道
+        cycleway_regional: 地区自行车道
+        cycleway_local: 本地自行车道
+        cycleway_mtb: 山地自行车路线
+        footway: 步道
+        rail: 铁路
+        train: 火车
+        subway: 地铁
+        ferry: 渡船
+        light_rail: 轻轨
+        tram: 有轨电车
+        trolleybus: 无轨电车
+        bus: 公共汽车
+        cable_car: 缆车
+        chair_lift: 吊椅缆车
+        runway: 机场跑道
+        taxiway: 滑行道
+        apron: 机场停机坪
+        admin: 行政区边界
+        capital: 首都
+        city: 城市
+        orchard: 果园
+        vineyard: 葡萄园
+        forest: 森林
+        wood: 树林
+        farmland: 农田
+        grass: 草坪
+        meadow: 草甸
+        bare_rock: 裸岩
+        sand: 沙地
+        golf: 高尔夫球场
+        park: 公园
+        common: 公地
+        built_up: 建成区
+        resident: 居住区
+        retail: 零售区
+        industrial: 工业区
+        commercial: 商业区
+        heathland: 欧石楠荒地
+        scrubland: 灌木丛林地
+        lake: 湖
+        reservoir: 水库
+        intermittent_water: 间歇性水体
+        glacier: 冰川
+        reef: 礁
+        wetland: 湿地
+        farm: 农场
+        brownfield: 棕地
+        cemetery: 坟场
+        allotments: 小块园地
+        pitch: 体育场
+        centre: 体育馆
+        beach: 海滩
+        reserve: 自然保护区
+        military: 军事区
+        school: 学校
+        university: 大学
+        hospital: 医院
+        building: 特殊建筑物
+        station: 火车站
+        railway_halt: 铁路乘降所
+        subway_station: 地铁站
+        tram_stop: 有轨电车站
+        summit: 山峰
+        peak: 山峰
+        tunnel: 双虚线=隧道
+        bridge: 双实线=桥
+        private: 私人通行
+        destination: 目的地通行
+        construction: 在建道路
+        bus_stop: 公共汽车站
+        bicycle_shop: 自行车店
+        bicycle_rental: 自行车租赁
+        bicycle_parking: 自行车停车场
+        bicycle_parking_small: 小型自行车停车场
+        toilets: 厕所

   traces:
     visibility:
       private: 私有 (只以匿名分享，无顺序的点)
   traces:
     visibility:
       private: 私有 (只以匿名分享，无顺序的点)

diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 7dd057cec5c6110b5b26e2ecde3e2a027651dfeb..7985169f197b124372bea58fa6115142251bfaf4 100644 (file)
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1082,40 +1082,40 @@ zh-HK:
       search: 搜尋
       where_am_i: 這是哪裡？
       reverse_directions_text: 反轉方向
       search: 搜尋
       where_am_i: 這是哪裡？
       reverse_directions_text: 反轉方向

-    key:
-      table:
-        entry:
-          motorway: 高速公路
-          rail: 鐵路
-          subway: 地鐵
-          runway: 機場跑道
-          apron: 機場停機坪
-          admin: 行政邊界
-          forest: 森林
-          golf: 哥爾夫球場
-          park: 公園
-          resident: 住宅區
-          industrial: 工業區
-          commercial: 商業區
-          lake: 湖泊
-          reservoir: 水庫
-          brownfield: 棕地
-          cemetery: 墓地
-          pitch: 運動場
-          centre: 運動中心
-          reserve: 自然保護區
-          military: 軍事區
-          school: 學校
-          university: 大學
-          station: 火車站
-          bicycle_shop: 單車店
-          bicycle_parking: 單車停泊處
-          toilets: 廁所

     welcome:
       introduction: 歡迎來到OpenStreetMap，自由而可以編輯的世界地圖。現在您已經注冊完成，繪製地圖所需要的準備已經就緒。以下是一份快速指南，裡面包含着您所需要知道的最重要事項。
       add_a_note:
         title: 沒時間編輯？加筆註記吧！
         para_1: 如果你只想讓一些小問題得以更正，而沒有時間注冊並學習如何編輯，那麼加入註記是非常容易的。
     welcome:
       introduction: 歡迎來到OpenStreetMap，自由而可以編輯的世界地圖。現在您已經注冊完成，繪製地圖所需要的準備已經就緒。以下是一份快速指南，裡面包含着您所需要知道的最重要事項。
       add_a_note:
         title: 沒時間編輯？加筆註記吧！
         para_1: 如果你只想讓一些小問題得以更正，而沒有時間注冊並學習如何編輯，那麼加入註記是非常容易的。

+  map_keys:
+    show:
+      entries:
+        motorway: 高速公路
+        rail: 鐵路
+        subway: 地鐵
+        runway: 機場跑道
+        apron: 機場停機坪
+        admin: 行政邊界
+        forest: 森林
+        golf: 哥爾夫球場
+        park: 公園
+        resident: 住宅區
+        industrial: 工業區
+        commercial: 商業區
+        lake: 湖泊
+        reservoir: 水庫
+        brownfield: 棕地
+        cemetery: 墓地
+        pitch: 運動場
+        centre: 運動中心
+        reserve: 自然保護區
+        military: 軍事區
+        school: 學校
+        university: 大學
+        station: 火車站
+        bicycle_shop: 單車店
+        bicycle_parking: 單車停泊處
+        toilets: 廁所

   traces:
     create:
       traces_waiting: 您有%{count}條軌跡等待上傳。請考慮先讓目前的軌跡處理完成後，再來繼續上傳其他軌跡，以免阻礙其他用戶的排程。
   traces:
     create:
       traces_waiting: 您有%{count}條軌跡等待上傳。請考慮先讓目前的軌跡處理完成後，再來繼續上傳其他軌跡，以免阻礙其他用戶的排程。

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 5d7cbb3a11ce815a23c7f33374293e3c06a19cef..8233c4bf4767cec1abef0b2adec2180bdca0f99a 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1571,7 +1571,9 @@ zh-TW:
       title: 問題
       select_status: 選擇狀態
       select_type: 選擇類型
       title: 問題
       select_status: 選擇狀態
       select_type: 選擇類型

+      select_last_managed_by: 選取上次管理者

       reported_user: 已回報使用者
       reported_user: 已回報使用者

+      not_managed: 未管理

       search: 搜尋
       search_guidance: 搜尋問題：
       states:
       search: 搜尋
       search_guidance: 搜尋問題：
       states:


@@ -1585,6 +1587,7 @@ zh-TW:
       status: 狀態
       reports: 回報
       last_updated: 上一次更新
       status: 狀態
       reports: 回報
       last_updated: 上一次更新

+      last_managed: 上次管理

       reporting_users: 回報使用者
       reports_count:
         one: '%{count} 份回報'
       reporting_users: 回報使用者
       reports_count:
         one: '%{count} 份回報'


@@ -1632,6 +1635,9 @@ zh-TW:
         diary_comment: '%{entry_title}，留言 #%{comment_id}'
         note: '註記 #%{note_id}'
       reportable_heading:
         diary_comment: '%{entry_title}，留言 #%{comment_id}'
         note: '註記 #%{note_id}'
       reportable_heading:

+        diary_comment_html: 日記留言 %{title} 於 %{datetime_created} 建立，更新於 %{datetime_updated}
+        diary_entry_html: 日記條目 %{title} 於 %{datetime_created} 建立，更新於 %{datetime_updated}
+        note_html: '%{title} 於 %{datetime_created} 建立，更新於 %{datetime_updated}'

         user_html: 使用者 %{title} 建立於 %{datetime_created}
     reporters:
       index:
         user_html: 使用者 %{title} 建立於 %{datetime_created}
     reporters:
       index:


@@ -2307,95 +2313,6 @@ zh-TW:
         bicycle: 自行車
         car: 開車
         foot: 步行
         bicycle: 自行車
         car: 開車
         foot: 步行

-    key:
-      table:
-        entry:
-          motorway: 高速公路
-          main_road: 主要幹道
-          trunk: 快速公路
-          primary: 省道
-          secondary: 縣道
-          unclassified: 未分級道路
-          pedestrian: 人行道
-          track: 產業道路
-          bridleway: 馬道
-          cycleway: 自行車道
-          cycleway_national: 國家自行車道
-          cycleway_regional: 地區自行車道
-          cycleway_local: 地方自行車道
-          cycleway_mtb: 登山車路線
-          footway: 步道
-          rail: 鐵路
-          train: 列車
-          subway: 地下鐵
-          ferry: 渡輪
-          light_rail: 輕軌
-          tram: 路面電車
-          trolleybus: 無軌電車
-          bus: 公車
-          cable_car: 大型纜車
-          chair_lift: 吊椅式索道
-          runway: 機場跑道
-          taxiway: 滑行道
-          apron: 機場停機坪
-          admin: 行政區邊界
-          capital: 首都
-          city: 城市
-          orchard: 果園
-          vineyard: 葡萄園
-          forest: 人工林
-          wood: 自然林
-          farmland: 農地
-          grass: 草坪
-          meadow: 牧草地
-          bare_rock: 裸岩
-          sand: 沙地
-          golf: 高爾夫球場
-          park: 公園
-          common: 共有地
-          built_up: 建成區
-          resident: 住宅區
-          retail: 零售商區
-          industrial: 工業區
-          commercial: 商業區
-          heathland: 石楠荒地
-          scrubland: 灌木叢林地
-          lake: 湖泊
-          reservoir: 水庫/大型蓄水池
-          intermittent_water: 間歇性水體
-          glacier: 冰河
-          reef: 暗礁
-          wetland: 濕地
-          farm: 農田
-          brownfield: 棕色地 (受污染放置待恢復重開發地)
-          cemetery: 公墓
-          allotments: 社區農園
-          pitch: 運動場地
-          centre: 運動中心
-          beach: 海灘
-          reserve: 自然保育
-          military: 軍事區
-          school: 學校
-          university: 大學
-          hospital: 醫院
-          building: 重要建築
-          station: 鐵路車站
-          railway_halt: 鐵路招呼站
-          subway_station: 地鐵站
-          tram_stop: 路面電車停靠站
-          summit: 頂峰
-          peak: 山峰
-          tunnel: 虛線邊框 = 隧道
-          bridge: 黑線邊框 = 橋樑
-          private: 私人進出
-          destination: 目的地進出
-          construction: 興建中道路
-          bus_stop: 公車站牌
-          bicycle_shop: 自行車店
-          bicycle_rental: 自行車出租
-          bicycle_parking: 自行車停車場
-          bicycle_parking_small: 小型自行車停車場
-          toilets: 廁所

     welcome:
       title: 歡迎！
       introduction: 歡迎來到 OpenStreetMap，自由和可編輯的世界地圖。你目前已經登入，可以開始繪製地圖。這裡有一份你必須知道的最重要事項的快速指南。
     welcome:
       title: 歡迎！
       introduction: 歡迎來到 OpenStreetMap，自由和可編輯的世界地圖。你目前已經登入，可以開始繪製地圖。這裡有一份你必須知道的最重要事項的快速指南。


@@ -2456,6 +2373,95 @@ zh-TW:
           沒有需要正式建立一個與地方分會同等規模的團體。
           事實上，許多團體作為人們的非正式集會或是社群團體而非常成功地存在。任何人都可以設定或是加入這些團體。請在%{communities_wiki_link}上閱讀更多內容。
         communities_wiki: 社群 wiki 頁面
           沒有需要正式建立一個與地方分會同等規模的團體。
           事實上，許多團體作為人們的非正式集會或是社群團體而非常成功地存在。任何人都可以設定或是加入這些團體。請在%{communities_wiki_link}上閱讀更多內容。
         communities_wiki: 社群 wiki 頁面

+  map_keys:
+    show:
+      entries:
+        motorway: 高速公路
+        main_road: 主要幹道
+        trunk: 快速公路
+        primary: 省道
+        secondary: 縣道
+        unclassified: 未分級道路
+        pedestrian: 人行道
+        track: 產業道路
+        bridleway: 馬道
+        cycleway: 自行車道
+        cycleway_national: 國家自行車道
+        cycleway_regional: 地區自行車道
+        cycleway_local: 地方自行車道
+        cycleway_mtb: 登山車路線
+        footway: 步道
+        rail: 鐵路
+        train: 列車
+        subway: 地下鐵
+        ferry: 渡輪
+        light_rail: 輕軌
+        tram: 路面電車
+        trolleybus: 無軌電車
+        bus: 公車
+        cable_car: 大型纜車
+        chair_lift: 吊椅式索道
+        runway: 機場跑道
+        taxiway: 滑行道
+        apron: 機場停機坪
+        admin: 行政區邊界
+        capital: 首都
+        city: 城市
+        orchard: 果園
+        vineyard: 葡萄園
+        forest: 人工林
+        wood: 自然林
+        farmland: 農地
+        grass: 草坪
+        meadow: 牧草地
+        bare_rock: 裸岩
+        sand: 沙地
+        golf: 高爾夫球場
+        park: 公園
+        common: 共有地
+        built_up: 建成區
+        resident: 住宅區
+        retail: 零售商區
+        industrial: 工業區
+        commercial: 商業區
+        heathland: 石楠荒地
+        scrubland: 灌木叢林地
+        lake: 湖泊
+        reservoir: 水庫/大型蓄水池
+        intermittent_water: 間歇性水體
+        glacier: 冰河
+        reef: 暗礁
+        wetland: 濕地
+        farm: 農田
+        brownfield: 棕色地 (受污染放置待恢復重開發地)
+        cemetery: 公墓
+        allotments: 社區農園
+        pitch: 運動場地
+        centre: 運動中心
+        beach: 海灘
+        reserve: 自然保育
+        military: 軍事區
+        school: 學校
+        university: 大學
+        hospital: 醫院
+        building: 重要建築
+        station: 鐵路車站
+        railway_halt: 鐵路招呼站
+        subway_station: 地鐵站
+        tram_stop: 路面電車停靠站
+        summit: 頂峰
+        peak: 山峰
+        tunnel: 虛線邊框 = 隧道
+        bridge: 黑線邊框 = 橋樑
+        private: 私人進出
+        destination: 目的地進出
+        construction: 興建中道路
+        bus_stop: 公車站牌
+        bicycle_shop: 自行車店
+        bicycle_rental: 自行車出租
+        bicycle_parking: 自行車停車場
+        bicycle_parking_small: 小型自行車停車場
+        toilets: 廁所

   traces:
     visibility:
       private: 私人 (以匿名方式分享，節點無順序)
   traces:
     visibility:
       private: 私人 (以匿名方式分享，節點無順序)


@@ -3215,7 +3221,7 @@ zh-TW:
     heatmap:
       tooltip:
         no_contributions: '%{date} 沒有貢獻'
     heatmap:
       tooltip:
         no_contributions: '%{date} 沒有貢獻'

-        contributions: '{{PLURAL|one=%{count} 貢獻於%{date}|% {count} 貢獻於 %{date}}'
+        contributions: '{{PLURAL|one=%{count} 貢獻於 %{date}|%{count} 貢獻於 %{date}}'

   redactions:
     edit:
       heading: 編輯修訂
   redactions:
     edit:
       heading: 編輯修訂