Localisation updates from https://translatewiki.net.

diff --git a/config/locales/af.yml b/config/locales/af.yml
index b675b2befef5440e3e30225a7f111dbe8015fc91..8e46d6266467d259323545b24f92191c4bd8a9f7 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -1721,21 +1721,21 @@ af:
           subway: Ondergrondse spoorweg
           cable_car: Sweefspoor
           chair_lift: stoelhyser
           subway: Ondergrondse spoorweg
           cable_car: Sweefspoor
           chair_lift: stoelhyser

-          runway_only: Aanloopbaan
+          runway: Aanloopbaan

           taxiway: vliegtuigrybaan
           taxiway: vliegtuigrybaan

-          apron_only: Lughaweplatform
+          apron: Lughaweplatform

           admin: Administratiewe grens
           admin: Administratiewe grens

-          forest_only: Woud
+          forest: Woud

           wood: Bos
           golf: Gholfbaan
           park: Park
           wood: Bos
           golf: Gholfbaan
           park: Park

-          common_only: Gemeen
+          common: Gemeen

           resident: Woongebied
           retail: Kleinhandel-gebied
           industrial: Nywerheidsgebied
           commercial: Handelsgebied
           heathland: Heide
           resident: Woongebied
           retail: Kleinhandel-gebied
           industrial: Nywerheidsgebied
           commercial: Handelsgebied
           heathland: Heide

-          lake_only: Meer
+          lake: Meer

           reservoir: reservoir
           farm: Plaas
           brownfield: Braakveldterrein
           reservoir: reservoir
           farm: Plaas
           brownfield: Braakveldterrein


@@ -1745,11 +1745,11 @@ af:
           centre: Sportsentrum
           reserve: Natuurreservaat
           military: Militêre gebied
           centre: Sportsentrum
           reserve: Natuurreservaat
           military: Militêre gebied

-          school_only: Skool
+          school: Skool

           university: universiteit
           building: Betekenisvolle gebou
           station: Spoorwegstasie
           university: universiteit
           building: Betekenisvolle gebou
           station: Spoorwegstasie

-          summit_only: Piek
+          summit: Piek

           peak: piek
           tunnel: Strepieomhulsel = tonnel
           bridge: Swart omhulsel = brug
           peak: piek
           tunnel: Strepieomhulsel = tonnel
           bridge: Swart omhulsel = brug

diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index 6d6053edafcf7c253944db17b6be5525a66f9105..8d6ff74d6350af3eda4dc204fd3950631f83664e 100644 (file)
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -914,21 +914,21 @@ aln:
           subway: Metro
           cable_car: teleferik
           chair_lift: heqë karrige
           subway: Metro
           cable_car: teleferik
           chair_lift: heqë karrige

-          runway_only: Aeroporti i pistës
+          runway: Aeroporti i pistës

           taxiway: taxiway
           taxiway: taxiway

-          apron_only: aeroportit Aeroporti
+          apron: aeroportit Aeroporti

           admin: kufitare administrative
           admin: kufitare administrative

-          forest_only: Pyll
+          forest: Pyll

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

-          common_only: I përbashkët
+          common: I përbashkët

           resident: Zonë Rezidenciale
           retail: zonë me pakicë
           industrial: Zonë Industriale
           commercial: Zona Tregtare
           heathland: Heathland
           resident: Zonë Rezidenciale
           retail: zonë me pakicë
           industrial: Zonë Industriale
           commercial: Zona Tregtare
           heathland: Heathland

-          lake_only: Liqe
+          lake: Liqe

           reservoir: rezervuar
           farm: Ferm
           brownfield: site Brownfield
           reservoir: rezervuar
           farm: Ferm
           brownfield: site Brownfield


@@ -938,11 +938,11 @@ aln:
           centre: Qendër Sportive
           reserve: rezervë Natyra
           military: Zonë Ushtarake
           centre: Qendër Sportive
           reserve: rezervë Natyra
           military: Zonë Ushtarake

-          school_only: Shkollë
+          school: Shkollë

           university: universitet
           building: ndërtimin e rëndësishme
           station: Stacion hekurudhor
           university: universitet
           building: ndërtimin e rëndësishme
           station: Stacion hekurudhor

-          summit_only: Samiti i
+          summit: Samiti i

           peak: pik
           tunnel: tunel zorrë thye =
           bridge: Shtresë e jashtme e Zi = urë
           peak: pik
           tunnel: tunel zorrë thye =
           bridge: Shtresë e jashtme e Zi = urë

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 3e9404caeef55c7c409e2c9684ae9dfeda5a865e..ec6693043492e1d5e92006326ffa024ca48874a6 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -2213,21 +2213,21 @@ ar:
           subway: قطار الأنفاق
           cable_car: عربة أسلاك
           chair_lift: تلفريك
           subway: قطار الأنفاق
           cable_car: عربة أسلاك
           chair_lift: تلفريك

-          runway_only: مدرج مطار
+          runway: مدرج مطار

           taxiway: مدرج مطار لمناورات الطائرات
           taxiway: مدرج مطار لمناورات الطائرات

-          apron_only: ساحة مطار
+          apron: ساحة مطار

           admin: حدود إدارية
           admin: حدود إدارية

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

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

-          common_only: شائع
+          common: شائع

           resident: منطقة سكنية
           retail: منطقة بيع بالمفرق
           industrial: منطقة صناعية
           commercial: منطقة تجارية
           heathland: أرض بور
           resident: منطقة سكنية
           retail: منطقة بيع بالمفرق
           industrial: منطقة صناعية
           commercial: منطقة تجارية
           heathland: أرض بور

-          lake_only: بحيرة
+          lake: بحيرة

           reservoir: خزان
           farm: مزرعة
           brownfield: موقع مخلفات
           reservoir: خزان
           farm: مزرعة
           brownfield: موقع مخلفات


@@ -2237,11 +2237,11 @@ ar:
           centre: مركز رياضي
           reserve: محمية طبيعية
           military: منطقة عسكرية
           centre: مركز رياضي
           reserve: محمية طبيعية
           military: منطقة عسكرية

-          school_only: مدرسة
+          school: مدرسة

           university: جامعة
           building: مبنى كبير
           station: محطة قطار
           university: جامعة
           building: مبنى كبير
           station: محطة قطار

-          summit_only: قمة
+          summit: قمة

           peak: ذروة
           tunnel: غطاء متقطع = نفق
           bridge: غطاء أسود = جسر
           peak: ذروة
           tunnel: غطاء متقطع = نفق
           bridge: غطاء أسود = جسر

diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index 2e64be5149643cdbc962c200f508431178b7479c..26ac7d1cd23ac826768b8e0f0a6682e66fac444d 100644 (file)
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -780,20 +780,20 @@ arz:
           footway: طريق مشاة
           rail: سكه حديدية
           subway: قطار الأنفاق
           footway: طريق مشاة
           rail: سكه حديدية
           subway: قطار الأنفاق

-          runway_only: مدرج مطار للإقلاع/الهبوط
+          runway: مدرج مطار للإقلاع/الهبوط

           taxiway: مدرج مطار لمناورات الطائرات
           taxiway: مدرج مطار لمناورات الطائرات

-          apron_only: ساحه مطار
+          apron: ساحه مطار

           admin: حدود إدارية
           admin: حدود إدارية

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

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

-          common_only: شائع
+          common: شائع

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

-          lake_only: بحيرة
+          lake: بحيرة

           reservoir: خزان
           farm: أرض زراعية
           cemetery: مقبرة
           reservoir: خزان
           farm: أرض زراعية
           cemetery: مقبرة


@@ -802,11 +802,11 @@ arz:
           centre: مركز رياضي
           reserve: محميه طبيعية
           military: منطقه عسكرية
           centre: مركز رياضي
           reserve: محميه طبيعية
           military: منطقه عسكرية

-          school_only: مدرسة
+          school: مدرسة

           university: جامعة
           building: مبنى كبير
           station: محطه قطار
           university: جامعة
           building: مبنى كبير
           station: محطه قطار

-          summit_only: قمة
+          summit: قمة

           peak: ذروة
           private: استخدام خصوصي
           construction: الطرق تحت الإنشاء
           peak: ذروة
           private: استخدام خصوصي
           construction: الطرق تحت الإنشاء

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 47dd5433421b0d190bea0eed91d541ff12e66804..199bddf7550cb8721dd1af49fd79e5ccd5510a02 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -1708,21 +1708,21 @@ ast:
           subway: Metro
           cable_car: Teleféricu
           chair_lift: telesilla
           subway: Metro
           cable_car: Teleféricu
           chair_lift: telesilla

-          runway_only: Pista d'aeropuertu
+          runway: Pista d'aeropuertu

           taxiway: cai de rodaxe
           taxiway: cai de rodaxe

-          apron_only: Aparcamientu d'aviones
+          apron: Aparcamientu d'aviones

           admin: Llende alministrativa
           admin: Llende alministrativa

-          forest_only: Área forestal
+          forest: Área forestal

           wood: Viesca
           golf: Campu de golf
           park: Parque
           wood: Viesca
           golf: Campu de golf
           park: Parque

-          common_only: Espaciu comunal
+          common: Espaciu comunal

           resident: Área residencial
           retail: Área de tiendes
           industrial: Área industrial
           commercial: Área comercial
           heathland: Berezal
           resident: Área residencial
           retail: Área de tiendes
           industrial: Área industrial
           commercial: Área comercial
           heathland: Berezal

-          lake_only: Llagu
+          lake: Llagu

           reservoir: banzáu
           farm: Casería
           brownfield: Terrén en derribu
           reservoir: banzáu
           farm: Casería
           brownfield: Terrén en derribu


@@ -1732,11 +1732,11 @@ ast:
           centre: Centru deportivu
           reserve: Reserva natural
           military: Área militar
           centre: Centru deportivu
           reserve: Reserva natural
           military: Área militar

-          school_only: Escuela
+          school: Escuela

           university: universidá
           building: Edificiu destacáu
           station: Estación de tren
           university: universidá
           building: Edificiu destacáu
           station: Estación de tren

-          summit_only: Cume
+          summit: Cume

           peak: picu
           tunnel: Borde de rayes = túnel
           bridge: Borde prietu = ponte
           peak: picu
           tunnel: Borde de rayes = túnel
           bridge: Borde prietu = ponte

diff --git a/config/locales/az.yml b/config/locales/az.yml
index a731c37b90a906dddd7f10bcc669b5c782b8a39e..97f9e0f31c8979386b070164b205837e0e613523 100644 (file)
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -986,26 +986,26 @@ az:
           footway: Piyada yolu
           rail: Dəmir yolu
           subway: Metro
           footway: Piyada yolu
           rail: Dəmir yolu
           subway: Metro

-          runway_only: Aeroport uçuş-enmə zolağı
+          runway: Aeroport uçuş-enmə zolağı

           admin: Administrativ sərhəd
           admin: Administrativ sərhəd

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

           park: Park
           resident: Yaşayış sahəsi
           retail: Ticarət sahəsi
           industrial: Sənaye sahəsi
           commercial: Ticarət sahəsi
           park: Park
           resident: Yaşayış sahəsi
           retail: Ticarət sahəsi
           industrial: Sənaye sahəsi
           commercial: Ticarət sahəsi

-          lake_only: Göl
+          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
           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_only: Məktəb
+          school: Məktəb

           university: universitet
           building: Əhəmiyyətli bina
           station: Dəmiryol stansiyası
           university: universitet
           building: Əhəmiyyətli bina
           station: Dəmiryol stansiyası

-          summit_only: Zirvə
+          summit: Zirvə

           peak: pik
           private: Xüsusi giriş
   traces:
           peak: pik
           private: Xüsusi giriş
   traces:

diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index 5f47c628d765c5adbd01a010c5dc82a7bb4d07b9..16cd8d6243ac441fd82415d124f443361d7b4540 100644 (file)
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -1171,21 +1171,21 @@ be-Tarask:
           subway: Мэтро
           cable_car: Канатная дарога
           chair_lift: крэславы пад’ёмнік
           subway: Мэтро
           cable_car: Канатная дарога
           chair_lift: крэславы пад’ёмнік

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

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

-          apron_only: Пэрон аэрапорта
+          apron: Пэрон аэрапорта

           admin: Адміністрацыйная мяжа
           admin: Адміністрацыйная мяжа

-          forest_only: Лес
+          forest: Лес

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

-          common_only: Грамадзкая зямля
+          common: Грамадзкая зямля

           resident: Жылы раён
           retail: Гандлёвы раён
           industrial: Прамысловы раён
           commercial: Камэрцыйны раён
           heathland: Пусташ
           resident: Жылы раён
           retail: Гандлёвы раён
           industrial: Прамысловы раён
           commercial: Камэрцыйны раён
           heathland: Пусташ

-          lake_only: Возера
+          lake: Возера

           reservoir: вадасховішча
           farm: Фэрма
           brownfield: Закінутая тэрыторыя
           reservoir: вадасховішча
           farm: Фэрма
           brownfield: Закінутая тэрыторыя


@@ -1195,11 +1195,11 @@ be-Tarask:
           centre: Спартовы цэнтар
           reserve: Запаведнік
           military: Вайсковая тэрыторыя
           centre: Спартовы цэнтар
           reserve: Запаведнік
           military: Вайсковая тэрыторыя

-          school_only: Школа
+          school: Школа

           university: унівэрсытэт
           building: Значны будынак
           station: Чыгуначная станцыя
           university: унівэрсытэт
           building: Значны будынак
           station: Чыгуначная станцыя

-          summit_only: Вяршыня
+          summit: Вяршыня

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

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 435a442ec2ad65d472fa4d470a02e1bd4a09c4b0..ad37e3ec355f91eb35395a975518a58a2d570836 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1726,21 +1726,21 @@ be:
           bus: Аўтобус
           cable_car: Канатная дарога
           chair_lift: Крэсельны пад'ёмнік
           bus: Аўтобус
           cable_car: Канатная дарога
           chair_lift: Крэсельны пад'ёмнік

-          runway_only: Узлетна-пасадачная паласа
+          runway: Узлетна-пасадачная паласа

           taxiway: рулёжная дарожка
           taxiway: рулёжная дарожка

-          apron_only: Перон аэрапорта
+          apron: Перон аэрапорта

           admin: Адміністрацыйная мяжа
           admin: Адміністрацыйная мяжа

-          forest_only: Лес
+          forest: Лес

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

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

           resident: Жылы раён
           retail: Гандлевая плошча
           industrial: Прамысловая зона
           commercial: Камерцыйная зона
           heathland: Пустка
           resident: Жылы раён
           retail: Гандлевая плошча
           industrial: Прамысловая зона
           commercial: Камерцыйная зона
           heathland: Пустка

-          lake_only: Возера
+          lake: Возера

           reservoir: вадасховішча
           glacier: Ляднік
           farm: Ферма
           reservoir: вадасховішча
           glacier: Ляднік
           farm: Ферма


@@ -1751,11 +1751,11 @@ be:
           centre: Спартыўны цэнтр
           reserve: Запаведнік
           military: Ваенная зона
           centre: Спартыўны цэнтр
           reserve: Запаведнік
           military: Ваенная зона

-          school_only: Школа
+          school: Школа

           university: універсітэт
           building: Значны будынак
           station: Чыгуначны вакзал
           university: універсітэт
           building: Значны будынак
           station: Чыгуначны вакзал

-          summit_only: Вяршыня
+          summit: Вяршыня

           peak: пік
           tunnel: Тунэль (пункцірам)
           bridge: Мост (суцэльная лінія)
           peak: пік
           tunnel: Тунэль (пункцірам)
           bridge: Мост (суцэльная лінія)

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index e37bf301c9e88f93bb353defe1a98152231163d0..ff1229ca89bed23956008754cc752501364d64e4 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1667,21 +1667,21 @@ bg:
           subway: Метро
           cable_car: Кабинков лифт
           chair_lift: седалков лифт
           subway: Метро
           cable_car: Кабинков лифт
           chair_lift: седалков лифт

-          runway_only: Летищна писта
+          runway: Летищна писта

           taxiway: път за рулиране
           taxiway: път за рулиране

-          apron_only: Летищен перон
+          apron: Летищен перон

           admin: Административна граница
           admin: Административна граница

-          forest_only: Гора
+          forest: Гора

           wood: Дървета
           golf: Игрище за голф
           park: Парк
           wood: Дървета
           golf: Игрище за голф
           park: Парк

-          common_only: Обща
+          common: Обща

           resident: Жилищна зона
           retail: Търговска зона
           industrial: Промишлена зона
           commercial: Търговска зона
           heathland: Пустош
           resident: Жилищна зона
           retail: Търговска зона
           industrial: Промишлена зона
           commercial: Търговска зона
           heathland: Пустош

-          lake_only: Езеро
+          lake: Езеро

           reservoir: язовир
           farm: Ферма
           brownfield: Място за строеж
           reservoir: язовир
           farm: Ферма
           brownfield: Място за строеж


@@ -1691,11 +1691,11 @@ bg:
           centre: Спортен център
           reserve: Природен резерват
           military: Военна зона
           centre: Спортен център
           reserve: Природен резерват
           military: Военна зона

-          school_only: Училище
+          school: Училище

           university: Университет
           building: Значима сграда
           station: Железопътна гара
           university: Университет
           building: Значима сграда
           station: Железопътна гара

-          summit_only: Било
+          summit: Било

           peak: връх
           tunnel: Тунел (пунктирана линия)
           bridge: Мост (плътна линия)
           peak: връх
           tunnel: Тунел (пунктирана линия)
           bridge: Мост (плътна линия)

diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 9ec3005ae6b5c93c4c93e407cc7b7baf079f83d9..8217c7ad2502cf37785f944d8e2e98d3e0af3359 100644 (file)
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -1742,31 +1742,31 @@ bn:
           train: রেলগাড়ি
           subway: ভূগর্ভস্থ পথ
           ferry: ফেরি
           train: রেলগাড়ি
           subway: ভূগর্ভস্থ পথ
           ferry: ফেরি

-          tram_only: ট্রাম
+          tram: ট্রাম

           bus: বাস
           cable_car: ক্যাবল কার
           admin: প্রশাসনিক সীমানা
           bus: বাস
           cable_car: ক্যাবল কার
           admin: প্রশাসনিক সীমানা

-          orchard_only: ফলবাগিচা
+          orchard: ফলবাগিচা

           vineyard: আঙুর খেত
           vineyard: আঙুর খেত

-          forest_only: অরণ্য
+          forest: অরণ্য

           wood: কাঠ
           farmland: কৃষিজমি
           meadow: তৃণভূমি
           sand: বালু
           golf: গল্ফ মাঠ
           park: উদ্যান
           wood: কাঠ
           farmland: কৃষিজমি
           meadow: তৃণভূমি
           sand: বালু
           golf: গল্ফ মাঠ
           park: উদ্যান

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

           resident: আবাসিক এলাকা
           industrial: শিল্পাঞ্চল
           commercial: বাণিজ্যিক এলাকা
           resident: আবাসিক এলাকা
           industrial: শিল্পাঞ্চল
           commercial: বাণিজ্যিক এলাকা

-          lake_only: হ্রদ
+          lake: হ্রদ

           reservoir: জলাধার
           glacier: হিমবাহ
           farm: খামার
           cemetery: কবরস্থান
           centre: ক্রীড়া কেন্দ্র
           military: সামরিক এলাকা
           reservoir: জলাধার
           glacier: হিমবাহ
           farm: খামার
           cemetery: কবরস্থান
           centre: ক্রীড়া কেন্দ্র
           military: সামরিক এলাকা

-          school_only: বিদ্যালয়
+          school: বিদ্যালয়

           university: বিশ্ববিদ্যালয়
           hospital: হাসপাতাল
           station: রেল স্টেশন
           university: বিশ্ববিদ্যালয়
           hospital: হাসপাতাল
           station: রেল স্টেশন

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 1ded912cfb287d35b7885eca9b6db4712e05502f..6292a37ec77a7d45127a872da0a03ec15592cb67 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -2248,29 +2248,29 @@ br:
           subway: Linenn vetro
           ferry: Karrlistri
           light_rail: Metro skañv
           subway: Linenn vetro
           ferry: Karrlistri
           light_rail: Metro skañv

-          tram_only: Tramgarr
+          tram: Tramgarr

           trolleybus: Trollebus
           bus: Karr-boutin
           cable_car: Teleferik
           chair_lift: Fungador
           trolleybus: Trollebus
           bus: Karr-boutin
           cable_car: Teleferik
           chair_lift: Fungador

-          runway_only: Roudenn evit an taksioù
+          runway: Roudenn evit an taksioù

           taxiway: Hent evit an taksioù
           taxiway: Hent evit an taksioù

-          apron_only: Roudenn aerborzh
+          apron: Roudenn aerborzh

           admin: Bevenn velestradurel
           capital: Kêr-benn
           city: Kêr
           admin: Bevenn velestradurel
           capital: Kêr-benn
           city: Kêr

-          orchard_only: Gwerje
+          orchard: Gwerje

           vineyard: Gwinieg
           vineyard: Gwinieg

-          forest_only: Koad
+          forest: Koad

           wood: Koad
           farmland: Tachenn labour-douar
           wood: Koad
           farmland: Tachenn labour-douar

-          grass_only: Geot
+          grass: Geot

           meadow: Prad
           bare_rock: Roc'h noazh
           sand: Traezh
           golf: Tachenn golf
           park: Park
           meadow: Prad
           bare_rock: Roc'h noazh
           sand: Traezh
           golf: Tachenn golf
           park: Park

-          common_only: prad
+          common: prad

           built_up: Takad savet
           resident: Takad annez
           retail: Takad kenwerzh
           built_up: Takad savet
           resident: Takad annez
           retail: Takad kenwerzh


@@ -2278,7 +2278,7 @@ br:
           commercial: Takad kenwerzhel
           heathland: Lanneier
           scrubland: Strouezheg
           commercial: Takad kenwerzhel
           heathland: Lanneier
           scrubland: Strouezheg

-          lake_only: Lenn
+          lake: Lenn

           reservoir: Mirlenn
           glacier: Skorneg
           reef: Karreg
           reservoir: Mirlenn
           glacier: Skorneg
           reef: Karreg


@@ -2291,12 +2291,12 @@ br:
           centre: Kreizenn sport
           reserve: Gwarezva natur
           military: Takad milourel
           centre: Kreizenn sport
           reserve: Gwarezva natur
           military: Takad milourel

-          school_only: Skol
+          school: Skol

           university: Skol-veur
           hospital: Ospital
           building: Savadur pouezus
           station: Porzh-houarn
           university: Skol-veur
           hospital: Ospital
           building: Savadur pouezus
           station: Porzh-houarn

-          summit_only: Lein
+          summit: Lein

           peak: Pikern
           tunnel: Bord poentoùigoù = riboul
           bridge: Bord du = pont
           peak: Pikern
           tunnel: Bord poentoùigoù = riboul
           bridge: Bord du = pont


@@ -2904,6 +2904,8 @@ br:
         few: Kuzhet ho peus %{count} implijer·ez
         many: Kuzhet ho peus %{count} implijer·ez
         other: Kuzhet ho peus %{count} implijer·ez
         few: Kuzhet ho peus %{count} implijer·ez
         many: Kuzhet ho peus %{count} implijer·ez
         other: Kuzhet ho peus %{count} implijer·ez

+      user_mute_explainer: Kemennadennoù an implijerien kuzhet a zo kaset d'ur voest-resev
+        disheñvel ha n'ho po kemenn ebet a-zivout o fosteloù.

       table:
         thead:
           muted_user: Implijer·ez kuzhet
       table:
         thead:
           muted_user: Implijer·ez kuzhet

diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 067a8008ffe7c819124f2ea7c1b8f4a9030edc03..bf3d2e0a46e6cd4869221afebb107612bfcbc414 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1198,21 +1198,21 @@ bs:
           subway: Podzemna željeznica
           cable_car: Kabinska žičara
           chair_lift: Uspinjača sa naslonjačem
           subway: Podzemna željeznica
           cable_car: Kabinska žičara
           chair_lift: Uspinjača sa naslonjačem

-          runway_only: Aerodromska pista
+          runway: Aerodromska pista

           taxiway: Aerodromska rulna staza
           taxiway: Aerodromska rulna staza

-          apron_only: Parking za avione
+          apron: Parking za avione

           admin: Administrativna granica
           admin: Administrativna granica

-          forest_only: Šume (održavane, od šumarije)
+          forest: Šume (održavane, od šumarije)

           wood: Šume (prirodne, neodržavane)
           golf: Golf teren
           park: Park
           wood: Šume (prirodne, neodržavane)
           golf: Golf teren
           park: Park

-          common_only: Travnjaci
+          common: Travnjaci

           resident: Stambeno područje
           retail: Maloprodajno područje
           industrial: Industrijsko područje
           commercial: Poslovno područje
           heathland: Stepa
           resident: Stambeno područje
           retail: Maloprodajno područje
           industrial: Industrijsko područje
           commercial: Poslovno područje
           heathland: Stepa

-          lake_only: Jezero
+          lake: Jezero

           reservoir: Rezervoar
           farm: Polja, farme, njive
           brownfield: Gradilište
           reservoir: Rezervoar
           farm: Polja, farme, njive
           brownfield: Gradilište


@@ -1222,11 +1222,11 @@ bs:
           centre: Sportski centar
           reserve: Rezervat prirode
           military: Vojno područje
           centre: Sportski centar
           reserve: Rezervat prirode
           military: Vojno područje

-          school_only: Škola
+          school: Škola

           university: Univerzitet
           building: Značajna zgrada
           station: Željeznička stanica
           university: Univerzitet
           building: Značajna zgrada
           station: Željeznička stanica

-          summit_only: Vrh
+          summit: Vrh

           peak: Kota
           tunnel: Iscrtkani rubovi = tunel
           bridge: Crni rubovi = most
           peak: Kota
           tunnel: Iscrtkani rubovi = tunel
           bridge: Crni rubovi = most

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 9460cb162f21fd500fbc3492901f14cd61af9f63..9588360d3f64b7611736bbacc61b0d00995ca617 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -2304,27 +2304,27 @@ ca:
           subway: Metro
           ferry: Ferri
           light_rail: Ferrocarril lleuger
           subway: Metro
           ferry: Ferri
           light_rail: Ferrocarril lleuger

-          tram_only: Tramvia
+          tram: Tramvia

           trolleybus: Troleibús
           bus: Autobús
           cable_car: Telefèric
           chair_lift: Telecadira
           trolleybus: Troleibús
           bus: Autobús
           cable_car: Telefèric
           chair_lift: Telecadira

-          runway_only: Pista d'aeroport
+          runway: Pista d'aeroport

           taxiway: Carrer de rodatge
           taxiway: Carrer de rodatge

-          apron_only: Estacionament d'avions
+          apron: Estacionament d'avions

           admin: Límit administratiu
           admin: Límit administratiu

-          orchard_only: Hort
+          orchard: Hort

           vineyard: Vinya
           vineyard: Vinya

-          forest_only: Bosc
+          forest: Bosc

           wood: Arbreda
           farmland: Terra de conreu
           wood: Arbreda
           farmland: Terra de conreu

-          grass_only: Gespa
+          grass: Gespa

           meadow: Prada
           bare_rock: Roca pelada
           sand: Sorra
           golf: Camp de golf
           park: Parc
           meadow: Prada
           bare_rock: Roca pelada
           sand: Sorra
           golf: Camp de golf
           park: Parc

-          common_only: Àrea comunal
+          common: Àrea comunal

           built_up: Zona edificada
           resident: Zona residencial
           retail: Àrea comercial
           built_up: Zona edificada
           resident: Zona residencial
           retail: Àrea comercial


@@ -2332,7 +2332,7 @@ ca:
           commercial: Zona comercial
           heathland: Bruguerar
           scrubland: Matolls
           commercial: Zona comercial
           heathland: Bruguerar
           scrubland: Matolls

-          lake_only: Llac
+          lake: Llac

           reservoir: Embassament
           intermittent_water: Cos d'aigua intermitent
           glacier: Glacera
           reservoir: Embassament
           intermittent_water: Cos d'aigua intermitent
           glacier: Glacera


@@ -2346,12 +2346,12 @@ ca:
           centre: Centre esportiu
           reserve: Reserva natural
           military: Àrea militar
           centre: Centre esportiu
           reserve: Reserva natural
           military: Àrea militar

-          school_only: Escola - Institut
+          school: Escola - Institut

           university: Universitat
           hospital: Hospital
           building: Edifici significatiu
           station: Estació de tren
           university: Universitat
           hospital: Hospital
           building: Edifici significatiu
           station: Estació de tren

-          summit_only: Cim
+          summit: Cim

           peak: Cim
           tunnel: Línia discontínua = túnel
           bridge: Línia negra = pont
           peak: Cim
           tunnel: Línia discontínua = túnel
           bridge: Línia negra = pont

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index c43d86d64bde7b563f25731d0fd128a166c948ac..40f2bc433dabae8187afd65fdca67083c481c1d9 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -2395,21 +2395,21 @@ cs:
           subway: Metro
           cable_car: Lanovka
           chair_lift: sedačková lanovka
           subway: Metro
           cable_car: Lanovka
           chair_lift: sedačková lanovka

-          runway_only: Vzletová a přistávací dráha
+          runway: Vzletová a přistávací dráha

           taxiway: pojezdová dráha
           taxiway: pojezdová dráha

-          apron_only: Letištní odbavovací plocha
+          apron: Letištní odbavovací plocha

           admin: Administrativní hranice
           admin: Administrativní hranice

-          forest_only: Les
+          forest: Les

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

-          common_only: Pastvina
+          common: Pastvina

           resident: Obytná oblast
           retail: Nákupní oblast
           industrial: Průmyslová oblast
           commercial: Kancelářská oblast
           heathland: Vřesoviště
           resident: Obytná oblast
           retail: Nákupní oblast
           industrial: Průmyslová oblast
           commercial: Kancelářská oblast
           heathland: Vřesoviště

-          lake_only: Jezero
+          lake: Jezero

           reservoir: nádrž
           farm: Farma
           brownfield: Zbořeniště
           reservoir: nádrž
           farm: Farma
           brownfield: Zbořeniště


@@ -2419,11 +2419,11 @@ cs:
           centre: Sportovní centrum
           reserve: Přírodní rezervace
           military: Vojenský prostor
           centre: Sportovní centrum
           reserve: Přírodní rezervace
           military: Vojenský prostor

-          school_only: Škola
+          school: Škola

           university: univerzita
           building: Významná budova
           station: Nádraží
           university: univerzita
           building: Významná budova
           station: Nádraží

-          summit_only: Vrchol
+          summit: Vrchol

           peak: hora
           tunnel: Čárkované obrysy = tunel
           bridge: Černé obrysy = most
           peak: hora
           tunnel: Čárkované obrysy = tunel
           bridge: Černé obrysy = most

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index ea322ca3b5d2a13ac3413dfa75afb70137f4731d..f3b5fa772dc286078a64564385f81d9049c127d1 100644 (file)
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -44,6 +44,11 @@ cy:
       messages:
         invalid_email_address: nid yw'n ymddangos ei fod yn gyfeiriad e-bost dilys
         email_address_not_routable: nid yw'n gyrchadwy
       messages:
         invalid_email_address: nid yw'n ymddangos ei fod yn gyfeiriad e-bost dilys
         email_address_not_routable: nid yw'n gyrchadwy

+      models:
+        user_mute:
+          attributes:
+            subject:
+              format: '%{message}'

     models:
       acl: Rhestr Rheoli Mynediad
       changeset: Grŵp newid
     models:
       acl: Rhestr Rheoli Mynediad
       changeset: Grŵp newid


@@ -819,11 +824,15 @@ cy:
           college: Adeilad Coleg
           commercial: Adeilad Masnachol
           construction: Adeilad yn cael ei Adeiladu
           college: Adeilad Coleg
           commercial: Adeilad Masnachol
           construction: Adeilad yn cael ei Adeiladu

+          detached: Tŷ Datgysylltiedig

           dormitory: Dorm
           dormitory: Dorm

+          duplex: Tŷ Deublyg

           farm: Ffermdy
           farm: Ffermdy

+          farm_auxiliary: Tŷ Fferm Ategol

           garage: Garej
           garages: Garejis
           greenhouse: Tŷ Gwydr
           garage: Garej
           garages: Garejis
           greenhouse: Tŷ Gwydr

+          hangar: Hangar

           hospital: Adeilad Ysbyty
           hotel: Adeilad Gwesty
           house: Tŷ
           hospital: Adeilad Ysbyty
           hotel: Adeilad Gwesty
           house: Tŷ


@@ -831,11 +840,13 @@ cy:
           hut: Cwt
           industrial: Adeilad Diwydiannol
           kindergarten: Adeilad Meithrinfa
           hut: Cwt
           industrial: Adeilad Diwydiannol
           kindergarten: Adeilad Meithrinfa

+          manufacture: Adeilad Gweithgynhyrchu

           office: Adeilad Swyddfa
           public: Adeilad Cyhoeddus
           residential: Adeilad Preswyl
           retail: Adeilad Adwerthu
           roof: To
           office: Adeilad Swyddfa
           public: Adeilad Cyhoeddus
           residential: Adeilad Preswyl
           retail: Adeilad Adwerthu
           roof: To

+          ruins: Adeilad Adfeiliedig

           school: Adeilad Ysgol
           shed: Sied
           stable: Stabl
           school: Adeilad Ysgol
           shed: Sied
           stable: Stabl


@@ -1395,6 +1406,8 @@ cy:
       reopen: Ailagor
       read_reports: Darllen Adroddiadau
       new_reports: Adroddiadau Newydd
       reopen: Ailagor
       read_reports: Darllen Adroddiadau
       new_reports: Adroddiadau Newydd

+    comments:
+      comment_from_html: Sylw gan %{user_link} ar %{comment_created_at}

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


@@ -1524,12 +1537,15 @@ cy:
       hi: Helo %{to_user},
       greeting: Helo,
       commented:
       hi: Helo %{to_user},
       greeting: Helo,
       commented:

+        subject_own: '[OpenStreetMap] Gwnaeth %{commenter} sylw ar un o''ch grwpiau
+          newid'

         partial_changeset_with_comment: gyda sylw '%{changeset_comment}'
         partial_changeset_with_comment_html: gyda sylw '%{changeset_comment}'
         partial_changeset_without_comment: dim sylw
   confirmations:
     confirm:
       heading: Gwiriwch eich e-byst!
         partial_changeset_with_comment: gyda sylw '%{changeset_comment}'
         partial_changeset_with_comment_html: gyda sylw '%{changeset_comment}'
         partial_changeset_without_comment: dim sylw
   confirmations:
     confirm:
       heading: Gwiriwch eich e-byst!

+      introduction_1: Rydym wedi anfon e-bost cadarnhau atoch.

       button: Cadarnhau
       click_here: cliciwch yma
     confirm_resend:
       button: Cadarnhau
       click_here: cliciwch yma
     confirm_resend:


@@ -1563,11 +1579,13 @@ cy:
       to: I
       subject: Pwnc
       date: Dyddiad
       to: I
       subject: Pwnc
       date: Dyddiad

+      actions: Gweithredoedd

     message_summary:
       unread_button: Marcio fel heb ei ddarllen
       read_button: Marcio fel wedi'i ddarllen
       reply_button: Ateb
       destroy_button: Dileu
     message_summary:
       unread_button: Marcio fel heb ei ddarllen
       read_button: Marcio fel wedi'i ddarllen
       reply_button: Ateb
       destroy_button: Dileu

+      unmute_button: Symud i'r Mewnflwch

     new:
       title: Anfon neges
       send_message_to_html: Anfon neges newydd at %{name}
     new:
       title: Anfon neges
       send_message_to_html: Anfon neges newydd at %{name}


@@ -1582,6 +1600,7 @@ cy:
       body: Sori, nid oes neges gyda'r id yno.
     outbox:
       title: Blwch Allan
       body: Sori, nid oes neges gyda'r id yno.
     outbox:
       title: Blwch Allan

+      actions: Gweithredoedd

       messages:
         one: Mae gennych %{count} neges wedi ei anfon
         other: Mae gennych %{count} neges wedi eu hanfon
       messages:
         one: Mae gennych %{count} neges wedi ei anfon
         other: Mae gennych %{count} neges wedi eu hanfon


@@ -1710,6 +1729,7 @@ cy:
       image: Delwedd
       alt: Testun amgen
       url: URL
       image: Delwedd
       alt: Testun amgen
       url: URL

+      codeblock: Bloc cod

     richtext_field:
       edit: Golygu
       preview: Rhagolwg
     richtext_field:
       edit: Golygu
       preview: Rhagolwg


@@ -1924,25 +1944,45 @@ cy:
           cycleway_local: Llwybr beiciau lleol
           footway: Troedffordd
           rail: Rheilffordd
           cycleway_local: Llwybr beiciau lleol
           footway: Troedffordd
           rail: Rheilffordd

+          train: Trên

           subway: Trenau tanddaear
           subway: Trenau tanddaear

+          ferry: Fferi
+          light_rail: Rheilffordd ysgafn
+          tram: Tram
+          trolleybus: Bws Drydan
+          bus: Bws

           cable_car: Car cebl
           cable_car: Car cebl

-          chair_lift: lifft cadair
-          runway_only: Llwybr glanio
-          taxiway: thacsiffordd maes awyr
-          apron_only: Llain
+          chair_lift: Cadair godi
+          runway: Llwybr glanio
+          taxiway: Tacsiffordd
+          apron: Llain

           admin: Ffin gweinyddol
           admin: Ffin gweinyddol

-          forest_only: Coedwig
+          capital: Prifddinas
+          city: Dinas
+          orchard: Perllan
+          vineyard: Gwinllan
+          forest: Coedwig

           wood: Coedlan
           wood: Coedlan

+          farmland: Tir Ffermio
+          grass: Gwair
+          meadow: Gwaun
+          bare_rock: Carreg Plaen
+          sand: Tywod

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

-          common_only: Comin
+          common: Comin
+          built_up: Ardal Adeiledig

           resident: Ardal breswyl
           retail: Ardal adwerthu
           industrial: Ardal ddiwydiannol
           commercial: Ardal fasnachol
           heathland: Rhos
           resident: Ardal breswyl
           retail: Ardal adwerthu
           industrial: Ardal ddiwydiannol
           commercial: Ardal fasnachol
           heathland: Rhos

-          lake_only: Llyn
-          reservoir: chronfa ddŵr
+          scrubland: Prysgoed
+          lake: Llyn
+          reservoir: Cronfa Ddŵr
+          glacier: Rhewlif
+          reef: Riff
+          wetland: Gwlyptir

           farm: Fferm
           brownfield: Safle tir llwyd
           cemetery: Mynwent
           farm: Fferm
           brownfield: Safle tir llwyd
           cemetery: Mynwent


@@ -1951,17 +1991,20 @@ cy:
           centre: Canolfan chwaraeon
           reserve: Gwarchodfa natur
           military: Ardal filwrol
           centre: Canolfan chwaraeon
           reserve: Gwarchodfa natur
           military: Ardal filwrol

-          school_only: Ysgol
-          university: phrifysgol
+          school: Ysgol
+          university: Prifysgol
+          hospital: Ysbyty

           building: Adeilad arwyddocâol
           station: Gorsaf drên
           building: Adeilad arwyddocâol
           station: Gorsaf drên

-          summit_only: Copa
-          peak: chrib
+          summit: Copa
+          peak: Copa

           tunnel: Border toredig = twnnel
           bridge: Border du = pont
           private: Mynediad preifat
           destination: Mynediad cyrchfan
           construction: Ffyrdd yn cael eu hadeiladu
           tunnel: Border toredig = twnnel
           bridge: Border du = pont
           private: Mynediad preifat
           destination: Mynediad cyrchfan
           construction: Ffyrdd yn cael eu hadeiladu

+          bus_stop: Safle Bws
+          stop: Safle

           bicycle_shop: Siop feiciau
           bicycle_parking: Man parcio beiciau
           toilets: Toiledau
           bicycle_shop: Siop feiciau
           bicycle_parking: Man parcio beiciau
           toilets: Toiledau


@@ -2133,6 +2176,7 @@ cy:
       read_gpx: Darllen arllwybrau GPS preifat
       write_gpx: Uwchlwytho arllwybrau GPS
       write_notes: Addasu nodiadau
       read_gpx: Darllen arllwybrau GPS preifat
       write_gpx: Uwchlwytho arllwybrau GPS
       write_notes: Addasu nodiadau

+      write_redactions: Gorchuddio data map

       read_email: Darllen cyfeiriad e-bost defnyddwyr
       skip_authorization: Cymeradwyo cais yn awtomatig
   oauth_clients:
       read_email: Darllen cyfeiriad e-bost defnyddwyr
       skip_authorization: Cymeradwyo cais yn awtomatig
   oauth_clients:


@@ -2185,6 +2229,7 @@ cy:
     index:
       application: Ap
       permissions: Caniatadau
     index:
       application: Ap
       permissions: Caniatadau

+      oauth_2: OAuth 2

   users:
     new:
       title: Cofrestru
   users:
     new:
       title: Cofrestru


@@ -2193,6 +2238,7 @@ cy:
         header: Rhydd ac agored
       display name description: Eich enw defnyddiwr cyhoeddus. Gallwch newid hyn yn
         nes ymlaen yn eich dewisiadau.
         header: Rhydd ac agored
       display name description: Eich enw defnyddiwr cyhoeddus. Gallwch newid hyn yn
         nes ymlaen yn eich dewisiadau.

+      external auth: 'Dilysu Trydydd Parti:'

       use external auth: Fel arall, defnyddiwch drydydd parti i fewngofnodi
       continue: Cofrestru
       terms accepted: Diolch am dderbyn telerau newydd cyfranwyr!
       use external auth: Fel arall, defnyddiwch drydydd parti i fewngofnodi
       continue: Cofrestru
       terms accepted: Diolch am dderbyn telerau newydd cyfranwyr!


@@ -2231,6 +2277,8 @@ cy:
       my_dashboard: Dangosfwrdd
       blocks on me: Blociau arnaf i
       blocks by me: Blociau gennyf i
       my_dashboard: Dangosfwrdd
       blocks on me: Blociau arnaf i
       blocks by me: Blociau gennyf i

+      create_mute: Anwybyddu'r Defnyddiwr hwn
+      destroy_mute: Dad-anwybyddu'r Defnyddiwr hwn

       edit_profile: Golygu Proffil
       send message: Anfon Neges
       diary: Dyddiadur
       edit_profile: Golygu Proffil
       send message: Anfon Neges
       diary: Dyddiadur


@@ -2251,6 +2299,15 @@ cy:
       role:
         administrator: Mae'r defnyddiwr hwn yn weinyddwr.
         moderator: Mae'r defnyddiwr hwn yn gymedrolwr.
       role:
         administrator: Mae'r defnyddiwr hwn yn weinyddwr.
         moderator: Mae'r defnyddiwr hwn yn gymedrolwr.

+        importer: Mae'r defnyddiwr hwn yn fewnforiwr
+        grant:
+          administrator: Rhoi statws gweinyddwr
+          moderator: Rhoi statws cymedrolwr
+          importer: Rhoi statws mewnforiwr
+        revoke:
+          administrator: Tynnu statws gweinyddwr
+          moderator: Tynnu statws cymedrolwr
+          importer: Tynnu statws mewnforiwr

       block_history: Blociau Gweithredol
       moderator_history: Blociau a roddwyd
       comments: Sylwadau
       block_history: Blociau Gweithredol
       moderator_history: Blociau a roddwyd
       comments: Sylwadau


@@ -2372,6 +2429,15 @@ cy:
       showing_page: Tudalen %{page}
       next: Nesaf »
       previous: « Blaenorol
       showing_page: Tudalen %{page}
       next: Nesaf »
       previous: « Blaenorol

+  user_mutes:
+    index:
+      table:
+        thead:
+          actions: Gweithredoedd
+        tbody:
+          send_message: Anfon neges
+    create:
+      notice: Rydych chi wedi anwybyddu %{name}.

   notes:
     index:
       heading: Nodiadau %{user}
   notes:
     index:
       heading: Nodiadau %{user}


@@ -2439,6 +2505,7 @@ cy:
       short_url: URL Byr
       include_marker: Cynnwys marciwr
       center_marker: Canoli'r map ar y marciwr
       short_url: URL Byr
       include_marker: Cynnwys marciwr
       center_marker: Canoli'r map ar y marciwr

+      view_larger_map: Gweld Map Mawr

     embed:
       report_problem: Adrodd am broblem
     key:
     embed:
       report_problem: Adrodd am broblem
     key:

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 4d61f11422db9cf2a1e14f37c8ddb97595f4d10d..929a7e0af3e595238d04db10b3065e4e532cf787 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -2358,29 +2358,29 @@ da:
           subway: Undergrundsbane
           ferry: Færge
           light_rail: Letbane
           subway: Undergrundsbane
           ferry: Færge
           light_rail: Letbane

-          tram_only: Sporvogn
+          tram: Sporvogn

           trolleybus: Trolleybus
           bus: Bus
           cable_car: Kabelvogn
           chair_lift: Stolelift
           trolleybus: Trolleybus
           bus: Bus
           cable_car: Kabelvogn
           chair_lift: Stolelift

-          runway_only: Landingsbane
+          runway: Landingsbane

           taxiway: Rullevej
           taxiway: Rullevej

-          apron_only: Lufthavnsforplads
+          apron: Lufthavnsforplads

           admin: Administrativ grænse
           capital: Hovedstad
           city: By
           admin: Administrativ grænse
           capital: Hovedstad
           city: By

-          orchard_only: Plantage
+          orchard: Plantage

           vineyard: Vingård
           vineyard: Vingård

-          forest_only: Skov
+          forest: Skov

           wood: Træ
           farmland: Landbrugsjord
           wood: Træ
           farmland: Landbrugsjord

-          grass_only: Græs
+          grass: Græs

           meadow: Eng
           bare_rock: Blottet klippe
           sand: Sand
           golf: Golfbane
           park: Park
           meadow: Eng
           bare_rock: Blottet klippe
           sand: Sand
           golf: Golfbane
           park: Park

-          common_only: Fælled
+          common: Fælled

           built_up: Bebygget område
           resident: Boligområde
           retail: Detailhandelsområde
           built_up: Bebygget område
           resident: Boligområde
           retail: Detailhandelsområde


@@ -2388,7 +2388,7 @@ da:
           commercial: Erhvervsområde
           heathland: Hede
           scrubland: Buskads
           commercial: Erhvervsområde
           heathland: Hede
           scrubland: Buskads

-          lake_only: Sø
+          lake: Sø

           reservoir: Reservoir
           intermittent_water: Periodisk vandmasse
           glacier: Gletsjer
           reservoir: Reservoir
           intermittent_water: Periodisk vandmasse
           glacier: Gletsjer


@@ -2402,12 +2402,12 @@ da:
           centre: Sportscenter
           reserve: Naturreservat
           military: Militært område
           centre: Sportscenter
           reserve: Naturreservat
           military: Militært område

-          school_only: Skole
+          school: Skole

           university: Universitet
           hospital: Sygehus
           building: Vigtig bygning
           station: Togstation
           university: Universitet
           hospital: Sygehus
           building: Vigtig bygning
           station: Togstation

-          summit_only: Bjergtop
+          summit: Bjergtop

           peak: Højdepunkt
           tunnel: Stiplet kant = tunnel
           bridge: Sort kant = bro
           peak: Højdepunkt
           tunnel: Stiplet kant = tunnel
           bridge: Sort kant = bro

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 372ccb05cf0fdeae891e18529f430c1dca2bd724..ab879429d350658fd5fa210ef31fe3011cdff556 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2418,21 +2418,21 @@ de:
           subway: U-Bahn
           cable_car: Seilbahn
           chair_lift: Sessellift
           subway: U-Bahn
           cable_car: Seilbahn
           chair_lift: Sessellift

-          runway_only: Start- und Landebahn
+          runway: Start- und Landebahn

           taxiway: Rollbahn
           taxiway: Rollbahn

-          apron_only: Flughafenvorfeld
+          apron: Flughafenvorfeld

           admin: Landesgrenzen, sonstige Grenzen
           admin: Landesgrenzen, sonstige Grenzen

-          forest_only: Wald
+          forest: Wald

           wood: Wald
           golf: Golfplatz
           park: Park
           wood: Wald
           golf: Golfplatz
           park: Park

-          common_only: öffentliche Grünfläche (brit.)
+          common: öffentliche Grünfläche (brit.)

           resident: Wohngebiet
           retail: Einkaufszentrum
           industrial: Industriegebiet
           commercial: Gewerbegebiet
           heathland: Heide
           resident: Wohngebiet
           retail: Einkaufszentrum
           industrial: Industriegebiet
           commercial: Gewerbegebiet
           heathland: Heide

-          lake_only: See
+          lake: See

           reservoir: Stausee
           intermittent_water: Intermittierender Gewässer
           farm: Landwirtschaft
           reservoir: Stausee
           intermittent_water: Intermittierender Gewässer
           farm: Landwirtschaft


@@ -2443,11 +2443,11 @@ de:
           centre: Sportzentrum
           reserve: Naturschutzgebiet
           military: Militärgebiet
           centre: Sportzentrum
           reserve: Naturschutzgebiet
           military: Militärgebiet

-          school_only: Schule
+          school: Schule, Universität

           university: Universität
           building: Bedeutendes Gebäude
           station: Bahnhof
           university: Universität
           building: Bedeutendes Gebäude
           station: Bahnhof

-          summit_only: Gipfel
+          summit: Gipfel

           peak: Bergspitze
           tunnel: Gestrichelter Rand = Tunnel
           bridge: Schwarzer Rand = Brücke
           peak: Bergspitze
           tunnel: Gestrichelter Rand = Tunnel
           bridge: Schwarzer Rand = Brücke

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index a9dd800b2ed14463db51c96d666a04011bfb8eb1..7a1c18359558a55c0a9e469ca5a57da3006b4395 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -910,18 +910,18 @@ diq:
           track: Raya Herın
           bridleway: Raya Ancınıştan
           cycleway: Raya Bisiklet
           track: Raya Herın
           bridleway: Raya Ancınıştan
           cycleway: Raya Bisiklet

-          forest_only: Mêşe
+          forest: Mêşe

           wood: Meşe
           golf: Saxay Golfi
           park: Perk
           wood: Meşe
           golf: Saxay Golfi
           park: Perk

-          common_only: Çimen
-          lake_only: Gol
+          common: Çimen
+          lake: Gol

           farm: Cıtinin
           cemetery: Mezlaser
           allotments: Bostan
           farm: Cıtinin
           cemetery: Mezlaser
           allotments: Bostan

-          school_only: Wendxane
+          school: Wendxane

           university: Uniwersita
           university: Uniwersita

-          summit_only: Sersıq
+          summit: Sersıq

           peak: Ko
     welcome:
       title: Xeyr amey!
           peak: Ko
     welcome:
       title: Xeyr amey!

diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index d13208383bd4421619a1bc6687c13780b5fd0085..ae5ed0f7bc96c8a863b9d02b0683a6a19866a037 100644 (file)
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -1269,21 +1269,21 @@ dsb:
           subway: Pódzemska
           cable_car: Kablowa elektriska
           chair_lift: sedłowy lift
           subway: Pódzemska
           cable_car: Kablowa elektriska
           chair_lift: sedłowy lift

-          runway_only: Pśizemjeńska cera
+          runway: Pśizemjeńska cera

           taxiway: lětadłowa cera
           taxiway: lětadłowa cera

-          apron_only: Pśedpólo lětanišća
+          apron: Pśedpólo lětanišća

           admin: Zastojnstwowa granica
           admin: Zastojnstwowa granica

-          forest_only: Góla
+          forest: Góla

           wood: Lěs
           golf: Golfowišćo
           park: Park
           wood: Lěs
           golf: Golfowišćo
           park: Park

-          common_only: Powšykny
+          common: Powšykny

           resident: Bydleński wobcerk
           retail: Nakupowanišćo
           industrial: Industrijowy wobcerk
           commercial: Źěłarstwowy wobcerk
           heathland: Wrjosate strony
           resident: Bydleński wobcerk
           retail: Nakupowanišćo
           industrial: Industrijowy wobcerk
           commercial: Źěłarstwowy wobcerk
           heathland: Wrjosate strony

-          lake_only: Jazor
+          lake: Jazor

           reservoir: gaśeński jazor
           farm: Farma
           brownfield: Industrijowe lědo
           reservoir: gaśeński jazor
           farm: Farma
           brownfield: Industrijowe lědo


@@ -1293,11 +1293,11 @@ dsb:
           centre: Sportowy centrum
           reserve: Strony šćitaneje pśirody
           military: Militarny wobcerk
           centre: Sportowy centrum
           reserve: Strony šćitaneje pśirody
           military: Militarny wobcerk

-          school_only: Šula
+          school: Šula

           university: uniwersita
           building: Pśesegajuce twarjenje
           station: Dwórnišćo, zeleznicowa stacija
           university: uniwersita
           building: Pśesegajuce twarjenje
           station: Dwórnišćo, zeleznicowa stacija

-          summit_only: Wjerch
+          summit: Wjerch

           peak: špica
           tunnel: Smužkowane wobcerjenje = tunel
           bridge: Carne wobcerjenje = móst
           peak: špica
           tunnel: Smužkowane wobcerjenje = tunel
           bridge: Carne wobcerjenje = móst

diff --git a/config/locales/el.yml b/config/locales/el.yml
index f691af5c0af5287100e4349856a1e52b6a0f0d97..5dff1525a5a2a7d283b7ef6612715cc5966c8d73 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -2375,34 +2375,34 @@ el:
           subway: Υπόγειος Σιδηρόδρομος
           ferry: Πορθμείο
           light_rail: Ελαφρύς σιδηρόδρομος
           subway: Υπόγειος Σιδηρόδρομος
           ferry: Πορθμείο
           light_rail: Ελαφρύς σιδηρόδρομος

-          tram_only: Τραμ
+          tram: Τραμ

           trolleybus: Τρόλεϊ
           bus: Λεωφορείο
           cable_car: Τελεφερίκ
           chair_lift: Αναβατήρας
           trolleybus: Τρόλεϊ
           bus: Λεωφορείο
           cable_car: Τελεφερίκ
           chair_lift: Αναβατήρας

-          runway_only: Διάδρομος Αεροδρομίου
+          runway: Διάδρομος Αεροδρομίου

           taxiway: Τροχόδρομος
           taxiway: Τροχόδρομος

-          apron_only: Πίστα προσγείωσης αεροδρομίου
+          apron: Πίστα προσγείωσης αεροδρομίου

           admin: Διοικητικό όριο
           capital: Πρωτεύουσα
           city: Πόλη
           vineyard: Αμπελώνας
           admin: Διοικητικό όριο
           capital: Πρωτεύουσα
           city: Πόλη
           vineyard: Αμπελώνας

-          forest_only: Δάσος
+          forest: Δάσος

           wood: Φυσικό δάσος
           wood: Φυσικό δάσος

-          grass_only: Γρασίδι
+          grass: Γρασίδι

           meadow: Λιβάδι
           bare_rock: Γυμνός βράχος
           sand: Άμμος
           golf: Γήπεδο γκολφ
           park: Πάρκο
           meadow: Λιβάδι
           bare_rock: Γυμνός βράχος
           sand: Άμμος
           golf: Γήπεδο γκολφ
           park: Πάρκο

-          common_only: Κοινόχρηστο
+          common: Κοινόχρηστο

           built_up: Δομημένη περιοχή
           resident: Κατοικημένη περιοχή
           retail: Περιοχή λιανικού εμπορίου
           industrial: Βιομηχανική περιοχή
           commercial: Εμπορική περιοχή
           heathland: Φρυγανότοπος
           built_up: Δομημένη περιοχή
           resident: Κατοικημένη περιοχή
           retail: Περιοχή λιανικού εμπορίου
           industrial: Βιομηχανική περιοχή
           commercial: Εμπορική περιοχή
           heathland: Φρυγανότοπος

-          lake_only: Λίμνη
+          lake: Λίμνη

           reservoir: Ταμιευτήρας
           glacier: Παγετώνας
           reef: Ύφαλος
           reservoir: Ταμιευτήρας
           glacier: Παγετώνας
           reef: Ύφαλος


@@ -2414,12 +2414,12 @@ el:
           centre: Αθλητικό κέντρο
           reserve: Φυσικό καταφύγιο
           military: Στρατιωτική περιοχή
           centre: Αθλητικό κέντρο
           reserve: Φυσικό καταφύγιο
           military: Στρατιωτική περιοχή

-          school_only: Σχολείο
+          school: Σχολείο

           university: Πανεπιστήμιο
           hospital: Νοσοκομείο
           building: Σημαντικό κτήριο
           station: Σιδηροδρομικός σταθμός
           university: Πανεπιστήμιο
           hospital: Νοσοκομείο
           building: Σημαντικό κτήριο
           station: Σιδηροδρομικός σταθμός

-          summit_only: Κορυφή
+          summit: Κορυφή

           peak: Κορυφή
           tunnel: Διακεκομμένο περίβλημα = σήραγγα
           bridge: Μαύρο περίβλημα = γέφυρα
           peak: Κορυφή
           tunnel: Διακεκομμένο περίβλημα = σήραγγα
           bridge: Μαύρο περίβλημα = γέφυρα

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index e07c9aaab8cb854bfc86c1e523eba033ca4cbed0..5eefc686ff0ae2d0a1158e44a223fa3af50e0f8a 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1597,21 +1597,21 @@ en-GB:
           subway: Subway
           cable_car: Cable car
           chair_lift: chairlift
           subway: Subway
           cable_car: Cable car
           chair_lift: chairlift

-          runway_only: Airport Runway
+          runway: Airport Runway

           taxiway: taxiway
           taxiway: taxiway

-          apron_only: Airport apron
+          apron: Airport apron

           admin: Administrative boundary
           admin: Administrative boundary

-          forest_only: Forest
+          forest: Forest

           wood: Wood
           golf: Golf course
           park: Park
           wood: Wood
           golf: Golf course
           park: Park

-          common_only: Common
+          common: Common

           resident: Residential area
           retail: Retail area
           industrial: Industrial area
           commercial: Commercial area
           heathland: Heathland
           resident: Residential area
           retail: Retail area
           industrial: Industrial area
           commercial: Commercial area
           heathland: Heathland

-          lake_only: Lake
+          lake: Lake

           reservoir: reservoir
           farm: Farm
           brownfield: Brownfield site
           reservoir: reservoir
           farm: Farm
           brownfield: Brownfield site


@@ -1621,11 +1621,11 @@ en-GB:
           centre: Sports centre
           reserve: Nature reserve
           military: Military area
           centre: Sports centre
           reserve: Nature reserve
           military: Military area

-          school_only: School
+          school: School

           university: university
           building: Significant building
           station: Railway station
           university: university
           building: Significant building
           station: Railway station

-          summit_only: Summit
+          summit: Summit

           peak: peak
           tunnel: Dashed casing = tunnel
           bridge: Black casing = bridge
           peak: peak
           tunnel: Dashed casing = tunnel
           bridge: Black casing = bridge

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 8b225aacbee8b7cb2f26ae6ac185f1083370b4e3..7f0c698a3af5554ed9b1775bcc0ab633f06399d0 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1642,6 +1642,7 @@ eo:
       loaded:
         one: estas sukcese enlegita kun %{trace_points} el ebla %{count} punkto.
         other: estas sukcese enlegita kun %{trace_points} el eblaj %{count} punktoj.
       loaded:
         one: estas sukcese enlegita kun %{trace_points} el ebla %{count} punkto.
         other: estas sukcese enlegita kun %{trace_points} el eblaj %{count} punktoj.

+      all_your_traces_html: Ĉiuj viaj sukcese alŝutitaj GPX-spuroj troveblas ĉe %{url}.

       subject: '[OpenStreetMap] GPX-dosiero enportita sukcese'
     signup_confirm:
       subject: '[OpenStreetMap] Bonvenon al OpenStreetMap'
       subject: '[OpenStreetMap] GPX-dosiero enportita sukcese'
     signup_confirm:
       subject: '[OpenStreetMap] Bonvenon al OpenStreetMap'


@@ -2329,29 +2330,29 @@ eo:
           subway: Metroo
           ferry: Pramo
           light_rail: Malpeza vagonaro
           subway: Metroo
           ferry: Pramo
           light_rail: Malpeza vagonaro

-          tram_only: Tramo
+          tram: Tramo

           trolleybus: Trolebuso
           bus: Aŭtobuso
           cable_car: Kablovojo
           chair_lift: Telfero seĝa
           trolleybus: Trolebuso
           bus: Aŭtobuso
           cable_car: Kablovojo
           chair_lift: Telfero seĝa

-          runway_only: Avia dromo
+          runway: Avia dromo

           taxiway: Aŭtokur-strato
           taxiway: Aŭtokur-strato

-          apron_only: Aviadil-parkumejo
+          apron: Aviadil-parkumejo

           admin: Administra limo
           capital: Ĉefurbo
           city: Urbo
           admin: Administra limo
           capital: Ĉefurbo
           city: Urbo

-          orchard_only: Fruktoĝardeno
+          orchard: Fruktoĝardeno

           vineyard: Vinberĝardeno
           vineyard: Vinberĝardeno

-          forest_only: Kultiv-arbaro
+          forest: Kultiv-arbaro

           wood: Arbaro
           farmland: Agrokultura tereno
           wood: Arbaro
           farmland: Agrokultura tereno

-          grass_only: Herbotapiŝo
+          grass: Herbotapiŝo

           meadow: Herbejo
           bare_rock: Roka areo
           sand: Sabla tereno
           golf: Golfejo
           park: Parko
           meadow: Herbejo
           bare_rock: Roka areo
           sand: Sabla tereno
           golf: Golfejo
           park: Parko

-          common_only: Publika ripoza tereno
+          common: Publika ripoza tereno

           built_up: Konstruaĵ-kovrita tereno
           resident: Privatdoma tereno
           retail: Komercejo
           built_up: Konstruaĵ-kovrita tereno
           resident: Privatdoma tereno
           retail: Komercejo


@@ -2359,7 +2360,7 @@ eo:
           commercial: Oficeja tereno
           heathland: Erikejo
           scrubland: Arbustaro
           commercial: Oficeja tereno
           heathland: Erikejo
           scrubland: Arbustaro

-          lake_only: Lago
+          lake: Lago

           reservoir: Lago artefarita
           intermittent_water: Sezona akvujo
           glacier: Glacirivero
           reservoir: Lago artefarita
           intermittent_water: Sezona akvujo
           glacier: Glacirivero


@@ -2373,12 +2374,12 @@ eo:
           centre: Sporta centro
           reserve: Naturrezervejo
           military: Armea tereno
           centre: Sporta centro
           reserve: Naturrezervejo
           military: Armea tereno

-          school_only: Lernejo
+          school: Lernejo

           university: Universitato
           hospital: Malsanulejo
           building: Grava konstruaĵo
           station: Stacidomo
           university: Universitato
           hospital: Malsanulejo
           building: Grava konstruaĵo
           station: Stacidomo

-          summit_only: Montosupro
+          summit: Montosupro

           peak: Montpinto
           tunnel: Strekumita konturo - tunelo
           bridge: Nigra konturo - ponto
           peak: Montpinto
           tunnel: Strekumita konturo - tunelo
           bridge: Nigra konturo - ponto

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 2e513925e1fd47bac84d2d4377f98546a3359b74..95bafbdcb5a643d48ba73b933de6ee74e38d3cc8 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -134,6 +134,12 @@ es:
       messages:
         invalid_email_address: no parece ser una dirección de correo electrónico válida
         email_address_not_routable: no es enrutable
       messages:
         invalid_email_address: no parece ser una dirección de correo electrónico válida
         email_address_not_routable: no es enrutable

+      models:
+        user_mute:
+          attributes:
+            subject:
+              format: '%{message}'
+          is_already_muted: ya esta silenciado

     models:
       acl: Lista de control de acceso
       changeset: Conjunto de cambios
     models:
       acl: Lista de control de acceso
       changeset: Conjunto de cambios


@@ -1893,6 +1899,11 @@ es:
       no_sent_messages_html: Aún no tienes mensajes enviados. ¿Por qué no ponerte
         en contacto con algunas de las %{people_mapping_nearby_link}?
       people_mapping_nearby: personas mapeando cerca
       no_sent_messages_html: Aún no tienes mensajes enviados. ¿Por qué no ponerte
         en contacto con algunas de las %{people_mapping_nearby_link}?
       people_mapping_nearby: personas mapeando cerca

+    muted:
+      title: Mensajes silenciados
+      messages:
+        one: '%{count} mensaje silenciado'
+        other: Tienes %{count} mensajes silenciados

     reply:
       wrong_user: Estás conectado como `%{user}' pero el mensaje que quieres responder
         no se ha enviado a dicho usuario. Por favor, inicia sesión con el usuario
     reply:
       wrong_user: Estás conectado como `%{user}' pero el mensaje que quieres responder
         no se ha enviado a dicho usuario. Por favor, inicia sesión con el usuario


@@ -1911,6 +1922,7 @@ es:
     heading:
       my_inbox: Mi buzón
       my_outbox: Mi buzón de salida
     heading:
       my_inbox: Mi buzón
       my_outbox: Mi buzón de salida

+      muted_messages: Mensajes silenciados

     mark:
       as_read: Mensaje marcado como leído
       as_unread: Mensaje marcado como no leído
     mark:
       as_read: Mensaje marcado como leído
       as_unread: Mensaje marcado como no leído


@@ -1942,6 +1954,8 @@ es:
         URL?
     update:
       flash changed: Tu contraseña ha sido cambiada.
         URL?
     update:
       flash changed: Tu contraseña ha sido cambiada.

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

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


@@ -2432,37 +2446,56 @@ es:
           primary: Vía primaria
           secondary: Vía secundaria
           unclassified: Vía de menos nivel
           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
           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
           footway: Vía peatonal
           rail: Ferrocarril

+          train: Tren

           subway: Metro
           subway: Metro

-          tram_only: Tranvía
+          ferry: Ferry
+          light_rail: Tren Ligero
+          tram: Tranvía
+          trolleybus: Trolebús

           bus: Autobús
           cable_car: Telecabina
           chair_lift: Telesilla
           bus: Autobús
           cable_car: Telecabina
           chair_lift: Telesilla

-          runway_only: Pista de aeropuerto
+          runway: Pista de aeropuerto

           taxiway: Calle de rodaje
           taxiway: Calle de rodaje

-          apron_only: Rampa aeroportuaria
+          apron: Rampa aeroportuaria

           admin: Límite administrativo
           admin: Límite administrativo

-          orchard_only: Huerta
-          forest_only: Bosque
-          wood: Bosque
+          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
           sand: Arena
           golf: Campo de golf
           park: Parque

-          common_only: Común
+          common: Común
+          built_up: Área construida

           resident: Zona residencial
           retail: Zona de comercios
           industrial: Zona industrial
           commercial: Zona comercial
           heathland: Brezal
           resident: Zona residencial
           retail: Zona de comercios
           industrial: Zona industrial
           commercial: Zona comercial
           heathland: Brezal

-          lake_only: Lago
-          reservoir: embalse
+          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
           farm: Granja
           brownfield: Sitio baldío
           cemetery: Cementerio


@@ -2471,12 +2504,13 @@ es:
           centre: Centro deportivo
           reserve: Reserva natural
           military: Área militar
           centre: Centro deportivo
           reserve: Reserva natural
           military: Área militar

-          school_only: Escuela
-          university: universidad
+          school: 'Escuela: universidad'
+          university: Universidad
+          hospital: Hospital

           building: Edificio significativo
           station: Estación de tren
           building: Edificio significativo
           station: Estación de tren

-          summit_only: Cumbre
-          peak: pico
+          summit: Cumbre
+          peak: Pico

           tunnel: Borde a rayas = túnel
           bridge: Borde negro = puente
           private: Acceso privado
           tunnel: Borde a rayas = túnel
           bridge: Borde negro = puente
           private: Acceso privado


@@ -2695,6 +2729,7 @@ es:
       oauth1_settings: Otras configuraciones
       oauth2_applications: Aplicaciones de OAuth 2
       oauth2_authorizations: Autorizaciones de OAuth 2
       oauth1_settings: Otras configuraciones
       oauth2_applications: Aplicaciones de OAuth 2
       oauth2_authorizations: Autorizaciones de OAuth 2

+      muted_users: Usuarios silenciados

   oauth:
     authorize:
       title: Autorizar el acceso a tu cuenta
   oauth:
     authorize:
       title: Autorizar el acceso a tu cuenta


@@ -2821,6 +2856,7 @@ es:
       application: Solicitudes
       permissions: Permisos
       no_applications_html: Aún no has autorizado aplicaciones a %{oauth2}.
       application: Solicitudes
       permissions: Permisos
       no_applications_html: Aún no has autorizado aplicaciones a %{oauth2}.

+      oauth_2: OAuth 2

     application:
       revoke: Revocar el acceso
       confirm_revoke: ¿Revocar el acceso a esta aplicación?
     application:
       revoke: Revocar el acceso
       confirm_revoke: ¿Revocar el acceso a esta aplicación?


@@ -2906,6 +2942,8 @@ es:
       my_dashboard: Mi tablero
       blocks on me: Bloqueos sobre mí
       blocks by me: Bloqueados por mí
       my_dashboard: Mi tablero
       blocks on me: Bloqueos sobre mí
       blocks by me: Bloqueados por mí

+      create_mute: Silenciar a este usuario
+      destroy_mute: Dejar de silenciar a este usuario

       edit_profile: Editar perfil
       send message: Enviar mensaje
       diary: Diario
       edit_profile: Editar perfil
       send message: Enviar mensaje
       diary: Diario


@@ -2937,6 +2975,7 @@ es:
           importer: Revocar el acceso importador
       block_history: Bloqueos activos
       moderator_history: Bloqueos impuestos
           importer: Revocar el acceso importador
       block_history: Bloqueos activos
       moderator_history: Bloqueos impuestos

+      revoke_all_blocks: Revocar todos los bloqueos

       comments: Comentarios
       create_block: Bloquear a este usuario
       activate_user: Activar este usuario
       comments: Comentarios
       create_block: Bloquear a este usuario
       activate_user: Activar este usuario


@@ -3051,6 +3090,16 @@ es:
       confirm: ¿Estás seguro de que deseas revocar este bloqueo?
       revoke: ¡Revocar!
       flash: Este bloqueo ha sido revocado.
       confirm: ¿Estás seguro de que deseas revocar este bloqueo?
       revoke: ¡Revocar!
       flash: Este bloqueo ha sido revocado.

+    revoke_all:
+      title: Revocando todos los bloqueos en %{block_on}
+      heading_html: Revocando todos los bloqueos en %{block_on}
+      empty: '%{name} no tiene bloqueos activos.'
+      confirm: ¿Estás seguro de que deseas revocar %{active_blocks}?
+      active_blocks:
+        one: '%{count} bloqueo activo'
+        other: '%{count} bloqueos activos'
+      revoke: ¡Revocar!
+      flash: Todos los bloqueos activos han sido revocados.

     helper:
       time_future_html: Termina en %{time}.
       until_login: Activo hasta que el usuario acceda.
     helper:
       time_future_html: Termina en %{time}.
       until_login: Activo hasta que el usuario acceda.


@@ -3112,11 +3161,27 @@ es:
       previous: « Anterior
   user_mutes:
     index:
       previous: « Anterior
   user_mutes:
     index:

+      title: Usuarios silenciados
+      my_muted_users: Mis usuarios silenciados
+      you_have_muted_n_users:
+        one: Has silenciado %{count} usuario
+        other: Has silenciado %{count} usuarios
+      user_mute_explainer: Los mensajes de los usuarios silenciados se trasladan a
+        una bandeja de entrada separada y no recibirás notificaciones por correo electrónico.
+      user_mute_admins_and_moderators: Puedes silenciar a los administradores y moderadores
+        pero sus mensajes no serán silenciados.

       table:
         thead:
       table:
         thead:

+          muted_user: Usuario silenciado

           actions: Acciones
         tbody:
           actions: Acciones
         tbody:

+          unmute: Dejar de silenciar

           send_message: Enviar mensaje
           send_message: Enviar mensaje

+    create:
+      notice: Has silenciado a %{name}.
+      error: '%{name} no pudo ser silenciado. %{full_message}.'
+    destroy:
+      notice: Has dejado de silenciar a %{name}.

   notes:
     index:
       title: Notas creadas o comentadas por %{user}
   notes:
     index:
       title: Notas creadas o comentadas por %{user}


@@ -3153,6 +3218,7 @@ es:
       reactivate: Reactivar
       comment_and_resolve: Comentar y resolver
       comment: Comentar
       reactivate: Reactivar
       comment_and_resolve: Comentar y resolver
       comment: Comentar

+      log_in_to_comment: Inicia sesión para comentar esta nota

       report_link_html: Si esta nota contiene información sensible que debe eliminarse,
         puedes %{link}.
       other_problems_resolve: Para todos los demás problemas con la nota, resuélvelo
       report_link_html: Si esta nota contiene información sensible que debe eliminarse,
         puedes %{link}.
       other_problems_resolve: Para todos los demás problemas con la nota, resuélvelo

diff --git a/config/locales/et.yml b/config/locales/et.yml
index 9e5d19d7cf16d802df315d35d0796ccf3afd2122..73ead41cce04f4311ab31c4aefdb15726a003e16 100644 (file)
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1820,21 +1820,21 @@ et:
           subway: Metroo
           cable_car: Köisraudtee
           chair_lift: Toolilift
           subway: Metroo
           cable_car: Köisraudtee
           chair_lift: Toolilift

-          runway_only: Lennurada
+          runway: Lennurada

           taxiway: Ruleerimistee
           taxiway: Ruleerimistee

-          apron_only: Lennujaama perroon
+          apron: Lennujaama perroon

           admin: Halduspiir
           admin: Halduspiir

-          forest_only: Tulundusmets
+          forest: Tulundusmets

           wood: Mets
           golf: Golfiväljak
           park: Park
           wood: Mets
           golf: Golfiväljak
           park: Park

-          common_only: Heinamaa
+          common: Heinamaa

           resident: Elamurajoon
           retail: Kaubanduspiirkond
           industrial: Tööstuspiirkond
           commercial: Äripiirkond
           heathland: Nõmm
           resident: Elamurajoon
           retail: Kaubanduspiirkond
           industrial: Tööstuspiirkond
           commercial: Äripiirkond
           heathland: Nõmm

-          lake_only: Järv
+          lake: Järv

           reservoir: Veehoidla
           farm: Põllumajanduslik maa
           brownfield: Ehitusmaa
           reservoir: Veehoidla
           farm: Põllumajanduslik maa
           brownfield: Ehitusmaa


@@ -1844,11 +1844,11 @@ et:
           centre: Spordikeskus
           reserve: Looduskaitseala
           military: Sõjaväe kasutuses
           centre: Spordikeskus
           reserve: Looduskaitseala
           military: Sõjaväe kasutuses

-          school_only: Kool
+          school: Kool

           university: Ülikool
           building: Märkimisväärne hoone
           station: Raudteejaam
           university: Ülikool
           building: Märkimisväärne hoone
           station: Raudteejaam

-          summit_only: Mägi
+          summit: Mägi

           peak: Tipp
           tunnel: Katkendlik ümbris = tunnel
           bridge: Must ümbris = sild
           peak: Tipp
           tunnel: Katkendlik ümbris = tunnel
           bridge: Must ümbris = sild

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 2478397db8b8cf0e7d02b728d6949147312e26ac..d1eb73e47d469bafca073aa051354b309593c8c4 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -2208,21 +2208,21 @@ eu:
           subway: Metroa
           cable_car: Funikularra
           chair_lift: teleaulkia
           subway: Metroa
           cable_car: Funikularra
           chair_lift: teleaulkia

-          runway_only: Aireportuko Pista
+          runway: Aireportuko Pista

           taxiway: taxi bidea
           taxiway: taxi bidea

-          apron_only: Aireportu plataforma
+          apron: Aireportu plataforma

           admin: Muga administratiboa
           admin: Muga administratiboa

-          forest_only: Baso
+          forest: Baso

           wood: Basoa
           golf: Golf-zelai
           park: Parke
           wood: Basoa
           golf: Golf-zelai
           park: Parke

-          common_only: Arrunta
+          common: Arrunta

           resident: Etxebizitza ingurua
           retail: Txikizkako azalera
           industrial: Industrialdea
           commercial: Merkataritza eremua
           heathland: Txilardia
           resident: Etxebizitza ingurua
           retail: Txikizkako azalera
           industrial: Industrialdea
           commercial: Merkataritza eremua
           heathland: Txilardia

-          lake_only: Aintzira
+          lake: Aintzira

           reservoir: urtegia
           farm: Baserria
           brownfield: Landarik gabeko gunea
           reservoir: urtegia
           farm: Baserria
           brownfield: Landarik gabeko gunea


@@ -2232,11 +2232,11 @@ eu:
           centre: Kiroldegi
           reserve: Natura-erreserba
           military: Eremu militarra
           centre: Kiroldegi
           reserve: Natura-erreserba
           military: Eremu militarra

-          school_only: Eskola
+          school: Eskola

           university: unibertsitate
           building: Eraikin garrantzitsua
           station: Tren geltokia
           university: unibertsitate
           building: Eraikin garrantzitsua
           station: Tren geltokia

-          summit_only: Tontorra
+          summit: Tontorra

           peak: gailurra
           tunnel: Marratxodun estalkia = tunela
           bridge: Estalki beltza = zubia
           peak: gailurra
           tunnel: Marratxodun estalkia = tunela
           bridge: Estalki beltza = zubia

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 2f3237fe2e057742fc2580106268a2edc978bca6..94925f9afc458c65e35a6d9b4d9255b1f047c115 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -2099,21 +2099,21 @@ fa:
           subway: مترو
           cable_car: تله‌فریک
           chair_lift: صندلی بالابر
           subway: مترو
           cable_car: تله‌فریک
           chair_lift: صندلی بالابر

-          runway_only: باند فرودگاه
+          runway: باند فرودگاه

           taxiway: خزش‌راه
           taxiway: خزش‌راه

-          apron_only: پیشگاه فرودگاه
+          apron: پیشگاه فرودگاه

           admin: مرز اداری
           admin: مرز اداری

-          forest_only: جنگل
+          forest: جنگل

           wood: چوب
           golf: زمین گلف
           park: پارک
           wood: چوب
           golf: زمین گلف
           park: پارک

-          common_only: مشاع
+          common: مشاع

           resident: منطقهٔ مسکونی
           retail: منطقه خرده فروشی
           industrial: منطقه صنعتی
           commercial: منطقه تجاری
           heathland: Heathland
           resident: منطقهٔ مسکونی
           retail: منطقه خرده فروشی
           industrial: منطقه صنعتی
           commercial: منطقه تجاری
           heathland: Heathland

-          lake_only: دریاچه
+          lake: دریاچه

           reservoir: مخزن
           farm: مزرعه
           brownfield: سایت قهوه‌ای
           reservoir: مخزن
           farm: مزرعه
           brownfield: سایت قهوه‌ای


@@ -2123,11 +2123,11 @@ fa:
           centre: مرکز ورزشی
           reserve: طبیعت حفاظت شده
           military: منطقه نظامی
           centre: مرکز ورزشی
           reserve: طبیعت حفاظت شده
           military: منطقه نظامی

-          school_only: مدرسه
+          school: مدرسه

           university: دانشگاه
           building: ساختمان مهم
           station: ایستگاه راه آهن
           university: دانشگاه
           building: ساختمان مهم
           station: ایستگاه راه آهن

-          summit_only: چکاد
+          summit: چکاد

           peak: قله
           tunnel: لبهٔ خط‌چین‌دار = تونل
           bridge: لبهٔ سیاه = پل
           peak: قله
           tunnel: لبهٔ خط‌چین‌دار = تونل
           bridge: لبهٔ سیاه = پل

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 50758b38f34a7ed16ca306bc1045923f85fed951..06a0b697c3a8e0c1c66e72805e6087d808d587f3 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -2207,21 +2207,21 @@ fi:
           subway: Metro
           cable_car: Köysirata
           chair_lift: tuolihissi
           subway: Metro
           cable_car: Köysirata
           chair_lift: tuolihissi

-          runway_only: Lentokentän kiitotie
+          runway: Lentokentän kiitotie

           taxiway: rullaustie
           taxiway: rullaustie

-          apron_only: Lentokentän asemataso
+          apron: Lentokentän asemataso

           admin: Hallinnollinen raja
           admin: Hallinnollinen raja

-          forest_only: Talousmetsä
+          forest: Talousmetsä

           wood: Metsä
           golf: Golfkenttä
           park: Puisto
           wood: Metsä
           golf: Golfkenttä
           park: Puisto

-          common_only: Niitty
+          common: Niitty

           resident: Asuinalue
           retail: Kaupallinen alue
           industrial: Teollisuusalue
           commercial: Toimistoalue
           heathland: Kanervikko
           resident: Asuinalue
           retail: Kaupallinen alue
           industrial: Teollisuusalue
           commercial: Toimistoalue
           heathland: Kanervikko

-          lake_only: Järvi
+          lake: Järvi

           reservoir: tekojärvi
           farm: Maatila
           brownfield: Purettujen rakennusten alue
           reservoir: tekojärvi
           farm: Maatila
           brownfield: Purettujen rakennusten alue


@@ -2231,11 +2231,11 @@ fi:
           centre: Urheilukeskus
           reserve: Luonnonsuojelualue
           military: Sotilasalue
           centre: Urheilukeskus
           reserve: Luonnonsuojelualue
           military: Sotilasalue

-          school_only: Koulu
+          school: Koulu

           university: yliopisto
           building: Merkittävä rakennus
           station: Rautatieasema
           university: yliopisto
           building: Merkittävä rakennus
           station: Rautatieasema

-          summit_only: Vuorenhuippu
+          summit: Vuorenhuippu

           peak: huippu
           tunnel: Katkoviivallinen kehys = tunneli
           bridge: Musta kehys = silta
           peak: huippu
           tunnel: Katkoviivallinen kehys = tunneli
           bridge: Musta kehys = silta

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 41710fb1c3beca0cdda6d316e70d515a46ea21ae..44ceda85ac7d4e4eed048754cd745f1aa5a7ed1d 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -44,6 +44,7 @@
 # Author: JB
 # Author: Jean-Frédéric
 # Author: JenyxGym
 # Author: JB
 # Author: Jean-Frédéric
 # Author: JenyxGym

+# Author: Jg45

 # Author: Jiremek
 # Author: Jlrb+
 # Author: Koreller
 # Author: Jiremek
 # Author: Jlrb+
 # Author: Koreller


@@ -791,7 +792,7 @@ fr:
           drag_lift: Téléski
           gondola: Télécabine
           magic_carpet: Tapis roulant élévateur
           drag_lift: Téléski
           gondola: Télécabine
           magic_carpet: Tapis roulant élévateur

-          platter: Monte-plat
+          platter: Téléski à plateau

           pylon: Pylône
           station: Gare de télécabine
           t-bar: Monte-barre en T
           pylon: Pylône
           station: Gare de télécabine
           t-bar: Monte-barre en T


@@ -2501,29 +2502,29 @@ fr:
           subway: Ligne de métro
           ferry: Ferry
           light_rail: Voie ferrée légère
           subway: Ligne de métro
           ferry: Ferry
           light_rail: Voie ferrée légère

-          tram_only: Tramway
+          tram: Tramway

           trolleybus: Trolleybus
           bus: Bus
           cable_car: Téléphérique
           chair_lift: Télésiège
           trolleybus: Trolleybus
           bus: Bus
           cable_car: Téléphérique
           chair_lift: Télésiège

-          runway_only: Piste d’aéroport
+          runway: Piste d’aéroport

           taxiway: Piste de circulation d'un aéroport
           taxiway: Piste de circulation d'un aéroport

-          apron_only: Stationnement d’avions
+          apron: Stationnement d’avions

           admin: Limite administrative
           capital: Capitale
           city: Ville
           admin: Limite administrative
           capital: Capitale
           city: Ville

-          orchard_only: Verger
+          orchard: Verger

           vineyard: Vignoble
           vineyard: Vignoble

-          forest_only: Forêt
+          forest: Forêt

           wood: Bois
           farmland: Terres agricoles
           wood: Bois
           farmland: Terres agricoles

-          grass_only: Pelouse
+          grass: Pelouse

           meadow: Prairie
           bare_rock: Roche nue
           sand: Sable
           golf: Parcours de golf
           park: Parc
           meadow: Prairie
           bare_rock: Roche nue
           sand: Sable
           golf: Parcours de golf
           park: Parc

-          common_only: Espace commun
+          common: Espace commun

           built_up: Zone bâtie
           resident: Zone résidentielle
           retail: Zone de commerce
           built_up: Zone bâtie
           resident: Zone résidentielle
           retail: Zone de commerce


@@ -2531,7 +2532,7 @@ fr:
           commercial: Zone tertiaire
           heathland: Lande
           scrubland: Fruticée
           commercial: Zone tertiaire
           heathland: Lande
           scrubland: Fruticée

-          lake_only: Lac
+          lake: Lac

           reservoir: Réservoir
           intermittent_water: plan d’eau intermittent
           glacier: Glacier
           reservoir: Réservoir
           intermittent_water: plan d’eau intermittent
           glacier: Glacier


@@ -2545,12 +2546,12 @@ fr:
           centre: Centre sportif
           reserve: Réserve naturelle
           military: Zone militaire
           centre: Centre sportif
           reserve: Réserve naturelle
           military: Zone militaire

-          school_only: École
+          school: École

           university: Université
           hospital: Hôpital
           building: Bâtiment important
           station: Gare ferroviaire
           university: Université
           hospital: Hôpital
           building: Bâtiment important
           station: Gare ferroviaire

-          summit_only: Sommet
+          summit: Sommet

           peak: Pic
           tunnel: Bordure pointillée = tunnel
           bridge: Bord noir = pont
           peak: Pic
           tunnel: Bordure pointillée = tunnel
           bridge: Bord noir = pont

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 64ffc6160e9c888775c0021ebf0ff2a4661402b5..aee698bdb7c6664c3e1a693d1008d6d0c92fe795 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -1343,27 +1343,27 @@ fur:
           rail: Ferade
           subway: Metropolitane
           ferry: Traghet
           rail: Ferade
           subway: Metropolitane
           ferry: Traghet

-          tram_only: Tram
-          runway_only: Piste dal aeropuart
+          tram: Tram
+          runway: Piste dal aeropuart

           admin: Confin aministratîf
           admin: Confin aministratîf

-          forest_only: Bosc
-          grass_only: Prât
+          forest: Bosc
+          grass: Prât

           meadow: Prâts
           sand: Savalon
           golf: Troi di golf
           park: Parc
           meadow: Prâts
           sand: Savalon
           golf: Troi di golf
           park: Parc

-          common_only: Comugnâi
+          common: Comugnâi

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

-          lake_only: Lâc
+          lake: Lâc

           cemetery: Simiteri
           pitch: Cjamp sportîf
           centre: Centri sportîf
           reserve: Riserve naturâl
           military: Zone militâr
           cemetery: Simiteri
           pitch: Cjamp sportîf
           centre: Centri sportîf
           reserve: Riserve naturâl
           military: Zone militâr

-          school_only: Scuele
+          school: Scuele

           university: Universitât
           hospital: Ospedâl
           station: stazion de ferade
           university: Universitât
           hospital: Ospedâl
           station: stazion de ferade

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index eace115b6f1496468fb89fb152034f3725ee6ab8..e0339c5caa27420c26ec914d651b04b8352e7093 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -2036,21 +2036,21 @@ fy:
           subway: Metrospoar
           cable_car: Kabelbaan
           chair_lift: stuoltsjelift
           subway: Metrospoar
           cable_car: Kabelbaan
           chair_lift: stuoltsjelift

-          runway_only: Start-/lânings-
+          runway: Start-/lânings-

           taxiway: taksybaan lofthaven
           taxiway: taksybaan lofthaven

-          apron_only: Platfoarm
+          apron: Platfoarm

           admin: Bestjoerlike grins
           admin: Bestjoerlike grins

-          forest_only: Bosk
+          forest: Bosk

           wood: Wâld
           golf: Golfbaan
           park: Park
           wood: Wâld
           golf: Golfbaan
           park: Park

-          common_only: Miente
+          common: Miente

           resident: Wengebiet
           retail: Winkelgebiet
           industrial: Yndustrygebiet
           commercial: Kommersjeel gebiet
           heathland: Heidelân
           resident: Wengebiet
           retail: Winkelgebiet
           industrial: Yndustrygebiet
           commercial: Kommersjeel gebiet
           heathland: Heidelân

-          lake_only: Mar
+          lake: Mar

           reservoir: opslachmar
           farm: Boerepleats
           brownfield: Braaklân
           reservoir: opslachmar
           farm: Boerepleats
           brownfield: Braaklân


@@ -2060,11 +2060,11 @@ fy:
           centre: Sportsintrum
           reserve: Natuerreservaat
           military: Militêr terrein
           centre: Sportsintrum
           reserve: Natuerreservaat
           military: Militêr terrein

-          school_only: Skoalle
+          school: Skoalle

           university: universiteit
           building: Wichtich gebou
           station: Spoarweistasjon
           university: universiteit
           building: Wichtich gebou
           station: Spoarweistasjon

-          summit_only: Top
+          summit: Top

           peak: pyk
           tunnel: Streekte râne = tunnel
           bridge: Swarte râne = brêge
           peak: pyk
           tunnel: Streekte râne = tunnel
           bridge: Swarte râne = brêge

diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index a44fd258156204c1c2edf5070241417257024f76..0b7c35521121e68e500a75189392a8acd6662c39 100644 (file)
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -1545,21 +1545,21 @@ ga:
           subway: Meitreo
           cable_car: Carr cábla
           chair_lift: cathaoir chábla
           subway: Meitreo
           cable_car: Carr cábla
           chair_lift: cathaoir chábla

-          runway_only: Rúidbhealach Aerfoirt
+          runway: Rúidbhealach Aerfoirt

           taxiway: bealach innealta
           taxiway: bealach innealta

-          apron_only: Naprún Aerfoirt
+          apron: Naprún Aerfoirt

           admin: Teorainn riaracháin
           admin: Teorainn riaracháin

-          forest_only: Foraois
+          forest: Foraois

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

-          common_only: Coimín
+          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á
           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_only: Loch
+          lake: Loch

           reservoir: taiscumar
           farm: Feirm
           brownfield: Láithreán athfhorbraíochta
           reservoir: taiscumar
           farm: Feirm
           brownfield: Láithreán athfhorbraíochta


@@ -1569,11 +1569,11 @@ ga:
           centre: Ionad spóirt
           reserve: Tearmann dúlra
           military: Limistéar míleata
           centre: Ionad spóirt
           reserve: Tearmann dúlra
           military: Limistéar míleata

-          school_only: Scoil
+          school: Scoil

           university: ollscoil
           building: Foirgneamh suntasach
           station: Stáisiún Iarnróid
           university: ollscoil
           building: Foirgneamh suntasach
           station: Stáisiún Iarnróid

-          summit_only: Mullach
+          summit: Mullach

           peak: binn
           tunnel: Líne bhriste = tollán
           bridge: Líne dhubh = droichead
           peak: binn
           tunnel: Líne bhriste = tollán
           bridge: Líne dhubh = droichead

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index 170daed121d871b45758f4700234bc6d9ceaf83b..7f9eb131c22f77319df7594799b8a787b136ba01 100644 (file)
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -489,10 +489,10 @@ gcf:
       table:
         entry:
           train: Tren
       table:
         entry:
           train: Tren

-          forest_only: Granbwa
-          grass_only: Zèb
+          forest: Granbwa
+          grass: Zèb

           cemetery: Simityè
           cemetery: Simityè

-          school_only: Lékòl
+          school: Lékòl

           hospital: Lopital
     welcome:
       rules:
           hospital: Lopital
     welcome:
       rules:

diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 92ea3630d6b64b79973952df5ca34cfc73ada6cf..99a76fa5c4479fa7eb31df02e81ff3a563f90a4c 100644 (file)
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1400,21 +1400,21 @@ gd:
           subway: Meatro
           cable_car: Carbad-càbaill
           chair_lift: Lioft-sèitheir
           subway: Meatro
           cable_car: Carbad-càbaill
           chair_lift: Lioft-sèitheir

-          runway_only: Raon-laighe puirt-adhair
+          runway: Raon-laighe puirt-adhair

           taxiway: Raon-cuairteachaidh
           taxiway: Raon-cuairteachaidh

-          apron_only: Aparan puirt-adhair
+          apron: Aparan puirt-adhair

           admin: Crìoch rianachd
           admin: Crìoch rianachd

-          forest_only: Coille
+          forest: Coille

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

-          common_only: Coitcheann
+          common: Coitcheann

           resident: Raon-còmhnaidh
           retail: Raon bhuitean
           industrial: Raon gnìomhachais
           commercial: Raon malairt
           heathland: Aonach
           resident: Raon-còmhnaidh
           retail: Raon bhuitean
           industrial: Raon gnìomhachais
           commercial: Raon malairt
           heathland: Aonach

-          lake_only: Loch
+          lake: Loch

           reservoir: Loch-tasgaidh
           farm: Tuathanas
           brownfield: Fearann fàs
           reservoir: Loch-tasgaidh
           farm: Tuathanas
           brownfield: Fearann fàs


@@ -1424,11 +1424,11 @@ gd:
           centre: Ionad-spòrs
           reserve: Tèarmann nàdair
           military: Raon an airm
           centre: Ionad-spòrs
           reserve: Tèarmann nàdair
           military: Raon an airm

-          school_only: Sgoil
+          school: Sgoil

           university: Oilthigh
           building: Togalach cudromach
           station: Stèisean-rèile
           university: Oilthigh
           building: Togalach cudromach
           station: Stèisean-rèile

-          summit_only: Mullach
+          summit: Mullach

           peak: Sgurr
           tunnel: Oir-strìochagan = tunail
           bridge: Oir-loidhnichean = drochaid
           peak: Sgurr
           tunnel: Oir-strìochagan = tunail
           bridge: Oir-loidhnichean = drochaid

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 037781be8cb8fb7896df9433a8ef1201d4f17520..06341c1b57236bd2dc2a20f55f2236389dcb34cb 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -2385,29 +2385,29 @@ gl:
           subway: Metro
           ferry: Transbordador
           light_rail: Metro lixeiro
           subway: Metro
           ferry: Transbordador
           light_rail: Metro lixeiro

-          tram_only: Tranvía
+          tram: Tranvía

           trolleybus: Trolebús
           bus: Autobús
           cable_car: Teleférico
           chair_lift: Telecadeira
           trolleybus: Trolebús
           bus: Autobús
           cable_car: Teleférico
           chair_lift: Telecadeira

-          runway_only: Pista do aeroporto
+          runway: Pista do aeroporto

           taxiway: Vía de circulación do aeroporto
           taxiway: Vía de circulación do aeroporto

-          apron_only: Plataforma do aeroporto
+          apron: Plataforma do aeroporto

           admin: Límite administrativo
           capital: Capital
           city: Cidade
           admin: Límite administrativo
           capital: Capital
           city: Cidade

-          orchard_only: Horta
+          orchard: Horta

           vineyard: Viñedo
           vineyard: Viñedo

-          forest_only: Bosque
+          forest: Bosque

           wood: Bosque
           farmland: Terra de labranza
           wood: Bosque
           farmland: Terra de labranza

-          grass_only: Herba
+          grass: Herba

           meadow: Pradaría
           bare_rock: Rocha núa
           sand: Area
           golf: Campo de golf
           park: Parque
           meadow: Pradaría
           bare_rock: Rocha núa
           sand: Area
           golf: Campo de golf
           park: Parque

-          common_only: Espazo común
+          common: Espazo común

           built_up: Zona edificada
           resident: Zona residencial
           retail: Zona comercial
           built_up: Zona edificada
           resident: Zona residencial
           retail: Zona comercial


@@ -2415,7 +2415,7 @@ gl:
           commercial: Zona de oficinas
           heathland: Breixeira
           scrubland: Matogueira
           commercial: Zona de oficinas
           heathland: Breixeira
           scrubland: Matogueira

-          lake_only: Lagoa
+          lake: Lagoa

           reservoir: Encoro
           intermittent_water: Masa de auga intermitente
           glacier: Glaciar
           reservoir: Encoro
           intermittent_water: Masa de auga intermitente
           glacier: Glaciar


@@ -2429,12 +2429,12 @@ gl:
           centre: Centro deportivo
           reserve: Reserva natural
           military: Zona militar
           centre: Centro deportivo
           reserve: Reserva natural
           military: Zona militar

-          school_only: Escola
+          school: Escola

           university: Universidade
           hospital: Hospital
           building: Edificio significativo
           station: Estación de ferrocarrís
           university: Universidade
           hospital: Hospital
           building: Edificio significativo
           station: Estación de ferrocarrís

-          summit_only: Cumio
+          summit: Cumio

           peak: Cume
           tunnel: Bordo a raias = túnel
           bridge: Bordo negro = ponte
           peak: Cume
           tunnel: Bordo a raias = túnel
           bridge: Bordo negro = ponte

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 123fcc6666db8ebb62de2af975b332486852adff..0806b4254e56b9be1d7a5ebcf27f8bff1bc2d3bd 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -2375,29 +2375,29 @@ he:
           subway: רכבת תחתית
           ferry: מעבורת
           light_rail: רכבת קלה
           subway: רכבת תחתית
           ferry: מעבורת
           light_rail: רכבת קלה

-          tram_only: חשמלית
+          tram: חשמלית

           trolleybus: טרוליבוס
           bus: אוטובוס
           cable_car: רכבל
           chair_lift: רכבל מושבים
           trolleybus: טרוליבוס
           bus: אוטובוס
           cable_car: רכבל
           chair_lift: רכבל מושבים

-          runway_only: מסלול נחיתה
+          runway: מסלול נחיתה

           taxiway: מסלול הסעה
           taxiway: מסלול הסעה

-          apron_only: רחבת חניה למטוסים
+          apron: רחבת חניה למטוסים

           admin: גבול שטח שיפוט
           capital: בירה
           city: עיר
           admin: גבול שטח שיפוט
           capital: בירה
           city: עיר

-          orchard_only: מטע
+          orchard: מטע

           vineyard: כרם
           vineyard: כרם

-          forest_only: יער
+          forest: יער

           wood: חורשה
           farmland: שטח חקלאי
           wood: חורשה
           farmland: שטח חקלאי

-          grass_only: דשא
+          grass: דשא

           meadow: אחו
           bare_rock: סלע חשוף
           sand: חול
           golf: מסלול גולף
           park: פארק
           meadow: אחו
           bare_rock: סלע חשוף
           sand: חול
           golf: מסלול גולף
           park: פארק

-          common_only: מרעה
+          common: מרעה

           built_up: שטח בנוי
           resident: אזור מגורים
           retail: אזור קמעונאי
           built_up: שטח בנוי
           resident: אזור מגורים
           retail: אזור קמעונאי


@@ -2405,7 +2405,7 @@ he:
           commercial: אזור מסחרי
           heathland: שדה פרא
           scrubland: בתה
           commercial: אזור מסחרי
           heathland: שדה פרא
           scrubland: בתה

-          lake_only: אגם
+          lake: אגם

           reservoir: מאגר
           intermittent_water: גוף מים תקופתי
           glacier: קרחון יבשתי
           reservoir: מאגר
           intermittent_water: גוף מים תקופתי
           glacier: קרחון יבשתי


@@ -2419,12 +2419,12 @@ he:
           centre: מרכז ספורט
           reserve: שמורת טבע
           military: שטח צבאי
           centre: מרכז ספורט
           reserve: שמורת טבע
           military: שטח צבאי

-          school_only: בית ספר
+          school: בית ספר

           university: אוניברסיטה
           hospital: בית חולים
           building: בניין בעל חשיבות
           station: תחנת רכבת
           university: אוניברסיטה
           hospital: בית חולים
           building: בניין בעל חשיבות
           station: תחנת רכבת

-          summit_only: פסגה
+          summit: פסגה

           peak: פסגה
           tunnel: קו מקווקו = מנהרה
           bridge: קו שחור = גשר
           peak: פסגה
           tunnel: קו מקווקו = מנהרה
           bridge: קו שחור = גשר

diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index f4b73c42cb86397e18d0d6be0715ce78baa4c4bc..923e60ef0e33e2f5e0d6432a5459bf32edf9d4a6 100644 (file)
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -985,20 +985,20 @@ hi:
           subway: उपमार्ग
           bus: बस
           cable_car: केबल कार
           subway: उपमार्ग
           bus: बस
           cable_car: केबल कार

-          runway_only: एयरपोर्ट रनवे
-          forest_only: वन
+          runway: एयरपोर्ट रनवे
+          forest: वन

           wood: लकड़ी
           wood: लकड़ी

-          grass_only: घास
+          grass: घास

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

-          lake_only: झील
+          lake: झील

           farm: खेत
           cemetery: कब्रिस्तान
           allotments: आवंटन
           farm: खेत
           cemetery: कब्रिस्तान
           allotments: आवंटन

-          school_only: पाठशाला
+          school: पाठशाला

           university: विश्वविद्यालय
           hospital: अस्पताल
           building: महत्वपूर्ण भवन
           university: विश्वविद्यालय
           hospital: अस्पताल
           building: महत्वपूर्ण भवन

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index a79599127bc59cfd4fa3c85c72d6b048a0b7d7c2..1547a548ff0e71f8fd2e8bb6355b34610cff659c 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1427,21 +1427,21 @@ hr:
           subway: Podzemna željeznica
           cable_car: Kabinska žičara
           chair_lift: sedežnica
           subway: Podzemna željeznica
           cable_car: Kabinska žičara
           chair_lift: sedežnica

-          runway_only: Aerodromska pista
+          runway: Aerodromska pista

           taxiway: aerodromske ceste (za avione)
           taxiway: aerodromske ceste (za avione)

-          apron_only: Parking za avione (apron)
+          apron: Parking za avione (apron)

           admin: Administrativna granica
           admin: Administrativna granica

-          forest_only: Šuma (održavane, od šumarije)
+          forest: Šuma (održavane, od šumarije)

           wood: Šume (prirodne, neodržavane)
           golf: Golf teren
           park: Park
           wood: Šume (prirodne, neodržavane)
           golf: Golf teren
           park: Park

-          common_only: Travnjaci
+          common: Travnjaci

           resident: Stambeno područje
           retail: Maloprodajno područje
           industrial: Industrijsko područje
           commercial: Poslovno područje
           heathland: Gustiš, makija, grmlje
           resident: Stambeno područje
           retail: Maloprodajno područje
           industrial: Industrijsko područje
           commercial: Poslovno područje
           heathland: Gustiš, makija, grmlje

-          lake_only: Jezero
+          lake: Jezero

           reservoir: rezervoar
           farm: Polja, farme, njive
           brownfield: Gradilište
           reservoir: rezervoar
           farm: Polja, farme, njive
           brownfield: Gradilište


@@ -1451,11 +1451,11 @@ hr:
           centre: Sportski  centar
           reserve: Rezervat prirode
           military: Vojno područje
           centre: Sportski  centar
           reserve: Rezervat prirode
           military: Vojno područje

-          school_only: Škola
+          school: Škola

           university: Sveučilište
           building: Zgrada
           station: Željeznički kolodvor
           university: Sveučilište
           building: Zgrada
           station: Željeznički kolodvor

-          summit_only: Vrh
+          summit: Vrh

           peak: vrhunac
           tunnel: Iscrtkani rubovi = tunel
           bridge: Crni rubovi = most
           peak: vrhunac
           tunnel: Iscrtkani rubovi = tunel
           bridge: Crni rubovi = most

diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index a275375e0b09d281de4c93055c4b0e2105ca761f..62ebac442c97aa53f7b7fc3aa0c9d0d0a0007072 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -2009,21 +2009,21 @@ hsb:
           subway: Podzemska železnica
           cable_car: Kablowa nadróžna
           chair_lift: sydłowy lift
           subway: Podzemska železnica
           cable_car: Kablowa nadróžna
           chair_lift: sydłowy lift

-          runway_only: Přizemišćo
+          runway: Přizemišćo

           taxiway: lětadłowa jězdnja
           taxiway: lětadłowa jězdnja

-          apron_only: Lětanišćowe předpolo
+          apron: Lětanišćowe předpolo

           admin: Zarjadniska hranica
           admin: Zarjadniska hranica

-          forest_only: Hajina
+          forest: Hajina

           wood: Lěs
           golf: Golfownišćo
           park: Park
           wood: Lěs
           golf: Golfownišćo
           park: Park

-          common_only: Powšitkowny
+          common: Powšitkowny

           resident: Bydlenski wobwod
           retail: Nakupowanišćo
           industrial: Industrijowa kónčina
           commercial: Přemysłowa kónčina
           heathland: Hola
           resident: Bydlenski wobwod
           retail: Nakupowanišćo
           industrial: Industrijowa kónčina
           commercial: Přemysłowa kónčina
           heathland: Hola

-          lake_only: Jězor
+          lake: Jězor

           reservoir: spjaty jězor
           farm: Farma
           brownfield: Industrijowe lado
           reservoir: spjaty jězor
           farm: Farma
           brownfield: Industrijowe lado


@@ -2033,11 +2033,11 @@ hsb:
           centre: Sportowy centrum
           reserve: Přirodoškitne pasmo
           military: Wojerske pasmo
           centre: Sportowy centrum
           reserve: Přirodoškitne pasmo
           military: Wojerske pasmo

-          school_only: Šula
+          school: Šula

           university: uniwersita
           building: Wuznamne twarjenje
           station: Dwórnišćo
           university: uniwersita
           building: Wuznamne twarjenje
           station: Dwórnišćo

-          summit_only: Wjeršk
+          summit: Wjeršk

           peak: kónčk hory
           tunnel: Smužkowana kroma = tunl
           bridge: Čorna kroma = móst
           peak: kónčk hory
           tunnel: Smužkowana kroma = tunl
           bridge: Čorna kroma = móst

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 58b7f973a34ffc21addc52c37ba215da26ff5ce2..a22dfbd51787a42293a9554e616b80f21d4a12dc 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -2259,34 +2259,34 @@ hu:
           subway: Metró
           ferry: Komp
           light_rail: HÉV
           subway: Metró
           ferry: Komp
           light_rail: HÉV

-          tram_only: Villamos
+          tram: Villamos

           trolleybus: Trolibusz
           bus: Busz
           cable_car: Nagykabinos felvonó
           chair_lift: Ülőlift
           trolleybus: Trolibusz
           bus: Busz
           cable_car: Nagykabinos felvonó
           chair_lift: Ülőlift

-          runway_only: Kifutópálya
+          runway: Kifutópálya

           taxiway: Gurulóút
           taxiway: Gurulóút

-          apron_only: Forgalmi előtér
+          apron: Forgalmi előtér

           admin: Közigazgatási határ
           admin: Közigazgatási határ

-          orchard_only: Gyümölcsös
+          orchard: Gyümölcsös

           vineyard: Szőlő
           vineyard: Szőlő

-          forest_only: Erdő
+          forest: Erdő

           wood: Természetes erdő
           farmland: Mezőgazdasági terület
           wood: Természetes erdő
           farmland: Mezőgazdasági terület

-          grass_only: Fű
+          grass: Fű

           meadow: Rét
           bare_rock: Csupasz szikla
           sand: Homok
           golf: Golfpálya
           park: Park
           meadow: Rét
           bare_rock: Csupasz szikla
           sand: Homok
           golf: Golfpálya
           park: Park

-          common_only: Füves terület
+          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
           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

-          lake_only: Tó
+          lake: Tó

           reservoir: Víztározó
           intermittent_water: Időszakos víztest
           glacier: Gleccser
           reservoir: Víztározó
           intermittent_water: Időszakos víztest
           glacier: Gleccser


@@ -2300,12 +2300,12 @@ hu:
           centre: Sportközpont
           reserve: Természetvédelmi terület
           military: Katonai terület
           centre: Sportközpont
           reserve: Természetvédelmi terület
           military: Katonai terület

-          school_only: Iskola
+          school: Iskola; egyetem

           university: Egyetem
           hospital: Kórház
           building: Fontosabb épület
           station: Vasútállomás
           university: Egyetem
           hospital: Kórház
           building: Fontosabb épület
           station: Vasútállomás

-          summit_only: Hegycsúcs
+          summit: Hegycsúcs

           peak: Hegycsúcs
           tunnel: Szaggatott szegély = alagút
           bridge: Fekete szegély = híd
           peak: Hegycsúcs
           tunnel: Szaggatott szegély = alagút
           bridge: Fekete szegély = híd

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 9b568a32cec70d1d12559d0c6983f0f1180741fb..6aace21cd23e46ff6e8a78c1da2ac64ac23ecd7e 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -2335,27 +2335,27 @@ ia:
           subway: Metro
           ferry: Ferry-boat
           light_rail: Ferrovia legier
           subway: Metro
           ferry: Ferry-boat
           light_rail: Ferrovia legier

-          tram_only: Tram
+          tram: Tram

           trolleybus: Trolleybus
           bus: Autobus
           cable_car: Telepherico
           chair_lift: Telesedia
           trolleybus: Trolleybus
           bus: Autobus
           cable_car: Telepherico
           chair_lift: Telesedia

-          runway_only: Pista de aeroporto
+          runway: Pista de aeroporto

           taxiway: Via de circulation pro aviones
           taxiway: Via de circulation pro aviones

-          apron_only: Platteforma pro aviones
+          apron: Platteforma pro aviones

           admin: Limite administrative
           admin: Limite administrative

-          orchard_only: Verdiero
+          orchard: Verdiero

           vineyard: Vinia
           vineyard: Vinia

-          forest_only: Foreste
+          forest: Foreste

           wood: Bosco
           farmland: Terra agricole
           wood: Bosco
           farmland: Terra agricole

-          grass_only: Herba
+          grass: Herba

           meadow: Prato
           bare_rock: Rocca nude
           sand: Sablo
           golf: Percurso de golf
           park: Parco
           meadow: Prato
           bare_rock: Rocca nude
           sand: Sablo
           golf: Percurso de golf
           park: Parco

-          common_only: Commun
+          common: Commun

           built_up: Area edificate
           resident: Area residential
           retail: Zona de commercio al detalio
           built_up: Area edificate
           resident: Area residential
           retail: Zona de commercio al detalio


@@ -2363,7 +2363,7 @@ ia:
           commercial: Area commercial
           heathland: Landa
           scrubland: Terreno de brossas
           commercial: Area commercial
           heathland: Landa
           scrubland: Terreno de brossas

-          lake_only: Laco
+          lake: Laco

           reservoir: Reservoir
           intermittent_water: Massa de aqua intermittente
           glacier: Glaciero
           reservoir: Reservoir
           intermittent_water: Massa de aqua intermittente
           glacier: Glaciero


@@ -2377,12 +2377,12 @@ ia:
           centre: Centro de sport
           reserve: Reserva natural
           military: Area militar
           centre: Centro de sport
           reserve: Reserva natural
           military: Area militar

-          school_only: Schola
+          school: Schola

           university: Universitate
           hospital: Hospital
           building: Edificio significante
           station: Station ferroviari
           university: Universitate
           hospital: Hospital
           building: Edificio significante
           station: Station ferroviari

-          summit_only: Summitate
+          summit: Summitate

           peak: Picco
           tunnel: Bordo a lineettas = tunnel
           bridge: Bordo nigre = ponte
           peak: Picco
           tunnel: Bordo a lineettas = tunnel
           bridge: Bordo nigre = ponte

diff --git a/config/locales/id.yml b/config/locales/id.yml
index bb5eb83f74e185f933712f3e72998d7e34cfb29e..0ee57a368a2c6853d4c47a00928c6fc69c08d3e9 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -2293,21 +2293,21 @@ id:
           subway: Kereta bawah tanah
           cable_car: Kereta Kabel
           chair_lift: Kereta Gantung
           subway: Kereta bawah tanah
           cable_car: Kereta Kabel
           chair_lift: Kereta Gantung

-          runway_only: Landasan bandara
+          runway: Landasan bandara

           taxiway: landas hubung
           taxiway: landas hubung

-          apron_only: Tempat Parkir Pesawat
+          apron: Tempat Parkir Pesawat

           admin: Batas administrasi
           admin: Batas administrasi

-          forest_only: Hutan
+          forest: Hutan

           wood: Kayu
           golf: Lapangan Golf
           park: Taman
           wood: Kayu
           golf: Lapangan Golf
           park: Taman

-          common_only: Umum
+          common: Umum

           resident: Area Permukiman
           retail: Area pertokoan
           industrial: Kawasan industri
           commercial: Area komersial
           heathland: Semak
           resident: Area Permukiman
           retail: Area pertokoan
           industrial: Kawasan industri
           commercial: Area komersial
           heathland: Semak

-          lake_only: Danau
+          lake: Danau

           reservoir: Wilayah Serapan (Reservoir)
           farm: Pertanian
           brownfield: Lahan kosong
           reservoir: Wilayah Serapan (Reservoir)
           farm: Pertanian
           brownfield: Lahan kosong


@@ -2317,11 +2317,11 @@ id:
           centre: Pusat Olahraga
           reserve: Cagar Alam
           military: Kawasan militer
           centre: Pusat Olahraga
           reserve: Cagar Alam
           military: Kawasan militer

-          school_only: Sekolah
+          school: Sekolah

           university: universitas
           building: Bangunan Penting
           station: Stasiun Kereta Api
           university: universitas
           building: Bangunan Penting
           station: Stasiun Kereta Api

-          summit_only: Puncak
+          summit: Puncak

           peak: puncak
           tunnel: Dashed Casing = terowongan
           bridge: Black casing = jembatan
           peak: puncak
           tunnel: Dashed Casing = terowongan
           bridge: Black casing = jembatan

diff --git a/config/locales/is.yml b/config/locales/is.yml
index ce9386c4500ee3a5410db194928b42bc86747b83..512db18bdc3a9492a672382184421d0f2f3a72ca 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -2369,21 +2369,21 @@ is:
           subway: Neðanjarðarlest
           cable_car: Kláflyfta
           chair_lift: stólalyfta
           subway: Neðanjarðarlest
           cable_car: Kláflyfta
           chair_lift: stólalyfta

-          runway_only: Flugbraut
+          runway: Flugbraut

           taxiway: akstursbraut
           taxiway: akstursbraut

-          apron_only: Flughlað
+          apron: Flughlað

           admin: Stjórnsýslumörk
           admin: Stjórnsýslumörk

-          forest_only: Ræktaður skógur
+          forest: Ræktaður skógur

           wood: Náttúrulegur skógur
           golf: Golfvöllur
           park: Almenningsgarður
           wood: Náttúrulegur skógur
           golf: Golfvöllur
           park: Almenningsgarður

-          common_only: Almenningur
+          common: Almenningur

           resident: Íbúðasvæði
           retail: Smásölusvæði
           industrial: Iðnaðarsvæði
           commercial: Verslunarsvæði
           heathland: Heiðalönd
           resident: Íbúðasvæði
           retail: Smásölusvæði
           industrial: Iðnaðarsvæði
           commercial: Verslunarsvæði
           heathland: Heiðalönd

-          lake_only: Vatn
+          lake: Vatn

           reservoir: uppistöðulón
           farm: Bóndabær
           brownfield: Nýbyggingarsvæði
           reservoir: uppistöðulón
           farm: Bóndabær
           brownfield: Nýbyggingarsvæði


@@ -2393,11 +2393,11 @@ is:
           centre: Íþróttamiðstöð
           reserve: Náttúruverndarsvæði
           military: Hersvæði
           centre: Íþróttamiðstöð
           reserve: Náttúruverndarsvæði
           military: Hersvæði

-          school_only: Skóli
+          school: Skóli

           university: Háskóli
           building: Merkisbygging
           station: Lestarstöð
           university: Háskóli
           building: Merkisbygging
           station: Lestarstöð

-          summit_only: Fjallstindur
+          summit: Fjallstindur

           peak: tindur
           tunnel: Umkringt punktalínum = göng
           bridge: Umkringt svartri línu = brú
           peak: tindur
           tunnel: Umkringt punktalínum = göng
           bridge: Umkringt svartri línu = brú

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 756d7f5744e6afc4355e1646668ee0d8f4f59847..e8d910c81342f6f3717505d244f05d099b69f9c3 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -2405,36 +2405,36 @@ it:
           subway: Metropolitana
           ferry: Traghetto
           light_rail: Metropolitana leggera
           subway: Metropolitana
           ferry: Traghetto
           light_rail: Metropolitana leggera

-          tram_only: Tram
+          tram: Tram

           trolleybus: Filobus
           bus: Autobus
           cable_car: Funivia
           chair_lift: Seggiovia
           trolleybus: Filobus
           bus: Autobus
           cable_car: Funivia
           chair_lift: Seggiovia

-          runway_only: Pista di decollo/atterraggio
+          runway: Pista di decollo/atterraggio

           taxiway: Pista di rullaggio
           taxiway: Pista di rullaggio

-          apron_only: Area di parcheggio aeroportuale
+          apron: Area di parcheggio aeroportuale

           admin: Confine amministrativo
           capital: Capitale
           city: Città
           admin: Confine amministrativo
           capital: Capitale
           city: Città

-          orchard_only: Frutteto
+          orchard: Frutteto

           vineyard: Vigneto
           vineyard: Vigneto

-          forest_only: Foresta
+          forest: Foresta

           wood: Bosco
           farmland: Terreno agricolo
           wood: Bosco
           farmland: Terreno agricolo

-          grass_only: Prato
+          grass: Prato

           meadow: Prato
           bare_rock: Roccia nuda
           sand: Sabbia
           golf: Campo da golf
           park: Parco
           meadow: Prato
           bare_rock: Roccia nuda
           sand: Sabbia
           golf: Campo da golf
           park: Parco

-          common_only: Area comune
+          common: Area comune

           resident: Zona residenziale
           retail: Zona con negozi
           industrial: Zona industriale
           commercial: Zona di uffici
           heathland: Brughiera
           scrubland: Macchia
           resident: Zona residenziale
           retail: Zona con negozi
           industrial: Zona industriale
           commercial: Zona di uffici
           heathland: Brughiera
           scrubland: Macchia

-          lake_only: Lago
+          lake: Lago

           reservoir: Riserva idrica
           intermittent_water: Corpo idrico intermittente
           glacier: Ghiacciaio
           reservoir: Riserva idrica
           intermittent_water: Corpo idrico intermittente
           glacier: Ghiacciaio


@@ -2448,12 +2448,12 @@ it:
           centre: Centro sportivo
           reserve: Riserva naturale
           military: Area militare
           centre: Centro sportivo
           reserve: Riserva naturale
           military: Area militare

-          school_only: Scuola
+          school: Scuola

           university: Università
           hospital: Ospedale
           building: Edificio significativo
           station: Stazione ferroviaria
           university: Università
           hospital: Ospedale
           building: Edificio significativo
           station: Stazione ferroviaria

-          summit_only: Vetta
+          summit: Vetta

           peak: Picco montuoso
           tunnel: Linea tratteggiata = tunnel
           bridge: Quadrettatura nera = ponte
           peak: Picco montuoso
           tunnel: Linea tratteggiata = tunnel
           bridge: Quadrettatura nera = ponte

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 137ec16a035b13e6d339144944c3166bb8ea2ac9..127ec058de69446405c90b04ff8b01583a8f82b9 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -2027,21 +2027,21 @@ ja:
           subway: 地下鉄
           cable_car: 交走式ロープウェイ
           chair_lift: チェアリフト
           subway: 地下鉄
           cable_car: 交走式ロープウェイ
           chair_lift: チェアリフト

-          runway_only: 空港滑走路
+          runway: 空港滑走路

           taxiway: 空港誘導路
           taxiway: 空港誘導路

-          apron_only: 空港ビル
+          apron: 空港ビル

           admin: 行政境界
           admin: 行政境界

-          forest_only: 森
+          forest: 森

           wood: 森林
           golf: ゴルフ場
           park: 公園
           wood: 森林
           golf: ゴルフ場
           park: 公園

-          common_only: 共有地
+          common: 共有地

           resident: 住宅地
           retail: 小売業地域
           industrial: 工業地域
           commercial: オフィス地域
           heathland: 荒地
           resident: 住宅地
           retail: 小売業地域
           industrial: 工業地域
           commercial: オフィス地域
           heathland: 荒地

-          lake_only: 湖
+          lake: 湖

           reservoir: 溜池
           farm: 農牧場
           brownfield: 褐色地
           reservoir: 溜池
           farm: 農牧場
           brownfield: 褐色地


@@ -2051,11 +2051,11 @@ ja:
           centre: スポーツセンター
           reserve: 自然保護区
           military: 軍用地域
           centre: スポーツセンター
           reserve: 自然保護区
           military: 軍用地域

-          school_only: 学校
+          school: 学校

           university: 大学
           building: 重要建造物
           station: 鉄道駅
           university: 大学
           building: 重要建造物
           station: 鉄道駅

-          summit_only: 山脈
+          summit: 山脈

           peak: 山頂
           tunnel: 点線の枠 = トンネル
           bridge: 黒枠 = 橋梁
           peak: 山頂
           tunnel: 点線の枠 = トンネル
           bridge: 黒枠 = 橋梁

diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 1ba4bd622402045108006cc797c588e41553b8ac..19c5b53a1ac2ead3907481ab8ae2f51c532042db 100644 (file)
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -943,15 +943,15 @@ ka:
           rail: რკინიგზა
           subway: მეტრო
           cable_car: საბაგირო გზა
           rail: რკინიგზა
           subway: მეტრო
           cable_car: საბაგირო გზა

-          runway_only: აეროპორტის ასაფრენ-დასაფრენი ბილიკი
+          runway: აეროპორტის ასაფრენ-დასაფრენი ბილიკი

           admin: ადმინისტრაციული საზღვარი
           admin: ადმინისტრაციული საზღვარი

-          forest_only: ტყე
+          forest: ტყე

           wood: ტყე
           golf: გოლფის მოედანი
           park: პარკი
           resident: საცხოვრებელი ტერიტორია
           commercial: კომერციული ტერიტორია
           wood: ტყე
           golf: გოლფის მოედანი
           park: პარკი
           resident: საცხოვრებელი ტერიტორია
           commercial: კომერციული ტერიტორია

-          lake_only: ტბა
+          lake: ტბა

           reservoir: წყალსაცავი
           farm: ფერმა
           cemetery: სასაფლაო
           reservoir: წყალსაცავი
           farm: ფერმა
           cemetery: სასაფლაო


@@ -959,10 +959,10 @@ ka:
           centre: სპორტული ცენტრი
           reserve: ნაკრძალი
           military: სამხედრო ტერიტორია
           centre: სპორტული ცენტრი
           reserve: ნაკრძალი
           military: სამხედრო ტერიტორია

-          school_only: სკოლა
+          school: სკოლა

           university: უნივერსიტეტი
           station: რკინიგზის სადგური
           university: უნივერსიტეტი
           station: რკინიგზის სადგური

-          summit_only: მწვერვალი
+          summit: მწვერვალი

           peak: პიკი
   traces:
     new:
           peak: პიკი
   traces:
     new:

diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index b82af9366a4bb777ad6e3782274727c22bdc930a..422a992109540214c8d25f15da1501f6ed9c89c0 100644 (file)
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -1120,9 +1120,9 @@ kab:
     key:
       table:
         entry:
     key:
       table:
         entry:

-          forest_only: Tiẓgi
-          lake_only: Amdun
-          school_only: Aɣerbaz
+          forest: Tiẓgi
+          lake: Amdun
+          school: Aɣerbaz

           university: Tasdawit
     welcome:
       title: Anṣuf!
           university: Tasdawit
     welcome:
       title: Anṣuf!

diff --git a/config/locales/kk-cyrl.yml b/config/locales/kk-cyrl.yml
index 19365c90b983fbdbbbebcd53170affaeb3ef296f..918147ef58686d532e944570c02d0b50c4be92b5 100644 (file)
--- a/config/locales/kk-cyrl.yml
+++ b/config/locales/kk-cyrl.yml
@@ -972,22 +972,22 @@ kk-cyrl:
           unclassified: Жергілікті жол
           rail: Темір жол
           subway: Метро
           unclassified: Жергілікті жол
           rail: Темір жол
           subway: Метро

-          apron_only: Әуежай перроны
+          apron: Әуежай перроны

           admin: Әкімшілік шекара
           admin: Әкімшілік шекара

-          forest_only: Орман
+          forest: Орман

           golf: Гольф алаңы
           park: Саябақ
           resident: Тұрғын аудан
           retail: Сауда аймағы
           industrial: Өнеркәсіп аймағы
           golf: Гольф алаңы
           park: Саябақ
           resident: Тұрғын аудан
           retail: Сауда аймағы
           industrial: Өнеркәсіп аймағы

-          lake_only: Көл
+          lake: Көл

           farm: Ферма
           cemetery: Зират
           allotments: Саяжайлар
           pitch: Спорт алаңы
           centre: Спорт орталығы
           military: Әскери аймақ
           farm: Ферма
           cemetery: Зират
           allotments: Саяжайлар
           pitch: Спорт алаңы
           centre: Спорт орталығы
           military: Әскери аймақ

-          school_only: Мектеп
+          school: Мектеп

           university: университет
           building: Елеулі ғимарат
           station: Темір жол бекеті
           university: университет
           building: Елеулі ғимарат
           station: Темір жол бекеті

diff --git a/config/locales/km.yml b/config/locales/km.yml
index 70a1a68123527391992e1cc49c78fbf3db8c9c90..6d6d5d65d68eea362696a761321a03467d95e39b 100644 (file)
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -724,12 +724,12 @@ km:
           rail: ផ្លូវដែក
           subway: ផ្លូវដែកក្រោមដី
           admin: ព្រំដែនរដ្ឋបាល
           rail: ផ្លូវដែក
           subway: ផ្លូវដែកក្រោមដី
           admin: ព្រំដែនរដ្ឋបាល

-          forest_only: ព្រៃឈើ​
+          forest: ព្រៃឈើ​

           park: ឧទ្យាន​
           industrial: តំបន់ឧស្សាហកម្ម​
           farm: កសិដ្ឋាន​
           centre: មជ្ឈមណ្ឌល​កីឡា​
           park: ឧទ្យាន​
           industrial: តំបន់ឧស្សាហកម្ម​
           farm: កសិដ្ឋាន​
           centre: មជ្ឈមណ្ឌល​កីឡា​

-          school_only: សាលារៀន​
+          school: សាលារៀន​

           university: សាកលវិទ្យាល័យ​
           station: ស្ថានីយ៍ផ្លូវដែក
   traces:
           university: សាកលវិទ្យាល័យ​
           station: ស្ថានីយ៍ផ្លូវដែក
   traces:

diff --git a/config/locales/kn.yml b/config/locales/kn.yml
index 5e68c9f672e9e3cad87b02faf3e677af23083ad4..5072045574c7759a039cdf456a40af37722b98a1 100644 (file)
--- a/config/locales/kn.yml
+++ b/config/locales/kn.yml
@@ -868,14 +868,14 @@ kn:
       table:
         entry:
           main_road: ಮುಖ್ಯ ರಸ್ತೆ
       table:
         entry:
           main_road: ಮುಖ್ಯ ರಸ್ತೆ

-          forest_only: ಅರಣ್ಯ
+          forest: ಅರಣ್ಯ

           park: ಉದ್ಯಾನ
           resident: ವಾಸ ಮಾಡುವ ಸ್ಥಳ
           park: ಉದ್ಯಾನ
           resident: ವಾಸ ಮಾಡುವ ಸ್ಥಳ

-          lake_only: ಕೆರೆ
+          lake: ಕೆರೆ

           reservoir: ಅಣೆಕಟ್ಟು
           farm: ಒಕ್ಕಲು ಜಮೀನು
           cemetery: ಸ್ಮಾಶಾಣ
           reservoir: ಅಣೆಕಟ್ಟು
           farm: ಒಕ್ಕಲು ಜಮೀನು
           cemetery: ಸ್ಮಾಶಾಣ

-          school_only: ಪಾಠಶಾಲೆ
+          school: ಪಾಠಶಾಲೆ

           university: ವಿಶ್ವವಿದ್ಯಾಲಯ
           station: ರೈಲು ನಿಲ್ದಾಣ
     welcome:
           university: ವಿಶ್ವವಿದ್ಯಾಲಯ
           station: ರೈಲು ನಿಲ್ದಾಣ
     welcome:

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 57f315ff5df126fbe0c9308b6c577b7ecc27144d..28a6ae63016b1238eedc1cc633d02f29d14943bb 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -2158,21 +2158,21 @@ ko:
           subway: 지하철
           cable_car: 케이블 카
           chair_lift: 체어 리프트
           subway: 지하철
           cable_car: 케이블 카
           chair_lift: 체어 리프트

-          runway_only: 공항 활주로
+          runway: 공항 활주로

           taxiway: 공항 유도로
           taxiway: 공항 유도로

-          apron_only: 공항 계류장
+          apron: 공항 계류장

           admin: 행정 구역 경계
           admin: 행정 구역 경계

-          forest_only: 숲
+          forest: 숲

           wood: 산림
           golf: 골프장
           park: 공원
           wood: 산림
           golf: 골프장
           park: 공원

-          common_only: 공유지
+          common: 공유지

           resident: 주거 지역
           retail: 소매 지역
           industrial: 산업 지역
           commercial: 상업/관공서 지역
           heathland: 황무지
           resident: 주거 지역
           retail: 소매 지역
           industrial: 산업 지역
           commercial: 상업/관공서 지역
           heathland: 황무지

-          lake_only: 호수
+          lake: 호수

           reservoir: 저수지
           farm: 농장
           brownfield: 재개발지역
           reservoir: 저수지
           farm: 농장
           brownfield: 재개발지역


@@ -2182,11 +2182,11 @@ ko:
           centre: 스포츠 센터
           reserve: 자연 보호구역
           military: 군사 지역
           centre: 스포츠 센터
           reserve: 자연 보호구역
           military: 군사 지역

-          school_only: 학교
+          school: 학교

           university: 대학
           building: 주요 건물
           station: 철도역
           university: 대학
           building: 주요 건물
           station: 철도역

-          summit_only: 산꼭대기
+          summit: 산꼭대기

           peak: 봉우리
           tunnel: 점선 테두리 = 터널
           bridge: 검은 테두리 = 다리
           peak: 봉우리
           tunnel: 점선 테두리 = 터널
           bridge: 검은 테두리 = 다리

diff --git a/config/locales/ksh.yml b/config/locales/ksh.yml
index eebd7da5c9865ce54d7b3bec9b573e38014df15f..f9a7e9e8929c88566c346ec96bfc60953050bcd1 100644 (file)
--- a/config/locales/ksh.yml
+++ b/config/locales/ksh.yml
@@ -281,21 +281,21 @@ ksh:
           subway: U-Bahn
           cable_car: Seilbahn
           chair_lift: Sässelbahn
           subway: U-Bahn
           cable_car: Seilbahn
           chair_lift: Sässelbahn

-          runway_only: Startbahn, Landebahn
+          runway: Startbahn, Landebahn

           taxiway: Rollwääsch om Fluchhaaven
           taxiway: Rollwääsch om Fluchhaaven

-          apron_only: Halldepläz om Fluchveäld
+          apron: Halldepläz om Fluchveäld

           admin: Verwalldongsjränz
           admin: Verwalldongsjränz

-          forest_only: Wald, Bösch
+          forest: Wald, Bösch

           wood: Urwald
           golf: Jolfplaz
           park: Park
           wood: Urwald
           golf: Jolfplaz
           park: Park

-          common_only: öffentlesch Land
+          common: öffentlesch Land

           resident: Wohnjebeet
           retail: Einkaufszentrum
           industrial: Industriejebeet
           commercial: Jewerbejebeet
           heathland: Heed
           resident: Wohnjebeet
           retail: Einkaufszentrum
           industrial: Industriejebeet
           commercial: Jewerbejebeet
           heathland: Heed

-          lake_only: See, Wejer
+          lake: See, Wejer

           reservoir: Stausee
           farm: Buurehoff
           brownfield: Industriebrachland
           reservoir: Stausee
           farm: Buurehoff
           brownfield: Industriebrachland


@@ -305,11 +305,11 @@ ksh:
           centre: Schpochtzäntom
           reserve: Naturschozjebeet
           military: Jebeet vum Kammiß
           centre: Schpochtzäntom
           reserve: Naturschozjebeet
           military: Jebeet vum Kammiß

-          school_only: Scholl
+          school: Scholl

           university: Univäsität
           building: Weeschtesch Bouwärk
           station: Bahnhoff
           university: Univäsität
           building: Weeschtesch Bouwärk
           station: Bahnhoff

-          summit_only: Bärschspez
+          summit: Bärschspez

           peak: Bärschspez
           tunnel: Rand jeschtreschelt = Tunnell
           bridge: Fätte Rand = Bröck
           peak: Bärschspez
           tunnel: Rand jeschtreschelt = Tunnell
           bridge: Fätte Rand = Bröck

diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 4581251ecf6adda4b82f23fe32dc3450670eff79..9f5facc581dde9a4a8af969623a0bdc10b4d247b 100644 (file)
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -2124,21 +2124,21 @@ ku-Latn:
           subway: Metro
           cable_car: Teleferîk
           chair_lift: Teleferîk
           subway: Metro
           cable_car: Teleferîk
           chair_lift: Teleferîk

-          runway_only: Pîsta balafirgehê
+          runway: Pîsta balafirgehê

           taxiway: Rêya balafirgehê yê çûnûhatinê
           taxiway: Rêya balafirgehê yê çûnûhatinê

-          apron_only: Aprona balafirgehê
+          apron: Aprona balafirgehê

           admin: Sînorê îdarî
           admin: Sînorê îdarî

-          forest_only: Daristan
+          forest: Daristan

           wood: Daristan (bêçavdêrî, wek-xwe-hêlayî)
           golf: Cihê golfê
           park: Park
           wood: Daristan (bêçavdêrî, wek-xwe-hêlayî)
           golf: Cihê golfê
           park: Park

-          common_only: Erda mişterek
+          common: Erda mişterek

           resident: Cihê îkametê
           retail: Saheya Perakendeyê (Maxazayan)
           industrial: Cihê endustriyê
           commercial: Herêma bazirganiyê
           heathland: Erdê qeraç
           resident: Cihê îkametê
           retail: Saheya Perakendeyê (Maxazayan)
           industrial: Cihê endustriyê
           commercial: Herêma bazirganiyê
           heathland: Erdê qeraç

-          lake_only: Gol
+          lake: Gol

           reservoir: Gola sûnî
           farm: Cotgeh
           brownfield: Erdê vala
           reservoir: Gola sûnî
           farm: Cotgeh
           brownfield: Erdê vala


@@ -2148,11 +2148,11 @@ ku-Latn:
           centre: Navenda sporê
           reserve: Herêma muhefezekirî ya tebîetê
           military: Qada eskerî
           centre: Navenda sporê
           reserve: Herêma muhefezekirî ya tebîetê
           military: Qada eskerî

-          school_only: Dibistan
+          school: Dibistan

           university: Unîversîte
           building: Avahiya girîng
           station: Stasyona trênê
           university: Unîversîte
           building: Avahiya girîng
           station: Stasyona trênê

-          summit_only: Lûtke
+          summit: Lûtke

           peak: Lûtke
           tunnel: Xeta qutqutî = tûnel
           bridge: Xeta reş = pir
           peak: Lûtke
           tunnel: Xeta qutqutî = tûnel
           bridge: Xeta reş = pir

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 332620d5ba3f5cd780738d560e825d7d028e65ad..e2daa23bb447785db4ff2cc25d0b73236a47c46b 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -2043,29 +2043,29 @@ lb:
           train: Zuch
           subway: Metro
           ferry: Fär
           train: Zuch
           subway: Metro
           ferry: Fär

-          tram_only: Tram
+          tram: Tram

           bus: Bus
           cable_car: Seelbunn
           chair_lift: Sessellift
           bus: Bus
           cable_car: Seelbunn
           chair_lift: Sessellift

-          runway_only: Start- a Landebunn
+          runway: Start- a Landebunn

           taxiway: Rullbunn
           admin: Verwaltungsgrenz
           capital: Haaptstad
           city: Stad
           taxiway: Rullbunn
           admin: Verwaltungsgrenz
           capital: Haaptstad
           city: Stad

-          orchard_only: Bongert
+          orchard: Bongert

           vineyard: Wéngert
           vineyard: Wéngert

-          forest_only: Bësch
+          forest: Bësch

           wood: Bësch
           wood: Bësch

-          grass_only: Wiss
+          grass: Wiss

           sand: Sand
           golf: Golfterrain
           park: Park
           sand: Sand
           golf: Golfterrain
           park: Park

-          common_only: ëffentlech Gréngfläch (brit.)
+          common: ëffentlech Gréngfläch (brit.)

           retail: Akaafszentrum
           industrial: Industriezone
           commercial: Commercëgebitt
           heathland: Heed
           retail: Akaafszentrum
           industrial: Industriezone
           commercial: Commercëgebitt
           heathland: Heed

-          lake_only: Séi
+          lake: Séi

           glacier: Gletscher
           farm: Bauerenhaff
           brownfield: Broochland
           glacier: Gletscher
           farm: Bauerenhaff
           brownfield: Broochland


@@ -2075,12 +2075,12 @@ lb:
           centre: Sportszenter
           reserve: Naturschutzgebitt
           military: Militärgebitt
           centre: Sportszenter
           reserve: Naturschutzgebitt
           military: Militärgebitt

-          school_only: Schoul
+          school: Schoul

           university: Universitéit
           hospital: Spidol
           building: Bedeitend Gebai
           station: Gare (Eisebunn)
           university: Universitéit
           hospital: Spidol
           building: Bedeitend Gebai
           station: Gare (Eisebunn)

-          summit_only: Spëtzt
+          summit: Spëtzt

           private: Privaten Terrain
           destination: Nëmme fir Leit mat Uleies
           construction: Stroossen am Bau
           private: Privaten Terrain
           destination: Nëmme fir Leit mat Uleies
           construction: Stroossen am Bau

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index de13a108f14dfc5a2fd7c033093f7e8cb582dec9..6c5507279570c75347b920c3a0b1c7429cade1a7 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -2080,21 +2080,21 @@ lt:
           subway: Metropoliteno linija
           cable_car: Lyno keltuvas
           chair_lift: keltuvas
           subway: Metropoliteno linija
           cable_car: Lyno keltuvas
           chair_lift: keltuvas

-          runway_only: Kilimo takas
+          runway: Kilimo takas

           taxiway: Riedėjimo takas
           taxiway: Riedėjimo takas

-          apron_only: Oro uosto lėktuvų aikštelė
+          apron: Oro uosto lėktuvų aikštelė

           admin: Administracinės ribos
           admin: Administracinės ribos

-          forest_only: Miškas
+          forest: Miškas

           wood: Medžių teritorija
           golf: Golfo laukas
           park: Parkas
           wood: Medžių teritorija
           golf: Golfo laukas
           park: Parkas

-          common_only: Bendras
+          common: Bendras

           resident: Gyvenamoji zona
           retail: Mažmeninis rajonas
           industrial: Pramoninė zona
           commercial: Komericinis plotas
           heathland: Šilynas
           resident: Gyvenamoji zona
           retail: Mažmeninis rajonas
           industrial: Pramoninė zona
           commercial: Komericinis plotas
           heathland: Šilynas

-          lake_only: Ežeras
+          lake: Ežeras

           reservoir: rezervuaras
           farm: Ūkis
           brownfield: Apleista teritorija
           reservoir: rezervuaras
           farm: Ūkis
           brownfield: Apleista teritorija


@@ -2104,11 +2104,11 @@ lt:
           centre: Sporto centras
           reserve: Gamtos rezervatas
           military: Karinis rajonas
           centre: Sporto centras
           reserve: Gamtos rezervatas
           military: Karinis rajonas

-          school_only: Mokykla
+          school: Mokykla

           university: universitetas
           building: Didelis pastatas
           station: Geležinkelio stotis
           university: universitetas
           building: Didelis pastatas
           station: Geležinkelio stotis

-          summit_only: Viršūnė
+          summit: Viršūnė

           peak: Viršukalnė
           tunnel: Punktyriniai kraštai = tiltas
           bridge: Tamsūs kraštai = tiltas
           peak: Viršukalnė
           tunnel: Punktyriniai kraštai = tiltas
           bridge: Tamsūs kraštai = tiltas

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 21962b1cc71494dbda41d8038ae8ef61f55b5cf9..f45ca65a06c15afa9abc7bde2366090139f9875a 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1721,21 +1721,21 @@ lv:
           subway: Metro
           cable_car: Trošu ceļš
           chair_lift: krēslu pacēlājs
           subway: Metro
           cable_car: Trošu ceļš
           chair_lift: krēslu pacēlājs

-          runway_only: Lidostas skrejceļš
+          runway: Lidostas skrejceļš

           taxiway: manevrēšanas ceļš
           taxiway: manevrēšanas ceļš

-          apron_only: Lidostas rampa
+          apron: Lidostas rampa

           admin: Administratīvā robeža
           admin: Administratīvā robeža

-          forest_only: Mežs
+          forest: Mežs

           wood: Pirmatnējs mežs
           golf: Golfa laukums
           park: Parks
           wood: Pirmatnējs mežs
           golf: Golfa laukums
           park: Parks

-          common_only: Koplietošanas zeme
+          common: Koplietošanas zeme

           resident: Dzīvojamā zona
           retail: Mazumtirdzniecības zona
           industrial: Rūpniecības zona
           commercial: Tirdzniecības zona
           heathland: Tīrelis
           resident: Dzīvojamā zona
           retail: Mazumtirdzniecības zona
           industrial: Rūpniecības zona
           commercial: Tirdzniecības zona
           heathland: Tīrelis

-          lake_only: Ezeri
+          lake: Ezeri

           reservoir: ūdenskrātuves
           farm: Saimniecība
           brownfield: Nekopta vieta
           reservoir: ūdenskrātuves
           farm: Saimniecība
           brownfield: Nekopta vieta


@@ -1745,11 +1745,11 @@ lv:
           centre: Sporta centrs
           reserve: Dabas rezervāts
           military: Militārā zona
           centre: Sporta centrs
           reserve: Dabas rezervāts
           military: Militārā zona

-          school_only: Skola
+          school: Skola

           university: universitāte
           building: Ēka
           station: Dzelzceļa stacija
           university: universitāte
           building: Ēka
           station: Dzelzceļa stacija

-          summit_only: Virsotne
+          summit: Virsotne

           peak: smaile
           tunnel: Tunelis
           bridge: Tilts
           peak: smaile
           tunnel: Tunelis
           bridge: Tilts

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 548b929af5969519af57aac9e731ec4a3ace7564..97127722823b1bc221e5d661840b1cbd1e9e091c 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -280,7 +280,7 @@ mk:
   accounts:
     edit:
       title: Уреди сметка
   accounts:
     edit:
       title: Уреди сметка

-      my settings: Ð\9cои пÑ\80илагодувања
+      my settings: Ð\9cои нагодувања

       current email address: Тековна е-пошта
       external auth: Надворешна заверка
       openid:
       current email address: Тековна е-пошта
       external auth: Надворешна заверка
       openid:


@@ -1630,6 +1630,8 @@ mk:
       loaded:
         one: успешно вчитано со %{trace_points} од %{count} можни точки.
         other: успешно вчитано со %{trace_points} од %{count} можни точки.
       loaded:
         one: успешно вчитано со %{trace_points} од %{count} можни точки.
         other: успешно вчитано со %{trace_points} од %{count} можни точки.

+      all_your_traces_html: Сите ваши успешно подигнати GPX-траги ќе ги најдете на
+        %{url}.

       subject: '[OpenStreetMap] Успешен увоз на GPX-податотека'
     signup_confirm:
       subject: '[OpenStreetMap] Добре дојдовте на OpenStreetMap'
       subject: '[OpenStreetMap] Успешен увоз на GPX-податотека'
     signup_confirm:
       subject: '[OpenStreetMap] Добре дојдовте на OpenStreetMap'


@@ -2342,29 +2344,29 @@ mk:
           subway: Метро
           ferry: Траект
           light_rail: Лека железница
           subway: Метро
           ferry: Траект
           light_rail: Лека железница

-          tram_only: Трамвај
+          tram: Трамвај

           trolleybus: Тролејбус
           bus: Автобус
           cable_car: Клупна жичница
           chair_lift: Клупна жичница
           trolleybus: Тролејбус
           bus: Автобус
           cable_car: Клупна жичница
           chair_lift: Клупна жичница

-          runway_only: Аеродромска писта
+          runway: Аеродромска писта

           taxiway: Рулажна патека
           taxiway: Рулажна патека

-          apron_only: Аеродромска платформа
+          apron: Аеродромска платформа

           admin: Административна граница
           capital: Главен град
           city: Град
           admin: Административна граница
           capital: Главен град
           city: Град

-          orchard_only: Овоштарник
+          orchard: Овоштарник

           vineyard: Лозје
           vineyard: Лозје

-          forest_only: Шума
+          forest: Шума

           wood: Шума
           farmland: Земјоделско земјиште
           wood: Шума
           farmland: Земјоделско земјиште

-          grass_only: Трева
+          grass: Трева

           meadow: Ливада
           bare_rock: Гола карпа
           sand: Песок
           golf: Голф-терен
           park: Парк
           meadow: Ливада
           bare_rock: Гола карпа
           sand: Песок
           golf: Голф-терен
           park: Парк

-          common_only: Општествена земја
+          common: Општествена земја

           built_up: Изградено подрачје
           resident: Станбено подрачје
           retail: Трговско подрачје
           built_up: Изградено подрачје
           resident: Станбено подрачје
           retail: Трговско подрачје


@@ -2372,7 +2374,7 @@ mk:
           commercial: Комерцијално подрачје
           heathland: Вресиште
           scrubland: Шикара
           commercial: Комерцијално подрачје
           heathland: Вресиште
           scrubland: Шикара

-          lake_only: Езеро
+          lake: Езеро

           reservoir: Резервоар
           intermittent_water: Повремена водна површина
           glacier: Ледник
           reservoir: Резервоар
           intermittent_water: Повремена водна површина
           glacier: Ледник


@@ -2386,12 +2388,12 @@ mk:
           centre: Спортски центар
           reserve: Природен резерват
           military: Воено подрачје
           centre: Спортски центар
           reserve: Природен резерват
           military: Воено подрачје

-          school_only: Училиште
+          school: Училиште

           university: Универзитет
           hospital: Болница
           building: Значајно здание
           station: Железничка станица
           university: Универзитет
           hospital: Болница
           building: Значајно здание
           station: Железничка станица

-          summit_only: Врв
+          summit: Врв

           peak: Врв
           tunnel: Испрекината линија = тунел
           bridge: Црна линија = мост
           peak: Врв
           tunnel: Испрекината линија = тунел
           bridge: Црна линија = мост


@@ -2807,7 +2809,7 @@ mk:
       my notes: Мои белешки
       my messages: Мои пораки
       my profile: Мојот профил
       my notes: Мои белешки
       my messages: Мои пораки
       my profile: Мојот профил

-      my settings: Ð\9cои нагодÑ\83ваÑ\9aа
+      my settings: Ð\9cои поÑ\81Ñ\82авки

       my comments: Мои коментари
       my_preferences: Мои нагодувања
       my_dashboard: Моја управувачница
       my comments: Мои коментари
       my_preferences: Мои нагодувања
       my_dashboard: Моја управувачница

diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index 86f0d903e769cd134dd496c1ac1e1ee4964996f3..9a7a689a59d4385eb73d5e99c5a33fbb51f1d97c 100644 (file)
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -1174,20 +1174,20 @@ mr:
           subway: मेट्रो
           cable_car: रज्जुमार्ग
           chair_lift: खुर्ची उद्वाहन
           subway: मेट्रो
           cable_car: रज्जुमार्ग
           chair_lift: खुर्ची उद्वाहन

-          runway_only: विमानतळ धावपट्टी
+          runway: विमानतळ धावपट्टी

           taxiway: खेचमार्ग
           taxiway: खेचमार्ग

-          apron_only: विमानतळावरील भरणतळ
+          apron: विमानतळावरील भरणतळ

           admin: प्रशासकीय सीमा
           admin: प्रशासकीय सीमा

-          forest_only: वन
+          forest: वन

           wood: जंगल
           golf: गोल्फ कोर्स
           park: उद्यान
           wood: जंगल
           golf: गोल्फ कोर्स
           park: उद्यान

-          common_only: सार्वजनिक जमीन
+          common: सार्वजनिक जमीन

           resident: निवासी क्षेत्र
           retail: विक्री क्षेत्र
           industrial: औद्योगिक क्षेत्र
           commercial: वाणिज्यिक क्षेत्र
           resident: निवासी क्षेत्र
           retail: विक्री क्षेत्र
           industrial: औद्योगिक क्षेत्र
           commercial: वाणिज्यिक क्षेत्र

-          lake_only: तलाव
+          lake: तलाव

           reservoir: जलाशय
           farm: मळा
           cemetery: दफनभूमी
           reservoir: जलाशय
           farm: मळा
           cemetery: दफनभूमी


@@ -1196,11 +1196,11 @@ mr:
           centre: क्रीडाकेंद्र
           reserve: अभयारण्य
           military: लष्करी क्षेत्र
           centre: क्रीडाकेंद्र
           reserve: अभयारण्य
           military: लष्करी क्षेत्र

-          school_only: शाळा
+          school: शाळा

           university: विद्यापीठ
           building: महत्वपूर्ण इमारत
           station: रेल्वे स्थानक
           university: विद्यापीठ
           building: महत्वपूर्ण इमारत
           station: रेल्वे स्थानक

-          summit_only: शिखर
+          summit: शिखर

           peak: शिखर
           tunnel: तुटक कड = बोगदा
           bridge: काळी कड = पूल
           peak: शिखर
           tunnel: तुटक कड = बोगदा
           bridge: काळी कड = पूल

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 925636d5ee9d184230ee4929e7e5ceaca0d15524..bc61362c1e945f952c2c0d0c648d498e5cb15dcc 100644 (file)
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1726,21 +1726,21 @@ ms:
           subway: Landasan bawah tanah
           cable_car: Kereta kabel
           chair_lift: lif kerusi
           subway: Landasan bawah tanah
           cable_car: Kereta kabel
           chair_lift: lif kerusi

-          runway_only: Landasan kapal terbang
+          runway: Landasan kapal terbang

           taxiway: jalan rayap
           taxiway: jalan rayap

-          apron_only: Kawasan gerak lapangan terbang
+          apron: Kawasan gerak lapangan terbang

           admin: Sempadan pentadbiran
           admin: Sempadan pentadbiran

-          forest_only: Hutan
+          forest: Hutan

           wood: Hutan kecil
           golf: Padang golf
           park: Taman
           wood: Hutan kecil
           golf: Padang golf
           park: Taman

-          common_only: Tanah awam
+          common: Tanah awam

           resident: Kawasan perumahan
           retail: Kawasan peruncitan
           industrial: Kawasan perindustrian
           commercial: Kawasan perdagangan
           heathland: Kawasan rawa
           resident: Kawasan perumahan
           retail: Kawasan peruncitan
           industrial: Kawasan perindustrian
           commercial: Kawasan perdagangan
           heathland: Kawasan rawa

-          lake_only: Tasik
+          lake: Tasik

           reservoir: takungan
           farm: Ladang
           brownfield: Tanah terbiar
           reservoir: takungan
           farm: Ladang
           brownfield: Tanah terbiar


@@ -1750,11 +1750,11 @@ ms:
           centre: Pusat sukan
           reserve: Cagar alam
           military: Kawasan tentera
           centre: Pusat sukan
           reserve: Cagar alam
           military: Kawasan tentera

-          school_only: Sekolah
+          school: Sekolah

           university: universiti
           building: Bangunan penting
           station: Stesen keretapi
           university: universiti
           building: Bangunan penting
           station: Stesen keretapi

-          summit_only: Kemuncak
+          summit: Kemuncak

           peak: puncak
           tunnel: Kasing bertitik-titik = terowong
           bridge: Kasing hitam = jambatan
           peak: puncak
           tunnel: Kasing bertitik-titik = terowong
           bridge: Kasing hitam = jambatan

diff --git a/config/locales/my.yml b/config/locales/my.yml
index f02493973933a0dbe1f7c555e93de2d20901519b..2833f6f6f93c92ac4705bac31f6df4c8318143bb 100644 (file)
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -689,12 +689,12 @@ my:
           bridleway: မြင်းစီးလမ်း
           cycleway: စက်ဘီးသွားလမ်း
           rail: ရထားလမ်း
           bridleway: မြင်းစီးလမ်း
           cycleway: စက်ဘီးသွားလမ်း
           rail: ရထားလမ်း

-          runway_only: လေယာဉ်ကွင်းပြေးလမ်း
-          forest_only: သစ်တော
+          runway: လေယာဉ်ကွင်းပြေးလမ်း
+          forest: သစ်တော

           park: ပန်းခြံ
           park: ပန်းခြံ

-          lake_only: ရေကန်
+          lake: ရေကန်

           cemetery: သုဿန်
           cemetery: သုဿန်

-          school_only: ကျောင်း
+          school: ကျောင်း

           university: တက္ကသိုလ်
           station: ရထားဘူတာ
           construction: ဖောက်နေဆဲ လမ်းများ
           university: တက္ကသိုလ်
           station: ရထားဘူတာ
           construction: ဖောက်နေဆဲ လမ်းများ

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 6d3c6228e79e59422d79c5edab6db6316e225521..a58345208648190474103483ac6b7d27a7abf214 100644 (file)
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -1843,21 +1843,21 @@ nb:
           subway: Undergrunnsbane
           cable_car: Kabelvogn
           chair_lift: stolheis
           subway: Undergrunnsbane
           cable_car: Kabelvogn
           chair_lift: stolheis

-          runway_only: Flystripe
+          runway: Flystripe

           taxiway: taksebane
           taxiway: taksebane

-          apron_only: terminal
+          apron: terminal

           admin: Administrativ grense
           admin: Administrativ grense

-          forest_only: Skog
+          forest: Skog

           wood: Ved
           golf: Golfbane
           park: Park
           wood: Ved
           golf: Golfbane
           park: Park

-          common_only: Vanlig
+          common: Vanlig

           resident: Boligområde
           retail: Detaljsalgområde
           industrial: Industriområde
           commercial: Kommersielt område
           heathland: Heilandskap
           resident: Boligområde
           retail: Detaljsalgområde
           industrial: Industriområde
           commercial: Kommersielt område
           heathland: Heilandskap

-          lake_only: Innsjø
+          lake: Innsjø

           reservoir: reservoar
           farm: Gård
           brownfield: Tidligere industriområde
           reservoir: reservoar
           farm: Gård
           brownfield: Tidligere industriområde


@@ -1867,11 +1867,11 @@ nb:
           centre: Sportssenter
           reserve: Naturreservat
           military: Militært område
           centre: Sportssenter
           reserve: Naturreservat
           military: Militært område

-          school_only: Skole
+          school: Skole

           university: universitet
           building: Viktig bygning
           station: Jernbanestasjon
           university: universitet
           building: Viktig bygning
           station: Jernbanestasjon

-          summit_only: Topp
+          summit: Topp

           peak: fjelltopp
           tunnel: Streket kant = tunnel
           bridge: Sort kant = bru
           peak: fjelltopp
           tunnel: Streket kant = tunnel
           bridge: Sort kant = bru

diff --git a/config/locales/nds.yml b/config/locales/nds.yml
index 0c30d907d9f0a66baab55a9ad89995525cdfde8d..cb1eceeae7bab85c0d3536442fdf24d3a14df52f 100644 (file)
--- a/config/locales/nds.yml
+++ b/config/locales/nds.yml
@@ -522,21 +522,21 @@ nds:
           subway: U-Bahn
           cable_car: Kavelbahn
           chair_lift: Skilift
           subway: U-Bahn
           cable_car: Kavelbahn
           chair_lift: Skilift

-          runway_only: Fleger-Lannbahn
+          runway: Fleger-Lannbahn

           taxiway: Fleger-Rullweg
           taxiway: Fleger-Rullweg

-          apron_only: Terminal
+          apron: Terminal

           admin: Grenz
           admin: Grenz

-          forest_only: Forst
+          forest: Forst

           wood: Woold
           golf: Golfplatz
           park: Park
           wood: Woold
           golf: Golfplatz
           park: Park

-          common_only: Wisch
+          common: Wisch

           resident: Wahnrebeed
           retail: Ladenrebeed
           industrial: Industrierebeed
           commercial: Hannelsrebeed
           heathland: Heid
           resident: Wahnrebeed
           retail: Ladenrebeed
           industrial: Industrierebeed
           commercial: Hannelsrebeed
           heathland: Heid

-          lake_only: See
+          lake: See

           reservoir: Stausee
           farm: Buurnhoff
           brownfield: Industrie-Braakland
           reservoir: Stausee
           farm: Buurnhoff
           brownfield: Industrie-Braakland


@@ -546,11 +546,11 @@ nds:
           centre: Sportzentrum
           reserve: Naturpark
           military: Militärrebeed
           centre: Sportzentrum
           reserve: Naturpark
           military: Militärrebeed

-          school_only: School
+          school: School

           university: Universität
           building: Wichtig Bowark
           station: Bahnhoff
           university: Universität
           building: Wichtig Bowark
           station: Bahnhoff

-          summit_only: Bargtopp
+          summit: Bargtopp

           peak: Bargtopp
           tunnel: Strekel-Rand = Tunnel
           bridge: Fett Rand = Brügg
           peak: Bargtopp
           tunnel: Strekel-Rand = Tunnel
           bridge: Fett Rand = Brügg

diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 64035c830573d88b93cbd7920bf8dea36428d2b6..5f1e4dc05c38d7a614c56ede4c5cf6608018c9d0 100644 (file)
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -993,18 +993,18 @@ ne:
           subway: सबवे
           cable_car: केबल कार
           chair_lift: कुर्सी लिफ्ट
           subway: सबवे
           cable_car: केबल कार
           chair_lift: कुर्सी लिफ्ट

-          forest_only: वन
+          forest: वन

           wood: कुञ्ज
           golf: गल्फ कोर्स
           park: उद्यान
           resident: आवासीय क्षेत्र
           wood: कुञ्ज
           golf: गल्फ कोर्स
           park: उद्यान
           resident: आवासीय क्षेत्र

-          lake_only: ताल
+          lake: ताल

           reservoir: मुहान
           farm: खेती
           cemetery: अन्त्यष्टी स्थल
           reservoir: मुहान
           farm: खेती
           cemetery: अन्त्यष्टी स्थल

-          school_only: विद्यालय
+          school: विद्यालय

           university: विश्वविद्यालय
           university: विश्वविद्यालय

-          summit_only: शिखर
+          summit: शिखर

           peak: शिखर
           bicycle_shop: साइकल पसल
           bicycle_parking: साकल पार्किङ
           peak: शिखर
           bicycle_shop: साइकल पसल
           bicycle_parking: साकल पार्किङ

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 6e98d2dc7c22c5a05d800c5b57d22799aace60ed..a7c153a898b48a504ea930503fca9c74c23c6e68 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -2408,27 +2408,27 @@ nl:
           subway: Metro
           ferry: Veerboot
           light_rail: Lightrail
           subway: Metro
           ferry: Veerboot
           light_rail: Lightrail

-          tram_only: Tram
+          tram: Tram

           trolleybus: Trolleybus
           bus: Bus
           cable_car: Kabelbaan
           chair_lift: Stoeltjeslift
           trolleybus: Trolleybus
           bus: Bus
           cable_car: Kabelbaan
           chair_lift: Stoeltjeslift

-          runway_only: Start- en landingsbaan
+          runway: Start- en landingsbaan

           taxiway: Taxibaan
           taxiway: Taxibaan

-          apron_only: Luchthavenplatform
+          apron: Luchthavenplatform

           admin: Bestuurlijke grens
           admin: Bestuurlijke grens

-          orchard_only: Boomgaard
+          orchard: Boomgaard

           vineyard: Wijngaard
           vineyard: Wijngaard

-          forest_only: Bos
+          forest: Bos

           wood: Bos
           farmland: Landbouwgrond
           wood: Bos
           farmland: Landbouwgrond

-          grass_only: Gras
+          grass: Gras

           meadow: Weide
           bare_rock: Kale rots
           sand: Zand
           golf: Golfbaan
           park: Park
           meadow: Weide
           bare_rock: Kale rots
           sand: Zand
           golf: Golfbaan
           park: Park

-          common_only: Gemene grond
+          common: Gemene grond

           built_up: Bebouwde kom
           resident: Woongebied
           retail: Winkelgebied
           built_up: Bebouwde kom
           resident: Woongebied
           retail: Winkelgebied


@@ -2436,7 +2436,7 @@ nl:
           commercial: Commercieel gebied
           heathland: Heide
           scrubland: Struikgewas
           commercial: Commercieel gebied
           heathland: Heide
           scrubland: Struikgewas

-          lake_only: Meer
+          lake: Meer

           reservoir: Reservoir
           glacier: Gletsjer
           farm: Boerderij
           reservoir: Reservoir
           glacier: Gletsjer
           farm: Boerderij


@@ -2447,11 +2447,11 @@ nl:
           centre: Sportcentrum
           reserve: Natuurreservaat
           military: Militair gebied
           centre: Sportcentrum
           reserve: Natuurreservaat
           military: Militair gebied

-          school_only: School
+          school: School; universiteit

           university: Universiteit
           building: Belangrijk gebouw
           station: Spoorwegstation
           university: Universiteit
           building: Belangrijk gebouw
           station: Spoorwegstation

-          summit_only: Top
+          summit: Top

           peak: Piek
           tunnel: Tunnel
           bridge: Brug
           peak: Piek
           tunnel: Tunnel
           bridge: Brug

diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index e31f6a1648ba483caa239c6675abafb1c1cf8a59..3bafdc26c5952f614ec680e0832d1ae30002c6d9 100644 (file)
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -2181,21 +2181,21 @@ nn:
           subway: Undergrunnsbane
           cable_car: Kabelvogn
           chair_lift: stolheis
           subway: Undergrunnsbane
           cable_car: Kabelvogn
           chair_lift: stolheis

-          runway_only: Flystripe
+          runway: Flystripe

           taxiway: taksebane
           taxiway: taksebane

-          apron_only: terminal
+          apron: terminal

           admin: Administrativ grense
           admin: Administrativ grense

-          forest_only: Skog
+          forest: Skog

           wood: Ved
           golf: Golfbane
           park: Park
           wood: Ved
           golf: Golfbane
           park: Park

-          common_only: Vanleg
+          common: Vanleg

           resident: Boligområde
           retail: Detaljsalgområde
           industrial: Industriområde
           commercial: Kommersielt område
           heathland: Heilandskap
           resident: Boligområde
           retail: Detaljsalgområde
           industrial: Industriområde
           commercial: Kommersielt område
           heathland: Heilandskap

-          lake_only: Innsjø
+          lake: Innsjø

           reservoir: reservoar
           farm: Gard
           brownfield: Tidlegare industriområde
           reservoir: reservoar
           farm: Gard
           brownfield: Tidlegare industriområde


@@ -2205,11 +2205,11 @@ nn:
           centre: Sportssenter
           reserve: Naturreservat
           military: Militært område
           centre: Sportssenter
           reserve: Naturreservat
           military: Militært område

-          school_only: Skule
+          school: Skule

           university: universitet
           building: Viktig bygning
           station: Jernbanestasjon
           university: universitet
           building: Viktig bygning
           station: Jernbanestasjon

-          summit_only: Topp
+          summit: Topp

           peak: fjelltopp
           tunnel: Streka kant = tunnel
           bridge: Sort kant = bru
           peak: fjelltopp
           tunnel: Streka kant = tunnel
           bridge: Sort kant = bru

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 3175b68a736fb5e18167350f3ba61c2505e59de6..0f8fcc61ca07e90b9ab42168d8179d0c691c8271 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -1521,23 +1521,23 @@ nqo:
           rail: ߣߍ߰ߛߌߟߊ
           subway: ߘߎ߰ߞߘߐ߬ߛߌߟߊ
           cable_car: ߘߎ߲ߞߎߟߎ߲
           rail: ߣߍ߰ߛߌߟߊ
           subway: ߘߎ߰ߞߘߐ߬ߛߌߟߊ
           cable_car: ߘߎ߲ߞߎߟߎ߲

-          runway_only: ߛߊ߲ߡߊߘߊ߲ ߓߏ߬ߙߌ߬ ߛߌߟߊ
+          runway: ߛߊ߲ߡߊߘߊ߲ ߓߏ߬ߙߌ߬ ߛߌߟߊ

           taxiway: ߥߊߟߌߥߊߟߌ ߫ ߛߌߟߊ
           admin: ߓߐߕߏ߲߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ߬ߞߊ
           taxiway: ߥߊߟߌߥߊߟߌ ߫ ߛߌߟߊ
           admin: ߓߐߕߏ߲߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ߬ߞߊ

-          forest_only: ߕߎ
+          forest: ߕߎ

           wood: ߦߙߌ
           wood: ߦߙߌ

-          common_only: ߘߍ߬ߒ߬ߡߊ߬ ߞߣߍ
+          common: ߘߍ߬ߒ߬ߡߊ߬ ߞߣߍ

           resident: ߡߐ߰ߘߐ߬ ߛߌߟߊ
           retail: ߖߎ߬ߟߦߊ߬ ߞߣߍ
           industrial: ߘߍ߲߰ߦߊ߬ߟߌ ߕߌ߲߬ߞߎߘߎ߲
           commercial: ߖߊ߬ߥߏ ߘߌ߲߬ߞߌߙߊ
           resident: ߡߐ߰ߘߐ߬ ߛߌߟߊ
           retail: ߖߎ߬ߟߦߊ߬ ߞߣߍ
           industrial: ߘߍ߲߰ߦߊ߬ߟߌ ߕߌ߲߬ߞߎߘߎ߲
           commercial: ߖߊ߬ߥߏ ߘߌ߲߬ߞߌߙߊ

-          lake_only: ߞߐ߰ߖߌ߬ߘߟߊ
+          lake: ߞߐ߰ߖߌ߬ߘߟߊ

           farm: ߝߏ߬ߘߏ
           cemetery: ߞߊߓߙߎߟߏ
           centre: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ ߕߊ߲ߓߊ߲
           reserve: ߛߎ߲ߞߎ߲ ߦߙߐ߫ ߟߊߕߏߣߍ߲
           military: ߣߊ߲߬ߕߌ߰ ߕߌ߲ߞߎߘߎ߲
           farm: ߝߏ߬ߘߏ
           cemetery: ߞߊߓߙߎߟߏ
           centre: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ ߕߊ߲ߓߊ߲
           reserve: ߛߎ߲ߞߎ߲ ߦߙߐ߫ ߟߊߕߏߣߍ߲
           military: ߣߊ߲߬ߕߌ߰ ߕߌ߲ߞߎߘߎ߲

-          school_only: ߞߊ߬ߙߊ߲߬ߕߊ
+          school: ߞߊ߬ߙߊ߲߬ߕߊ

           university: ߖߊ߯ߓߘߊ
           station: ߣߍ߰ߛߌߟߊ ߟߐ߬ߘߊ߮
           construction: ߛߌߟߊ ߡߍ߲ ߟߊ ߦߴߌ ߘߐ߫
           university: ߖߊ߯ߓߘߊ
           station: ߣߍ߰ߛߌߟߊ ߟߐ߬ߘߊ߮
           construction: ߛߌߟߊ ߡߍ߲ ߟߊ ߦߴߌ ߘߐ߫

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 396831072acdcd0aca748b5353a6fd7925b36e19..309e2fcf9b088516914c285aa7af428ad62b78be 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -2028,21 +2028,21 @@ oc:
           subway: Linha de mètro
           cable_car: Teleferic
           chair_lift: telesèti
           subway: Linha de mètro
           cable_car: Teleferic
           chair_lift: telesèti

-          runway_only: Pista d'aeropòrt
+          runway: Pista d'aeropòrt

           taxiway: via de circulacion d'aeropòrt
           taxiway: via de circulacion d'aeropòrt

-          apron_only: Estacionament d'avions
+          apron: Estacionament d'avions

           admin: Limit administratiu
           admin: Limit administratiu

-          forest_only: Sèuva
+          forest: Sèuva

           wood: Bòsc
           golf: Percors de gòlf
           park: Pargue
           wood: Bòsc
           golf: Percors de gòlf
           park: Pargue

-          common_only: Espaci comun
+          common: Espaci comun

           resident: Zòna residenciala
           retail: Zòna de comèrci
           industrial: Zòna industriala
           commercial: Zòna terciària
           heathland: Landa
           resident: Zòna residenciala
           retail: Zòna de comèrci
           industrial: Zòna industriala
           commercial: Zòna terciària
           heathland: Landa

-          lake_only: Lac
+          lake: Lac

           reservoir: Sèrva
           farm: Zòna agricòla
           brownfield: Zòna rasada
           reservoir: Sèrva
           farm: Zòna agricòla
           brownfield: Zòna rasada


@@ -2052,11 +2052,11 @@ oc:
           centre: Centre esportiu
           reserve: Resèrva naturala
           military: Zòna militara
           centre: Centre esportiu
           reserve: Resèrva naturala
           military: Zòna militara

-          school_only: Escòla
+          school: Escòla

           university: universitat
           building: Bastissa significativa
           station: Gara ferroviària
           university: universitat
           building: Bastissa significativa
           station: Gara ferroviària

-          summit_only: Som
+          summit: Som

           peak: pic
           tunnel: Bòrd en puntilhats = tunèl
           bridge: Bòrd negre = pont
           peak: pic
           tunnel: Bòrd en puntilhats = tunèl
           bridge: Bòrd negre = pont

diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 8b1d9913a33ea5c1790792e1967cb92783c67dea..45320480b8f184626342bb69b7ab480cf100677d 100644 (file)
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -936,20 +936,20 @@ pa:
           subway: ਸਬ-ਵੇਅ
           cable_car: ਕੇਬਲ ਕਾਰ
           chair_lift: ਕੁਰਸੀ ਲਿਫ਼ਟ
           subway: ਸਬ-ਵੇਅ
           cable_car: ਕੇਬਲ ਕਾਰ
           chair_lift: ਕੁਰਸੀ ਲਿਫ਼ਟ

-          runway_only: ਹਵਾਈ ਅੱਡੇ ਦੀ ਉਡਾਣ ਪੱਟੀ
+          runway: ਹਵਾਈ ਅੱਡੇ ਦੀ ਉਡਾਣ ਪੱਟੀ

           taxiway: ਟੈਕਸੀਵੇਅ
           taxiway: ਟੈਕਸੀਵੇਅ

-          apron_only: ਹਵਾਈ ਅੱਡੇ ਦਾ ਐਪਰਨ
+          apron: ਹਵਾਈ ਅੱਡੇ ਦਾ ਐਪਰਨ

           admin: ਪ੍ਰਸ਼ਾਸਕੀ ਸਰਹੱਦ
           admin: ਪ੍ਰਸ਼ਾਸਕੀ ਸਰਹੱਦ

-          forest_only: ਜੰਗਲ
+          forest: ਜੰਗਲ

           wood: ਜੰਗਲ
           golf: ਗੋਲਫ਼ ਮੈਦਾਨ
           park: ਪਾਰਕ
           wood: ਜੰਗਲ
           golf: ਗੋਲਫ਼ ਮੈਦਾਨ
           park: ਪਾਰਕ

-          common_only: ਸ਼ਾਮਲਾਟ
+          common: ਸ਼ਾਮਲਾਟ

           resident: ਰਿਹਾਇਸ਼ੀ ਇਲਾਕਾ
           retail: ਪਰਚੂਨ ਖੇਤਰ
           industrial: ਉਦਯੋਗਿਕ ਖੇਤਰ
           commercial: ਵਪਾਰਕ ਖੇਤਰ
           resident: ਰਿਹਾਇਸ਼ੀ ਇਲਾਕਾ
           retail: ਪਰਚੂਨ ਖੇਤਰ
           industrial: ਉਦਯੋਗਿਕ ਖੇਤਰ
           commercial: ਵਪਾਰਕ ਖੇਤਰ

-          lake_only: ਝੀਲ
+          lake: ਝੀਲ

           reservoir: ਕੁੰਡ
           farm: ਖੇਤ
           cemetery: ਸ਼ਮਸ਼ਾਨ
           reservoir: ਕੁੰਡ
           farm: ਖੇਤ
           cemetery: ਸ਼ਮਸ਼ਾਨ


@@ -957,11 +957,11 @@ pa:
           centre: ਖੇਡ ਕੇਂਦਰ
           reserve: ਕੁਦਰਤੀ ਰੱਖ
           military: ਫ਼ੌਜੀ ਇਲਾਕਾ
           centre: ਖੇਡ ਕੇਂਦਰ
           reserve: ਕੁਦਰਤੀ ਰੱਖ
           military: ਫ਼ੌਜੀ ਇਲਾਕਾ

-          school_only: ਸਕੂਲ
+          school: ਸਕੂਲ

           university: ਯੂਨੀਵਰਸਿਟੀ
           building: ਮਹੱਤਵਪੂਰਨ ਇਮਾਰਤ
           station: ਰੇਲਵੇ ਸਟੇਸ਼ਨ
           university: ਯੂਨੀਵਰਸਿਟੀ
           building: ਮਹੱਤਵਪੂਰਨ ਇਮਾਰਤ
           station: ਰੇਲਵੇ ਸਟੇਸ਼ਨ

-          summit_only: ਸਿਖਰ
+          summit: ਸਿਖਰ

           peak: ਚੋਟੀ
           construction: ਉਸਾਰੀ ਹੇਠ ਸੜਕਾਂ
     welcome:
           peak: ਚੋਟੀ
           construction: ਉਸਾਰੀ ਹੇਠ ਸੜਕਾਂ
     welcome:

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 55cfdc702c5d9b5456961900be6919965c4e6d52..7c641a29f8abc07e873bc51493dbf3744fe8fdbb 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -2344,26 +2344,26 @@ pl:
           subway: Metro
           ferry: Prom
           light_rail: Kolej miejska
           subway: Metro
           ferry: Prom
           light_rail: Kolej miejska

-          tram_only: Tramwaj
+          tram: Tramwaj

           trolleybus: Trolejbus
           bus: Autobus
           cable_car: Kolej linowa
           chair_lift: wyciąg krzesełkowy
           trolleybus: Trolejbus
           bus: Autobus
           cable_car: Kolej linowa
           chair_lift: wyciąg krzesełkowy

-          runway_only: Pas startowy
+          runway: Pas startowy

           taxiway: kołowania
           taxiway: kołowania

-          apron_only: Płyta lotniska
+          apron: Płyta lotniska

           admin: Granica
           admin: Granica

-          forest_only: Las
+          forest: Las

           wood: Drzewa
           golf: Pole golfowe
           park: Park
           wood: Drzewa
           golf: Pole golfowe
           park: Park

-          common_only: Pole
+          common: Pole

           resident: Teren mieszkalny
           retail: Zabudowa handlowo-usługowa
           industrial: Teren przemysłowy
           commercial: Teren komercyjny
           heathland: Wrzosowisko
           resident: Teren mieszkalny
           retail: Zabudowa handlowo-usługowa
           industrial: Teren przemysłowy
           commercial: Teren komercyjny
           heathland: Wrzosowisko

-          lake_only: Jezioro
+          lake: Jezioro

           reservoir: zbiornik
           glacier: Lodowiec
           farm: Gospodarstwo rolne
           reservoir: zbiornik
           glacier: Lodowiec
           farm: Gospodarstwo rolne


@@ -2374,11 +2374,11 @@ pl:
           centre: Centrum sportowe
           reserve: Rezerwat przyrody
           military: Teren wojskowy
           centre: Centrum sportowe
           reserve: Rezerwat przyrody
           military: Teren wojskowy

-          school_only: Szkoła
+          school: Szkoła

           university: uniwersytet
           building: Ważny budynek
           station: Stacja kolejowa
           university: uniwersytet
           building: Ważny budynek
           station: Stacja kolejowa

-          summit_only: Góra
+          summit: Góra

           peak: szczyt
           tunnel: Kreskowany obrys – tunel
           bridge: Czarny obrys – most
           peak: szczyt
           tunnel: Kreskowany obrys – tunel
           bridge: Czarny obrys – most

diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml
index ab4de926aca34fa582e0704d2cf7f1cef693156a..50b66ba8c965be2ea93ff4e09f9e5b82861e3797 100644 (file)
--- a/config/locales/pnb.yml
+++ b/config/locales/pnb.yml
@@ -1659,21 +1659,21 @@ pnb:
           subway: سبوے
           cable_car: کیبل کار
           chair_lift: کُرسی لِفٹ
           subway: سبوے
           cable_car: کیبل کار
           chair_lift: کُرسی لِفٹ

-          runway_only: ہوائی اڈے اُڈاݨ پٹی
+          runway: ہوائی اڈے اُڈاݨ پٹی

           taxiway: ٹیکسی‌وے
           taxiway: ٹیکسی‌وے

-          apron_only: ہوائی اڈے دا ایپرن
+          apron: ہوائی اڈے دا ایپرن

           admin: پرشاسکی سرحد
           admin: پرشاسکی سرحد

-          forest_only: رکھّ
+          forest: رکھّ

           wood: جنگل
           golf: گولف مَیدان
           park: پارک
           wood: جنگل
           golf: گولف مَیدان
           park: پارک

-          common_only: شاملاٹ
+          common: شاملاٹ

           resident: رہائشی کھیتر
           retail: پرچون کھیتر
           industrial: سناتی کھیتر
           commercial: وپارک کھیتر
           heathland: ہیتھ
           resident: رہائشی کھیتر
           retail: پرچون کھیتر
           industrial: سناتی کھیتر
           commercial: وپارک کھیتر
           heathland: ہیتھ

-          lake_only: جھیل
+          lake: جھیل

           reservoir: کُنڈ
           farm: کھیت
           brownfield: براؤنفیلڈ
           reservoir: کُنڈ
           farm: کھیت
           brownfield: براؤنفیلڈ


@@ -1683,11 +1683,11 @@ pnb:
           centre: کھیڈ کیندر
           reserve: کُدرتی رکھّ
           military: فَوجی کھیتر
           centre: کھیڈ کیندر
           reserve: کُدرتی رکھّ
           military: فَوجی کھیتر

-          school_only: سکول
+          school: سکول

           university: یونیورستی
           building: مہتوپورن عمارت
           station: ریلوے سٹیشن
           university: یونیورستی
           building: مہتوپورن عمارت
           station: ریلوے سٹیشن

-          summit_only: سکھر
+          summit: سکھر

           peak: چوٹی
           tunnel: سُرنگ (ڈیش لائیناں)
           bridge: پُل (کالیاں لائیناں)
           peak: چوٹی
           tunnel: سُرنگ (ڈیش لائیناں)
           bridge: پُل (کالیاں لائیناں)

diff --git a/config/locales/ps.yml b/config/locales/ps.yml
index 457742e917f0d061a792ce1c70366e28eeadb4ba..413a13d754a0365ef5b515a511f05d38e10d84da 100644 (file)
--- a/config/locales/ps.yml
+++ b/config/locales/ps.yml
@@ -368,14 +368,14 @@ ps:
     key:
       table:
         entry:
     key:
       table:
         entry:

-          forest_only: ځنگل
+          forest: ځنگل

           park: پارک
           park: پارک

-          lake_only: ډنډ
+          lake: ډنډ

           reservoir: زېرمتون
           farm: کرونده
           cemetery: هديره
           military: پوځي سيمه
           reservoir: زېرمتون
           farm: کرونده
           cemetery: هديره
           military: پوځي سيمه

-          school_only: ښوونځی
+          school: ښوونځی

           university: پوهنتون
   traces:
     new:
           university: پوهنتون
   traces:
     new:

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 91ec6c7cc1675af74a4b3838da267d94abf36aa9..0862829262ce3075f69060441ba186699f8a3e05 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -2378,27 +2378,27 @@ pt-PT:
           subway: Metropolitano
           ferry: Ferry
           light_rail: Comboio ligeiro
           subway: Metropolitano
           ferry: Ferry
           light_rail: Comboio ligeiro

-          tram_only: Elétrico
+          tram: Elétrico

           trolleybus: Troleicarro
           bus: Autocarro
           cable_car: Teleférico
           chair_lift: Teleférico
           trolleybus: Troleicarro
           bus: Autocarro
           cable_car: Teleférico
           chair_lift: Teleférico

-          runway_only: Pista de aviação
+          runway: Pista de aviação

           taxiway: Via de circulação
           taxiway: Via de circulação

-          apron_only: Estacionamento de aviões
+          apron: Estacionamento de aviões

           admin: Fronteira administrativa
           admin: Fronteira administrativa

-          orchard_only: Pomar
+          orchard: Pomar

           vineyard: Vinha
           vineyard: Vinha

-          forest_only: Floresta gerida
+          forest: Floresta gerida

           wood: Bosque
           farmland: Terreno agrícola
           wood: Bosque
           farmland: Terreno agrícola

-          grass_only: Relva
+          grass: Relva

           meadow: Prado
           bare_rock: Rocha exposta
           sand: Areia
           golf: Campo de golfe
           park: Parque público
           meadow: Prado
           bare_rock: Rocha exposta
           sand: Areia
           golf: Campo de golfe
           park: Parque público

-          common_only: Terrenos comunitários
+          common: Terrenos comunitários

           built_up: Zona edificada
           resident: Área residencial
           retail: Área de retalho
           built_up: Zona edificada
           resident: Área residencial
           retail: Área de retalho


@@ -2406,7 +2406,7 @@ pt-PT:
           commercial: Área comercial
           heathland: Charneca
           scrubland: Matagal
           commercial: Área comercial
           heathland: Charneca
           scrubland: Matagal

-          lake_only: Lago
+          lake: Lago

           reservoir: Reservatório
           intermittent_water: Corpo de água intermitente
           glacier: Glaciar
           reservoir: Reservatório
           intermittent_water: Corpo de água intermitente
           glacier: Glaciar


@@ -2420,12 +2420,12 @@ pt-PT:
           centre: Centro desportivo
           reserve: Reserva natural
           military: Área militar
           centre: Centro desportivo
           reserve: Reserva natural
           military: Área militar

-          school_only: Escola
+          school: Escola

           university: Universidade
           hospital: Hospital
           building: Edifício importante
           station: Estação ferroviária
           university: Universidade
           hospital: Hospital
           building: Edifício importante
           station: Estação ferroviária

-          summit_only: Cume
+          summit: Cume

           peak: Pico
           tunnel: Linha tracejada = túnel
           bridge: Linha cheia = ponte
           peak: Pico
           tunnel: Linha tracejada = túnel
           bridge: Linha cheia = ponte

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 687d5bc44132ec3f31dba6f1f41b21f297a592f5..18c834175844f39ebca3e10a10b6267a38a44a36 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -2378,23 +2378,23 @@ pt:
           subway: Metrô
           cable_car: Bonde aéreo
           chair_lift: Teleférico
           subway: Metrô
           cable_car: Bonde aéreo
           chair_lift: Teleférico

-          runway_only: Pista de Pouso
+          runway: Pista de Pouso

           taxiway: pista de taxiamento
           taxiway: pista de taxiamento

-          apron_only: Pátio de aeródromo
+          apron: Pátio de aeródromo

           admin: Limite administrativo
           vineyard: Vinha
           admin: Limite administrativo
           vineyard: Vinha

-          forest_only: Floresta manejada
+          forest: Floresta manejada

           wood: Bosque nativo
           meadow: Prado
           golf: Campo de golfe
           park: Parque
           wood: Bosque nativo
           meadow: Prado
           golf: Campo de golfe
           park: Parque

-          common_only: Baldio comunitário
+          common: Baldio comunitário

           resident: Área residencial
           retail: Área de varejo
           industrial: Área industrial
           commercial: Área de negócios
           heathland: Urzal
           resident: Área residencial
           retail: Área de varejo
           industrial: Área industrial
           commercial: Área de negócios
           heathland: Urzal

-          lake_only: Lago
+          lake: Lago

           reservoir: Reservatório
           farm: Lavoura
           brownfield: Terreno abandonado
           reservoir: Reservatório
           farm: Lavoura
           brownfield: Terreno abandonado


@@ -2404,12 +2404,12 @@ pt:
           centre: Centro/clube esportivo
           reserve: Reserva ambiental
           military: Área militar
           centre: Centro/clube esportivo
           reserve: Reserva ambiental
           military: Área militar

-          school_only: Escola
+          school: Escola/Universidade

           university: universidade
           hospital: Hospital
           building: Edifício importante
           station: Estação ferroviária
           university: universidade
           hospital: Hospital
           building: Edifício importante
           station: Estação ferroviária

-          summit_only: Cume
+          summit: Cume

           peak: cume
           tunnel: Túnel (contorno tracejado)
           bridge: Ponte/viaduto (contorno contínuo)
           peak: cume
           tunnel: Túnel (contorno tracejado)
           bridge: Ponte/viaduto (contorno contínuo)

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index f660f8cb66b1cc9fd5d1ed667aa11a9ccd4d5989..42170491d530f12801bb4fcf047b95e793543ba5 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -2377,34 +2377,34 @@ ro:
           train: Tren
           subway: Stație de metrou
           ferry: Feribot
           train: Tren
           subway: Stație de metrou
           ferry: Feribot

-          tram_only: Tramvai
+          tram: Tramvai

           trolleybus: Troleibuz
           bus: Autobuz
           cable_car: Telecabină
           chair_lift: Telescaun
           trolleybus: Troleibuz
           bus: Autobuz
           cable_car: Telecabină
           chair_lift: Telescaun

-          runway_only: Pistă de Aeroport
+          runway: Pistă de Aeroport

           taxiway: taxiway
           taxiway: taxiway

-          apron_only: Aeronavă
+          apron: Aeronavă

           admin: Graniță administrativă
           admin: Graniță administrativă

-          orchard_only: Livadă
+          orchard: Livadă

           vineyard: Podgorie
           vineyard: Podgorie

-          forest_only: Pădure
+          forest: Pădure

           wood: Lemn
           farmland: Teren agricol
           wood: Lemn
           farmland: Teren agricol

-          grass_only: Iarbă
+          grass: Iarbă

           meadow: Luncă
           bare_rock: Stâncă goală
           sand: Nisip
           golf: Teren de golf
           park: Parc
           meadow: Luncă
           bare_rock: Stâncă goală
           sand: Nisip
           golf: Teren de golf
           park: Parc

-          common_only: Comun
+          common: Comun

           built_up: Zonă construită
           resident: Zonă rezidențială
           retail: Spațiul de retail
           industrial: Zonă industrială
           commercial: Zonă comercială
           heathland: Landă
           built_up: Zonă construită
           resident: Zonă rezidențială
           retail: Spațiul de retail
           industrial: Zonă industrială
           commercial: Zonă comercială
           heathland: Landă

-          lake_only: Lac
+          lake: Lac

           reservoir: Rezervor
           intermittent_water: Corp de apă intermitent
           glacier: Ghețar
           reservoir: Rezervor
           intermittent_water: Corp de apă intermitent
           glacier: Ghețar


@@ -2417,12 +2417,12 @@ ro:
           centre: Centru de sport
           reserve: Rezervație naturală
           military: Zonă militară
           centre: Centru de sport
           reserve: Rezervație naturală
           military: Zonă militară

-          school_only: Școală
+          school: School; university

           university: Universitate
           hospital: Spital
           building: Clădire importantă
           station: Gară
           university: Universitate
           hospital: Spital
           building: Clădire importantă
           station: Gară

-          summit_only: Vârf de munte
+          summit: Vârf de munte

           peak: Vârf
           tunnel: Dashed casing = tunel
           bridge: Black casing = pod
           peak: Vârf
           tunnel: Dashed casing = tunel
           bridge: Black casing = pod

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index ded7cca8c0ea2a0790fd321c66885a8a9e2a4615..a93e329ea390ee9044ff64019c5f7681eb6a7da4 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -533,7 +533,7 @@ ru:
       feature_warning: Необходимо загрузить %{num_features} объектов, что может замедлить
         ваш браузер. Вы уверены что хотите просмотреть эти данные?
       load_data: Загрузить данные
       feature_warning: Необходимо загрузить %{num_features} объектов, что может замедлить
         ваш браузер. Вы уверены что хотите просмотреть эти данные?
       load_data: Загрузить данные

-      loading: Ð\97агÑ\80Ñ\83зка...
+      loading: Ð\97агÑ\80Ñ\83жаеÑ\82Ñ\81Ñ\8fâ\80¦

     tag_details:
       tags: Теги
       wiki_link:
     tag_details:
       tags: Теги
       wiki_link:


@@ -2315,32 +2315,32 @@ ru:
           train: Поезд
           subway: Линия метро
           ferry: Паром
           train: Поезд
           subway: Линия метро
           ferry: Паром

-          tram_only: Трамвай
+          tram: Трамвай

           trolleybus: Троллейбус
           bus: Автобус
           cable_car: Канатная дорога
           chair_lift: кресельный подъёмник
           trolleybus: Троллейбус
           bus: Автобус
           cable_car: Канатная дорога
           chair_lift: кресельный подъёмник

-          runway_only: Взлётно-посадочная полоса аэропорта
+          runway: Взлётно-посадочная полоса аэропорта

           taxiway: рулёжная дорожка
           taxiway: рулёжная дорожка

-          apron_only: Перрон аэродрома
+          apron: Перрон аэродрома

           admin: Административная граница
           admin: Административная граница

-          orchard_only: Фруктовый сад
+          orchard: Фруктовый сад

           vineyard: Виноградник
           vineyard: Виноградник

-          forest_only: Лес
+          forest: Лес

           wood: Роща
           farmland: Сельхозугодья
           wood: Роща
           farmland: Сельхозугодья

-          grass_only: Трава
+          grass: Трава

           meadow: Луг
           golf: Площадка для гольфа
           park: Парк
           meadow: Луг
           golf: Площадка для гольфа
           park: Парк

-          common_only: Общественная земля
+          common: Общественная земля

           built_up: Площадь застройки
           resident: Жилой район
           retail: Торговый район
           industrial: Промышленный район
           commercial: Коммерческий район
           heathland: Вересковая пустошь
           built_up: Площадь застройки
           resident: Жилой район
           retail: Торговый район
           industrial: Промышленный район
           commercial: Коммерческий район
           heathland: Вересковая пустошь

-          lake_only: Озеро
+          lake: Озеро

           reservoir: Водохранилище
           glacier: Ледник
           farm: Ферма
           reservoir: Водохранилище
           glacier: Ледник
           farm: Ферма


@@ -2351,12 +2351,12 @@ ru:
           centre: Спортивный центр
           reserve: Заповедник
           military: Военная территория
           centre: Спортивный центр
           reserve: Заповедник
           military: Военная территория

-          school_only: Школа
+          school: Школа, университет

           university: Университет
           hospital: Больница
           building: Значительное здание
           station: Железнодорожная станция
           university: Университет
           hospital: Больница
           building: Значительное здание
           station: Железнодорожная станция

-          summit_only: Вершина
+          summit: Вершина

           peak: Вершина горы
           tunnel: Туннель (пунктир)
           bridge: Мост (жирная линия)
           peak: Вершина горы
           tunnel: Туннель (пунктир)
           bridge: Мост (жирная линия)

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index a37e7b87bcb478b1e4ace7bbfd9bc53510f10da9..33883d2ba4980ad80b5b9a6537c12203aa1186d6 100644 (file)
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -583,10 +583,10 @@ sat:
       table:
         entry:
           footway: ᱛᱟᱲᱟᱢᱦᱚᱨ
       table:
         entry:
           footway: ᱛᱟᱲᱟᱢᱦᱚᱨ

-          forest_only: ᱵᱤᱨ
+          forest: ᱵᱤᱨ

           wood: ᱠᱟᱴᱷ
           park: ᱵᱟᱜᱟᱱ
           wood: ᱠᱟᱴᱷ
           park: ᱵᱟᱜᱟᱱ

-          school_only: ᱤᱛᱩᱱ ᱟᱥᱲᱟ
+          school: ᱤᱛᱩᱱ ᱟᱥᱲᱟ

           bicycle_shop: ᱥᱟᱭᱠᱤᱞ ᱫᱩᱠᱟᱹᱱ
           bicycle_parking: ᱥᱟᱭᱠᱤᱞ ᱯᱟᱨᱠᱤᱝ
           toilets: ᱴᱚᱭᱞᱮᱴᱠᱚ
           bicycle_shop: ᱥᱟᱭᱠᱤᱞ ᱫᱩᱠᱟᱹᱱ
           bicycle_parking: ᱥᱟᱭᱠᱤᱞ ᱯᱟᱨᱠᱤᱝ
           toilets: ᱴᱚᱭᱞᱮᱴᱠᱚ

diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index c38acc7e9b8414f6b35edbf20493255fa13c31d9..b0b9ddcde66e9db6f2f7dac2a6cad9df0352e47c 100644 (file)
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -2363,21 +2363,21 @@ sc:
           subway: Metropolitana
           cable_car: Funivia
           chair_lift: ascensore carrotzina
           subway: Metropolitana
           cable_car: Funivia
           chair_lift: ascensore carrotzina

-          runway_only: Pista de aeroportu
+          runway: Pista de aeroportu

           taxiway: carrera de furriada
           taxiway: carrera de furriada

-          apron_only: Àrea de parchègiu de sos aèreos
+          apron: Àrea de parchègiu de sos aèreos

           admin: Làcana amministrativa
           admin: Làcana amministrativa

-          forest_only: Litu
+          forest: Litu

           wood: Buscu
           golf: Campu de golf
           park: Parcu
           wood: Buscu
           golf: Campu de golf
           park: Parcu

-          common_only: Comunu
+          common: Comunu

           resident: Àrea de residèntzia
           retail: Àrea cummertziale
           industrial: Àrea industriale
           commercial: Àrea cummertziale
           heathland: Istruvina
           resident: Àrea de residèntzia
           retail: Àrea cummertziale
           industrial: Àrea industriale
           commercial: Àrea cummertziale
           heathland: Istruvina

-          lake_only: Lagu
+          lake: Lagu

           reservoir: riserva de abba
           farm: Fatoria
           brownfield: Terrinu industriale abbandonadu
           reservoir: riserva de abba
           farm: Fatoria
           brownfield: Terrinu industriale abbandonadu


@@ -2387,11 +2387,11 @@ sc:
           centre: Tzentru isportivu
           reserve: Reserva naturale
           military: Zona militare
           centre: Tzentru isportivu
           reserve: Reserva naturale
           military: Zona militare

-          school_only: Iscola
+          school: Iscola

           university: universidade
           building: Edifìtziu significativu
           station: Istatzione ferroviària
           university: universidade
           building: Edifìtziu significativu
           station: Istatzione ferroviària

-          summit_only: Cùcuru de monte
+          summit: Cùcuru de monte

           peak: cùcuru
           tunnel: Lìnia trategiada = galleria
           bridge: Oros nieddos = ponte
           peak: cùcuru
           tunnel: Lìnia trategiada = galleria
           bridge: Oros nieddos = ponte

diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index 735573c2f61257c3b719a11e223023423f916099..a4268ee15970b1967e08cdacff8d6834d2f7000f 100644 (file)
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -43,6 +43,11 @@ scn:
     errors:
       messages:
         invalid_email_address: nun pari èssiri nu nnirizzu email vàlidu
     errors:
       messages:
         invalid_email_address: nun pari èssiri nu nnirizzu email vàlidu

+      models:
+        user_mute:
+          attributes:
+            subject:
+              format: '%{message}'

     models:
       acl: Lista di cuntrollu d'accessu
       changeset: Gruppu di canciamenti
     models:
       acl: Lista di cuntrollu d'accessu
       changeset: Gruppu di canciamenti


@@ -163,6 +168,7 @@ scn:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

+      microsoft: Microsoft

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


@@ -191,6 +197,7 @@ scn:
   account:
     deletions:
       show:
   account:
     deletions:
       show:

+        title: Cancella lu mè cuntu

         delete_account: Cancella cuntu
         confirm_delete: Sî sicuru?
         cancel: Annulla
         delete_account: Cancella cuntu
         confirm_delete: Sî sicuru?
         cancel: Annulla


@@ -325,8 +332,10 @@ scn:
         tag: La pàggina dâ wiki chi discrivi l'etichetta %{key}=%{value}
       wikidata_link: Lu suggettu %{page} supra a Wikidata
       wikipedia_link: L'artìculu %{page} supra a Wikipedia
         tag: La pàggina dâ wiki chi discrivi l'etichetta %{key}=%{value}
       wikidata_link: Lu suggettu %{page} supra a Wikidata
       wikipedia_link: L'artìculu %{page} supra a Wikipedia

+      wikimedia_commons_link: L'elementu %{page} supra Wikimedia Commons

       telephone_link: Chiama lu %{phone_number}
       colour_preview: Antiprima culuri %{colour_value}
       telephone_link: Chiama lu %{phone_number}
       colour_preview: Antiprima culuri %{colour_value}

+      email_link: Email %{email}

     query:
       title: Arricerca di l'elimenti
       introduction: Clicca supra â cartina pi circari l'elimenti vicini.
     query:
       title: Arricerca di l'elimenti
       introduction: Clicca supra â cartina pi circari l'elimenti vicini.


@@ -1518,21 +1527,21 @@ scn:
           subway: Mitrupulitana
           cable_car: Funivìa
           chair_lift: seggiuvìa
           subway: Mitrupulitana
           cable_car: Funivìa
           chair_lift: seggiuvìa

-          runway_only: Pista d’attirraggiu
+          runway: Pista d’attirraggiu

           taxiway: pista di rullaggiu
           taxiway: pista di rullaggiu

-          apron_only: Ària di parcheggiu ariupurtuali
+          apron: Ària di parcheggiu ariupurtuali

           admin: Cunfini amministrativu
           admin: Cunfini amministrativu

-          forest_only: Furesta
+          forest: Furesta

           wood: Voscu
           golf: Campu di golf
           park: Villa
           wood: Voscu
           golf: Campu di golf
           park: Villa

-          common_only: Cumuni
+          common: Cumuni

           resident: Zona risidinziali
           retail: Zona di nigozzî
           industrial: Zona nnustriali
           commercial: Zona cummirciali
           heathland: Brughiera
           resident: Zona risidinziali
           retail: Zona di nigozzî
           industrial: Zona nnustriali
           commercial: Zona cummirciali
           heathland: Brughiera

-          lake_only: Lacu
+          lake: Lacu

           reservoir: lacu artificiali
           farm: Massarìa
           brownfield: Zona di bunìfica
           reservoir: lacu artificiali
           farm: Massarìa
           brownfield: Zona di bunìfica


@@ -1542,11 +1551,11 @@ scn:
           centre: Centru spurtivu
           reserve: Riserva naturali
           military: Zona militari
           centre: Centru spurtivu
           reserve: Riserva naturali
           military: Zona militari

-          school_only: Scola
+          school: Scola

           university: univirsità
           building: Edificiu mpurtanti
           station: Stazzioni dâ ferruvìa
           university: univirsità
           building: Edificiu mpurtanti
           station: Stazzioni dâ ferruvìa

-          summit_only: Muntagna
+          summit: Muntagna

           peak: Muntagna
           tunnel: Cuntornu trattiatu = jallarìa
           bridge: Cuntornu niurittu = ponti
           peak: Muntagna
           tunnel: Cuntornu trattiatu = jallarìa
           bridge: Cuntornu niurittu = ponti

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index fc7e1ed5350cd42408236d4f49a3205426f61dfa..70c9a09cb4d11351e17e02915d1db5ad995624b5 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -923,10 +923,10 @@ sco:
           retail: Retail aurie
           industrial: Industrial aurie
           commercial: Commercial aurie
           retail: Retail aurie
           industrial: Industrial aurie
           commercial: Commercial aurie

-          lake_only: Loch
+          lake: Loch

           farm: Ferm
           military: Militar aurie
           farm: Ferm
           military: Militar aurie

-          school_only: Schuil
+          school: Schuil

           university: varsity
           building: Signeeficant biggin
     welcome:
           university: varsity
           building: Signeeficant biggin
     welcome:

diff --git a/config/locales/sh.yml b/config/locales/sh.yml
index 1e6d91e3d74ac748df64ce8e9de602f73afd9be5..557ac5bc739e369bda83d1e2851a708ec629ee13 100644 (file)
--- a/config/locales/sh.yml
+++ b/config/locales/sh.yml
@@ -731,21 +731,21 @@ sh:
           subway: Podzemna željeznica
           cable_car: Kabinska žičara
           chair_lift: sedežnica
           subway: Podzemna željeznica
           cable_car: Kabinska žičara
           chair_lift: sedežnica

-          runway_only: Aerodromska pista
+          runway: Aerodromska pista

           taxiway: rulna staza
           taxiway: rulna staza

-          apron_only: Parking za avione
+          apron: Parking za avione

           admin: Administrativna granica
           admin: Administrativna granica

-          forest_only: Šuma
+          forest: Šuma

           wood: Šume (prirodne, neodržavane)
           golf: Golf teren
           park: Park
           wood: Šume (prirodne, neodržavane)
           golf: Golf teren
           park: Park

-          common_only: Travnjaci
+          common: Travnjaci

           resident: Stambeno područje
           retail: Maloprodajno područje
           industrial: Industrijsko područje
           commercial: Poslovno područje
           heathland: Vriština
           resident: Stambeno područje
           retail: Maloprodajno područje
           industrial: Industrijsko područje
           commercial: Poslovno područje
           heathland: Vriština

-          lake_only: Jezero
+          lake: Jezero

           reservoir: rezervoar
           farm: Farma
           brownfield: Gradilište
           reservoir: rezervoar
           farm: Farma
           brownfield: Gradilište


@@ -755,11 +755,11 @@ sh:
           centre: Sportski centar
           reserve: Rezervat prirode
           military: Vojno područje
           centre: Sportski centar
           reserve: Rezervat prirode
           military: Vojno područje

-          school_only: Škola
+          school: Škola

           university: univerzitet
           building: Značajna zgrada
           station: Željeznička stanica
           university: univerzitet
           building: Značajna zgrada
           station: Željeznička stanica

-          summit_only: Vrh
+          summit: Vrh

           peak: vrh
     welcome:
       title: Dobrodošli!
           peak: vrh
     welcome:
       title: Dobrodošli!

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index d9ce75568b9b06d68c896c67f6ccf5e65db063d3..66108416d8c45bb94bcb40c54880f69453affe86 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -2121,21 +2121,21 @@ sk:
           subway: Metro
           cable_car: Lanovka
           chair_lift: sedačková lanovka
           subway: Metro
           cable_car: Lanovka
           chair_lift: sedačková lanovka

-          runway_only: Letisková dráha
+          runway: Letisková dráha

           taxiway: pojazdová dráha
           taxiway: pojazdová dráha

-          apron_only: Letisková odbavovacia plocha
+          apron: Letisková odbavovacia plocha

           admin: Administratívne hranice
           admin: Administratívne hranice

-          forest_only: Les (udržiavaný)
+          forest: Les (udržiavaný)

           wood: Les (neudržiavaný)
           golf: Golfové ihrisko
           park: Park
           wood: Les (neudržiavaný)
           golf: Golfové ihrisko
           park: Park

-          common_only: Pastvina
+          common: Pastvina

           resident: Obytná oblasť
           retail: Nákupná oblasť
           industrial: Priemyselná oblasť
           commercial: Komerčná oblasť
           heathland: Vresovisko
           resident: Obytná oblasť
           retail: Nákupná oblasť
           industrial: Priemyselná oblasť
           commercial: Komerčná oblasť
           heathland: Vresovisko

-          lake_only: Jazero
+          lake: Jazero

           reservoir: nádrž
           farm: Farma
           brownfield: Zborenisko
           reservoir: nádrž
           farm: Farma
           brownfield: Zborenisko


@@ -2145,11 +2145,11 @@ sk:
           centre: Športové centrum
           reserve: Prírodná rezervácia
           military: Vojenský priestor
           centre: Športové centrum
           reserve: Prírodná rezervácia
           military: Vojenský priestor

-          school_only: Škola
+          school: Škola

           university: univerzita
           building: Významná budova
           station: Železničná stanica
           university: univerzita
           building: Významná budova
           station: Železničná stanica

-          summit_only: Vrchol
+          summit: Vrchol

           peak: vrchol
           tunnel: Čiarkovaný obrys = tunel
           bridge: Čireny obrys = most
           peak: vrchol
           tunnel: Čiarkovaný obrys = tunel
           bridge: Čireny obrys = most

diff --git a/config/locales/skr-arab.yml b/config/locales/skr-arab.yml
index 1c3b3a447803a57a3b766fcd42697fb4bc39cce8..bf450d963e64cb881a014711a45dee9def68bacc 100644 (file)
--- a/config/locales/skr-arab.yml
+++ b/config/locales/skr-arab.yml
@@ -1221,7 +1221,7 @@ skr-arab:
           track: ٹرَیک
           train: ڳَݙی
           light_rail: لائٹ ریل
           track: ٹرَیک
           train: ڳَݙی
           light_rail: لائٹ ریل

-          tram_only: ٹرام
+          tram: ٹرام

           trolleybus: ٹرالی بس
           bus: بس
           cable_car: کیبل کار
           trolleybus: ٹرالی بس
           bus: بس
           cable_car: کیبل کار


@@ -1229,23 +1229,23 @@ skr-arab:
           taxiway: ٹیکسی دا راہ
           capital: دار الحکومت
           city: شَہر
           taxiway: ٹیکسی دا راہ
           capital: دار الحکومت
           city: شَہر

-          orchard_only: بغیچا
-          forest_only: جنگل
+          orchard: بغیچا
+          forest: جنگل

           wood: لکڑ
           wood: لکڑ

-          grass_only: گھا
+          grass: گھا

           meadow: چراگاہ
           sand: ریت
           golf: گولف مَیدان
           park: پارک
           meadow: چراگاہ
           sand: ریت
           golf: گولف مَیدان
           park: پارک

-          common_only: وقف
+          common: وقف

           retail: پرچون علاقہ
           industrial: صنعتی علاقہ
           commercial: کمرشل ایریا
           retail: پرچون علاقہ
           industrial: صنعتی علاقہ
           commercial: کمرشل ایریا

-          lake_only: جھیل
+          lake: جھیل

           reservoir: ذخائر
           glacier: گلیشیئر
           farm: کھیت
           reservoir: ذخائر
           glacier: گلیشیئر
           farm: کھیت

-          school_only: سکول
+          school: سکول

           university: یونی ورسٹی
           hospital: ہسپتال
           station: ریلوے ٹیشݨ
           university: یونی ورسٹی
           hospital: ہسپتال
           station: ریلوے ٹیشݨ

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 32f25381d128cb6bdc048054c43d1ef4578d9588..6a365a8a7a5fb94840fa1298bc2d7c7f6254830a 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -2420,29 +2420,29 @@ sl:
           subway: Podzemna železnica
           ferry: Trajekt
           light_rail: Lahka železnica
           subway: Podzemna železnica
           ferry: Trajekt
           light_rail: Lahka železnica

-          tram_only: Tramvaj
+          tram: Tramvaj

           trolleybus: Trolejbus
           bus: Avtobus
           cable_car: Nihalka
           chair_lift: Sedežnica
           trolleybus: Trolejbus
           bus: Avtobus
           cable_car: Nihalka
           chair_lift: Sedežnica

-          runway_only: Vzletno-pristajalna steza
+          runway: Vzletno-pristajalna steza

           taxiway: Vozna steza
           taxiway: Vozna steza

-          apron_only: Letališka ploščad
+          apron: Letališka ploščad

           admin: Upravna razmejitev
           capital: Glavno mesto
           city: Mesto
           admin: Upravna razmejitev
           capital: Glavno mesto
           city: Mesto

-          orchard_only: Sadovnjak
+          orchard: Sadovnjak

           vineyard: Vinograd
           vineyard: Vinograd

-          forest_only: Gozd
+          forest: Gozd

           wood: Gozd
           farmland: Kmetijsko zemljišče
           wood: Gozd
           farmland: Kmetijsko zemljišče

-          grass_only: Trava
+          grass: Trava

           meadow: Travnik
           bare_rock: Gola skala
           sand: Pesek
           golf: Igrišče za golf
           park: Park
           meadow: Travnik
           bare_rock: Gola skala
           sand: Pesek
           golf: Igrišče za golf
           park: Park

-          common_only: Travniki
+          common: Travniki

           built_up: Pozidano območje
           resident: Naselje
           retail: Trgovinsko območje
           built_up: Pozidano območje
           resident: Naselje
           retail: Trgovinsko območje


@@ -2450,7 +2450,7 @@ sl:
           commercial: Poslovno območje
           heathland: Grmičevje
           scrubland: Grmičevje
           commercial: Poslovno območje
           heathland: Grmičevje
           scrubland: Grmičevje

-          lake_only: Jezero
+          lake: Jezero

           reservoir: Vodni zbiralnik
           intermittent_water: Presihajoče vodno telo
           glacier: Ledenik
           reservoir: Vodni zbiralnik
           intermittent_water: Presihajoče vodno telo
           glacier: Ledenik


@@ -2464,12 +2464,12 @@ sl:
           centre: Športni center
           reserve: Naravni rezervat
           military: Vojaško območje
           centre: Športni center
           reserve: Naravni rezervat
           military: Vojaško območje

-          school_only: Šola
+          school: Šola; univerza

           university: Univerza
           hospital: Bolnišnica
           building: Pomembna stavba
           station: Železniška postaja
           university: Univerza
           hospital: Bolnišnica
           building: Pomembna stavba
           station: Železniška postaja

-          summit_only: Vrh
+          summit: Vrh

           peak: Vrh
           tunnel: Črtkana obroba = predor
           bridge: Krepka obroba = most
           peak: Vrh
           tunnel: Črtkana obroba = predor
           bridge: Krepka obroba = most

diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index a9122754f594c9e7c9f11dc121eb70792e4ecae0..410ba522aad93485d12ea380d7aa4883f862afc1 100644 (file)
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1183,11 +1183,11 @@ sq:
         entry:
           centre: Qendër sportive
           military: Zonë ushtarake
         entry:
           centre: Qendër sportive
           military: Zonë ushtarake

-          school_only: Shkollë
+          school: Shkollë

           university: Universitet
           building: Ndërtesë
           station: Stacioni hekurudhor
           university: Universitet
           building: Ndërtesë
           station: Stacioni hekurudhor

-          summit_only: Samit
+          summit: Samit

           peak: majë
     welcome:
       title: Mirësevjen
           peak: majë
     welcome:
       title: Mirësevjen

diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 3125108f284fd414a0e7d1a2b53b5a93e549d022..5e8182c0d0e9e4023d1b7c4ceea116c16a052ad7 100644 (file)
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1034,21 +1034,21 @@ sr-Latn:
           subway: Podzemna železnica
           cable_car: Žičara
           chair_lift: sedišnica
           subway: Podzemna železnica
           cable_car: Žičara
           chair_lift: sedišnica

-          runway_only: Aerodromska pista
+          runway: Aerodromska pista

           taxiway: rulne staze
           taxiway: rulne staze

-          apron_only: Aerodromski peron
+          apron: Aerodromski peron

           admin: Administrativna granica
           admin: Administrativna granica

-          forest_only: Šuma
+          forest: Šuma

           wood: Šuma
           golf: Golf teren
           park: Park
           wood: Šuma
           golf: Golf teren
           park: Park

-          common_only: Poljana
+          common: Poljana

           resident: Stambeno područje
           retail: Maloprodajno područje
           industrial: Industrijsko područje
           commercial: Poslovno područje
           heathland: Pustoš
           resident: Stambeno područje
           retail: Maloprodajno područje
           industrial: Industrijsko područje
           commercial: Poslovno područje
           heathland: Pustoš

-          lake_only: Jezero
+          lake: Jezero

           reservoir: rezervoar
           farm: Farma
           brownfield: Građevinsko zemljište
           reservoir: rezervoar
           farm: Farma
           brownfield: Građevinsko zemljište


@@ -1058,11 +1058,11 @@ sr-Latn:
           centre: Sportski centar
           reserve: Rezervat prirode
           military: Vojno područje
           centre: Sportski centar
           reserve: Rezervat prirode
           military: Vojno područje

-          school_only: Škola
+          school: Škola

           university: univerzitet
           building: Značajna zgrada
           station: Železnička stanica
           university: univerzitet
           building: Značajna zgrada
           station: Železnička stanica

-          summit_only: Uzvišenje
+          summit: Uzvišenje

           peak: vrh
           tunnel: Isprekidan okvir – tunel
           bridge: Crni okvir – most
           peak: vrh
           tunnel: Isprekidan okvir – tunel
           bridge: Crni okvir – most

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 7cb4165f6425dbe135aaee10697677b4635d0ed0..66928055d5de102e830b5420da9f0b4a5effb1be 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1674,24 +1674,24 @@ sr:
           bus: Аутобус
           cable_car: Жичара
           chair_lift: седишница
           bus: Аутобус
           cable_car: Жичара
           chair_lift: седишница

-          runway_only: Аеродромска писта
+          runway: Аеродромска писта

           taxiway: Рулна стаза
           taxiway: Рулна стаза

-          apron_only: Аеродромски перон
+          apron: Аеродромски перон

           admin: Административна граница
           capital: Престоница
           city: Град
           admin: Административна граница
           capital: Престоница
           city: Град

-          forest_only: Шума
+          forest: Шума

           wood: Шума
           meadow: Ливада
           golf: Голф терен
           park: Парк
           wood: Шума
           meadow: Ливада
           golf: Голф терен
           park: Парк

-          common_only: Пољана
+          common: Пољана

           resident: Стамбено подручје
           retail: Малопродајно подручје
           industrial: Индустријско подручје
           commercial: Пословно подручје
           heathland: Пустош
           resident: Стамбено подручје
           retail: Малопродајно подручје
           industrial: Индустријско подручје
           commercial: Пословно подручје
           heathland: Пустош

-          lake_only: Језеро
+          lake: Језеро

           reservoir: Резервоар
           farm: Фарма
           brownfield: Грађевинско земљиште
           reservoir: Резервоар
           farm: Фарма
           brownfield: Грађевинско земљиште


@@ -1701,12 +1701,12 @@ sr:
           centre: Спортски центар
           reserve: Резерват природе
           military: Војно подручје
           centre: Спортски центар
           reserve: Резерват природе
           military: Војно подручје

-          school_only: Школа
+          school: Школа

           university: Универзитет
           hospital: Болница
           building: Значајна зграда
           station: Железничка станица
           university: Универзитет
           hospital: Болница
           building: Значајна зграда
           station: Железничка станица

-          summit_only: Узвишење
+          summit: Узвишење

           peak: Врх
           tunnel: Испрекидан оквир – тунел
           bridge: Црни оквир – мост
           peak: Врх
           tunnel: Испрекидан оквир – тунел
           bridge: Црни оквир – мост

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 8721374e7a71ad68b93a2dfc8da437577640b4ed..0616ccd09739e6c2346710d048975b018512e4ee 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -2328,21 +2328,21 @@ sv:
           subway: Tunnelbana
           cable_car: Linbana
           chair_lift: stollift
           subway: Tunnelbana
           cable_car: Linbana
           chair_lift: stollift

-          runway_only: Landningsbana
+          runway: Landningsbana

           taxiway: taxibana
           taxiway: taxibana

-          apron_only: Flygplatsplatta
+          apron: Flygplatsplatta

           admin: Administrativ gräns
           admin: Administrativ gräns

-          forest_only: Kulturskog
+          forest: Kulturskog

           wood: Naturskog
           golf: Golfbana
           park: Park
           wood: Naturskog
           golf: Golfbana
           park: Park

-          common_only: Allmänning
+          common: Allmänning

           resident: Bostadsområde
           retail: Område för Detaljhandel
           industrial: Industriellt område
           commercial: Kommersiellt område
           heathland: Hed
           resident: Bostadsområde
           retail: Område för Detaljhandel
           industrial: Industriellt område
           commercial: Kommersiellt område
           heathland: Hed

-          lake_only: Sjö
+          lake: Sjö

           reservoir: vattenmagasin
           farm: Bondgård
           brownfield: Förfallen industritomt
           reservoir: vattenmagasin
           farm: Bondgård
           brownfield: Förfallen industritomt


@@ -2352,11 +2352,11 @@ sv:
           centre: Idrottsanläggning
           reserve: Naturreservat
           military: Militärområde
           centre: Idrottsanläggning
           reserve: Naturreservat
           military: Militärområde

-          school_only: Skola
+          school: Skola

           university: universitet
           building: Viktig byggnad
           station: Järnvägsstation
           university: universitet
           building: Viktig byggnad
           station: Järnvägsstation

-          summit_only: Höjd
+          summit: Höjd

           peak: topp
           tunnel: Streckade kanter = tunnel
           bridge: Svarta kanter = bro
           peak: topp
           tunnel: Streckade kanter = tunnel
           bridge: Svarta kanter = bro

diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index dafa1b03ef426fec313277ed18cf93dc390f0dd1..9b49e09f545721a43297bebfa20eedbaea0659ff 100644 (file)
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -100,7 +100,7 @@ ta:
         url: முதன்மை பயன்பாட்டு URL (தேவை)
         callback_url: திரும்ப அழைக்கும் URL
         support_url: URL ஐ ஆதரிக்கவும்
         url: முதன்மை பயன்பாட்டு URL (தேவை)
         callback_url: திரும்ப அழைக்கும் URL
         support_url: URL ஐ ஆதரிக்கவும்

-        allow_read_prefs: அவர்களின் பயனர் விருப்பங்களைப் படிக்கவும்
+        allow_read_prefs: அவர்களின் பயனர் விருப்பங்களை வாசி

         allow_write_prefs: அவர்களின் பயனர் விருப்பங்களை மாற்றவும்
         allow_write_diary: நாட்குறிப்பு உள்ளீடுகள், கருத்துகள் மற்றும் நண்பர்களை உருவாக்குங்கள்
         allow_write_api: வரைபடத்தை மாற்றவும்
         allow_write_prefs: அவர்களின் பயனர் விருப்பங்களை மாற்றவும்
         allow_write_diary: நாட்குறிப்பு உள்ளீடுகள், கருத்துகள் மற்றும் நண்பர்களை உருவாக்குங்கள்
         allow_write_api: வரைபடத்தை மாற்றவும்


@@ -714,31 +714,31 @@ ta:
           capital: தலைநகரம்
           city: நகரம்
           vineyard: திராட்சைத் தோட்டம்
           capital: தலைநகரம்
           city: நகரம்
           vineyard: திராட்சைத் தோட்டம்

-          forest_only: காடு
+          forest: காடு

           wood: விறகு
           farmland: பண்ணை நிலம்
           meadow: புல்வெளி
           bare_rock: வெற்றுப் பாறை
           sand: மணல்
           park: பூங்கா
           wood: விறகு
           farmland: பண்ணை நிலம்
           meadow: புல்வெளி
           bare_rock: வெற்றுப் பாறை
           sand: மணல்
           park: பூங்கா

-          common_only: பொதுவான
+          common: பொதுவான

           built_up: கட்டடப் பகுதி
           industrial: தொழிற்சாலை பகுதி
           commercial: வணிக பகுதி
           scrubland: புதர் நிலம்
           built_up: கட்டடப் பகுதி
           industrial: தொழிற்சாலை பகுதி
           commercial: வணிக பகுதி
           scrubland: புதர் நிலம்

-          lake_only: ஏரி
+          lake: ஏரி

           reservoir: நீர்நிலை
           glacier: பனிப்பாறை
           wetland: ஈரநிலம்
           farm: பண்ணை
           centre: விளையாட்டு மையம்
           military: ராணுவ பகுதி
           reservoir: நீர்நிலை
           glacier: பனிப்பாறை
           wetland: ஈரநிலம்
           farm: பண்ணை
           centre: விளையாட்டு மையம்
           military: ராணுவ பகுதி

-          school_only: பள்ளி
+          school: பள்ளி

           university: பல்கலைக்கழகம்
           hospital: மருத்துவமனை
           building: குறிப்பிடத்தக்க கட்டிடம்
           station: தொடர்வண்டி நிலையம்
           university: பல்கலைக்கழகம்
           hospital: மருத்துவமனை
           building: குறிப்பிடத்தக்க கட்டிடம்
           station: தொடர்வண்டி நிலையம்

-          summit_only: உச்சி மாநாடு
+          summit: உச்சி மாநாடு

           peak: உச்சி
           private: தனியார் அனுமதி
           construction: சாலைகளில்  கட்டுமானப் பணிகள் நடந்து வருகின்றன.
           peak: உச்சி
           private: தனியார் அனுமதி
           construction: சாலைகளில்  கட்டுமானப் பணிகள் நடந்து வருகின்றன.

diff --git a/config/locales/te.yml b/config/locales/te.yml
index 84b7d985155073ebabf278dec3ab96ca22ddb8dd..d5823c431b49af836e832479475127d433fea326 100644 (file)
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -2005,20 +2005,20 @@ te:
           subway: కిందారి
           cable_car: కేబుల్ కారు
           chair_lift: చెయిర్ లిఫ్ట్
           subway: కిందారి
           cable_car: కేబుల్ కారు
           chair_lift: చెయిర్ లిఫ్ట్

-          runway_only: విమానాశ్రయం రన్‌వే
+          runway: విమానాశ్రయం రన్‌వే

           taxiway: టాక్సీ వే
           taxiway: టాక్సీ వే

-          apron_only: విమానాశ్రయం ఏప్రాన్
+          apron: విమానాశ్రయం ఏప్రాన్

           admin: పరిపాలనా సరిహద్దు
           admin: పరిపాలనా సరిహద్దు

-          forest_only: అడవి
+          forest: అడవి

           wood: కలప
           golf: గోల్ఫ్ కోర్సు
           park: పార్కు
           wood: కలప
           golf: గోల్ఫ్ కోర్సు
           park: పార్కు

-          common_only: పచ్చికబయలు
+          common: పచ్చికబయలు

           resident: నివాస ప్రాంతం
           retail: రిటెయిల్ ప్రదేశం
           industrial: పారిశ్రామిక ప్రదేశం
           commercial: వాణిజ్య ప్రదేశం
           resident: నివాస ప్రాంతం
           retail: రిటెయిల్ ప్రదేశం
           industrial: పారిశ్రామిక ప్రదేశం
           commercial: వాణిజ్య ప్రదేశం

-          lake_only: సరస్సు
+          lake: సరస్సు

           reservoir: జలాశయం
           farm: పొలాలు
           brownfield: బ్రౌన్‌ఫీల్డ్ స్థలం
           reservoir: జలాశయం
           farm: పొలాలు
           brownfield: బ్రౌన్‌ఫీల్డ్ స్థలం


@@ -2027,7 +2027,7 @@ te:
           centre: క్రీడా కేంద్రం
           reserve: ప్రకృతి సంరక్షణ కేంద్రం
           military: మిలిటరీ ప్రదేశం
           centre: క్రీడా కేంద్రం
           reserve: ప్రకృతి సంరక్షణ కేంద్రం
           military: మిలిటరీ ప్రదేశం

-          school_only: పాఠశాల
+          school: పాఠశాల

           university: విశ్వవిద్యాలయం
           building: ప్రముఖ కట్టడము
           station: రైల్వే స్టేషన్
           university: విశ్వవిద్యాలయం
           building: ప్రముఖ కట్టడము
           station: రైల్వే స్టేషన్

diff --git a/config/locales/th.yml b/config/locales/th.yml
index 01433c5793b84b44e83242de21244ab218a4e1ff..cbaf187d0f458b8279b4bd40938a1263707a0b94 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1650,21 +1650,21 @@ th:
           subway: รถไฟใต้ดิน
           cable_car: รถกระเช้า
           chair_lift: รถกระเช้าเปลือย
           subway: รถไฟใต้ดิน
           cable_car: รถกระเช้า
           chair_lift: รถกระเช้าเปลือย

-          runway_only: ทางวิ่งสนามบิน
+          runway: ทางวิ่งสนามบิน

           taxiway: ทางขับเครื่องบิน
           taxiway: ทางขับเครื่องบิน

-          apron_only: โรงซ่อมบำรุงเครื่องบิน
+          apron: โรงซ่อมบำรุงเครื่องบิน

           admin: ขอบเขตการปกครอง
           admin: ขอบเขตการปกครอง

-          forest_only: ป่า
+          forest: ป่า

           wood: ไม้
           golf: สนามกอล์ฟ
           park: สวน
           wood: ไม้
           golf: สนามกอล์ฟ
           park: สวน

-          common_only: ที่ส่วนกลาง
+          common: ที่ส่วนกลาง

           resident: เขตที่พักอาศัย
           retail: พื้นที่พาณิชยกรรม
           industrial: พื้นที่อุตสาหกรรม
           commercial: พื้นที่พาณิชยกรรม
           heathland: ทุ่งไม้พุ่ม
           resident: เขตที่พักอาศัย
           retail: พื้นที่พาณิชยกรรม
           industrial: พื้นที่อุตสาหกรรม
           commercial: พื้นที่พาณิชยกรรม
           heathland: ทุ่งไม้พุ่ม

-          lake_only: ทะเลสาบ
+          lake: ทะเลสาบ

           reservoir: อ่างเก็บน้ำ
           farm: ไร่นา
           brownfield: พื้นที่อุตสาหกรรมเดิม
           reservoir: อ่างเก็บน้ำ
           farm: ไร่นา
           brownfield: พื้นที่อุตสาหกรรมเดิม


@@ -1674,11 +1674,11 @@ th:
           centre: ศูนย์กีฬา
           reserve: พื้นที่สงวนธรรมชาติ
           military: เขตทหาร
           centre: ศูนย์กีฬา
           reserve: พื้นที่สงวนธรรมชาติ
           military: เขตทหาร

-          school_only: โรงเรียน
+          school: โรงเรียน

           university: มหาวิทยาลัย
           building: อาคารสำคัญ
           station: สถานีรถไฟ
           university: มหาวิทยาลัย
           building: อาคารสำคัญ
           station: สถานีรถไฟ

-          summit_only: ยอดเขา
+          summit: ยอดเขา

           peak: ยอดเขา
           tunnel: เส้นประ = อุโมงค์
           bridge: เส้นทึบ = สะพาน
           peak: ยอดเขา
           tunnel: เส้นประ = อุโมงค์
           bridge: เส้นทึบ = สะพาน

diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index a1f8c64d1dfdaff8bc0509a6fa914cef6ea7e533..ef71c3333893042e57c723110808493bc23877cb 100644 (file)
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -1690,21 +1690,21 @@ tl:
           subway: Daanang pang-ilalim
           cable_car: Kotse ng kable
           chair_lift: upuang inaangat
           subway: Daanang pang-ilalim
           cable_car: Kotse ng kable
           chair_lift: upuang inaangat

-          runway_only: Rampa ng Paliparan
+          runway: Rampa ng Paliparan

           taxiway: daanan ng taksi
           taxiway: daanan ng taksi

-          apron_only: Tapis ng paliparan
+          apron: Tapis ng paliparan

           admin: Hangganang pampangangasiwa
           admin: Hangganang pampangangasiwa

-          forest_only: Gubat
+          forest: Gubat

           wood: Kahoy
           golf: Kurso ng golp
           park: Liwasan
           wood: Kahoy
           golf: Kurso ng golp
           park: Liwasan

-          common_only: Karaniwan
+          common: Karaniwan

           resident: Pook na panuluyan
           retail: Lugar na tingian
           industrial: Pook na pang-industriya
           commercial: Pook na pangkalakalan
           heathland: Lupain ng halamang erika
           resident: Pook na panuluyan
           retail: Lugar na tingian
           industrial: Pook na pang-industriya
           commercial: Pook na pangkalakalan
           heathland: Lupain ng halamang erika

-          lake_only: Lawa
+          lake: Lawa

           reservoir: tinggalan ng tubig
           farm: Bukid
           brownfield: Pook ng kayumangging bukirin
           reservoir: tinggalan ng tubig
           farm: Bukid
           brownfield: Pook ng kayumangging bukirin


@@ -1714,11 +1714,11 @@ tl:
           centre: Lunduyang pampalakasan
           reserve: Lupaing laan sa kalikasan
           military: Pook ng militar
           centre: Lunduyang pampalakasan
           reserve: Lupaing laan sa kalikasan
           military: Pook ng militar

-          school_only: Paaralan
+          school: Paaralan

           university: pamantasan
           building: Makabuluhang gusali
           station: Himpilan ng daambakal
           university: pamantasan
           building: Makabuluhang gusali
           station: Himpilan ng daambakal

-          summit_only: Taluktok
+          summit: Taluktok

           peak: tugatog
           tunnel: Ginitlingang pambalot = lagusan
           bridge: Itim na pambalot = tulay
           peak: tugatog
           tunnel: Ginitlingang pambalot = lagusan
           bridge: Itim na pambalot = tulay

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 061eaacd856b0086d45f8aed68697311b2d41b6f..117fe3084d6d7411bf2af3ca6390de394cc780e1 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -631,7 +631,7 @@ tr:
       heading: '%{user} Kullanıcısının Günlük Yorumları'
       subheading_html: '%{user} tarafından yapılan günlük yorumları'
       no_comments: Günlük yorumu yok
       heading: '%{user} Kullanıcısının Günlük Yorumları'
       subheading_html: '%{user} tarafından yapılan günlük yorumları'
       no_comments: Günlük yorumu yok

-      post: Gönder
+      post: Gönderi

       when: Tarih
       comment: Yorum
       newer_comments: Daha Yeni Yorumlar
       when: Tarih
       comment: Yorum
       newer_comments: Daha Yeni Yorumlar


@@ -698,7 +698,7 @@ tr:
         daha fazla arkadaş olmaya çalışmadan önce bir süre bekleyin.
     remove_friend:
       heading: '%{user}, arkadaşlıktan çıkarılsın mı?'
         daha fazla arkadaş olmaya çalışmadan önce bir süre bekleyin.
     remove_friend:
       heading: '%{user}, arkadaşlıktan çıkarılsın mı?'

-      button: ArkadaÅ\9flıktan çıkar
+      button: ArkadaÅ\9flıktan Ã\87ıkar

       success: '%{name}, arkadaş listesinden çıkarıldı.'
       not_a_friend: '%{name}, arkadaşın değil.'
   geocoder:
       success: '%{name}, arkadaş listesinden çıkarıldı.'
       not_a_friend: '%{name}, arkadaşın değil.'
   geocoder:


@@ -1594,7 +1594,7 @@ tr:
     start_mapping: Haritacılığa Başla
     edit: Düzenle
     history: Geçmiş
     start_mapping: Haritacılığa Başla
     edit: Düzenle
     history: Geçmiş

-    export: Dışa aktar
+    export: Dışa Aktar

     issues: Sorunlar
     data: Veri
     export_data: Verinin Dışalımı
     issues: Sorunlar
     data: Veri
     export_data: Verinin Dışalımı


@@ -1679,6 +1679,8 @@ tr:
       loaded:
         one: olası %{count} puan üzerinden %{trace_points} ile başarıyla yüklendi.
         other: olası %{count} puan üzerinden %{trace_points} ile başarıyla yüklendi.
       loaded:
         one: olası %{count} puan üzerinden %{trace_points} ile başarıyla yüklendi.
         other: olası %{count} puan üzerinden %{trace_points} ile başarıyla yüklendi.

+      all_your_traces_html: Başarıyla yüklediğiniz tüm GPX izlerinizi %{url} adresinde
+        bulabilirsiniz.

       subject: '[OpenStreetMap] GPX dosyası başarıyla alındı'
     signup_confirm:
       subject: '[OpenStreetMap]''e hoş geldin'
       subject: '[OpenStreetMap] GPX dosyası başarıyla alındı'
     signup_confirm:
       subject: '[OpenStreetMap]''e hoş geldin'


@@ -2241,7 +2243,7 @@ tr:
       no_iframe_support: Bu özelliği görüntülemek için gerekli olan HTML iframe tarayıcınız
         desteklemiyor.
     export:
       no_iframe_support: Bu özelliği görüntülemek için gerekli olan HTML iframe tarayıcınız
         desteklemiyor.
     export:

-      title: Dışa aktar
+      title: Dışa Aktar

       area_to_export: Çıkartılacak alan
       manually_select: Fare kullanarak farklı bir alan seç
       format_to_export: Çıkartma biçimi
       area_to_export: Çıkartılacak alan
       manually_select: Fare kullanarak farklı bir alan seç
       format_to_export: Çıkartma biçimi


@@ -2282,7 +2284,7 @@ tr:
       longitude: 'Boylam:'
       output: Çıktı
       paste_html: Yukarıdaki HTML kodu kopyalayıp websitesinde yapıştırabilir
       longitude: 'Boylam:'
       output: Çıktı
       paste_html: Yukarıdaki HTML kodu kopyalayıp websitesinde yapıştırabilir

-      export_button: Dışa aktar
+      export_button: Dışa Aktar

     fixthemap:
       title: Sorun bildir / Haritayı onar
       how_to_help:
     fixthemap:
       title: Sorun bildir / Haritayı onar
       how_to_help:


@@ -2396,29 +2398,29 @@ tr:
           subway: Metro
           ferry: Feribot
           light_rail: Hafif raylı
           subway: Metro
           ferry: Feribot
           light_rail: Hafif raylı

-          tram_only: Tramvay
+          tram: Tramvay

           trolleybus: Troleybüs
           bus: Otobüs
           cable_car: Teleferik
           chair_lift: Telesiyej
           trolleybus: Troleybüs
           bus: Otobüs
           cable_car: Teleferik
           chair_lift: Telesiyej

-          runway_only: Uçuş pisti
+          runway: Uçuş pisti

           taxiway: Taksi yolu
           taxiway: Taksi yolu

-          apron_only: Havaalanı apronu
+          apron: Havaalanı apronu

           admin: İdari sınırı
           capital: Başkent
           city: Şehir
           admin: İdari sınırı
           capital: Başkent
           city: Şehir

-          orchard_only: Meyve bahçesi
+          orchard: Meyve bahçesi

           vineyard: Üzüm bağı
           vineyard: Üzüm bağı

-          forest_only: Orman
+          forest: Orman

           wood: Koru
           farmland: Tarım arazisi
           wood: Koru
           farmland: Tarım arazisi

-          grass_only: Çimen
+          grass: Çimen

           meadow: Çayır
           bare_rock: Çıplak kaya
           sand: Kum
           golf: Golf sahası
           park: Park
           meadow: Çayır
           bare_rock: Çıplak kaya
           sand: Kum
           golf: Golf sahası
           park: Park

-          common_only: Çimen
+          common: Çimen

           built_up: İnşa alanı
           resident: Yerleşim bölgesi
           retail: Alışveriş merkezi
           built_up: İnşa alanı
           resident: Yerleşim bölgesi
           retail: Alışveriş merkezi


@@ -2426,7 +2428,7 @@ tr:
           commercial: Ticari ve hizmet alanı
           heathland: Fundalık
           scrubland: Çalılık
           commercial: Ticari ve hizmet alanı
           heathland: Fundalık
           scrubland: Çalılık

-          lake_only: Göl
+          lake: Göl

           reservoir: Rezervuar
           intermittent_water: Aralıklı su birikintisi
           glacier: Buzul
           reservoir: Rezervuar
           intermittent_water: Aralıklı su birikintisi
           glacier: Buzul


@@ -2440,12 +2442,12 @@ tr:
           centre: Spor merkezi
           reserve: Doğa koruma alanı
           military: Askeri bölge
           centre: Spor merkezi
           reserve: Doğa koruma alanı
           military: Askeri bölge

-          school_only: Okul
+          school: Okul

           university: Üniversite
           hospital: Hastane
           building: Önemli yapı
           station: Gar
           university: Üniversite
           hospital: Hastane
           building: Önemli yapı
           station: Gar

-          summit_only: Zirve
+          summit: Zirve

           peak: Zirve
           tunnel: çizgili kenar = tünel
           bridge: Siyah kenar = köprü
           peak: Zirve
           tunnel: çizgili kenar = tünel
           bridge: Siyah kenar = köprü


@@ -2882,7 +2884,7 @@ tr:
       edits: Düzenlemeler
       traces: İzler
       notes: Harita Notları
       edits: Düzenlemeler
       traces: İzler
       notes: Harita Notları

-      remove as friend: ArkadaÅ\9flıktan çıkar
+      remove as friend: ArkadaÅ\9flıktan Ã\87ıkar

       add as friend: Arkadaş Olarak Ekle
       mapper since: 'Haritacılığa başlama tarihi:'
       uid: 'Kullanıcı kimliği:'
       add as friend: Arkadaş Olarak Ekle
       mapper since: 'Haritacılığa başlama tarihi:'
       uid: 'Kullanıcı kimliği:'


@@ -2907,6 +2909,7 @@ tr:
           importer: İçe aktarıcı erişimini iptal et
       block_history: Etkin Engellemeler
       moderator_history: Verilen Engellemeler
           importer: İçe aktarıcı erişimini iptal et
       block_history: Etkin Engellemeler
       moderator_history: Verilen Engellemeler

+      revoke_all_blocks: Tüm engellemeleri iptal et

       comments: Yorumlar
       create_block: Bu kullanıcıyı engelle
       activate_user: Bu Kullanıcıyı Etkinleştir
       comments: Yorumlar
       create_block: Bu kullanıcıyı engelle
       activate_user: Bu Kullanıcıyı Etkinleştir


@@ -3017,6 +3020,16 @@ tr:
       confirm: Bu engeli kaldırmak istediğine emin misin?
       revoke: İptal!
       flash: Bu engelleme iptal edildi.
       confirm: Bu engeli kaldırmak istediğine emin misin?
       revoke: İptal!
       flash: Bu engelleme iptal edildi.

+    revoke_all:
+      title: '%{block_on} tarihindeki tüm engellemeler iptal ediliyor'
+      heading_html: '%{block_on} tarihindeki tüm engellemeler iptal ediliyor'
+      empty: '%{name} kullanıcısının herhangi aktif bir engeli yok.'
+      confirm: '%{active_blocks} iptal etmek istediğinizden emin misiniz?'
+      active_blocks:
+        one: '%{count} aktif engel'
+        other: '%{count} aktif engel'
+      revoke: İptal!
+      flash: Tüm aktif engellemeler iptal edildi.

     helper:
       time_future_html: '%{time} içinde bitecek.'
       until_login: Kullanıcı giriş yapana kadar aktif.
     helper:
       time_future_html: '%{time} içinde bitecek.'
       until_login: Kullanıcı giriş yapana kadar aktif.

diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index 72c8788f05c21a542025daeec15ee1a7576dd779..1f10f43330549a3b2712f09cce4f5277771be880 100644 (file)
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -895,13 +895,13 @@ tt:
           subway: Метро
           cable_car: Канат юлы
           admin: Административ чик
           subway: Метро
           cable_car: Канат юлы
           admin: Административ чик

-          forest_only: Урман
+          forest: Урман

           wood: Агачлык
           park: Парк
           resident: Торак районы
           industrial: Сәнәгый район
           heathland: Буш җир
           wood: Агачлык
           park: Парк
           resident: Торак районы
           industrial: Сәнәгый район
           heathland: Буш җир

-          lake_only: Күл
+          lake: Күл

           reservoir: сусаклагыч
           farm: Ферма
           cemetery: Зират
           reservoir: сусаклагыч
           farm: Ферма
           cemetery: Зират


@@ -909,7 +909,7 @@ tt:
           centre: Спорт үзәге
           reserve: Тыюлык
           military: Хәрби зона
           centre: Спорт үзәге
           reserve: Тыюлык
           military: Хәрби зона

-          school_only: Мәктәп
+          school: Мәктәп

           university: университет
           station: Тимер юл станциясе
           toilets: Бәдрәф
           university: университет
           station: Тимер юл станциясе
           toilets: Бәдрәф

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 9ed47f262897dc35f2a038fbb43878a5756b5274..6a48a0931105e9bbe3ccb0e95112adfa575f3c9d 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1557,7 +1557,7 @@ uk:
         other: ""
       no_reports: Скарг немає
       report_created_at_html: Вперше повідомлено %{datetime}
         other: ""
       no_reports: Скарг немає
       report_created_at_html: Вперше повідомлено %{datetime}

-      last_resolved_at_html: В останнє розв'язано %{datetime}
+      last_resolved_at_html: В останнє розвʼязано %{datetime}

       last_updated_at_html: В останнє оновлено %{datetime}, %{displayname}
       resolve: Розв'язати
       ignore: Ігнорувати
       last_updated_at_html: В останнє оновлено %{datetime}, %{displayname}
       resolve: Розв'язати
       ignore: Ігнорувати


@@ -2430,29 +2430,29 @@ uk:
           subway: Лінія метро
           ferry: Паром
           light_rail: Швидкісний трамвай
           subway: Лінія метро
           ferry: Паром
           light_rail: Швидкісний трамвай

-          tram_only: Трамвай
+          tram: Трамвай

           trolleybus: Тролейбус
           bus: Автобус
           cable_car: Канатна дорога
           chair_lift: Крісельний підйомник
           trolleybus: Тролейбус
           bus: Автобус
           cable_car: Канатна дорога
           chair_lift: Крісельний підйомник

-          runway_only: Злітно-посадкова смуга аеропорту
+          runway: Злітно-посадкова смуга аеропорту

           taxiway: Руліжна доріжка
           taxiway: Руліжна доріжка

-          apron_only: Перон аеропорту
+          apron: Перон аеропорту

           admin: Адміністративна межа
           capital: Столиця
           city: Місто
           admin: Адміністративна межа
           capital: Столиця
           city: Місто

-          orchard_only: Сад
+          orchard: Сад

           vineyard: Виноградник
           vineyard: Виноградник

-          forest_only: Ліс
+          forest: Ліс

           wood: Дерева
           farmland: Поле
           wood: Дерева
           farmland: Поле

-          grass_only: Трава
+          grass: Трава

           meadow: Левада
           bare_rock: Голі скелі
           sand: Пісок
           golf: Поле для гольфу
           park: Парк
           meadow: Левада
           bare_rock: Голі скелі
           sand: Пісок
           golf: Поле для гольфу
           park: Парк

-          common_only: Суспільні землі
+          common: Суспільні землі

           built_up: Забудована територія
           resident: Жила зона
           retail: Торговельний район
           built_up: Забудована територія
           resident: Жила зона
           retail: Торговельний район


@@ -2460,7 +2460,7 @@ uk:
           commercial: Бізнесова зона
           heathland: Пустище
           scrubland: Чагарник
           commercial: Бізнесова зона
           heathland: Пустище
           scrubland: Чагарник

-          lake_only: Озеро
+          lake: Озеро

           reservoir: Водосховище
           intermittent_water: Водойма, що пересихає
           glacier: Льодовик
           reservoir: Водосховище
           intermittent_water: Водойма, що пересихає
           glacier: Льодовик


@@ -2474,12 +2474,12 @@ uk:
           centre: Спортивний центр
           reserve: Заповідник
           military: Військова зона
           centre: Спортивний центр
           reserve: Заповідник
           military: Військова зона

-          school_only: Школа
+          school: Школа

           university: Університет
           hospital: Лікарня
           building: Значна споруда
           station: Залізнична станція
           university: Університет
           hospital: Лікарня
           building: Значна споруда
           station: Залізнична станція

-          summit_only: Вершина
+          summit: Вершина

           peak: Пік
           tunnel: Тунель (пунктиром)
           bridge: Міст (жирна лінія)
           peak: Пік
           tunnel: Тунель (пунктиром)
           bridge: Міст (жирна лінія)

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 4428beb016400d49342538513f73b546b8815633..c4b68cb07ea82d2a60cf4165f4dd858e9a6de67d 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -2025,21 +2025,21 @@ vi:
           subway: Đường ngầm
           cable_car: Đường xe cáp
           chair_lift: ghế cáp treo
           subway: Đường ngầm
           cable_car: Đường xe cáp
           chair_lift: ghế cáp treo

-          runway_only: Đường băng
+          runway: Đường băng

           taxiway: đường băng
           taxiway: đường băng

-          apron_only: Sân đậu máy bay
+          apron: Sân đậu máy bay

           admin: Biên giới hành chính
           admin: Biên giới hành chính

-          forest_only: Rừng trồng cây
+          forest: Rừng trồng cây

           wood: Rừng
           golf: Sân golf
           park: Công viên
           wood: Rừng
           golf: Sân golf
           park: Công viên

-          common_only: Đất công
+          common: Đất công

           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
           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_only: Hồ
+          lake: Hồ

           reservoir: hồ chứa nước
           farm: Ruộng
           brownfield: Cánh đồng nâu
           reservoir: hồ chứa nước
           farm: Ruộng
           brownfield: Cánh đồng nâu


@@ -2049,11 +2049,11 @@ vi:
           centre: Trung tâm thể thao
           reserve: Khu bảo tồn thiên niên
           military: Khu vực quân sự
           centre: Trung tâm thể thao
           reserve: Khu bảo tồn thiên niên
           military: Khu vực quân sự

-          school_only: Trường học
+          school: Trường học

           university: đại học
           building: Kiến trúc quan trọng
           station: Nhà ga
           university: đại học
           building: Kiến trúc quan trọng
           station: Nhà ga

-          summit_only: Đỉnh núi
+          summit: Đỉnh núi

           peak: đồi
           tunnel: Đường đứt nét = đường hầm
           bridge: Đường rắn = cầu
           peak: đồi
           tunnel: Đường đứt nét = đường hầm
           bridge: Đường rắn = cầu

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index a8cca961bfcf61a6b453dd3d6be8972a3ac9caa5..fe7c35408901a1c7ffe60725a829bdef53c9af4b 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -8,6 +8,7 @@
 # Author: Amire80
 # Author: Anakmalaysia
 # Author: Angrydog001
 # Author: Amire80
 # Author: Anakmalaysia
 # Author: Angrydog001

+# Author: Anterdc99

 # Author: Assoc
 # Author: Boyuan Yang
 # Author: C933103
 # Author: Assoc
 # Author: Boyuan Yang
 # Author: C933103


@@ -1921,6 +1922,7 @@ zh-CN:
       image: 图像
       alt: 替代文本
       url: URL
       image: 图像
       alt: 替代文本
       url: URL

+      codeblock: 代码块

     richtext_field:
       edit: 编辑
       preview: 预览
     richtext_field:
       edit: 编辑
       preview: 预览


@@ -2230,27 +2232,29 @@ zh-CN:
           subway: 地铁
           ferry: 渡船
           light_rail: 轻轨
           subway: 地铁
           ferry: 渡船
           light_rail: 轻轨

-          tram_only: 有轨电车
+          tram: 有轨电车

           trolleybus: 无轨电车
           bus: 公共汽车
           cable_car: 缆车
           chair_lift: 吊椅缆车
           trolleybus: 无轨电车
           bus: 公共汽车
           cable_car: 缆车
           chair_lift: 吊椅缆车

-          runway_only: 机场跑道
+          runway: 机场跑道

           taxiway: 滑行道
           taxiway: 滑行道

-          apron_only: 机场停机坪
+          apron: 机场停机坪

           admin: 行政区边界
           admin: 行政区边界

-          orchard_only: 果园
+          capital: 首都
+          city: 城市
+          orchard: 果园

           vineyard: 葡萄园
           vineyard: 葡萄园

-          forest_only: 森林
+          forest: 森林

           wood: 树林
           farmland: 农田
           wood: 树林
           farmland: 农田

-          grass_only: 草坪
+          grass: 草坪

           meadow: 草甸
           bare_rock: 裸岩
           sand: 沙地
           golf: 高尔夫球场
           park: 公园
           meadow: 草甸
           bare_rock: 裸岩
           sand: 沙地
           golf: 高尔夫球场
           park: 公园

-          common_only: 公地
+          common: 公地

           built_up: 建成区
           resident: 居住区
           retail: 零售区
           built_up: 建成区
           resident: 居住区
           retail: 零售区


@@ -2258,7 +2262,7 @@ zh-CN:
           commercial: 商业区
           heathland: 荒原
           scrubland: 灌木丛林地
           commercial: 商业区
           heathland: 荒原
           scrubland: 灌木丛林地

-          lake_only: 湖
+          lake: 湖

           reservoir: 水库
           intermittent_water: 间歇性水体
           glacier: 冰川
           reservoir: 水库
           intermittent_water: 间歇性水体
           glacier: 冰川


@@ -2272,12 +2276,12 @@ zh-CN:
           centre: 体育馆
           reserve: 自然保护区
           military: 军事区
           centre: 体育馆
           reserve: 自然保护区
           military: 军事区

-          school_only: 学校
+          school: 学校

           university: 大学
           hospital: 医院
           building: 特殊建筑物
           station: 火车站
           university: 大学
           hospital: 医院
           building: 特殊建筑物
           station: 火车站

-          summit_only: 山峰
+          summit: 山峰

           peak: 山峰
           tunnel: 双虚线=隧道
           bridge: 双实线=桥
           peak: 山峰
           tunnel: 双虚线=隧道
           bridge: 双实线=桥


@@ -2570,6 +2574,7 @@ zh-CN:
       application: 应用程序
       permissions: 权限
       no_applications_html: 您还没有授权任何%{oauth2}应用程序。
       application: 应用程序
       permissions: 权限
       no_applications_html: 您还没有授权任何%{oauth2}应用程序。

+      oauth_2: OAuth 2

     application:
       revoke: 撤销访问权限
       confirm_revoke: 撤消此应用程序的访问权限？
     application:
       revoke: 撤销访问权限
       confirm_revoke: 撤消此应用程序的访问权限？


@@ -2668,6 +2673,7 @@ zh-CN:
           importer: 撤销导入者权限
       block_history: 激活的封禁
       moderator_history: 执行封禁者
           importer: 撤销导入者权限
       block_history: 激活的封禁
       moderator_history: 执行封禁者

+      revoke_all_blocks: 撤销所有封禁

       comments: 评论
       create_block: 封禁此用户
       activate_user: 启用此用户
       comments: 评论
       create_block: 封禁此用户
       activate_user: 启用此用户


@@ -2765,6 +2771,11 @@ zh-CN:
       confirm: 您确定要撤销该封禁？
       revoke: 撤销！
       flash: 该封禁已经被撤销。
       confirm: 您确定要撤销该封禁？
       revoke: 撤销！
       flash: 该封禁已经被撤销。

+    revoke_all:
+      title: 正在撤销对%{block_on}的所有封禁
+      heading_html: 正在撤销对%{block_on}的所有封禁
+      confirm: 您确定要撤销%{active_blocks}吗？
+      revoke: 撤销！

     helper:
       time_future_html: 结束于 %{time}。
       until_login: 用户登录时激活。
     helper:
       time_future_html: 结束于 %{time}。
       until_login: 用户登录时激活。

diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 55dc7a619e9fdbf2bc3c071892641abcf0849afd..b83cf01f4d91e6f4a8b09a38779ddf51c54cb213 100644 (file)
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1140,16 +1140,16 @@ zh-HK:
           motorway: 高速公路
           rail: 鐵路
           subway: 地鐵
           motorway: 高速公路
           rail: 鐵路
           subway: 地鐵

-          runway_only: 機場跑道
-          apron_only: 機場停機坪
+          runway: 機場跑道
+          apron: 機場停機坪

           admin: 行政邊界
           admin: 行政邊界

-          forest_only: 森林
+          forest: 森林

           golf: 哥爾夫球場
           park: 公園
           resident: 住宅區
           industrial: 工業區
           commercial: 商業區
           golf: 哥爾夫球場
           park: 公園
           resident: 住宅區
           industrial: 工業區
           commercial: 商業區

-          lake_only: 湖泊
+          lake: 湖泊

           reservoir: 水庫
           brownfield: 棕地
           cemetery: 墓地
           reservoir: 水庫
           brownfield: 棕地
           cemetery: 墓地


@@ -1157,7 +1157,7 @@ zh-HK:
           centre: 運動中心
           reserve: 自然保護區
           military: 軍事區
           centre: 運動中心
           reserve: 自然保護區
           military: 軍事區

-          school_only: 學校
+          school: 學校

           university: 大學
           station: 火車站
           bicycle_shop: 單車店
           university: 大學
           station: 火車站
           bicycle_shop: 單車店

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index fe2f7da26dd4af23b603d0d093b1019444b5717d..03e7b99c83d4e224fa9b93e3087c43cebc68e242 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1620,6 +1620,7 @@ zh-TW:
       loaded:
         one: 成功載入 %{count} 個可能軌跡點中的 %{trace_points} 個。
         other: 成功載入 %{count} 個可能軌跡點中的 %{trace_points} 個。
       loaded:
         one: 成功載入 %{count} 個可能軌跡點中的 %{trace_points} 個。
         other: 成功載入 %{count} 個可能軌跡點中的 %{trace_points} 個。

+      all_your_traces_html: 您可以在 %{url} 找到所有您上傳成功的 GPX 軌跡。

       subject: '[OpenStreetMap] GPX 匯入成功'
     signup_confirm:
       subject: '[OpenStreetMap] 歡迎加入 OpenStreetMap'
       subject: '[OpenStreetMap] GPX 匯入成功'
     signup_confirm:
       subject: '[OpenStreetMap] 歡迎加入 OpenStreetMap'


@@ -2203,29 +2204,29 @@ zh-TW:
           subway: 地下鐵
           ferry: 渡輪
           light_rail: 輕軌
           subway: 地下鐵
           ferry: 渡輪
           light_rail: 輕軌

-          tram_only: 路面電車
+          tram: 路面電車

           trolleybus: 無軌電車
           bus: 公車
           cable_car: 大型纜車
           chair_lift: 升降吊椅
           trolleybus: 無軌電車
           bus: 公車
           cable_car: 大型纜車
           chair_lift: 升降吊椅

-          runway_only: 機場跑道
+          runway: 機場跑道

           taxiway: 滑行道
           taxiway: 滑行道

-          apron_only: 機場停機坪
+          apron: 機場停機坪

           admin: 行政區邊界
           capital: 首都
           city: 城市
           admin: 行政區邊界
           capital: 首都
           city: 城市

-          orchard_only: 果園
+          orchard: 果園

           vineyard: 葡萄園
           vineyard: 葡萄園

-          forest_only: 森林
+          forest: 森林

           wood: 森林
           farmland: 農地
           wood: 森林
           farmland: 農地

-          grass_only: 草坪
+          grass: 草坪

           meadow: 牧草地
           bare_rock: 裸岩
           sand: 沙地
           golf: 高爾夫球場
           park: 公園
           meadow: 牧草地
           bare_rock: 裸岩
           sand: 沙地
           golf: 高爾夫球場
           park: 公園

-          common_only: 共有地
+          common: 共有地

           built_up: 組成面積
           resident: 住宅區
           retail: 商店區
           built_up: 組成面積
           resident: 住宅區
           retail: 商店區


@@ -2233,7 +2234,7 @@ zh-TW:
           commercial: 商業區
           heathland: 石楠荒地
           scrubland: 灌木叢林地
           commercial: 商業區
           heathland: 石楠荒地
           scrubland: 灌木叢林地

-          lake_only: 湖泊
+          lake: 湖泊

           reservoir: 水庫
           intermittent_water: 間歇性水體
           glacier: 冰河
           reservoir: 水庫
           intermittent_water: 間歇性水體
           glacier: 冰河


@@ -2247,12 +2248,12 @@ zh-TW:
           centre: 運動中心
           reserve: 自然保護區
           military: 軍事區
           centre: 運動中心
           reserve: 自然保護區
           military: 軍事區

-          school_only: 學校
+          school: 學校；大學

           university: 大學
           hospital: 醫院
           building: 重要建築
           station: 鐵路車站
           university: 大學
           hospital: 醫院
           building: 重要建築
           station: 鐵路車站

-          summit_only: 頂峰
+          summit: 頂峰

           peak: 山峰
           tunnel: 虛線邊框 = 隧道
           bridge: 黑線邊框 = 橋樑
           peak: 山峰
           tunnel: 虛線邊框 = 隧道
           bridge: 黑線邊框 = 橋樑