Localisation updates from https://translatewiki.net.

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 8301c6a80003896d546618bdb750cfb3697cbcde..5337d081329a128ec5f5eec5b412f0d16681c478 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -1719,30 +1719,24 @@ af:
           footway: Voetpad
           rail: Spoorweg
           subway: Ondergrondse spoorweg
           footway: Voetpad
           rail: Spoorweg
           subway: Ondergrondse spoorweg

-          cable:
-          - Sweefspoor
-          - stoelhyser
-          runway:
-          - Aanloopbaan
-          - vliegtuigrybaan
+          cable_car: Sweefspoor
+          chair_lift: stoelhyser
+          runway_only: Aanloopbaan
+          taxiway: vliegtuigrybaan

           apron_only: Lughaweplatform
           admin: Administratiewe grens
           apron_only: Lughaweplatform
           admin: Administratiewe grens

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

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

-          common:
-          - Gemeen
-          - weiland
+          common_only: Gemeen

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

-          lake:
-          - Meer
-          - reservoir
+          lake_only: Meer
+          reservoir: reservoir

           farm: Plaas
           brownfield: Braakveldterrein
           cemetery: Begraafplaas
           farm: Plaas
           brownfield: Braakveldterrein
           cemetery: Begraafplaas


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

-          school:
-          - Skool
-          - universiteit
+          school_only: Skool
+          university: universiteit

           building: Betekenisvolle gebou
           station: Spoorwegstasie
           building: Betekenisvolle gebou
           station: Spoorwegstasie

-          summit:
-          - Piek
-          - piek
+          summit_only: Piek
+          peak: piek

           tunnel: Strepieomhulsel = tonnel
           bridge: Swart omhulsel = brug
           private: Privaat toegang
           tunnel: Strepieomhulsel = tonnel
           bridge: Swart omhulsel = brug
           private: Privaat toegang

diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index a6143d4718a5e11185c1f70606527e767adc8a58..6d6053edafcf7c253944db17b6be5525a66f9105 100644 (file)
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -912,30 +912,24 @@ aln:
           footway: Këmbësore
           rail: Hekurudhor
           subway: Metro
           footway: Këmbësore
           rail: Hekurudhor
           subway: Metro

-          cable:
-          - teleferik
-          - heqë karrige
-          runway:
-          - Aeroporti i pistës
-          - taxiway
+          cable_car: teleferik
+          chair_lift: heqë karrige
+          runway_only: Aeroporti i pistës
+          taxiway: taxiway

           apron_only: aeroportit Aeroporti
           admin: kufitare administrative
           apron_only: aeroportit Aeroporti
           admin: kufitare administrative

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

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

-          common:
-          - I përbashkët
-          - livadh
+          common_only: 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:
-          - Liqe
-          - rezervuar
+          lake_only: Liqe
+          reservoir: rezervuar

           farm: Ferm
           brownfield: site Brownfield
           cemetery: Varrezë
           farm: Ferm
           brownfield: site Brownfield
           cemetery: Varrezë


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

-          school:
-          - Shkollë
-          - universitet
+          school_only: Shkollë
+          university: universitet

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

-          summit:
-          - Samiti i
-          - pik
+          summit_only: Samiti i
+          peak: pik

           tunnel: tunel zorrë thye =
           bridge: Shtresë e jashtme e Zi = urë
           private: qasje privat
           tunnel: tunel zorrë thye =
           bridge: Shtresë e jashtme e Zi = urë
           private: qasje privat

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index b6695d64a5531008cafbf6cef82ca0a5144283c4..b687bfb5faddd1d75f77d4b0eb301669e4d2a59e 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -2211,31 +2211,24 @@ ar:
           footway: طريق مشاة
           rail: سكة حديدية
           subway: قطار الأنفاق
           footway: طريق مشاة
           rail: سكة حديدية
           subway: قطار الأنفاق

-          cable:
-          - عربة أسلاك
-          - تلفريك
-          runway:
-          - مدرج مطار
-          - مدرج مطار لمناورات الطائرات
+          cable_car: عربة أسلاك
+          chair_lift: تلفريك
+          runway_only: مدرج مطار
+          taxiway: مدرج مطار لمناورات الطائرات

           apron_only: ساحة مطار
           admin: حدود إدارية
           apron_only: ساحة مطار
           admin: حدود إدارية

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

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

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

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

-          lake:
-          - بحيرة
-          - خزان
+          lake_only: بحيرة
+          reservoir: خزان

           farm: مزرعة
           brownfield: موقع مخلفات
           cemetery: مقبرة
           farm: مزرعة
           brownfield: موقع مخلفات
           cemetery: مقبرة


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

-          school:
-          - مدرسة
-          - جامعة
+          school_only: مدرسة
+          university: جامعة

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

-          summit:
-          - قمة
-          - ذروة
+          summit_only: قمة
+          peak: ذروة

           tunnel: غطاء متقطع = نفق
           bridge: غطاء أسود = جسر
           private: وصول خصوصي
           tunnel: غطاء متقطع = نفق
           bridge: غطاء أسود = جسر
           private: وصول خصوصي

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

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

           apron_only: ساحه مطار
           admin: حدود إدارية
           apron_only: ساحه مطار
           admin: حدود إدارية

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

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

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

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

-          lake:
-          - بحيرة
-          - خزان
+          lake_only: بحيرة
+          reservoir: خزان

           farm: أرض زراعية
           cemetery: مقبرة
           allotments: حصص سكنية
           farm: أرض زراعية
           cemetery: مقبرة
           allotments: حصص سكنية


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

-          school:
-          - مدرسة
-          - جامعة
+          school_only: مدرسة
+          university: جامعة

           building: مبنى كبير
           station: محطه قطار
           building: مبنى كبير
           station: محطه قطار

-          summit:
-          - قمة
-          - ذروة
+          summit_only: قمة
+          peak: ذروة

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

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index a805dc75ae4cb52245e80b735aa64034fe675d5e..2666262eda133e9b3021fc25a2b3be2ccfe528c2 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -1706,30 +1706,24 @@ ast:
           footway: Camín peatonal
           rail: Ferrocarril
           subway: Metro
           footway: Camín peatonal
           rail: Ferrocarril
           subway: Metro

-          cable:
-          - Teleféricu
-          - telesilla
-          runway:
-          - Pista d'aeropuertu
-          - cai de rodaxe
+          cable_car: Teleféricu
+          chair_lift: telesilla
+          runway_only: Pista d'aeropuertu
+          taxiway: cai de rodaxe

           apron_only: Aparcamientu d'aviones
           admin: Llende alministrativa
           apron_only: Aparcamientu d'aviones
           admin: Llende alministrativa

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

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

-          common:
-          - Espaciu comunal
-          - prau
+          common_only: 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:
-          - Llagu
-          - banzáu
+          lake_only: Llagu
+          reservoir: banzáu

           farm: Casería
           brownfield: Terrén en derribu
           cemetery: Cementeriu
           farm: Casería
           brownfield: Terrén en derribu
           cemetery: Cementeriu


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

-          school:
-          - Escuela
-          - universidá
+          school_only: Escuela
+          university: universidá

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

-          summit:
-          - Cume
-          - picu
+          summit_only: Cume
+          peak: picu

           tunnel: Borde de rayes = túnel
           bridge: Borde prietu = ponte
           private: Accesu priváu
           tunnel: Borde de rayes = túnel
           bridge: Borde prietu = ponte
           private: Accesu priváu

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

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

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

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

           park: Park
           park: Park

-          common:
-            1: çəmənlik

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

-          lake:
-          - Göl
-          - su anbarı
+          lake_only: 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
           farm: Ferma
           cemetery: Məzarlıq
           centre: İdman mərkəzi
           reserve: Təbiət Qoruğu
           military: Hərbi ərazi

-          school:
-          - Məktəb
-          - universitet
+          school_only: Məktəb
+          university: universitet

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

-          summit:
-          - Zirvə
-          - pik
+          summit_only: Zirvə
+          peak: pik

           private: Xüsusi giriş
   traces:
     new:
           private: Xüsusi giriş
   traces:
     new:

diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index 0ca9606a41b2453d2a4812c960c6171c05dd15fd..5f47c628d765c5adbd01a010c5dc82a7bb4d07b9 100644 (file)
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -1169,30 +1169,24 @@ be-Tarask:
           footway: Пешаходная дарога
           rail: Чыгунка
           subway: Мэтро
           footway: Пешаходная дарога
           rail: Чыгунка
           subway: Мэтро

-          cable:
-          - Канатная дарога
-          - крэславы пад’ёмнік
-          runway:
-          - Узьлётная паласа
-          - рулёжная дарога
+          cable_car: Канатная дарога
+          chair_lift: крэславы пад’ёмнік
+          runway_only: Узьлётная паласа
+          taxiway: рулёжная дарога

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

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

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

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

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

-          lake:
-          - Возера
-          - вадасховішча
+          lake_only: Возера
+          reservoir: вадасховішча

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


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

-          school:
-          - Школа
-          - унівэрсытэт
+          school_only: Школа
+          university: унівэрсытэт

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

-          summit:
-          - Вяршыня
-          - пік
+          summit_only: Вяршыня
+          peak: пік

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

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 1290552ce13681ffbadd282326285ad9e06e004e..036146588063b7fc7b9957eb9358d424ec502fcf 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1724,30 +1724,24 @@ be:
           subway: Метро
           trolleybus: Тралейбус
           bus: Аўтобус
           subway: Метро
           trolleybus: Тралейбус
           bus: Аўтобус

-          cable:
-          - Канатная дарога
-          - Крэсельны пад'ёмнік
-          runway:
-          - Узлетна-пасадачная паласа
-          - рулёжная дарожка
+          cable_car: Канатная дарога
+          chair_lift: Крэсельны пад'ёмнік
+          runway_only: Узлетна-пасадачная паласа
+          taxiway: рулёжная дарожка

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

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

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

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

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

-          lake:
-          - Возера
-          - вадасховішча
+          lake_only: Возера
+          reservoir: вадасховішча

           glacier: Ляднік
           farm: Ферма
           brownfield: Ачышчаная пляцоўка для забудовы
           glacier: Ляднік
           farm: Ферма
           brownfield: Ачышчаная пляцоўка для забудовы


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

-          school:
-          - Школа
-          - універсітэт
+          school_only: Школа
+          university: універсітэт

           building: Значны будынак
           station: Чыгуначны вакзал
           building: Значны будынак
           station: Чыгуначны вакзал

-          summit:
-          - Вяршыня
-          - пік
+          summit_only: Вяршыня
+          peak: пік

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

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index dd7af27470cb66c367912dd3270494c83fd702ea..fee83fd7c5918369850086574f7e62f635ef6b19 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1657,30 +1657,24 @@ bg:
           footway: Пътека
           rail: Железен път
           subway: Метро
           footway: Пътека
           rail: Железен път
           subway: Метро

-          cable:
-          - Кабинков лифт
-          - седалков лифт
-          runway:
-          - Летищна писта
-          - път за рулиране
+          cable_car: Кабинков лифт
+          chair_lift: седалков лифт
+          runway_only: Летищна писта
+          taxiway: път за рулиране

           apron_only: Летищен перон
           admin: Административна граница
           apron_only: Летищен перон
           admin: Административна граница

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

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

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

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

-          lake:
-          - Езеро
-          - язовир
+          lake_only: Езеро
+          reservoir: язовир

           farm: Ферма
           brownfield: Място за строеж
           cemetery: Гробище
           farm: Ферма
           brownfield: Място за строеж
           cemetery: Гробище


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

-          school:
-          - Училище
-          - университет
+          school_only: Училище
+          university: университет

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

-          summit:
-          - Било
-          - връх
+          summit_only: Било
+          peak: връх

           tunnel: Тунел (пунктирана линия)
           bridge: Мост (плътна линия)
           private: Частен достъп
           tunnel: Тунел (пунктирана линия)
           bridge: Мост (плътна линия)
           private: Частен достъп

diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 2d5f89f17ce3ec3153142858a355f4c13ccf341c..855916f527882c5782b615639d2fd64ab243d0ec 100644 (file)
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -347,7 +347,7 @@ bn:
     version: সংস্করণ
     in_changeset: পরিবর্তনসমূহ
     anonymous: নামহীন
     version: সংস্করণ
     in_changeset: পরিবর্তনসমূহ
     anonymous: নামহীন

-    no_comment: (কোন মন্তব্য নেই)
+    no_comment: (কোনো মন্তব্য নেই)

     part_of: অংশ
     part_of_relations:
       one: '%{count}টি সম্পর্ক'
     part_of: অংশ
     part_of_relations:
       one: '%{count}টি সম্পর্ক'


@@ -549,7 +549,7 @@ bn:
       login_to_leave_a_comment_html: মন্তব্য করতে %{login_link} করুন
       login: প্রবেশ
     no_such_entry:
       login_to_leave_a_comment_html: মন্তব্য করতে %{login_link} করুন
       login: প্রবেশ
     no_such_entry:

-      title: এমন কোন দিনলিপির ভুক্তি নেই
+      title: এমন কোনো দিনলিপির ভুক্তি নেই

       heading: '%{id} এই আইডি থেকে কোনও ভুক্তি নেই'
       body: দুঃখিত, %{id} এই আইডি থেকে কোনও দিনলিপির ভুক্তি অথবা মন্তব্য নেই। দয়া
         করে আপনার বানান যাচাই করুন, অথবা হতে পারে আপনি যে লিংকটিতে ক্লিক করেছেন তা
       heading: '%{id} এই আইডি থেকে কোনও ভুক্তি নেই'
       body: দুঃখিত, %{id} এই আইডি থেকে কোনও দিনলিপির ভুক্তি অথবা মন্তব্য নেই। দয়া
         করে আপনার বানান যাচাই করুন, অথবা হতে পারে আপনি যে লিংকটিতে ক্লিক করেছেন তা


@@ -615,7 +615,7 @@ bn:
       title: নিষিদ্ধ
     internal_server_error:
       title: অ্যাপ্লিকেশন ত্রুটি
       title: নিষিদ্ধ
     internal_server_error:
       title: অ্যাপ্লিকেশন ত্রুটি

-      description: ওপেনস্ট্রিটম্যাপ সার্ভার কোন অপ্রত্যাশিত অবস্থার সম্মুখীন হয়েছে
+      description: ওপেনস্ট্রিটম্যাপ সার্ভার কোনো অপ্রত্যাশিত অবস্থার সম্মুখীন হয়েছে

         যার ফলে অনুরোধ পূরণ করা যাচ্ছে না (HTTP ৫০০)
     not_found:
       title: ফাইল পাওয়া যায়নি
         যার ফলে অনুরোধ পূরণ করা যাচ্ছে না (HTTP ৫০০)
     not_found:
       title: ফাইল পাওয়া যায়নি


@@ -1465,17 +1465,18 @@ bn:
       read_button: পঠিত হিসেবে চিহ্নিত করুন
       reply_button: প্রত্যুত্তর
       destroy_button: মুছুন
       read_button: পঠিত হিসেবে চিহ্নিত করুন
       reply_button: প্রত্যুত্তর
       destroy_button: মুছুন

+      unmute_button: ইনবক্সে সরান

     new:
       title: বার্তা পাঠান
       send_message_to_html: '%{name}কে একটি নতুন বার্তা পাঠান'
       back_to_inbox: ইনবক্সে ফিরে যান
     create:
       message_sent: বার্তা পাঠানো হয়েছে
     new:
       title: বার্তা পাঠান
       send_message_to_html: '%{name}কে একটি নতুন বার্তা পাঠান'
       back_to_inbox: ইনবক্সে ফিরে যান
     create:
       message_sent: বার্তা পাঠানো হয়েছে

-      limit_exceeded: সাম্প্রতিক আপনি একগুচ্ছ বার্তা পাঠিয়েছেন। আর কোন বার্তা পাঠানোর
+      limit_exceeded: সাম্প্রতিক আপনি একগুচ্ছ বার্তা পাঠিয়েছেন। আর কোনো বার্তা পাঠানোর

         পূর্বে দয়া করে কিছুক্ষণ অপেক্ষা করুন।
     no_such_message:
         পূর্বে দয়া করে কিছুক্ষণ অপেক্ষা করুন।
     no_such_message:

-      title: কোন বার্তা নেই
-      heading: কোন বার্তা নেই
+      title: কোনো বার্তা নেই
+      heading: কোনো বার্তা নেই

       body: এই আইডির সাথে কোনও বার্তালাপ নেই।
     outbox:
       title: বহির্বাক্স
       body: এই আইডির সাথে কোনও বার্তালাপ নেই।
     outbox:
       title: বহির্বাক্স


@@ -1655,7 +1656,7 @@ bn:
       embeddable_html: অভ্যন্তরীণ HTML
       licence: লাইসেন্স
       too_large:
       embeddable_html: অভ্যন্তরীণ HTML
       licence: লাইসেন্স
       too_large:

-        advice: 'যদি à¦\89পরà§\87র রপà§\8dতানি বà§\8dযরà§\8dথ হয়, দয়া à¦\95রà§\87 নà§\80à¦\9aà§\87 তালিà¦\95াভà§\81à¦\95à§\8dত à¦\89à§\8eসà§\87র à¦\95à§\8bন
+        advice: 'যদি à¦\89পরà§\87র রপà§\8dতানি বà§\8dযরà§\8dথ হয়, দয়া à¦\95রà§\87 নিà¦\9aà§\87 তালিà¦\95াভà§\81à¦\95à§\8dত à¦\89à§\8eসà§\87র à¦\95à§\8bনà§\8b

           একটি ব্যবহারের জন্য বিবেচনা করুন:'
         planet:
           title: ওএসএম জগৎ
           একটি ব্যবহারের জন্য বিবেচনা করুন:'
         planet:
           title: ওএসএম জগৎ


@@ -1741,39 +1742,33 @@ bn:
           ferry: ফেরি
           tram_only: ট্রাম
           bus: বাস
           ferry: ফেরি
           tram_only: ট্রাম
           bus: বাস

-          cable:
-          - ক্যাবল কার
+          cable_car: ক্যাবল কার

           admin: প্রশাসনিক সীমানা
           admin: প্রশাসনিক সীমানা

-          orchard:
-          - ফলবাগিচা
-          forest:
-          - অরণ্য
-          - কাঠ
+          orchard_only: ফলবাগিচা
+          vineyard: আঙুর খেত
+          forest_only: অরণ্য
+          wood: কাঠ

           farmland: কৃষিজমি
           farmland: কৃষিজমি

-          grass:
-            1: তৃণভূমি
+          meadow: তৃণভূমি

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

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

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

-          lake:
-          - হ্রদ
-          - জলাধার
+          lake_only: হ্রদ
+          reservoir: জলাধার

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

-          school:
-          - বিদ্যালয়
-          - বিশ্ববিদ্যালয়
+          school_only: বিদ্যালয়
+          university: বিশ্ববিদ্যালয়
+          hospital: হাসপাতাল

           station: রেল স্টেশন
           station: রেল স্টেশন

-          summit:
-            1: শৃঙ্গ
+          peak: শৃঙ্গ

           bus_stop: বাস স্টপ
           stop: স্টপ
           bicycle_shop: সাইকেলের দোকান
           bus_stop: বাস স্টপ
           stop: স্টপ
           bicycle_shop: সাইকেলের দোকান


@@ -1932,9 +1927,9 @@ bn:
         সিদ্ধান্ত নিয়েছেন। আরও তথ্যের জন্য, অনুগ্রহ করে %{terms_declined_link} দেখুন।
       terms_declined_link: এই উইকি পাতা
     no_such_user:
         সিদ্ধান্ত নিয়েছেন। আরও তথ্যের জন্য, অনুগ্রহ করে %{terms_declined_link} দেখুন।
       terms_declined_link: এই উইকি পাতা
     no_such_user:

-      title: এরকম কোন ব্যবহারকারী নেই
+      title: এরকম কোনো ব্যবহারকারী নেই

       heading: ব্যবহারকারী %{user} বিদ্যমান নয়
       heading: ব্যবহারকারী %{user} বিদ্যমান নয়

-      body: দুঃখিত, %{user} নামের কোন ব্যবহারকারী নেই। অনুগ্রহ করে আপনার বানান পরীক্ষা
+      body: দুঃখিত, %{user} নামের কোনো ব্যবহারকারী নেই। অনুগ্রহ করে আপনার বানান পরীক্ষা

         করুন, অথবা হয়ত আপনি যে সংযোগটিতে টোকা দিয়েছেন সেটি ভুল।
       deleted: অপসারিত
     show:
         করুন, অথবা হয়ত আপনি যে সংযোগটিতে টোকা দিয়েছেন সেটি ভুল।
       deleted: অপসারিত
     show:


@@ -1988,7 +1983,7 @@ bn:
       summary_no_ip_html: '%{date}-এ %{name} তৈরি হয়েছে'
       confirm: নির্বাচিত ব্যবহারকারীদের নিশ্চিত করুন
       hide: নির্বাচিত ব্যবহারকারীদের লুকান
       summary_no_ip_html: '%{date}-এ %{name} তৈরি হয়েছে'
       confirm: নির্বাচিত ব্যবহারকারীদের নিশ্চিত করুন
       hide: নির্বাচিত ব্যবহারকারীদের লুকান

-      empty: কোন সাদৃশ্যপূর্ণ ব্যবহারকারী পাওয়া যায়নি
+      empty: কোনো সাদৃশ্যপূর্ণ ব্যবহারকারী পাওয়া যায়নি

     suspended:
       title: অ্যাকাউন্ট স্থগিত করা হয়েছে
       heading: অ্যাকাউন্ট স্থগিত করা হয়েছে
     suspended:
       title: অ্যাকাউন্ট স্থগিত করা হয়েছে
       heading: অ্যাকাউন্ট স্থগিত করা হয়েছে


@@ -2009,7 +2004,7 @@ bn:
         যুক্ত করুন।
   user_role:
     filter:
         যুক্ত করুন।
   user_role:
     filter:

-      not_a_role: উক্ত `%{role}' টি কোন সঠিক দায়িত্ব নয়।
+      not_a_role: উক্ত `%{role}' টি কোনো সঠিক দায়িত্ব নয়।

       already_has_role: এই ব্যবহারকারী %{role} দায়িত্বটি এখনো আছে।
       doesnt_have_role: এই ব্যবহারকারীর %{role} দায়িত্বটি নেই।
       not_revoke_admin_current_user: বর্তমান ব্যবহারকারীর থেকে প্রশাসকের ভূমিকা প্রত্যাহার
       already_has_role: এই ব্যবহারকারী %{role} দায়িত্বটি এখনো আছে।
       doesnt_have_role: এই ব্যবহারকারীর %{role} দায়িত্বটি নেই।
       not_revoke_admin_current_user: বর্তমান ব্যবহারকারীর থেকে প্রশাসকের ভূমিকা প্রত্যাহার

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

+      models:
+        user_mute:
+          attributes:
+            subject:
+              format: '%{message}'
+          is_already_muted: a zo tavet dija

     models:
       acl: Listenn kontroll moned
       changeset: Hollad cheñchamantoù
     models:
       acl: Listenn kontroll moned
       changeset: Hollad cheñchamantoù


@@ -1768,6 +1774,7 @@ br:
       to: Da
       subject: Danvez
       date: Deiziad
       to: Da
       subject: Danvez
       date: Deiziad

+      actions: Oberoù

     message_summary:
       unread_button: Merkañ evel anlennet
       read_button: Merkañ evel lennet
     message_summary:
       unread_button: Merkañ evel anlennet
       read_button: Merkañ evel lennet


@@ -1787,12 +1794,15 @@ br:
       body: Ho tigarez, n'eus kemennadenn ebet gant an id-se.
     outbox:
       title: Boest kas
       body: Ho tigarez, n'eus kemennadenn ebet gant an id-se.
     outbox:
       title: Boest kas

+      actions: Oberoù

       messages:
         one: Kaset hoc'h eus %{count} gemennadenn
         other: Kaset hoc'h eus %{count} kemennadenn
       no_sent_messages_html: N'hoc'h eus kaset kemennadenn ebet c'hoazh. Ha ma'z afec'h
         a darempred gant darn eus an %{people_mapping_nearby_link}?
       people_mapping_nearby: tud o kartennañ en ardremez
       messages:
         one: Kaset hoc'h eus %{count} gemennadenn
         other: Kaset hoc'h eus %{count} kemennadenn
       no_sent_messages_html: N'hoc'h eus kaset kemennadenn ebet c'hoazh. Ha ma'z afec'h
         a darempred gant darn eus an %{people_mapping_nearby_link}?
       people_mapping_nearby: tud o kartennañ en ardremez

+    muted:
+      title: Kemennadennoù tavet

     reply:
       wrong_user: Kevreet oc'h evel "%{user}", met ar gemennadenn a fell deoc'h respont
         outi n'eo ket bet kaset d'an implijer-se. Mar plij kevreit gant ar gont reizh
     reply:
       wrong_user: Kevreet oc'h evel "%{user}", met ar gemennadenn a fell deoc'h respont
         outi n'eo ket bet kaset d'an implijer-se. Mar plij kevreit gant ar gont reizh


@@ -1811,6 +1821,7 @@ br:
     heading:
       my_inbox: Ma boest resev
       my_outbox: Ma boest kas
     heading:
       my_inbox: Ma boest resev
       my_outbox: Ma boest kas

+      muted_messages: Kemennadennoù tavet

     mark:
       as_read: Kemennadenn merket evel lennet
       as_unread: Merkañ evel anlennet
     mark:
       as_read: Kemennadenn merket evel lennet
       as_unread: Merkañ evel anlennet


@@ -2233,32 +2244,24 @@ br:
           tram_only: Tramgarr
           trolleybus: Trollebus
           bus: Karr-boutin
           tram_only: Tramgarr
           trolleybus: Trollebus
           bus: Karr-boutin

-          cable:
-          - Teleferik
-          - fungador
-          runway:
-          - Roudenn evit an taksioù
-          - Roudenn evit an taksioù
+          cable_car: Teleferik
+          chair_lift: Fungador
+          runway_only: Roudenn evit an taksioù
+          taxiway: Hent evit an taksioù

           apron_only: Roudenn aerborzh
           admin: Bevenn velestradurel
           apron_only: Roudenn aerborzh
           admin: Bevenn velestradurel

-          orchard:
-          - Gwerje
-          - gwinieg
-          forest:
-          - Koad
-          - koad
+          orchard_only: Gwerje
+          vineyard: Gwinieg
+          forest_only: Koad
+          wood: Koad

           farmland: Tachenn labour-douar
           farmland: Tachenn labour-douar

-          grass:
-          - Geot
-          - prad
+          grass_only: Geot
+          meadow: Prad

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

-          common:
-          - prad
-          - prad
-          - liorzh
+          common_only: prad

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


@@ -2266,9 +2269,8 @@ br:
           commercial: Takad kenwerzhel
           heathland: Lanneier
           scrubland: Strouezheg
           commercial: Takad kenwerzhel
           heathland: Lanneier
           scrubland: Strouezheg

-          lake:
-          - Lenn
-          - mirlec'h
+          lake_only: Lenn
+          reservoir: Mirlenn

           glacier: Skorneg
           reef: Karreg
           wetland: Takad gleborek
           glacier: Skorneg
           reef: Karreg
           wetland: Takad gleborek


@@ -2280,15 +2282,13 @@ br:
           centre: Kreizenn sport
           reserve: Gwarezva natur
           military: Takad milourel
           centre: Kreizenn sport
           reserve: Gwarezva natur
           military: Takad milourel

-          school:
-          - Skol
-          - skol-veur
-          - ospital
+          school_only: Skol
+          university: Skol-veur
+          hospital: Ospital

           building: Savadur pouezus
           station: Porzh-houarn
           building: Savadur pouezus
           station: Porzh-houarn

-          summit:
-          - Lein
-          - pikern
+          summit_only: Lein
+          peak: Pikern

           tunnel: Bord poentoùigoù = riboul
           bridge: Bord du = pont
           private: Moned prevez
           tunnel: Bord poentoùigoù = riboul
           bridge: Bord du = pont
           private: Moned prevez


@@ -2336,6 +2336,7 @@ br:
         imports: Enporzhiadurioù
         automated_edits: Kemmoù emgefre
       start_mapping: Kregiñ da gartennaouiñ
         imports: Enporzhiadurioù
         automated_edits: Kemmoù emgefre
       start_mapping: Kregiñ da gartennaouiñ

+      continue_authorization: Kenderc'hel gant an aotre

       add_a_note:
         title: N'ho peus ket amzer da aozañ ? Ouzhpennit un notenn !
         para_1: Ma fell deoc'h ober ur reizhadennig hepken ha ma n'ho peus ket amzer
       add_a_note:
         title: N'ho peus ket amzer da aozañ ? Ouzhpennit un notenn !
         para_1: Ma fell deoc'h ober ur reizhadennig hepken ha ma n'ho peus ket amzer


@@ -2479,6 +2480,7 @@ br:
       oauth1_settings: Arventennoù OAuth 1
       oauth2_applications: Arloadoù OAuth 2
       oauth2_authorizations: Aotreoù OAuth 2
       oauth1_settings: Arventennoù OAuth 1
       oauth2_applications: Arloadoù OAuth 2
       oauth2_authorizations: Aotreoù OAuth 2

+      muted_users: Implijerien tavet

   oauth:
     authorize:
       title: Aotren mont d'ho kont
   oauth:
     authorize:
       title: Aotren mont d'ho kont


@@ -2664,6 +2666,7 @@ br:
       my_dashboard: Ma zaolenn-vourzh
       blocks on me: Stankadurioù evidon
       blocks by me: stankadurioù graet ganin
       my_dashboard: Ma zaolenn-vourzh
       blocks on me: Stankadurioù evidon
       blocks by me: stankadurioù graet ganin

+      create_mute: Tevel an implijer-mañ

       edit_profile: Aozañ ar profil
       send message: Kas ur gemennadenn
       diary: deizlevr
       edit_profile: Aozañ ar profil
       send message: Kas ur gemennadenn
       diary: deizlevr


@@ -2688,9 +2691,11 @@ br:
         grant:
           administrator: Reiñ ar moned merour
           moderator: Reiñ ar moned habaskaer
         grant:
           administrator: Reiñ ar moned merour
           moderator: Reiñ ar moned habaskaer

+          importer: Grataat gwirioù enporzhiañ

         revoke:
           administrator: Disteurel ar moned merour
           moderator: Disteurel ar moned habaskaer
         revoke:
           administrator: Disteurel ar moned merour
           moderator: Disteurel ar moned habaskaer

+          importer: Lemel ar gwirioù enporzhiañ

       block_history: stankadurioù oberiant
       moderator_history: Stankadurioù roet
       comments: evezhiadennoù
       block_history: stankadurioù oberiant
       moderator_history: Stankadurioù roet
       comments: evezhiadennoù


@@ -2876,6 +2881,19 @@ br:
       showing_page: Page %{page}
       next: ↓War-lerc'h »
       previous: ↓« Kent
       showing_page: Page %{page}
       next: ↓War-lerc'h »
       previous: ↓« Kent

+  user_mutes:
+    index:
+      title: Implijerien tavet
+      my_muted_users: Ma implijerien tavet
+      table:
+        thead:
+          muted_user: Implijer/ez tavet
+          actions: Oberoù
+        tbody:
+          send_message: Kas ur gemennadenn
+    create:
+      notice: Tavet ho peus %{name}.
+      error: Ne c'haller ket tevel %{name}. %{full_message}.

   notes:
     index:
       title: Notennoù kaset pe addispleget gant %{user}
   notes:
     index:
       title: Notennoù kaset pe addispleget gant %{user}

diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 7b6524f2155c459306da03dee5cc42cb36e6e3bb..067a8008ffe7c819124f2ea7c1b8f4a9030edc03 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1196,30 +1196,24 @@ bs:
           footway: Pješačka staza
           rail: Željeznica
           subway: Podzemna željeznica
           footway: Pješačka staza
           rail: Željeznica
           subway: Podzemna željeznica

-          cable:
-          - Kabinska žičara
-          - Uspinjača sa naslonjačem
-          runway:
-          - Aerodromska pista
-          - Aerodromska rulna staza
+          cable_car: Kabinska žičara
+          chair_lift: Uspinjača sa naslonjačem
+          runway_only: Aerodromska pista
+          taxiway: Aerodromska rulna staza

           apron_only: Parking za avione
           admin: Administrativna granica
           apron_only: Parking za avione
           admin: Administrativna granica

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

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

-          common:
-          - Travnjaci
-          - Livada
+          common_only: 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:
-          - Jezero
-          - Rezervoar
+          lake_only: Jezero
+          reservoir: Rezervoar

           farm: Polja, farme, njive
           brownfield: Gradilište
           cemetery: Groblje
           farm: Polja, farme, njive
           brownfield: Gradilište
           cemetery: Groblje


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

-          school:
-          - Škola
-          - Univerzitet
+          school_only: Škola
+          university: Univerzitet

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

-          summit:
-          - Vrh
-          - Kota
+          summit_only: Vrh
+          peak: Kota

           tunnel: Iscrtkani rubovi = tunel
           bridge: Crni rubovi = most
           private: Privatni pristup
           tunnel: Iscrtkani rubovi = tunel
           bridge: Crni rubovi = most
           private: Privatni pristup

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 72f68cd6bc94eb0bd18c2e1df23561832bd221e7..d1e7841aaaf0f98abe8d10c3f5b15ab1b0c7d8b7 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -2288,31 +2288,24 @@ ca:
           footway: Via de vianants
           rail: Ferrocarril
           subway: Metro
           footway: Via de vianants
           rail: Ferrocarril
           subway: Metro

-          cable:
-          - Telefèric
-          - telecadira
-          runway:
-          - Pista d'aeroport
-          - carrer de rodatge
+          cable_car: Telefèric
+          chair_lift: telecadira
+          runway_only: Pista d'aeroport
+          taxiway: carrer de rodatge

           apron_only: Estacionament d'avions
           admin: Límit administratiu
           apron_only: Estacionament d'avions
           admin: Límit administratiu

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

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

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

           resident: Zona residencial
           retail: Àrea comercial
           industrial: Zona industrial
           commercial: Zona comercial
           heathland: Bruguerar
           resident: Zona residencial
           retail: Àrea comercial
           industrial: Zona industrial
           commercial: Zona comercial
           heathland: Bruguerar

-          lake:
-          - Llac
-          - bassa
+          lake_only: Llac
+          reservoir: bassa

           farm: Granja
           brownfield: Àrea industrial abandonada
           cemetery: Cementiri
           farm: Granja
           brownfield: Àrea industrial abandonada
           cemetery: Cementiri


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

-          school:
-          - Escola - Institut
-          - Universitat
+          school_only: Escola - Institut
+          university: Universitat

           building: Edifici significatiu
           station: Estació de tren
           building: Edifici significatiu
           station: Estació de tren

-          summit:
-          - Cim
-          - pic
+          summit_only: Cim
+          peak: pic

           tunnel: Línia discontínua = túnel
           bridge: Línia negra = pont
           private: Accés privat
           tunnel: Línia discontínua = túnel
           bridge: Línia negra = pont
           private: Accés privat

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 927110acb1af10b6359d01d7030b2ef01b60a346..044cac058a8263580c08e80d4cbb171f3ecb4e87 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -2393,31 +2393,24 @@ cs:
           footway: Pěší cesta
           rail: Železnice
           subway: Metro
           footway: Pěší cesta
           rail: Železnice
           subway: Metro

-          cable:
-          - Lanovka
-          - sedačková lanovka
-          runway:
-          - Vzletová a přistávací dráha
-          - pojezdová dráha
+          cable_car: Lanovka
+          chair_lift: sedačková lanovka
+          runway_only: Vzletová a přistávací dráha
+          taxiway: pojezdová dráha

           apron_only: Letištní odbavovací plocha
           admin: Administrativní hranice
           apron_only: Letištní odbavovací plocha
           admin: Administrativní hranice

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

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

-          common:
-          - Pastvina
-          - louka
-          - zahrada
+          common_only: 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:
-          - Jezero
-          - nádrž
+          lake_only: Jezero
+          reservoir: nádrž

           farm: Farma
           brownfield: Zbořeniště
           cemetery: Hřbitov
           farm: Farma
           brownfield: Zbořeniště
           cemetery: Hřbitov


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

-          school:
-          - Škola
-          - univerzita
+          school_only: Škola
+          university: univerzita

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

-          summit:
-          - Vrchol
-          - hora
+          summit_only: Vrchol
+          peak: hora

           tunnel: Čárkované obrysy = tunel
           bridge: Černé obrysy = most
           private: Soukromý pozemek
           tunnel: Čárkované obrysy = tunel
           bridge: Černé obrysy = most
           private: Soukromý pozemek

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 8d60a3150b4fab23fdc513769835aa440e89d05a..a6f1440e5a359e3675e4892132ecd27cb7b10b62 100644 (file)
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1925,31 +1925,24 @@ cy:
           footway: Troedffordd
           rail: Rheilffordd
           subway: Trenau tanddaear
           footway: Troedffordd
           rail: Rheilffordd
           subway: Trenau tanddaear

-          cable:
-          - Car cebl
-          - lifft cadair
-          runway:
-          - Llwybr glanio
-          - thacsiffordd maes awyr
+          cable_car: Car cebl
+          chair_lift: lifft cadair
+          runway_only: Llwybr glanio
+          taxiway: thacsiffordd maes awyr

           apron_only: Llain
           admin: Ffin gweinyddol
           apron_only: Llain
           admin: Ffin gweinyddol

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

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

-          common:
-          - Comin
-          - gwaun
-          - gardd
+          common_only: Comin

           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:
-          - Llyn
-          - chronfa ddŵr
+          lake_only: Llyn
+          reservoir: chronfa ddŵr

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


@@ -1958,14 +1951,12 @@ cy:
           centre: Canolfan chwaraeon
           reserve: Gwarchodfa natur
           military: Ardal filwrol
           centre: Canolfan chwaraeon
           reserve: Gwarchodfa natur
           military: Ardal filwrol

-          school:
-          - Ysgol
-          - phrifysgol
+          school_only: Ysgol
+          university: phrifysgol

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

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

           tunnel: Border toredig = twnnel
           bridge: Border du = pont
           private: Mynediad preifat
           tunnel: Border toredig = twnnel
           bridge: Border du = pont
           private: Mynediad preifat

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 75baf8eb0819388c75a2ecad0719edbee6e33b40..0aca9c148366913b5799096bed124f02e7e9af66 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -2340,32 +2340,24 @@ da:
           tram_only: Sporvogn
           trolleybus: Trolleybus
           bus: Bus
           tram_only: Sporvogn
           trolleybus: Trolleybus
           bus: Bus

-          cable:
-          - Kabelvogn
-          - stolelift
-          runway:
-          - Landingsbane
-          - taxibane
+          cable_car: Kabelvogn
+          chair_lift: stolelift
+          runway_only: Landingsbane
+          taxiway: taxibane

           apron_only: Lufthavnsforplads
           admin: Administrativ grænse
           apron_only: Lufthavnsforplads
           admin: Administrativ grænse

-          orchard:
-          - Plantage
-          - vingård
-          forest:
-          - Skov
-          - træ
+          orchard_only: Plantage
+          vineyard: vingård
+          forest_only: Skov
+          wood: træ

           farmland: Landbrugsjord
           farmland: Landbrugsjord

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

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

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

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


@@ -2373,9 +2365,8 @@ da:
           commercial: Erhvervsområde
           heathland: Hede
           scrubland: Buskads
           commercial: Erhvervsområde
           heathland: Hede
           scrubland: Buskads

-          lake:
-          - Sø
-          - reservoir
+          lake_only: Sø
+          reservoir: reservoir

           intermittent_water: Periodisk vandmasse
           glacier: Gletsjer
           reef: Rev
           intermittent_water: Periodisk vandmasse
           glacier: Gletsjer
           reef: Rev


@@ -2388,15 +2379,13 @@ da:
           centre: Sportscenter
           reserve: Naturreservat
           military: Militært område
           centre: Sportscenter
           reserve: Naturreservat
           military: Militært område

-          school:
-          - Skole
-          - universitet
-          - sygehus
+          school_only: Skole
+          university: universitet
+          hospital: sygehus

           building: Vigtig bygning
           station: Togstation
           building: Vigtig bygning
           station: Togstation

-          summit:
-          - Bjergtop
-          - højdepunkt
+          summit_only: Bjergtop
+          peak: højdepunkt

           tunnel: Stiplet kant = tunnel
           bridge: Sort kant = bro
           private: Privat adgang
           tunnel: Stiplet kant = tunnel
           bridge: Sort kant = bro
           private: Privat adgang

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 185b702cd95f56a356c7a376482f39fda025a0d0..98c476cc93e47e87cdf450907a8fe6895e879225 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2412,31 +2412,24 @@ de:
           footway: Fußweg
           rail: Eisenbahn
           subway: U-Bahn
           footway: Fußweg
           rail: Eisenbahn
           subway: U-Bahn

-          cable:
-          - Seilbahn
-          - Sessellift
-          runway:
-          - Start- und Landebahn
-          - Rollbahn
+          cable_car: Seilbahn
+          chair_lift: Sessellift
+          runway_only: Start- und Landebahn
+          taxiway: Rollbahn

           apron_only: Flughafenvorfeld
           admin: Landesgrenzen, sonstige Grenzen
           apron_only: Flughafenvorfeld
           admin: Landesgrenzen, sonstige Grenzen

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

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

-          common:
-          - öffentliche Grünfläche (brit.)
-          - Wiese
-          - Garten
+          common_only: ö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:
-          - See
-          - Stausee
+          lake_only: See
+          reservoir: Stausee

           intermittent_water: Intermittierender Gewässer
           farm: Landwirtschaft
           brownfield: Brachfläche
           intermittent_water: Intermittierender Gewässer
           farm: Landwirtschaft
           brownfield: Brachfläche


@@ -2446,14 +2439,12 @@ de:
           centre: Sportzentrum
           reserve: Naturschutzgebiet
           military: Militärgebiet
           centre: Sportzentrum
           reserve: Naturschutzgebiet
           military: Militärgebiet

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

           building: Bedeutendes Gebäude
           station: Bahnhof
           building: Bedeutendes Gebäude
           station: Bahnhof

-          summit:
-          - Gipfel
-          - Bergspitze
+          summit_only: Gipfel
+          peak: Bergspitze

           tunnel: Gestrichelter Rand = Tunnel
           bridge: Schwarzer Rand = Brücke
           private: Privater Zugang
           tunnel: Gestrichelter Rand = Tunnel
           bridge: Schwarzer Rand = Brücke
           private: Privater Zugang

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 613b6270d0e7b20f0a4f42d6d353a498495c6499..a9dd800b2ed14463db51c96d666a04011bfb8eb1 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -910,24 +910,19 @@ 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:
-          - Mêşe
-          - Meşe
+          forest_only: Mêşe
+          wood: Meşe

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

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

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

-          school:
-          - Wendxane
-          - Uniwersita
-          summit:
-          - Sersıq
-          - Ko
+          school_only: Wendxane
+          university: Uniwersita
+          summit_only: Sersıq
+          peak: Ko

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

diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index bc8d4ced7882c93694e5025841f3f855808bd79c..d13208383bd4421619a1bc6687c13780b5fd0085 100644 (file)
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -1267,30 +1267,24 @@ dsb:
           footway: Drožka
           rail: Zeleznica
           subway: Pódzemska
           footway: Drožka
           rail: Zeleznica
           subway: Pódzemska

-          cable:
-          - Kablowa elektriska
-          - sedłowy lift
-          runway:
-          - Pśizemjeńska cera
-          - lětadłowa cera
+          cable_car: Kablowa elektriska
+          chair_lift: sedłowy lift
+          runway_only: Pśizemjeńska cera
+          taxiway: lětadłowa cera

           apron_only: Pśedpólo lětanišća
           admin: Zastojnstwowa granica
           apron_only: Pśedpólo lětanišća
           admin: Zastojnstwowa granica

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

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

-          common:
-          - Powšykny
-          - łuka
+          common_only: 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:
-          - Jazor
-          - gaśeński jazor
+          lake_only: Jazor
+          reservoir: gaśeński jazor

           farm: Farma
           brownfield: Industrijowe lědo
           cemetery: Kjarchob
           farm: Farma
           brownfield: Industrijowe lědo
           cemetery: Kjarchob


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

-          school:
-          - Šula
-          - uniwersita
+          school_only: Šula
+          university: uniwersita

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

-          summit:
-          - Wjerch
-          - špica
+          summit_only: Wjerch
+          peak: špica

           tunnel: Smužkowane wobcerjenje = tunel
           bridge: Carne wobcerjenje = móst
           private: Priwatny pśistup
           tunnel: Smužkowane wobcerjenje = tunel
           bridge: Carne wobcerjenje = móst
           private: Priwatny pśistup

diff --git a/config/locales/el.yml b/config/locales/el.yml
index 335e260a934411408d338b8ee7b3dca10728e503..1d1647224bee6d9d821575b5b41e5369f7063d3b 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -80,6 +80,12 @@ el:
       messages:
         invalid_email_address: δεν φαίνεται να είναι έγκυρη διεύθυνση ηλ. ταχυδρομείου
         email_address_not_routable: δεν είναι δρομολογητέο
       messages:
         invalid_email_address: δεν φαίνεται να είναι έγκυρη διεύθυνση ηλ. ταχυδρομείου
         email_address_not_routable: δεν είναι δρομολογητέο

+      models:
+        user_mute:
+          attributes:
+            subject:
+              format: '%{message}'
+          is_already_muted: είναι ήδη σε σίγαση

     models:
       acl: Λίστα ελέγχου πρόσβασης
       changeset: Ομάδα αλλαγών
     models:
       acl: Λίστα ελέγχου πρόσβασης
       changeset: Ομάδα αλλαγών


@@ -1822,11 +1828,13 @@ el:
       to: Προς
       subject: Θέμα
       date: Ημερομηνία
       to: Προς
       subject: Θέμα
       date: Ημερομηνία

+      actions: Ενέργειες

     message_summary:
       unread_button: Σήμανση ως αδιάβαστο
       read_button: Σήμανση ως διαβασμένο
       reply_button: Απάντηση
       destroy_button: Διαγραφή
     message_summary:
       unread_button: Σήμανση ως αδιάβαστο
       read_button: Σήμανση ως διαβασμένο
       reply_button: Απάντηση
       destroy_button: Διαγραφή

+      unmute_button: Μετακίνηση στα Εισερχόμενα

     new:
       title: Αποστολή μηνύματος
       send_message_to_html: Αποστολή νέου μηνύματος προς %{name}
     new:
       title: Αποστολή μηνύματος
       send_message_to_html: Αποστολή νέου μηνύματος προς %{name}


@@ -1841,12 +1849,15 @@ el:
       body: Λυπάμαι δεν υπάρχει μήνυμα με αυτό το αναγνωριστικό.
     outbox:
       title: Εξερχόμενα
       body: Λυπάμαι δεν υπάρχει μήνυμα με αυτό το αναγνωριστικό.
     outbox:
       title: Εξερχόμενα

+      actions: Ενέργειες

       messages:
         one: Έχετε %{count} απεσταλμένο μήνυμα
         other: Έχετε %{count} απεσταλμένα μηνύματα
       no_sent_messages_html: Δεν έχετε στείλει κανένα μήνυμα ακόμα. Γιατί δεν έρχεστε
         σε επαφή με μερικά %{people_mapping_nearby_link}?
       people_mapping_nearby: άτομα που χαρτογραφούν κοντά σας
       messages:
         one: Έχετε %{count} απεσταλμένο μήνυμα
         other: Έχετε %{count} απεσταλμένα μηνύματα
       no_sent_messages_html: Δεν έχετε στείλει κανένα μήνυμα ακόμα. Γιατί δεν έρχεστε
         σε επαφή με μερικά %{people_mapping_nearby_link}?
       people_mapping_nearby: άτομα που χαρτογραφούν κοντά σας

+    muted:
+      title: Μηνύματα σε Σίγαση

     reply:
       wrong_user: Έχετε συνδεθεί ως «%{user}» αλλά το μήνυμα που ζητάτε να απαντήσετε
         δεν έχει σταλεί σε αυτόν το χρήστη. Παρακαλούμε συνδεθείτε με το σωστό όνομα
     reply:
       wrong_user: Έχετε συνδεθεί ως «%{user}» αλλά το μήνυμα που ζητάτε να απαντήσετε
         δεν έχει σταλεί σε αυτόν το χρήστη. Παρακαλούμε συνδεθείτε με το σωστό όνομα


@@ -1865,9 +1876,13 @@ el:
     heading:
       my_inbox: Τα εισερχόμενα μου
       my_outbox: Τα εξερχόμενα μου
     heading:
       my_inbox: Τα εισερχόμενα μου
       my_outbox: Τα εξερχόμενα μου

+      muted_messages: Μηνύματα σε Σίγαση

     mark:
       as_read: Το μήνυμα σημειώθηκε ως αναγνωσμένο
       as_unread: Το μήνυμα σημειώθηκε ως μη αναγνωσμένο
     mark:
       as_read: Το μήνυμα σημειώθηκε ως αναγνωσμένο
       as_unread: Το μήνυμα σημειώθηκε ως μη αναγνωσμένο

+    unmute:
+      notice: Το μήνυμα μετακινήθηκε στα Εισερχόμενα
+      error: Δεν ήταν δυνατή η μετακίνηση του μηνύματος στα Εισερχόμενα.

     destroy:
       destroyed: Το μήνυμα διαγράφηκε
   passwords:
     destroy:
       destroyed: Το μήνυμα διαγράφηκε
   passwords:


@@ -1891,6 +1906,7 @@ el:
       flash token bad: Δεν βρήκατε αυτό το κομμάτι, μήπως πρέπει να ελέγξετε το URL;
     update:
       flash changed: Το συνθηματικό σας άλλαξε!
       flash token bad: Δεν βρήκατε αυτό το κομμάτι, μήπως πρέπει να ελέγξετε το URL;
     update:
       flash changed: Το συνθηματικό σας άλλαξε!

+      flash token bad: Δεν βρέθηκε αυτό το token, ελέγξτε ίσως τη διεύθυνση URL;

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


@@ -2329,6 +2345,7 @@ el:
           primary: Κύρια Οδός
           secondary: Δευτερεύουσα Οδός
           unclassified: Αταξινόμητη Οδός
           primary: Κύρια Οδός
           secondary: Δευτερεύουσα Οδός
           unclassified: Αταξινόμητη Οδός

+          pedestrian: Πεζόδρομος

           track: Αγροτικός / Δασικός δρόμος
           bridleway: Μονοπάτι για Άλογα
           cycleway: Ποδηλατόδρομος
           track: Αγροτικός / Δασικός δρόμος
           bridleway: Μονοπάτι για Άλογα
           cycleway: Ποδηλατόδρομος


@@ -2337,32 +2354,30 @@ el:
           cycleway_local: Τοπικός ποδηλατόδρομος
           footway: Μονοπάτι
           rail: Σιδηρόδρομος
           cycleway_local: Τοπικός ποδηλατόδρομος
           footway: Μονοπάτι
           rail: Σιδηρόδρομος

+          train: Τρένο

           subway: Υπόγειος Σιδηρόδρομος
           subway: Υπόγειος Σιδηρόδρομος

-          cable:
-          - Τελεφερίκ
-          - τελεφερίκ με καθίσματα
-          runway:
-          - Διάδρομος Αεροδρομίου
-          - τροχόδρομος
+          bus: Λεωφορείο
+          cable_car: Τελεφερίκ
+          chair_lift: τελεφερίκ με καθίσματα
+          runway_only: Διάδρομος Αεροδρομίου
+          taxiway: τροχόδρομος

           apron_only: Πίστα προσγείωσης αεροδρομίου
           admin: Διοικητικό όριο
           apron_only: Πίστα προσγείωσης αεροδρομίου
           admin: Διοικητικό όριο

-          forest:
-          - Δάσος
-          - Φυσικό δάσος
+          forest_only: Δάσος
+          wood: Φυσικό δάσος
+          bare_rock: Γυμνός βράχος
+          sand: Άμμος

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

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

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

-          lake:
-          - Λίμνη
-          - ταμιευτήρας
+          lake_only: Λίμνη
+          reservoir: ταμιευτήρας
+          glacier: Παγετώνας

           farm: Αγρόκτημα
           brownfield: Πρώην βιομηχανική περιοχή
           cemetery: Κοιμητήριο
           farm: Αγρόκτημα
           brownfield: Πρώην βιομηχανική περιοχή
           cemetery: Κοιμητήριο


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

-          school:
-          - Σχολείο
-          - πανεπιστήμιο
+          school_only: Σχολείο
+          university: πανεπιστήμιο

           building: Σημαντικό κτήριο
           station: Σιδηροδρομικός σταθμός
           building: Σημαντικό κτήριο
           station: Σιδηροδρομικός σταθμός

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

           tunnel: Διακεκομμένο περίβλημα = σήραγγα
           bridge: Μαύρο περίβλημα = γέφυρα
           private: Ιδιωτική πρόσβαση
           tunnel: Διακεκομμένο περίβλημα = σήραγγα
           bridge: Μαύρο περίβλημα = γέφυρα
           private: Ιδιωτική πρόσβαση


@@ -2431,6 +2444,7 @@ el:
         imports: Εισαγωγές
         automated_edits: Αυτοματοποιημένες Επεξεργασίες
       start_mapping: Ξεκινήστε τη Χαρτογράφηση
         imports: Εισαγωγές
         automated_edits: Αυτοματοποιημένες Επεξεργασίες
       start_mapping: Ξεκινήστε τη Χαρτογράφηση

+      continue_authorization: Συνέχιση Εξουσιοδότησης

       add_a_note:
         title: Δεν έχετε χρόνο για χαρτογράφηση; Προσθέστε μια σημείωση!
         para_1: Εάν θέλετε κάτι μικρό να διορθωθεί και δεν έχετε χρόνο να εγγραφείτε
       add_a_note:
         title: Δεν έχετε χρόνο για χαρτογράφηση; Προσθέστε μια σημείωση!
         para_1: Εάν θέλετε κάτι μικρό να διορθωθεί και δεν έχετε χρόνο να εγγραφείτε


@@ -2589,6 +2603,7 @@ el:
       oauth1_settings: Ρυθμίσεις OAuth 1
       oauth2_applications: Εφαρμογές OAuth 2
       oauth2_authorizations: Εξουσιοδοτήσεις OAuth 2
       oauth1_settings: Ρυθμίσεις OAuth 1
       oauth2_applications: Εφαρμογές OAuth 2
       oauth2_authorizations: Εξουσιοδοτήσεις OAuth 2

+      muted_users: Χρήστες σε Σίγαση

   oauth:
     authorize:
       title: Επιτρέψτε την πρόσβαση στο λογαριασμό σας
   oauth:
     authorize:
       title: Επιτρέψτε την πρόσβαση στο λογαριασμό σας


@@ -2803,6 +2818,8 @@ el:
       my_dashboard: Το ταμπλό μου
       blocks on me: Φραγές σε Εμένα
       blocks by me: Φραγές από Εμένα
       my_dashboard: Το ταμπλό μου
       blocks on me: Φραγές σε Εμένα
       blocks by me: Φραγές από Εμένα

+      create_mute: Σίγαση αυτού του χρήστη
+      destroy_mute: Κατάργηση σίγασης αυτού του χρήστη

       edit_profile: Επεξεργασία προφίλ
       send message: Αποστολή Μηνύματος
       diary: Ημερολόγιο
       edit_profile: Επεξεργασία προφίλ
       send message: Αποστολή Μηνύματος
       diary: Ημερολόγιο


@@ -3005,6 +3022,24 @@ el:
       showing_page: Σελίδα %{page}
       next: Επόμενη »
       previous: « Προηγούμενη
       showing_page: Σελίδα %{page}
       next: Επόμενη »
       previous: « Προηγούμενη

+  user_mutes:
+    index:
+      title: Χρήστες σε Σίγαση
+      my_muted_users: Οι χρήστες μου σε σίγαση
+      table:
+        thead:
+          muted_user: Χρήστης σε Σίγαση
+          actions: Ενέργειες
+        tbody:
+          unmute: Κατάργηση σίγασης
+          send_message: Αποστολή μηνύματος
+    create:
+      notice: Θέσατε σε σίγαση τον χρήστη %{name}.
+      error: Ο χρήστης %{name} δεν μπόρεσε να τεθεί σε σίγαση. %{full_message}.
+    destroy:
+      notice: Καταργήσατε τη σίγαση του χρήστη %{name}.
+      error: Δεν ήταν δυνατή η κατάργηση της σίγασης του χρήστη. Παρακαλούμε προσπαθήστε
+        ξανά.

   notes:
     index:
       title: Σημειώσεις που υποβλήθηκαν ή σχολιάστηκαν από τον χρήστη %{user}
   notes:
     index:
       title: Σημειώσεις που υποβλήθηκαν ή σχολιάστηκαν από τον χρήστη %{user}

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index b8b9a0ffce8158084bb2adf321e6368bbf6fc5c1..e07c9aaab8cb854bfc86c1e523eba033ca4cbed0 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1595,30 +1595,24 @@ en-GB:
           footway: Footway
           rail: Railway
           subway: Subway
           footway: Footway
           rail: Railway
           subway: Subway

-          cable:
-          - Cable car
-          - chairlift
-          runway:
-          - Airport Runway
-          - taxiway
+          cable_car: Cable car
+          chair_lift: chairlift
+          runway_only: Airport Runway
+          taxiway: taxiway

           apron_only: Airport apron
           admin: Administrative boundary
           apron_only: Airport apron
           admin: Administrative boundary

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

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

-          common:
-          - Common
-          - meadow
+          common_only: 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:
-          - Lake
-          - reservoir
+          lake_only: Lake
+          reservoir: reservoir

           farm: Farm
           brownfield: Brownfield site
           cemetery: Cemetery
           farm: Farm
           brownfield: Brownfield site
           cemetery: Cemetery


@@ -1627,14 +1621,12 @@ en-GB:
           centre: Sports centre
           reserve: Nature reserve
           military: Military area
           centre: Sports centre
           reserve: Nature reserve
           military: Military area

-          school:
-          - School
-          - university
+          school_only: School
+          university: university

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

-          summit:
-          - Summit
-          - peak
+          summit_only: Summit
+          peak: peak

           tunnel: Dashed casing = tunnel
           bridge: Black casing = bridge
           private: Private access
           tunnel: Dashed casing = tunnel
           bridge: Black casing = bridge
           private: Private access

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index c68eb826454c7990bfff80ae392471a0dbda0ba6..ab0eeaa9da7cdcbb89df97629dd9320e965d87a4 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1786,7 +1786,7 @@ eo:
       heading: Tiu ĉi mesaĝo ne ekzistas
       body: Bedaŭrinde ne ekzistas mesaĝo kun tiu ĉi identigilo.
     outbox:
       heading: Tiu ĉi mesaĝo ne ekzistas
       body: Bedaŭrinde ne ekzistas mesaĝo kun tiu ĉi identigilo.
     outbox:

-      title: Elirkesto
+      title: Senditujo

       actions: Agoj
       messages:
         one: Vi havas %{count} senditan mesaĝon
       actions: Agoj
       messages:
         one: Vi havas %{count} senditan mesaĝon


@@ -1821,6 +1821,9 @@ eo:
     mark:
       as_read: Mesaĝo markita kiel legitan
       as_unread: Mesaĝo markita kiel nelegitan
     mark:
       as_read: Mesaĝo markita kiel legitan
       as_unread: Mesaĝo markita kiel nelegitan

+    unmute:
+      notice: Movis mesaĝon al ricevujo
+      error: La mesaĝo ne povis esti movita al la ricevujo.

     destroy:
       destroyed: Mesaĝo forigita
   passwords:
     destroy:
       destroyed: Mesaĝo forigita
   passwords:


@@ -2327,32 +2330,24 @@ eo:
           tram_only: Tramo
           trolleybus: Trolebuso
           bus: Aŭtobuso
           tram_only: Tramo
           trolleybus: Trolebuso
           bus: Aŭtobuso

-          cable:
-          - Kablovojo
-          - seĝtelfero
-          runway:
-          - Avia dromo
-          - aŭtokur-strato
+          cable_car: Kablovojo
+          chair_lift: Telfero seĝa
+          runway_only: Avia dromo
+          taxiway: Aŭtokur-strato

           apron_only: Aviadil-parkumejo
           admin: Administra limo
           apron_only: Aviadil-parkumejo
           admin: Administra limo

-          orchard:
-          - Fruktoĝardeno
-          - vinberĝardeno
-          forest:
-          - Kultiv-arbaro
-          - arbaro
+          orchard_only: Fruktoĝardeno
+          vineyard: Vinberĝardeno
+          forest_only: Kultiv-arbaro
+          wood: Arbaro

           farmland: Agrokultura tereno
           farmland: Agrokultura tereno

-          grass:
-          - Herbotapiŝo
-          - herbejo
+          grass_only: Herbotapiŝo
+          meadow: Herbejo

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

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

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


@@ -2360,9 +2355,8 @@ eo:
           commercial: Oficeja tereno
           heathland: Erikejo
           scrubland: Arbustaro
           commercial: Oficeja tereno
           heathland: Erikejo
           scrubland: Arbustaro

-          lake:
-          - Lago
-          - akvorezervujo
+          lake_only: Lago
+          reservoir: Lago artefarita

           intermittent_water: Sezona akvujo
           glacier: Glacirivero
           reef: Rifo
           intermittent_water: Sezona akvujo
           glacier: Glacirivero
           reef: Rifo


@@ -2375,15 +2369,13 @@ eo:
           centre: Sporta centro
           reserve: Naturrezervejo
           military: Armea tereno
           centre: Sporta centro
           reserve: Naturrezervejo
           military: Armea tereno

-          school:
-          - Lernejo
-          - universitato
-          - malsanulejo
+          school_only: Lernejo
+          university: Universitato
+          hospital: Malsanulejo

           building: Grava konstruaĵo
           station: Stacidomo
           building: Grava konstruaĵo
           station: Stacidomo

-          summit:
-          - Montosupro
-          - montpinto
+          summit_only: Montosupro
+          peak: Montpinto

           tunnel: Strekumita konturo - tunelo
           bridge: Nigra konturo - ponto
           private: Privata aliro
           tunnel: Strekumita konturo - tunelo
           bridge: Nigra konturo - ponto
           private: Privata aliro


@@ -2523,8 +2515,8 @@ eo:
       visibility: 'Videbleco:'
       confirm_delete: Ĉu forigi tiun ĉi spuron?
     trace_paging_nav:
       visibility: 'Videbleco:'
       confirm_delete: Ĉu forigi tiun ĉi spuron?
     trace_paging_nav:

-      older: Antaŭaj spuroj
-      newer: Postaj spuroj
+      older: Pli malnovaj spuroj
+      newer: Pli novaj spuroj

     trace:
       pending: OKAZONTA
       count_points:
     trace:
       pending: OKAZONTA
       count_points:


@@ -2591,6 +2583,7 @@ eo:
       oauth1_settings: Agordoj OAuth 1
       oauth2_applications: Aplikaĵoj OAuth 2
       oauth2_authorizations: Rajtigoj OAuth 2
       oauth1_settings: Agordoj OAuth 1
       oauth2_applications: Aplikaĵoj OAuth 2
       oauth2_authorizations: Rajtigoj OAuth 2

+      muted_users: Silentigitaj uzantoj

   oauth:
     authorize:
       title: Rajtigi aliron al via konto
   oauth:
     authorize:
       title: Rajtigi aliron al via konto


@@ -2627,6 +2620,7 @@ eo:
       read_gpx: legi privatajn GPS-spurojn
       write_gpx: alŝuti GPS-spurojn
       write_notes: modifi rimarkojn
       read_gpx: legi privatajn GPS-spurojn
       write_gpx: alŝuti GPS-spurojn
       write_notes: modifi rimarkojn

+      write_redactions: Redakti map-datumojn

       read_email: legi retpoŝtan adreson de uzanto
       skip_authorization: Aŭtomate akcepti aplikaĵojn
   oauth_clients:
       read_email: legi retpoŝtan adreson de uzanto
       skip_authorization: Aŭtomate akcepti aplikaĵojn
   oauth_clients:


@@ -2797,8 +2791,10 @@ eo:
       my comments: Miaj komentoj
       my_preferences: Preferoj
       my_dashboard: Panelo
       my comments: Miaj komentoj
       my_preferences: Preferoj
       my_dashboard: Panelo

-      blocks on me: Blokas min
+      blocks on me: Ricevitaj blokadoj

       blocks by me: Blokitaj de mi
       blocks by me: Blokitaj de mi

+      create_mute: Silentigi tiun ĉi uzanton
+      destroy_mute: Malsilentigi tiun ĉi uzanton

       edit_profile: Redakti profilon
       send message: Sendi mesaĝon
       diary: Taglibro
       edit_profile: Redakti profilon
       send message: Sendi mesaĝon
       diary: Taglibro


@@ -2992,6 +2988,30 @@ eo:
       showing_page: Paĝo %{page}
       next: Sekva »
       previous: « Antaŭa
       showing_page: Paĝo %{page}
       next: Sekva »
       previous: « Antaŭa

+  user_mutes:
+    index:
+      title: Silentigitaj uzantoj
+      my_muted_users: Miaj silentigitaj uzantoj
+      you_have_muted_n_users:
+        one: Vi silentigis %{count} uzanton
+        other: Vi silentigis %{count} uzantojn
+      user_mute_explainer: Mesaĝoj de silentigitaj uzantoj estos movitaj al aparta
+        mesaĝujo kaj vi ne ricevos retpoŝtajn sciigojn pri ili.
+      user_mute_admins_and_moderators: Vi povas silentigi administrantojn kaj kontrolantojn,
+        tamen iliaj mesaĝoj ne estos silentigitaj.
+      table:
+        thead:
+          muted_user: Silentigita uzanto
+          actions: Agoj
+        tbody:
+          unmute: Malsilentigi
+          send_message: Sendi mesaĝon
+    create:
+      notice: Vi silentigis la uzanton %{name}.
+      error: Uzanto %{name} ne povas esti silentigita. %{full_message}.
+    destroy:
+      notice: Vi malsilentigis la uzanton %{name}.
+      error: Ne povis malsilentigi la uzanton. Reprovu.

   notes:
     index:
       title: Rimarkoj kreitaj aŭ komentitaj de %{user}
   notes:
     index:
       title: Rimarkoj kreitaj aŭ komentitaj de %{user}

diff --git a/config/locales/es.yml b/config/locales/es.yml
index b2b3de6eb9d5f292a441c5766072b6b6bb771962..a3efebd6921ef77e36a88aaf1eff9b9236ed5932 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -2443,34 +2443,26 @@ es:
           subway: Metro
           tram_only: Tranvía
           bus: Autobús
           subway: Metro
           tram_only: Tranvía
           bus: Autobús

-          cable:
-          - Telecabina
-          - Telesilla
-          runway:
-          - Pista de aeropuerto
-          - Calle de rodaje
+          cable_car: Telecabina
+          chair_lift: Telesilla
+          runway_only: Pista de aeropuerto
+          taxiway: Calle de rodaje

           apron_only: Rampa aeroportuaria
           admin: Límite administrativo
           apron_only: Rampa aeroportuaria
           admin: Límite administrativo

-          orchard:
-          - Huerta
-          forest:
-          - Bosque
-          - Bosque
+          orchard_only: Huerta
+          forest_only: Bosque
+          wood: Bosque

           sand: Arena
           golf: Campo de golf
           park: Parque
           sand: Arena
           golf: Campo de golf
           park: Parque

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

           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:
-          - Lago
-          - embalse
+          lake_only: Lago
+          reservoir: embalse

           farm: Granja
           brownfield: Sitio baldío
           cemetery: Cementerio
           farm: Granja
           brownfield: Sitio baldío
           cemetery: Cementerio


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

-          school:
-          - Escuela
-          - universidad
+          school_only: Escuela
+          university: universidad

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

-          summit:
-          - Cumbre
-          - pico
+          summit_only: 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

diff --git a/config/locales/et.yml b/config/locales/et.yml
index 073dc150b40836aac963b5b34025a1bb6b554c54..633cb2ab9a33367d0354784a827f8462cf7ef4a3 100644 (file)
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1805,30 +1805,24 @@ et:
           footway: Jalgtee
           rail: Raudtee
           subway: Metroo
           footway: Jalgtee
           rail: Raudtee
           subway: Metroo

-          cable:
-          - Köisraudtee
-          - toolilift
-          runway:
-          - Lennurada
-          - ruleerimistee
+          cable_car: Köisraudtee
+          chair_lift: toolilift
+          runway_only: Lennurada
+          taxiway: ruleerimistee

           apron_only: Lennujaama perroon
           admin: Halduspiir
           apron_only: Lennujaama perroon
           admin: Halduspiir

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

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

-          common:
-          - Heinamaa
-          - luht
+          common_only: 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:
-          - Järv
-          - veehoidla
+          lake_only: Järv
+          reservoir: veehoidla

           farm: Põllumajanduslik maa
           brownfield: Ehitusmaa
           cemetery: Surnuaed
           farm: Põllumajanduslik maa
           brownfield: Ehitusmaa
           cemetery: Surnuaed


@@ -1837,14 +1831,12 @@ et:
           centre: Spordikeskus
           reserve: Looduskaitseala
           military: Sõjaväe kasutuses
           centre: Spordikeskus
           reserve: Looduskaitseala
           military: Sõjaväe kasutuses

-          school:
-          - Kool
-          - ülikool
+          school_only: Kool
+          university: ülikool

           building: Märkimisväärne hoone
           station: Raudteejaam
           building: Märkimisväärne hoone
           station: Raudteejaam

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

           tunnel: Katkendlik ümbris = tunnel
           bridge: Must ümbris = sild
           private: Üksnes omanikule
           tunnel: Katkendlik ümbris = tunnel
           bridge: Must ümbris = sild
           private: Üksnes omanikule

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index ac051484e27a781de06bafc85177a7e435d15c68..eefb6b24dccfe784079086ad440bd8c3ea61a476 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -2206,31 +2206,24 @@ eu:
           footway: Oinezkoen bidea
           rail: Trenbidea
           subway: Metroa
           footway: Oinezkoen bidea
           rail: Trenbidea
           subway: Metroa

-          cable:
-          - Funikularra
-          - teleaulkia
-          runway:
-          - Aireportuko Pista
-          - taxi bidea
+          cable_car: Funikularra
+          chair_lift: teleaulkia
+          runway_only: Aireportuko Pista
+          taxiway: taxi bidea

           apron_only: Aireportu plataforma
           admin: Muga administratiboa
           apron_only: Aireportu plataforma
           admin: Muga administratiboa

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

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

-          common:
-          - Arrunta
-          - belardia
-          - lorategia
+          common_only: 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:
-          - Aintzira
-          - urtegia
+          lake_only: Aintzira
+          reservoir: urtegia

           farm: Baserria
           brownfield: Landarik gabeko gunea
           cemetery: Hilerri
           farm: Baserria
           brownfield: Landarik gabeko gunea
           cemetery: Hilerri


@@ -2239,14 +2232,12 @@ eu:
           centre: Kiroldegi
           reserve: Natura-erreserba
           military: Eremu militarra
           centre: Kiroldegi
           reserve: Natura-erreserba
           military: Eremu militarra

-          school:
-          - Eskola
-          - unibertsitate
+          school_only: Eskola
+          university: unibertsitate

           building: Eraikin garrantzitsua
           station: Tren geltokia
           building: Eraikin garrantzitsua
           station: Tren geltokia

-          summit:
-          - Tontorra
-          - gailurra
+          summit_only: Tontorra
+          peak: gailurra

           tunnel: Marratxodun estalkia = tunela
           bridge: Estalki beltza = zubia
           private: Sarbide pribatua
           tunnel: Marratxodun estalkia = tunela
           bridge: Estalki beltza = zubia
           private: Sarbide pribatua

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 6ec4a5cd6e43b0eb5a5d0d52eb4df6041ec67515..1caa4e7dec09b01c3a0ab42e8ed6b0d3129780f6 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -2096,30 +2096,24 @@ fa:
           footway: راه پیاده
           rail: راه‌آهن
           subway: مترو
           footway: راه پیاده
           rail: راه‌آهن
           subway: مترو

-          cable:
-          - تله‌فریک
-          - صندلی بالابر
-          runway:
-          - باند فرودگاه
-          - خزش‌راه
+          cable_car: تله‌فریک
+          chair_lift: صندلی بالابر
+          runway_only: باند فرودگاه
+          taxiway: خزش‌راه

           apron_only: پیشگاه فرودگاه
           admin: مرز اداری
           apron_only: پیشگاه فرودگاه
           admin: مرز اداری

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

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

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

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

-          lake:
-          - دریاچه
-          - مخزن
+          lake_only: دریاچه
+          reservoir: مخزن

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


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

-          school:
-          - مدرسه
-          - دانشگاه
+          school_only: مدرسه
+          university: دانشگاه

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

-          summit:
-          - چکاد
-          - قله
+          summit_only: چکاد
+          peak: قله

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

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 9ebf915028b8757a34eda8d8174a9006c6065da9..e08fc5c793d3d8a794bb5bf0a55e115689a9f61b 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -2205,31 +2205,24 @@ fi:
           footway: Jalkakäytävä
           rail: Junarata
           subway: Metro
           footway: Jalkakäytävä
           rail: Junarata
           subway: Metro

-          cable:
-          - Köysirata
-          - tuolihissi
-          runway:
-          - Lentokentän kiitotie
-          - rullaustie
+          cable_car: Köysirata
+          chair_lift: tuolihissi
+          runway_only: Lentokentän kiitotie
+          taxiway: rullaustie

           apron_only: Lentokentän asemataso
           admin: Hallinnollinen raja
           apron_only: Lentokentän asemataso
           admin: Hallinnollinen raja

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

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

-          common:
-          - Niitty
-          - keto
-          - puutarha
+          common_only: Niitty

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

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

           farm: Maatila
           brownfield: Purettujen rakennusten alue
           cemetery: Hautausmaa
           farm: Maatila
           brownfield: Purettujen rakennusten alue
           cemetery: Hautausmaa


@@ -2238,14 +2231,12 @@ fi:
           centre: Urheilukeskus
           reserve: Luonnonsuojelualue
           military: Sotilasalue
           centre: Urheilukeskus
           reserve: Luonnonsuojelualue
           military: Sotilasalue

-          school:
-          - Koulu
-          - yliopisto
+          school_only: Koulu
+          university: yliopisto

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

-          summit:
-          - Vuorenhuippu
-          - huippu
+          summit_only: Vuorenhuippu
+          peak: huippu

           tunnel: Katkoviivallinen kehys = tunneli
           bridge: Musta kehys = silta
           private: Yksityinen
           tunnel: Katkoviivallinen kehys = tunneli
           bridge: Musta kehys = silta
           private: Yksityinen

diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index e763144ad532b9f3b78d80b328eecfafb98900c3..e1579013e584c576d56901e3697cf1781ea41220 100644 (file)
--- a/config/locales/fit.yml
+++ b/config/locales/fit.yml
@@ -830,8 +830,7 @@ fit:
     key:
       table:
         entry:
     key:
       table:
         entry:

-          school:
-            1: yniversiteetti
+          university: yniversiteetti

     welcome:
       title: Tervetuloa!
       add_a_note:
     welcome:
       title: Tervetuloa!
       add_a_note:

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 0fd8fabaf8f37b74ff5b521e50072ebe4270efe4..9db11fabb752e6be061971f532d1127f138c8155 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -2485,32 +2485,24 @@ fr:
           tram_only: Tramway
           trolleybus: Trolleybus
           bus: Bus
           tram_only: Tramway
           trolleybus: Trolleybus
           bus: Bus

-          cable:
-          - Téléphérique
-          - télésiège
-          runway:
-          - Piste d’aéroport
-          - piste de circulation d’un aéroport
+          cable_car: Téléphérique
+          chair_lift: télésiège
+          runway_only: Piste d’aéroport
+          taxiway: piste de circulation d’un aéroport

           apron_only: Stationnement d’avions
           admin: Limite administrative
           apron_only: Stationnement d’avions
           admin: Limite administrative

-          orchard:
-          - Verger
-          - vignoble
-          forest:
-          - Forêt
-          - bois
+          orchard_only: Verger
+          vineyard: vignoble
+          forest_only: Forêt
+          wood: bois

           farmland: Terres agricoles
           farmland: Terres agricoles

-          grass:
-          - Pelouse
-          - prairie
+          grass_only: Pelouse
+          meadow: prairie

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

-          common:
-          - Espace commun
-          - prairie
-          - jardin
+          common_only: 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


@@ -2518,9 +2510,8 @@ fr:
           commercial: Zone tertiaire
           heathland: Lande
           scrubland: Fruticée
           commercial: Zone tertiaire
           heathland: Lande
           scrubland: Fruticée

-          lake:
-          - Lac
-          - bassin de retenue
+          lake_only: Lac
+          reservoir: bassin de retenue

           intermittent_water: plan d’eau intermittent
           glacier: Glacier
           reef: Récif
           intermittent_water: plan d’eau intermittent
           glacier: Glacier
           reef: Récif


@@ -2533,15 +2524,13 @@ fr:
           centre: Centre sportif
           reserve: Réserve naturelle
           military: Zone militaire
           centre: Centre sportif
           reserve: Réserve naturelle
           military: Zone militaire

-          school:
-          - École
-          - université
-          - hôpital
+          school_only: École
+          university: université
+          hospital: hôpital

           building: Bâtiment important
           station: Gare ferroviaire
           building: Bâtiment important
           station: Gare ferroviaire

-          summit:
-          - Sommet
-          - pic
+          summit_only: Sommet
+          peak: pic

           tunnel: Bordure pointillée = tunnel
           bridge: Bord noir = pont
           private: Accès privé
           tunnel: Bordure pointillée = tunnel
           bridge: Bord noir = pont
           private: Accès privé

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 900009e55650f2fc553ac086de2ac2e4d541f034..a1dc1c8582525ef1d1e011bc54db9208b2deeff3 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -1339,33 +1339,26 @@ fur:
           subway: Metropolitane
           ferry: Traghet
           tram_only: Tram
           subway: Metropolitane
           ferry: Traghet
           tram_only: Tram

-          runway:
-          - Piste dal aeropuart
+          runway_only: Piste dal aeropuart

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

-          forest:
-          - Bosc
+          forest_only: Bosc

           sand: Savalon
           golf: Troi di golf
           park: Parc
           sand: Savalon
           golf: Troi di golf
           park: Parc

-          common:
-          - Comugnâi
-          - prâts
-          - zardin
+          common_only: 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:
-          - Lâc
+          lake_only: 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:
-          - Scuele
-          - universitât
-          - ospedâl
+          school_only: Scuele
+          university: universitât
+          hospital: ospedâl

           station: stazion de ferade
           tunnel: Rie a trats = galarie
           bridge: Rie nere = puint
           station: stazion de ferade
           tunnel: Rie a trats = galarie
           bridge: Rie nere = puint

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 7d1c50c3ffbf3e36fd58237ffe8bacef9b6ddbd6..77e9c1f79a2fe2c84e8d440cd9618ecf50dbd371 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -2034,31 +2034,24 @@ fy:
           footway: Fuotpaad
           rail: Spoarwei
           subway: Metrospoar
           footway: Fuotpaad
           rail: Spoarwei
           subway: Metrospoar

-          cable:
-          - Kabelbaan
-          - stuoltsjelift
-          runway:
-          - Start-/lânings-
-          - taksybaan lofthaven
+          cable_car: Kabelbaan
+          chair_lift: stuoltsjelift
+          runway_only: Start-/lânings-
+          taxiway: taksybaan lofthaven

           apron_only: Platfoarm
           admin: Bestjoerlike grins
           apron_only: Platfoarm
           admin: Bestjoerlike grins

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

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

-          common:
-          - Miente
-          - greide
-          - tún
+          common_only: 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:
-          - Mar
-          - opslachmar
+          lake_only: Mar
+          reservoir: opslachmar

           farm: Boerepleats
           brownfield: Braaklân
           cemetery: Begraafplak
           farm: Boerepleats
           brownfield: Braaklân
           cemetery: Begraafplak


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

-          school:
-          - Skoalle
-          - universiteit
+          school_only: Skoalle
+          university: universiteit

           building: Wichtich gebou
           station: Spoarweistasjon
           building: Wichtich gebou
           station: Spoarweistasjon

-          summit:
-          - Top
-          - pyk
+          summit_only: Top
+          peak: pyk

           tunnel: Streekte râne = tunnel
           bridge: Swarte râne = brêge
           private: Tagong privee
           tunnel: Streekte râne = tunnel
           bridge: Swarte râne = brêge
           private: Tagong privee

diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 35c406e2a21bf18a1215c4ff0fa0b1feaeff29b7..9eef936676d54d39793f8b18c5af51b3957249d9 100644 (file)
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -1543,30 +1543,24 @@ ga:
           footway: Cosán
           rail: Iarnród
           subway: Meitreo
           footway: Cosán
           rail: Iarnród
           subway: Meitreo

-          cable:
-          - Carr cábla
-          - cathaoir chábla
-          runway:
-          - Rúidbhealach Aerfoirt
-          - bealach innealta
+          cable_car: Carr cábla
+          chair_lift: cathaoir chábla
+          runway_only: Rúidbhealach Aerfoirt
+          taxiway: bealach innealta

           apron_only: Naprún Aerfoirt
           admin: Teorainn riaracháin
           apron_only: Naprún Aerfoirt
           admin: Teorainn riaracháin

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

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

-          common:
-          - Coimín
-          - móinéar
+          common_only: 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:
-          - Loch
-          - taiscumar
+          lake_only: Loch
+          reservoir: taiscumar

           farm: Feirm
           brownfield: Láithreán athfhorbraíochta
           cemetery: Reilig
           farm: Feirm
           brownfield: Láithreán athfhorbraíochta
           cemetery: Reilig


@@ -1575,14 +1569,12 @@ 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:
-          - Scoil
-          - ollscoil
+          school_only: Scoil
+          university: ollscoil

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

-          summit:
-          - Mullach
-          - binn
+          summit_only: Mullach
+          peak: binn

           tunnel: Líne bhriste = tollán
           bridge: Líne dhubh = droichead
           private: Rochtain phríobháideach
           tunnel: Líne bhriste = tollán
           bridge: Líne dhubh = droichead
           private: Rochtain phríobháideach

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index f8db637225213d2f116465449f8524639945cd52..f78512306d98957eaa26f8c452d8f96e7f9a632e 100644 (file)
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -487,16 +487,11 @@ gcf:
       table:
         entry:
           train: Tren
       table:
         entry:
           train: Tren

-          forest:
-          - Granbwa
-          grass:
-          - Zèb
-          common:
-            2: Haden
+          forest_only: Granbwa
+          grass_only: Zèb

           cemetery: Simityè
           cemetery: Simityè

-          school:
-            0: Lékòl
-            2: Lopital
+          school_only: Lékòl
+          hospital: Lopital

     welcome:
       rules:
         title: Larèl-la!
     welcome:
       rules:
         title: Larèl-la!

diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 8f7640348f78b2c474ae97b930223e02b68ec593..4cbf8914647e890c3e363374c2a82bd48882ef22 100644 (file)
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1397,30 +1397,24 @@ gd:
           footway: Àrainn-choisichean
           rail: Rèile
           subway: Meatro
           footway: Àrainn-choisichean
           rail: Rèile
           subway: Meatro

-          cable:
-          - Carbad-càbaill
-          - Lioft-sèitheir
-          runway:
-          - Raon-laighe puirt-adhair
-          - Raon-cuairteachaidh
+          cable_car: Carbad-càbaill
+          chair_lift: Lioft-sèitheir
+          runway_only: Raon-laighe puirt-adhair
+          taxiway: Raon-cuairteachaidh

           apron_only: Aparan puirt-adhair
           admin: Crìoch rianachd
           apron_only: Aparan puirt-adhair
           admin: Crìoch rianachd

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

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

-          common:
-          - Coitcheann
-          - Faiche
+          common_only: 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:
-          - Loch
-          - Loch-tasgaidh
+          lake_only: Loch
+          reservoir: Loch-tasgaidh

           farm: Tuathanas
           brownfield: Fearann fàs
           cemetery: Cladh
           farm: Tuathanas
           brownfield: Fearann fàs
           cemetery: Cladh


@@ -1429,14 +1423,12 @@ 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:
-          - Sgoil
-          - Oilthigh
+          school_only: Sgoil
+          university: Oilthigh

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

-          summit:
-          - Mullach
-          - Sgurr
+          summit_only: Mullach
+          peak: Sgurr

           tunnel: Oir-strìochagan = tunail
           bridge: Oir-loidhnichean = drochaid
           private: Cead-inntrigidh prìobhaideach
           tunnel: Oir-strìochagan = tunail
           bridge: Oir-loidhnichean = drochaid
           private: Cead-inntrigidh prìobhaideach

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 5cf4f0addf03d94bd979063e9e02106364b3884c..811dbdc8476ab6708817886840e2943859840200 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -2367,32 +2367,24 @@ gl:
           tram_only: Tranvía
           trolleybus: Trolebús
           bus: Autobús
           tram_only: Tranvía
           trolleybus: Trolebús
           bus: Autobús

-          cable:
-          - Teleférico
-          - telecadeira
-          runway:
-          - Pista do aeroporto
-          - vía de circulación do aeroporto
+          cable_car: Teleférico
+          chair_lift: telecadeira
+          runway_only: Pista do aeroporto
+          taxiway: vía de circulación do aeroporto

           apron_only: Plataforma do aeroporto
           admin: Límite administrativo
           apron_only: Plataforma do aeroporto
           admin: Límite administrativo

-          orchard:
-          - Horta
-          - viñedo
-          forest:
-          - Bosque
-          - bosque
+          orchard_only: Horta
+          vineyard: viñedo
+          forest_only: Bosque
+          wood: bosque

           farmland: Terra de labranza
           farmland: Terra de labranza

-          grass:
-          - Herba
-          - pradaría
+          grass_only: Herba
+          meadow: pradaría

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

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

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


@@ -2400,9 +2392,8 @@ gl:
           commercial: Zona de oficinas
           heathland: Breixeira
           scrubland: Matogueira
           commercial: Zona de oficinas
           heathland: Breixeira
           scrubland: Matogueira

-          lake:
-          - Lagoa
-          - encoro
+          lake_only: Lagoa
+          reservoir: encoro

           intermittent_water: Masa de auga intermitente
           glacier: Glaciar
           reef: Arrecife
           intermittent_water: Masa de auga intermitente
           glacier: Glaciar
           reef: Arrecife


@@ -2415,15 +2406,13 @@ gl:
           centre: Centro deportivo
           reserve: Reserva natural
           military: Zona militar
           centre: Centro deportivo
           reserve: Reserva natural
           military: Zona militar

-          school:
-          - Escola
-          - universidade
-          - hospital
+          school_only: Escola
+          university: universidade
+          hospital: hospital

           building: Edificio significativo
           station: Estación de ferrocarrís
           building: Edificio significativo
           station: Estación de ferrocarrís

-          summit:
-          - Cumio
-          - cume
+          summit_only: Cumio
+          peak: cume

           tunnel: Bordo a raias = túnel
           bridge: Bordo negro = ponte
           private: Acceso privado
           tunnel: Bordo a raias = túnel
           bridge: Bordo negro = ponte
           private: Acceso privado

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 1e979d11a8ab6fb7ccf5edce7e0d32e09e174903..f9a8727eec4c9246f63e474f6794d41334376866 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -79,6 +79,9 @@ he:
       messages:
         invalid_email_address: זאת אינה כתובת דוא״ל תקנית
         email_address_not_routable: לא בר־ניתוב
       messages:
         invalid_email_address: זאת אינה כתובת דוא״ל תקנית
         email_address_not_routable: לא בר־ניתוב

+      models:
+        user_mute:
+          is_already_muted: כבר מושתק

     models:
       acl: רשימת בקרת גישה
       changeset: ערכת שינויים
     models:
       acl: רשימת בקרת גישה
       changeset: ערכת שינויים


@@ -1798,11 +1801,13 @@ he:
       to: אל
       subject: נושא
       date: תאריך
       to: אל
       subject: נושא
       date: תאריך

+      actions: פעולות

     message_summary:
       unread_button: סימון כ„לא נקרא”
       read_button: סימון כ„נקרא”
       reply_button: להשיב
       destroy_button: מחיקה
     message_summary:
       unread_button: סימון כ„לא נקרא”
       read_button: סימון כ„נקרא”
       reply_button: להשיב
       destroy_button: מחיקה

+      unmute_button: העברה לדואר הנכנס

     new:
       title: שליחת הודעה
       send_message_to_html: לשליחת הודעה חדשה אל %{name}
     new:
       title: שליחת הודעה
       send_message_to_html: לשליחת הודעה חדשה אל %{name}


@@ -1816,11 +1821,19 @@ he:
       body: אנו מצטערים, אין הודעה עם מזהה זה.
     outbox:
       title: תיבת דואר יוצא
       body: אנו מצטערים, אין הודעה עם מזהה זה.
     outbox:
       title: תיבת דואר יוצא

+      actions: פעולות

       messages:
         one: יש לך הודעה אחת שנשלחה
         other: יש לך %{count} הודעות שנשלחו
       no_sent_messages_html: אין לך הודעות נשלחו עד כה. מה דעתך ליצור קשר עם %{people_mapping_nearby_link}?
       people_mapping_nearby: משתתפים הממפים בקרבת מקום
       messages:
         one: יש לך הודעה אחת שנשלחה
         other: יש לך %{count} הודעות שנשלחו
       no_sent_messages_html: אין לך הודעות נשלחו עד כה. מה דעתך ליצור קשר עם %{people_mapping_nearby_link}?
       people_mapping_nearby: משתתפים הממפים בקרבת מקום

+    muted:
+      title: הודעות מושתקות
+      messages:
+        one: הודעה מושתקת
+        two: יש לך שתי הודעות מושתקות
+        many: יש לך %{count} הודעות מושתקות
+        other: יש לך %{count} הודעות מושתקות

     reply:
       wrong_user: נכנסת בשם „%{user}”, אבל ההודעה שביקשת להשיב עליה לא נשלחה לאותו
         המשתמש. נא להיכנס בחשבון הנכון כדי להשיב.
     reply:
       wrong_user: נכנסת בשם „%{user}”, אבל ההודעה שביקשת להשיב עליה לא נשלחה לאותו
         המשתמש. נא להיכנס בחשבון הנכון כדי להשיב.


@@ -1837,9 +1850,13 @@ he:
     heading:
       my_inbox: תיבת הדואר הנכנס שלי
       my_outbox: תיבת הדואר היוצא שלי
     heading:
       my_inbox: תיבת הדואר הנכנס שלי
       my_outbox: תיבת הדואר היוצא שלי

+      muted_messages: הודעות מושתקות

     mark:
       as_read: ההודעה סומנה כהודעה שנקראה
       as_unread: ההודעה סומנה כהודעה שלא נקראה
     mark:
       as_read: ההודעה סומנה כהודעה שנקראה
       as_unread: ההודעה סומנה כהודעה שלא נקראה

+    unmute:
+      notice: הודעה הועברה לדואר הנכנס
+      error: אי אפשר להעביר את ההודעה לדואר הנכנס.

     destroy:
       destroyed: ההודעה נמחקה
   passwords:
     destroy:
       destroyed: ההודעה נמחקה
   passwords:


@@ -2343,6 +2360,7 @@ he:
           primary: כביש ראשי
           secondary: כביש משני
           unclassified: דרך לא מסווגת
           primary: כביש ראשי
           secondary: כביש משני
           unclassified: דרך לא מסווגת

+          pedestrian: דרך להולכי רגל

           track: מסלול
           bridleway: מסלול לרכיבת סוסים
           cycleway: דרך לאופניים
           track: מסלול
           bridleway: מסלול לרכיבת סוסים
           cycleway: דרך לאופניים


@@ -2358,32 +2376,24 @@ he:
           tram_only: חשמלית
           trolleybus: טרוליבוס
           bus: אוטובוס
           tram_only: חשמלית
           trolleybus: טרוליבוס
           bus: אוטובוס

-          cable:
-          - רכבל
-          - מעלית סקי
-          runway:
-          - מסלול נחיתה
-          - דרך למוניות
+          cable_car: רכבל
+          chair_lift: רכבל מושבים
+          runway_only: מסלול נחיתה
+          taxiway: מסלול הסעה

           apron_only: רחבת חניה למטוסים
           admin: גבול שטח שיפוט
           apron_only: רחבת חניה למטוסים
           admin: גבול שטח שיפוט

-          orchard:
-          - מטע
-          - כרם
-          forest:
-          - יער
-          - חורשה
+          orchard_only: מטע
+          vineyard: כרם
+          forest_only: יער
+          wood: חורשה

           farmland: שטח חקלאי
           farmland: שטח חקלאי

-          grass:
-          - דשא
-          - מרעה
+          grass_only: דשא
+          meadow: אחו

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

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

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


@@ -2391,9 +2401,8 @@ he:
           commercial: אזור מסחרי
           heathland: שדה פרא
           scrubland: בתה
           commercial: אזור מסחרי
           heathland: שדה פרא
           scrubland: בתה

-          lake:
-          - אגם
-          - מאגר
+          lake_only: אגם
+          reservoir: מאגר

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


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

-          school:
-          - בית ספר
-          - אוניברסיטה
-          - בית חולים
+          school_only: בית ספר
+          university: אוניברסיטה
+          hospital: בית חולים

           building: בניין בעל חשיבות
           station: תחנת רכבת
           building: בניין בעל חשיבות
           station: תחנת רכבת

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

           tunnel: קו מקווקו = מנהרה
           bridge: קו שחור = גשר
           private: גישה פרטית
           tunnel: קו מקווקו = מנהרה
           bridge: קו שחור = גשר
           private: גישה פרטית


@@ -2611,6 +2618,7 @@ he:
       oauth1_settings: הגדרות OAuth 1
       oauth2_applications: יישומי OAuth 2
       oauth2_authorizations: אישורי OAuth 2
       oauth1_settings: הגדרות OAuth 1
       oauth2_applications: יישומי OAuth 2
       oauth2_authorizations: אישורי OAuth 2

+      muted_users: משתמשים מושתקים

   oauth:
     authorize:
       title: אישור הגישה לחשבון שלך
   oauth:
     authorize:
       title: אישור הגישה לחשבון שלך


@@ -2647,6 +2655,7 @@ he:
       read_gpx: לקרוא את מסלולי ה־GPS הפרטיים שלך
       write_gpx: להעלות מסלולי GPS
       write_notes: לשנות הערות
       read_gpx: לקרוא את מסלולי ה־GPS הפרטיים שלך
       write_gpx: להעלות מסלולי GPS
       write_notes: לשנות הערות

+      write_redactions: שינוי נתוני המפה

       read_email: לקרוא את כתובת הדוא"ל של המשתמש
       skip_authorization: לאשר את היישום אוטומטית
   oauth_clients:
       read_email: לקרוא את כתובת הדוא"ל של המשתמש
       skip_authorization: לאשר את היישום אוטומטית
   oauth_clients:


@@ -2811,6 +2820,8 @@ he:
       my_dashboard: לוח הבקרה שלי
       blocks on me: מתי חסמו אותי
       blocks by me: מתי חסמתי
       my_dashboard: לוח הבקרה שלי
       blocks on me: מתי חסמו אותי
       blocks by me: מתי חסמתי

+      create_mute: השתקת המשתמש הזה
+      destroy_mute: ביטול השתקת המשתמש הזה

       edit_profile: עריכת פרופיל
       send message: שליחת הודעה
       diary: יומן
       edit_profile: עריכת פרופיל
       send message: שליחת הודעה
       diary: יומן


@@ -3011,6 +3022,32 @@ he:
       showing_page: הדף %{page}
       next: הבא »
       previous: « הקודם
       showing_page: הדף %{page}
       next: הבא »
       previous: « הקודם

+  user_mutes:
+    index:
+      title: משתמשים מושתקים
+      my_muted_users: המשתמשים המושתקים שלי
+      you_have_muted_n_users:
+        one: השתקת משתמש אחד
+        two: השתקת שני משתמשים
+        many: השתקת %{count} משתמשים
+        other: השתקת %{count} משתמשים
+      user_mute_explainer: הודעות של משתמשים מושתקים מועברות לתיבת דואר נפרדת ולא
+        תישלחנה אליך התראות בדוא״ל.
+      user_mute_admins_and_moderators: אפשר להשתיק מנהלים ומפקחים אבל ההודעות שלהם
+        לא יושתקו.
+      table:
+        thead:
+          muted_user: משתמש מושתק
+          actions: פעולות
+        tbody:
+          unmute: ביטול השתקה
+          send_message: שליחת הודעה
+    create:
+      notice: השתקת את %{name}.
+      error: אי אפשר להשתיק את %{name}.‏ %{full_message}
+    destroy:
+      notice: ביטלת את ההשתקה של %{name}.
+      error: אי אפשר לבטל את השתקת המשתמש. נא לנסות שוב.

   notes:
     index:
       title: הערות ותגובות של %{user}
   notes:
     index:
       title: הערות ותגובות של %{user}

diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 99c7e5d3ef778e76dcbc86c23d33d06193b97f56..f4b73c42cb86397e18d0d6be0715ce78baa4c4bc 100644 (file)
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -984,29 +984,23 @@ hi:
           rail: रेलवे
           subway: उपमार्ग
           bus: बस
           rail: रेलवे
           subway: उपमार्ग
           bus: बस

-          cable:
-          - केबल कार
-          runway:
-          - एयरपोर्ट रनवे
-          forest:
-          - वन
-          - लकड़ी
-          grass:
-          - घास
+          cable_car: केबल कार
+          runway_only: एयरपोर्ट रनवे
+          forest_only: वन
+          wood: लकड़ी
+          grass_only: घास

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

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

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

-          school:
-          - पाठशाला
-          - विश्वविद्यालय
-          - अस्पताल
+          school_only: पाठशाला
+          university: विश्वविद्यालय
+          hospital: अस्पताल

           building: महत्वपूर्ण भवन
           station: रेलवे स्टेशन
           stop: रोकें
           building: महत्वपूर्ण भवन
           station: रेलवे स्टेशन
           stop: रोकें

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 72291d743cacc8ace7aff033ee48af74cf1cba82..a79599127bc59cfd4fa3c85c72d6b048a0b7d7c2 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1425,30 +1425,24 @@ hr:
           footway: Pješačka staza
           rail: Željeznica
           subway: Podzemna željeznica
           footway: Pješačka staza
           rail: Željeznica
           subway: Podzemna željeznica

-          cable:
-          - Kabinska žičara
-          - sedežnica
-          runway:
-          - Aerodromska pista
-          - aerodromske ceste (za avione)
+          cable_car: Kabinska žičara
+          chair_lift: sedežnica
+          runway_only: Aerodromska pista
+          taxiway: aerodromske ceste (za avione)

           apron_only: Parking za avione (apron)
           admin: Administrativna granica
           apron_only: Parking za avione (apron)
           admin: Administrativna granica

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

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

-          common:
-          - Travnjaci
-          - livade
+          common_only: 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:
-          - Jezero
-          - rezervoar
+          lake_only: Jezero
+          reservoir: rezervoar

           farm: Polja, farme, njive
           brownfield: Gradilište
           cemetery: Groblje
           farm: Polja, farme, njive
           brownfield: Gradilište
           cemetery: Groblje


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

-          school:
-          - Škola
-          - Sveučilište
+          school_only: Škola
+          university: Sveučilište

           building: Zgrada
           station: Željeznički kolodvor
           building: Zgrada
           station: Željeznički kolodvor

-          summit:
-          - Vrh
-          - vrhunac
+          summit_only: Vrh
+          peak: vrhunac

           tunnel: Iscrtkani rubovi = tunel
           bridge: Crni rubovi = most
           private: Privatni pristup
           tunnel: Iscrtkani rubovi = tunel
           bridge: Crni rubovi = most
           private: Privatni pristup

diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index a8e6bf5c6393b7c7207284248873188201333f82..acf341434998dee747a279a3549aa0c513095afd 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -2007,30 +2007,24 @@ hsb:
           footway: Chódnik
           rail: Železnica
           subway: Podzemska železnica
           footway: Chódnik
           rail: Železnica
           subway: Podzemska železnica

-          cable:
-          - Kablowa nadróžna
-          - sydłowy lift
-          runway:
-          - Přizemišćo
-          - lětadłowa jězdnja
+          cable_car: Kablowa nadróžna
+          chair_lift: sydłowy lift
+          runway_only: Přizemišćo
+          taxiway: lětadłowa jězdnja

           apron_only: Lětanišćowe předpolo
           admin: Zarjadniska hranica
           apron_only: Lětanišćowe předpolo
           admin: Zarjadniska hranica

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

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

-          common:
-          - Powšitkowny
-          - łuka
+          common_only: 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:
-          - Jězor
-          - spjaty jězor
+          lake_only: Jězor
+          reservoir: spjaty jězor

           farm: Farma
           brownfield: Industrijowe lado
           cemetery: Kěrchow
           farm: Farma
           brownfield: Industrijowe lado
           cemetery: Kěrchow


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

-          school:
-          - Šula
-          - uniwersita
+          school_only: Šula
+          university: uniwersita

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

-          summit:
-          - Wjeršk
-          - kónčk hory
+          summit_only: Wjeršk
+          peak: kónčk hory

           tunnel: Smužkowana kroma = tunl
           bridge: Čorna kroma = móst
           private: Priwatny přistup
           tunnel: Smužkowana kroma = tunl
           bridge: Čorna kroma = móst
           private: Priwatny přistup

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 5926c6bb806d33a0cd581c07c73a80dd3d755253..0f312162f3058eac3662fb862e338efbfefab927 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -2237,41 +2237,32 @@ hu:
           tram_only: Villamos
           trolleybus: Trolibusz
           bus: Busz
           tram_only: Villamos
           trolleybus: Trolibusz
           bus: Busz

-          cable:
-          - Nagykabinos felvonó
-          - függőszékes felvonó
-          runway:
-          - Kifutópálya
-          - gurulóút
+          cable_car: Nagykabinos felvonó
+          chair_lift: függőszékes felvonó
+          runway_only: Kifutópálya
+          taxiway: gurulóút

           apron_only: Forgalmi előtér
           admin: Közigazgatási határ
           apron_only: Forgalmi előtér
           admin: Közigazgatási határ

-          orchard:
-          - Gyümölcsös
-          - szőlő
-          forest:
-          - Erdő
-          - erdő
+          orchard_only: Gyümölcsös
+          vineyard: szőlő
+          forest_only: Erdő
+          wood: erdő

           farmland: Mezőgazdasági terület
           farmland: Mezőgazdasági terület

-          grass:
-          - Fű
-          - rét
+          grass_only: Fű
+          meadow: rét

           bare_rock: Csupasz szikla
           sand: Homok
           golf: Golfpálya
           park: Park
           bare_rock: Csupasz szikla
           sand: Homok
           golf: Golfpálya
           park: Park

-          common:
-          - Füves terület
-          - rét
-          - kert
+          common_only: 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:
-          - Tó
-          - víztározó
+          lake_only: Tó
+          reservoir: víztározó

           glacier: Gleccser
           farm: Tanya
           brownfield: Bontási terület
           glacier: Gleccser
           farm: Tanya
           brownfield: Bontási terület


@@ -2281,14 +2272,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:
-          - Iskola
-          - egyetem
+          school_only: Iskola
+          university: egyetem

           building: Fontosabb épület
           station: Vasútállomás
           building: Fontosabb épület
           station: Vasútállomás

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

           tunnel: Szaggatott szegély = alagút
           bridge: Fekete szegély = híd
           private: Behajtás csak engedéllyel
           tunnel: Szaggatott szegély = alagút
           bridge: Fekete szegély = híd
           private: Behajtás csak engedéllyel

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index fc53d703514bfdd7e29ec5e94533f5b09ae4bd2b..5a5bb722a37dca3edd7c636db54d3828e0f3ea24 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -2338,32 +2338,24 @@ ia:
           tram_only: Tram
           trolleybus: Trolleybus
           bus: Autobus
           tram_only: Tram
           trolleybus: Trolleybus
           bus: Autobus

-          cable:
-          - Telepherico
-          - Telesedia
-          runway:
-          - Pista de aeroporto
-          - via de circulation pro aviones
+          cable_car: Telepherico
+          chair_lift: Telesedia
+          runway_only: Pista de aeroporto
+          taxiway: via de circulation pro aviones

           apron_only: Platteforma pro aviones
           admin: Limite administrative
           apron_only: Platteforma pro aviones
           admin: Limite administrative

-          orchard:
-          - Verdiero
-          - vinia
-          forest:
-          - Foreste
-          - bosco
+          orchard_only: Verdiero
+          vineyard: vinia
+          forest_only: Foreste
+          wood: bosco

           farmland: Terra agricole
           farmland: Terra agricole

-          grass:
-          - Herba
-          - prato
+          grass_only: Herba
+          meadow: prato

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

-          common:
-          - Commun
-          - prato
-          - jardin
+          common_only: 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


@@ -2371,9 +2363,8 @@ ia:
           commercial: Area commercial
           heathland: Landa
           scrubland: Terreno de brossas
           commercial: Area commercial
           heathland: Landa
           scrubland: Terreno de brossas

-          lake:
-          - Laco
-          - bassino
+          lake_only: Laco
+          reservoir: bassino

           intermittent_water: Massa de aqua intermittente
           glacier: Glaciero
           reef: Scolio
           intermittent_water: Massa de aqua intermittente
           glacier: Glaciero
           reef: Scolio


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

-          school:
-          - Schola
-          - universitate
-          - hospital
+          school_only: Schola
+          university: universitate
+          hospital: hospital

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

-          summit:
-          - Summitate
-          - picco
+          summit_only: Summitate
+          peak: picco

           tunnel: Bordo a lineettas = tunnel
           bridge: Bordo nigre = ponte
           private: Accesso private
           tunnel: Bordo a lineettas = tunnel
           bridge: Bordo nigre = ponte
           private: Accesso private

diff --git a/config/locales/id.yml b/config/locales/id.yml
index 47c35d933f32c319970a3e8c89512afd4d254e2a..7a6007a800c5e3907ac1670082dfe6f40e0c540e 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -2291,31 +2291,24 @@ id:
           footway: Jalan Setapak
           rail: Rel Kereta
           subway: Kereta bawah tanah
           footway: Jalan Setapak
           rail: Rel Kereta
           subway: Kereta bawah tanah

-          cable:
-          - Kereta Kabel
-          - Kereta Gantung
-          runway:
-          - Landasan bandara
-          - landas hubung
+          cable_car: Kereta Kabel
+          chair_lift: Kereta Gantung
+          runway_only: Landasan bandara
+          taxiway: landas hubung

           apron_only: Tempat Parkir Pesawat
           admin: Batas administrasi
           apron_only: Tempat Parkir Pesawat
           admin: Batas administrasi

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

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

-          common:
-          - Umum
-          - Padang rumput
-          - kebun
+          common_only: 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:
-          - Danau
-          - Wilayah Serapan (Reservoir)
+          lake_only: Danau
+          reservoir: Wilayah Serapan (Reservoir)

           farm: Pertanian
           brownfield: Lahan kosong
           cemetery: Pemakaman
           farm: Pertanian
           brownfield: Lahan kosong
           cemetery: Pemakaman


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

-          school:
-          - Sekolah
-          - universitas
+          school_only: Sekolah
+          university: universitas

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

-          summit:
-          - Puncak
-          - puncak
+          summit_only: Puncak
+          peak: puncak

           tunnel: Dashed Casing = terowongan
           bridge: Black casing = jembatan
           private: Akses pribadi
           tunnel: Dashed Casing = terowongan
           bridge: Black casing = jembatan
           private: Akses pribadi

diff --git a/config/locales/is.yml b/config/locales/is.yml
index db69a2a28ab4c959e117a8b2c21a62c9f974cc55..e7a0944b1aa89ccdeea4fee296210a2b999a7129 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -2367,31 +2367,24 @@ is:
           footway: Gönguleið
           rail: Lestarteinar
           subway: Neðanjarðarlest
           footway: Gönguleið
           rail: Lestarteinar
           subway: Neðanjarðarlest

-          cable:
-          - Kláflyfta
-          - stólalyfta
-          runway:
-          - Flugbraut
-          - akstursbraut
+          cable_car: Kláflyfta
+          chair_lift: stólalyfta
+          runway_only: Flugbraut
+          taxiway: akstursbraut

           apron_only: Flughlað
           admin: Stjórnsýslumörk
           apron_only: Flughlað
           admin: Stjórnsýslumörk

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

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

-          common:
-          - Almenningur
-          - lundur
-          - garður
+          common_only: 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:
-          - Vatn
-          - uppistöðulón
+          lake_only: Vatn
+          reservoir: uppistöðulón

           farm: Bóndabær
           brownfield: Nýbyggingarsvæði
           cemetery: Grafreitur
           farm: Bóndabær
           brownfield: Nýbyggingarsvæði
           cemetery: Grafreitur


@@ -2400,14 +2393,12 @@ 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:
-          - Skóli
-          - Háskóli
+          school_only: Skóli
+          university: Háskóli

           building: Merkisbygging
           station: Lestarstöð
           building: Merkisbygging
           station: Lestarstöð

-          summit:
-          - Fjallstindur
-          - tindur
+          summit_only: Fjallstindur
+          peak: tindur

           tunnel: Umkringt punktalínum = göng
           bridge: Umkringt svartri línu = brú
           private: Einkaaðgangur
           tunnel: Umkringt punktalínum = göng
           bridge: Umkringt svartri línu = brú
           private: Einkaaðgangur

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 0aedfe4c43c7e3667e9078620f3bde77826dcd5d..7fc44ea7447ebf05c8fa44d831644555bfffb0f6 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -98,6 +98,9 @@ it:
       messages:
         invalid_email_address: non sembra essere un indirizzo e-mail valido
         email_address_not_routable: non è instradabile
       messages:
         invalid_email_address: non sembra essere un indirizzo e-mail valido
         email_address_not_routable: non è instradabile

+      models:
+        user_mute:
+          is_already_muted: è già silenziato

     models:
       acl: Lista di controllo degli accessi
       changeset: Gruppo di modifiche
     models:
       acl: Lista di controllo degli accessi
       changeset: Gruppo di modifiche


@@ -324,6 +327,9 @@ it:
         retain_changeset_discussions: Le discussioni su tuoi gruppi di modifiche e
           i commenti inseriti su altri gruppi di modifiche, se presenti, saranno mantenute.
         retain_email: Il tuo indirizzo e-mail sarà conservato.
         retain_changeset_discussions: Le discussioni su tuoi gruppi di modifiche e
           i commenti inseriti su altri gruppi di modifiche, se presenti, saranno mantenute.
         retain_email: Il tuo indirizzo e-mail sarà conservato.

+        recent_editing_html: Dato che hai effettuato delle modifiche di recente, al
+          momento la tua utenza non può essere eliminata. Sarà possibile farlo tra
+          %{time}.

         confirm_delete: Sei sicuro?
         cancel: Annulla
   accounts:
         confirm_delete: Sei sicuro?
         cancel: Annulla
   accounts:


@@ -1831,6 +1837,7 @@ it:
       read_button: Segna come già letto
       reply_button: Rispondi
       destroy_button: Cancella
       read_button: Segna come già letto
       reply_button: Rispondi
       destroy_button: Cancella

+      unmute_button: Sposta nella Posta in arrivo

     new:
       title: Invia messaggio
       send_message_to_html: Spedisci un nuovo messaggio a %{name}
     new:
       title: Invia messaggio
       send_message_to_html: Spedisci un nuovo messaggio a %{name}


@@ -1852,6 +1859,11 @@ it:
       no_sent_messages_html: Non ci sono ancora messaggi inviati. Perché non contatti
         qualcuno di questi %{people_mapping_nearby_link}?
       people_mapping_nearby: persone che mappano nelle vicinanze
       no_sent_messages_html: Non ci sono ancora messaggi inviati. Perché non contatti
         qualcuno di questi %{people_mapping_nearby_link}?
       people_mapping_nearby: persone che mappano nelle vicinanze

+    muted:
+      title: Messaggi silenziati
+      messages:
+        one: '%{count} messaggio silenziato'
+        other: Hai %{count} messaggi silenziati

     reply:
       wrong_user: Hai effettuato l'accesso come '%{user}', ma il messaggio al quale
         hai chiesto di rispondere non era diretto a quell'utente. Se vuoi rispondere,
     reply:
       wrong_user: Hai effettuato l'accesso come '%{user}', ma il messaggio al quale
         hai chiesto di rispondere non era diretto a quell'utente. Se vuoi rispondere,


@@ -1870,9 +1882,13 @@ it:
     heading:
       my_inbox: Posta in arrivo
       my_outbox: Posta in uscita
     heading:
       my_inbox: Posta in arrivo
       my_outbox: Posta in uscita

+      muted_messages: Messaggi silenziati

     mark:
       as_read: Messaggio marcato come già letto
       as_unread: Messaggio marcato come non letto
     mark:
       as_read: Messaggio marcato come già letto
       as_unread: Messaggio marcato come non letto

+    unmute:
+      notice: Il messaggio è stato spostato nella Posta in arrivo
+      error: Non è stato possibile spostare il messaggio nella Posta in arrivo.

     destroy:
       destroyed: Messaggio eliminato
   passwords:
     destroy:
       destroyed: Messaggio eliminato
   passwords:


@@ -2137,6 +2153,10 @@ it:
           Resources Canada), e della StatCan (Geography Division,
           Statistics Canada).
         contributors_ca_canada: Canada
           Resources Canada), e della StatCan (Geography Division,
           Statistics Canada).
         contributors_ca_canada: Canada

+        contributors_cz_credit_html: '%{czechia}: contiene dati dell''Amministrazione
+          statale dei rilevamenti topografici e del Catasto pubblicati con licenza
+          %{cc_licence_link}'
+        contributors_cz_czechia: Repubblica Ceca

         contributors_cz_cc_licence: Licenza internazionale Creative Commons Attribuzione
           4.0 (CC BY 4.0)
         contributors_cz_cc_licence_url: https://creativecommons.org/licenses/by/4.0/deed.it
         contributors_cz_cc_licence: Licenza internazionale Creative Commons Attribuzione
           4.0 (CC BY 4.0)
         contributors_cz_cc_licence_url: https://creativecommons.org/licenses/by/4.0/deed.it


@@ -2370,6 +2390,7 @@ it:
           primary: Strada primaria
           secondary: Strada secondaria
           unclassified: Strada non classificata
           primary: Strada primaria
           secondary: Strada secondaria
           unclassified: Strada non classificata

+          pedestrian: Percorso pedonale

           track: Strada forestale o agricola
           bridleway: Percorso per equitazione
           cycleway: Pista ciclabile
           track: Strada forestale o agricola
           bridleway: Percorso per equitazione
           cycleway: Pista ciclabile


@@ -2380,34 +2401,41 @@ it:
           rail: Ferrovia
           train: Treno
           subway: Metropolitana
           rail: Ferrovia
           train: Treno
           subway: Metropolitana

+          ferry: Traghetto
+          light_rail: Metropolitana leggera

           tram_only: Tram
           tram_only: Tram

+          trolleybus: Filobus

           bus: Autobus
           bus: Autobus

-          cable:
-          - Funivia
-          - seggiovia
-          runway:
-          - Pista di decollo/atterraggio
-          - pista di rullaggio
+          cable_car: Funivia
+          chair_lift: Seggiovia
+          runway_only: Pista di decollo/atterraggio
+          taxiway: Pista di rullaggio

           apron_only: Area di parcheggio aeroportuale
           admin: Confine amministrativo
           apron_only: Area di parcheggio aeroportuale
           admin: Confine amministrativo

-          forest:
-          - Foresta
-          - bosco
+          orchard_only: Frutteto
+          vineyard: Vigneto
+          forest_only: Foresta
+          wood: Bosco
+          farmland: Terreno agricolo
+          grass_only: Prato
+          meadow: Prato
+          bare_rock: Roccia nuda
+          sand: Sabbia

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

-          common:
-          - Area comune
-          - prato
-          - giardino
+          common_only: Area comune

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

-          lake:
-          - Lago
-          - riserva d'acqua
+          scrubland: Macchia
+          lake_only: Lago
+          reservoir: Riserva idrica
+          intermittent_water: Corpo idrico intermittente

           glacier: Ghiacciaio
           glacier: Ghiacciaio

+          reef: Scogliera
+          wetland: Zona umida

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


@@ -2416,19 +2444,19 @@ it:
           centre: Centro sportivo
           reserve: Riserva naturale
           military: Area militare
           centre: Centro sportivo
           reserve: Riserva naturale
           military: Area militare

-          school:
-          - Scuola
-          - università
+          school_only: Scuola
+          university: Università
+          hospital: Ospedale

           building: Edificio significativo
           station: Stazione ferroviaria
           building: Edificio significativo
           station: Stazione ferroviaria

-          summit:
-          - Vetta
-          - picco montuoso
+          summit_only: Vetta
+          peak: Picco montuoso

           tunnel: Linea tratteggiata = tunnel
           bridge: Quadrettatura nera = ponte
           private: Accesso privato
           destination: Servitù di passaggio
           construction: Strade in costruzione
           tunnel: Linea tratteggiata = tunnel
           bridge: Quadrettatura nera = ponte
           private: Accesso privato
           destination: Servitù di passaggio
           construction: Strade in costruzione

+          bus_stop: Fermata dell'autobus

           stop: Fermata
           bicycle_shop: Negozio di biciclette
           bicycle_parking: Parcheggio per biciclette
           stop: Fermata
           bicycle_shop: Negozio di biciclette
           bicycle_parking: Parcheggio per biciclette


@@ -2475,6 +2503,7 @@ it:
         imports: Importazioni
         automated_edits: Contributi automatici
       start_mapping: Inizia a mappare
         imports: Importazioni
         automated_edits: Contributi automatici
       start_mapping: Inizia a mappare

+      continue_authorization: Continua l'autorizzazione

       add_a_note:
         title: Non hai tempo per editare? Aggiungi una nota!
         para_1: Se vuoi fare solo una piccola correzione, ma non hai abbastanza tempo
       add_a_note:
         title: Non hai tempo per editare? Aggiungi una nota!
         para_1: Se vuoi fare solo una piccola correzione, ma non hai abbastanza tempo


@@ -2642,6 +2671,7 @@ it:
       oauth1_settings: Impostazioni OAuth
       oauth2_applications: Applicazioni OAuth 2
       oauth2_authorizations: Autorizzazioni OAuth 2
       oauth1_settings: Impostazioni OAuth
       oauth2_applications: Applicazioni OAuth 2
       oauth2_authorizations: Autorizzazioni OAuth 2

+      muted_users: Utenti silenziati

   oauth:
     authorize:
       title: Autorizzare l'accesso al tuo account
   oauth:
     authorize:
       title: Autorizzare l'accesso al tuo account


@@ -2851,6 +2881,8 @@ it:
       my_dashboard: La mia dashboard
       blocks on me: Blocchi su di me
       blocks by me: Blocchi applicati da me
       my_dashboard: La mia dashboard
       blocks on me: Blocchi su di me
       blocks by me: Blocchi applicati da me

+      create_mute: Silenzia questo utente
+      destroy_mute: Non silenziare più questo utente

       edit_profile: Modifica profilo
       send message: Invia messaggio
       diary: Diario
       edit_profile: Modifica profilo
       send message: Invia messaggio
       diary: Diario


@@ -3051,11 +3083,29 @@ it:
       previous: « Precedente
   user_mutes:
     index:
       previous: « Precedente
   user_mutes:
     index:

+      title: Utenti silenziati
+      my_muted_users: I miei utenti silenziati
+      you_have_muted_n_users:
+        one: Hai silenziato %{count} utente
+        other: Hai silenziato %{count} utenti
+      user_mute_explainer: I messaggi degli utenti silenziati vengono spostati in
+        una Posta in arrivo separata e non riceverai le notifiche via e-mail.
+      user_mute_admins_and_moderators: Puoi silenziare amministratori e moderatori
+        ma i loro messaggi non saranno silenziati.

       table:
         thead:
       table:
         thead:

+          muted_user: Utente silenziato

           actions: Azioni
         tbody:
           actions: Azioni
         tbody:

+          unmute: Non silenziare

           send_message: Invia messaggio
           send_message: Invia messaggio

+    create:
+      notice: Hai silenziato %{name}.
+      error: Non è stato possibile silenziare %{name}. %{full_message}.
+    destroy:
+      notice: Non rimosso %{name} dagli utenti silenziati.
+      error: Non è stato possibile rimuovere dagli utenti silenziati. Riprova più
+        tardi.

   notes:
     index:
       title: Note inserite o commentate da %{user}
   notes:
     index:
       title: Note inserite o commentate da %{user}

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index d3b98fc12acd1532322cc1455b159e5023fcf4ac..d6fc4c62b642dfda6fb85a6ff1b4b839fd2ce1fa 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -2025,31 +2025,24 @@ ja:
           footway: 歩道
           rail: 鉄道
           subway: 地下鉄
           footway: 歩道
           rail: 鉄道
           subway: 地下鉄

-          cable:
-          - 交走式ロープウェイ
-          - チェアリフト
-          runway:
-          - 空港滑走路
-          - 空港誘導路
+          cable_car: 交走式ロープウェイ
+          chair_lift: チェアリフト
+          runway_only: 空港滑走路
+          taxiway: 空港誘導路

           apron_only: 空港ビル
           admin: 行政境界
           apron_only: 空港ビル
           admin: 行政境界

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

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

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

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

-          lake:
-          - 湖
-          - 溜池
+          lake_only: 湖
+          reservoir: 溜池

           farm: 農牧場
           brownfield: 褐色地
           cemetery: 墓地
           farm: 農牧場
           brownfield: 褐色地
           cemetery: 墓地


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

-          school:
-          - 学校
-          - 大学
+          school_only: 学校
+          university: 大学

           building: 重要建造物
           station: 鉄道駅
           building: 重要建造物
           station: 鉄道駅

-          summit:
-          - 山脈
-          - 山頂
+          summit_only: 山脈
+          peak: 山頂

           tunnel: 点線の枠 = トンネル
           bridge: 黒枠 = 橋梁
           private: 私的通行
           tunnel: 点線の枠 = トンネル
           bridge: 黒枠 = 橋梁
           private: 私的通行

diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 3036a79d58799e8637f20b8e1195b628ed839a9c..1ba4bd622402045108006cc797c588e41553b8ac 100644 (file)
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -942,34 +942,28 @@ ka:
           footway: საფეხმავლო გზა
           rail: რკინიგზა
           subway: მეტრო
           footway: საფეხმავლო გზა
           rail: რკინიგზა
           subway: მეტრო

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

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

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

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

-          lake:
-          - ტბა
-          - წყალსაცავი
+          lake_only: ტბა
+          reservoir: წყალსაცავი

           farm: ფერმა
           cemetery: სასაფლაო
           pitch: სპორტული მოედანი
           centre: სპორტული ცენტრი
           reserve: ნაკრძალი
           military: სამხედრო ტერიტორია
           farm: ფერმა
           cemetery: სასაფლაო
           pitch: სპორტული მოედანი
           centre: სპორტული ცენტრი
           reserve: ნაკრძალი
           military: სამხედრო ტერიტორია

-          school:
-          - სკოლა
-          - უნივერსიტეტი
+          school_only: სკოლა
+          university: უნივერსიტეტი

           station: რკინიგზის სადგური
           station: რკინიგზის სადგური

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

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

diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 788881c39d59fadbac1ec70ea55b12cf346a2acd..b82af9366a4bb777ad6e3782274727c22bdc930a 100644 (file)
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -1120,13 +1120,10 @@ kab:
     key:
       table:
         entry:
     key:
       table:
         entry:

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

     welcome:
       title: Anṣuf!
       whats_on_the_map:
     welcome:
       title: Anṣuf!
       whats_on_the_map:

diff --git a/config/locales/kk-cyrl.yml b/config/locales/kk-cyrl.yml
index 47412d377c046d63ecff4f1bd4827fc19ad2eb67..19365c90b983fbdbbbebcd53170affaeb3ef296f 100644 (file)
--- a/config/locales/kk-cyrl.yml
+++ b/config/locales/kk-cyrl.yml
@@ -974,31 +974,24 @@ kk-cyrl:
           subway: Метро
           apron_only: Әуежай перроны
           admin: Әкімшілік шекара
           subway: Метро
           apron_only: Әуежай перроны
           admin: Әкімшілік шекара

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

           golf: Гольф алаңы
           park: Саябақ
           golf: Гольф алаңы
           park: Саябақ

-          common:
-            1: шабындық
-            2: бақ

           resident: Тұрғын аудан
           retail: Сауда аймағы
           industrial: Өнеркәсіп аймағы
           resident: Тұрғын аудан
           retail: Сауда аймағы
           industrial: Өнеркәсіп аймағы

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

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

-          school:
-          - Мектеп
-          - университет
+          school_only: Мектеп
+          university: университет

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

-          summit:
-            1: шың
+          peak: шың

           bicycle_shop: Велосипед дүкені
           toilets: Дәретхана
     welcome:
           bicycle_shop: Велосипед дүкені
           toilets: Дәретхана
     welcome:

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

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

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

-          school:
-          - សាលារៀន​
-          - សាកលវិទ្យាល័យ​
+          school_only: សាលារៀន​
+          university: សាកលវិទ្យាល័យ​

           station: ស្ថានីយ៍ផ្លូវដែក
   traces:
     new:
           station: ស្ថានីយ៍ផ្លូវដែក
   traces:
     new:

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

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

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

-          lake:
-          - ಕೆರೆ
-          - ಅಣೆಕಟ್ಟು
+          lake_only: ಕೆರೆ
+          reservoir: ಅಣೆಕಟ್ಟು

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

-          school:
-          - ಪಾಠಶಾಲೆ
-          - ವಿಶ್ವವಿದ್ಯಾಲಯ
+          school_only: ಪಾಠಶಾಲೆ
+          university: ವಿಶ್ವವಿದ್ಯಾಲಯ

           station: ರೈಲು ನಿಲ್ದಾಣ
     welcome:
       title: ಸುಸ್ವಾಗತ!
           station: ರೈಲು ನಿಲ್ದಾಣ
     welcome:
       title: ಸುಸ್ವಾಗತ!

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 57fcb4fc234cd2ba83f1bf27e41372d5c6a309cf..6d330bb20524547ea4315b8939febe644ec6bcef 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -2155,31 +2155,24 @@ ko:
           footway: 보도
           rail: 철도
           subway: 지하철
           footway: 보도
           rail: 철도
           subway: 지하철

-          cable:
-          - 케이블 카
-          - 체어 리프트
-          runway:
-          - 공항 활주로
-          - 공항 유도로
+          cable_car: 케이블 카
+          chair_lift: 체어 리프트
+          runway_only: 공항 활주로
+          taxiway: 공항 유도로

           apron_only: 공항 계류장
           admin: 행정 구역 경계
           apron_only: 공항 계류장
           admin: 행정 구역 경계

-          forest:
-          - 숲
-          - 산림
+          forest_only: 숲
+          wood: 산림

           golf: 골프장
           park: 공원
           golf: 골프장
           park: 공원

-          common:
-          - 공유지
-          - 목초지
-          - 정원
+          common_only: 공유지

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

-          lake:
-          - 호수
-          - 저수지
+          lake_only: 호수
+          reservoir: 저수지

           farm: 농장
           brownfield: 재개발지역
           cemetery: 묘역
           farm: 농장
           brownfield: 재개발지역
           cemetery: 묘역


@@ -2188,14 +2181,12 @@ ko:
           centre: 스포츠 센터
           reserve: 자연 보호구역
           military: 군사 지역
           centre: 스포츠 센터
           reserve: 자연 보호구역
           military: 군사 지역

-          school:
-          - 학교
-          - 대학
+          school_only: 학교
+          university: 대학

           building: 주요 건물
           station: 철도역
           building: 주요 건물
           station: 철도역

-          summit:
-          - 산꼭대기
-          - 봉우리
+          summit_only: 산꼭대기
+          peak: 봉우리

           tunnel: 점선 테두리 = 터널
           bridge: 검은 테두리 = 다리
           private: 개인 통행
           tunnel: 점선 테두리 = 터널
           bridge: 검은 테두리 = 다리
           private: 개인 통행

diff --git a/config/locales/ksh.yml b/config/locales/ksh.yml
index 0e78033d385ca3b9bd2549106781cc2b0c46862f..eebd7da5c9865ce54d7b3bec9b573e38014df15f 100644 (file)
--- a/config/locales/ksh.yml
+++ b/config/locales/ksh.yml
@@ -279,30 +279,24 @@ ksh:
           footway: Fohßwääsch udder Päddsche
           rail: Eiserbahn
           subway: U-Bahn
           footway: Fohßwääsch udder Päddsche
           rail: Eiserbahn
           subway: U-Bahn

-          cable:
-          - Seilbahn
-          - Sässelbahn
-          runway:
-          - Startbahn, Landebahn
-          - Rollwääsch om Fluchhaaven
+          cable_car: Seilbahn
+          chair_lift: Sässelbahn
+          runway_only: Startbahn, Landebahn
+          taxiway: Rollwääsch om Fluchhaaven

           apron_only: Halldepläz om Fluchveäld
           admin: Verwalldongsjränz
           apron_only: Halldepläz om Fluchveäld
           admin: Verwalldongsjränz

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

           golf: Jolfplaz
           park: Park
           golf: Jolfplaz
           park: Park

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

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

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

           farm: Buurehoff
           brownfield: Industriebrachland
           cemetery: Friedhoff
           farm: Buurehoff
           brownfield: Industriebrachland
           cemetery: Friedhoff


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

-          school:
-          - Scholl
-          - Univäsität
+          school_only: Scholl
+          university: Univäsität

           building: Weeschtesch Bouwärk
           station: Bahnhoff
           building: Weeschtesch Bouwärk
           station: Bahnhoff

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

           tunnel: Rand jeschtreschelt = Tunnell
           bridge: Fätte Rand = Bröck
           private: Der Zohjang es prėvaat
           tunnel: Rand jeschtreschelt = Tunnell
           bridge: Fätte Rand = Bröck
           private: Der Zohjang es prėvaat

diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 5ceb1b9721eace98d297e640dacade001e0d391e..e65fa522419fb0d79732fcdeefa33e550773bf8b 100644 (file)
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -2110,31 +2110,24 @@ ku-Latn:
           footway: Rêya peyayan
           rail: Rêhesin
           subway: Metro
           footway: Rêya peyayan
           rail: Rêhesin
           subway: Metro

-          cable:
-          - Teleferîk
-          - teleferîk
-          runway:
-          - Pîsta balafirgehê
-          - rêya balafirgehê yê çûnûhatinê
+          cable_car: Teleferîk
+          chair_lift: teleferîk
+          runway_only: Pîsta balafirgehê
+          taxiway: rêya balafirgehê yê çûnûhatinê

           apron_only: Aprona balafirgehê
           admin: Sînorê îdarî
           apron_only: Aprona balafirgehê
           admin: Sînorê îdarî

-          forest:
-          - Daristan
-          - Daristan
+          forest_only: Daristan
+          wood: Daristan

           golf: Cihê golfê
           park: Park
           golf: Cihê golfê
           park: Park

-          common:
-          - Erda mişterek
-          - mêrg
-          - bexçe
+          common_only: 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:
-          - Gol
-          - mexzen
+          lake_only: Gol
+          reservoir: mexzen

           farm: Cotgeh
           brownfield: Erdê vala
           cemetery: Gorristan
           farm: Cotgeh
           brownfield: Erdê vala
           cemetery: Gorristan


@@ -2143,14 +2136,12 @@ 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:
-          - Dibistan
-          - zanîngeh
+          school_only: Dibistan
+          university: zanîngeh

           building: Avahiya girîng
           station: Stasyona trênê
           building: Avahiya girîng
           station: Stasyona trênê

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

           tunnel: Xeta qutqutî = tûnel
           bridge: Xeta reş = pir
           private: Têketina taybet
           tunnel: Xeta qutqutî = tûnel
           bridge: Xeta reş = pir
           private: Têketina taybet

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 0204187c8ff1c6e036745ce8acae9ceb40b29f34..0d02eeb78d89e51f205668ad6d54e3d5ad8442f2 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -49,6 +49,11 @@ lb:
       messages:
         invalid_email_address: schéngt keng valabel E-Mail-Adress ze sinn
         email_address_not_routable: ass net routingfäeg
       messages:
         invalid_email_address: schéngt keng valabel E-Mail-Adress ze sinn
         email_address_not_routable: ass net routingfäeg

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

     models:
       acl: Zougrëffssteierlëscht
       changeset: Set vun Ännerungen
     models:
       acl: Zougrëffssteierlëscht
       changeset: Set vun Ännerungen


@@ -1706,6 +1711,7 @@ lb:
       to: Un
       subject: Sujet
       date: Datum
       to: Un
       subject: Sujet
       date: Datum

+      actions: Aktiounen

     message_summary:
       unread_button: Als net gelies markéieren
       read_button: Als gelies markéieren
     message_summary:
       unread_button: Als net gelies markéieren
       read_button: Als gelies markéieren


@@ -1725,6 +1731,7 @@ lb:
       body: Leider gëtt et kee Message mat där ID.
     outbox:
       title: Outbox
       body: Leider gëtt et kee Message mat där ID.
     outbox:
       title: Outbox

+      actions: Aktiounen

       messages:
         one: Du hues %{count} Noriicht gesent
         other: Du hues %{count} Noriichte gesent
       messages:
         one: Du hues %{count} Noriicht gesent
         other: Du hues %{count} Noriichte gesent


@@ -2038,34 +2045,25 @@ lb:
           ferry: Fär
           tram_only: Tram
           bus: Bus
           ferry: Fär
           tram_only: Tram
           bus: Bus

-          cable:
-          - Seelbunn
-          - Sessellift
-          runway:
-          - Start- a Landebunn
-          - Rullbunn
+          cable_car: Seelbunn
+          chair_lift: Sessellift
+          runway_only: Start- a Landebunn
+          taxiway: Rullbunn

           admin: Verwaltungsgrenz
           admin: Verwaltungsgrenz

-          orchard:
-          - Bongert
-          - Wéngert
-          forest:
-          - Bësch
-          - Bësch
-          grass:
-          - Wiss
+          orchard_only: Bongert
+          vineyard: Wéngert
+          forest_only: Bësch
+          wood: Bësch
+          grass_only: Wiss

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

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

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

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

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


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

-          school:
-          - Schoul
-          - Universitéit
-          - Spidol
+          school_only: Schoul
+          university: Universitéit
+          hospital: Spidol

           building: Bedeitend Gebai
           station: Gare (Eisebunn)
           building: Bedeitend Gebai
           station: Gare (Eisebunn)

-          summit:
-          - Spëtzt
+          summit_only: 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


@@ -2419,6 +2415,13 @@ lb:
       showing_page: Säit %{page}
       next: Nächst »
       previous: « Vireg
       showing_page: Säit %{page}
       next: Nächst »
       previous: « Vireg

+  user_mutes:
+    index:
+      table:
+        thead:
+          actions: Aktiounen
+        tbody:
+          send_message: Message schécken

   notes:
     index:
       no_notes: Keng Notizen
   notes:
     index:
       no_notes: Keng Notizen

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 906556fece1eed2a0feee2b031e4de8c7df3012a..fba850f5e7152c11f158df2612129f87c0c11eb5 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -2078,30 +2078,24 @@ lt:
           footway: Pėsčiųjų takas
           rail: Geležinkelis
           subway: Metropoliteno linija
           footway: Pėsčiųjų takas
           rail: Geležinkelis
           subway: Metropoliteno linija

-          cable:
-          - Lyno keltuvas
-          - keltuvas
-          runway:
-          - Kilimo takas
-          - Riedėjimo takas
+          cable_car: Lyno keltuvas
+          chair_lift: keltuvas
+          runway_only: Kilimo takas
+          taxiway: Riedėjimo takas

           apron_only: Oro uosto lėktuvų aikštelė
           admin: Administracinės ribos
           apron_only: Oro uosto lėktuvų aikštelė
           admin: Administracinės ribos

-          forest:
-          - Miškas
-          - Medžių teritorija
+          forest_only: Miškas
+          wood: Medžių teritorija

           golf: Golfo laukas
           park: Parkas
           golf: Golfo laukas
           park: Parkas

-          common:
-          - Bendras
-          - pieva
+          common_only: 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:
-          - Ežeras
-          - rezervuaras
+          lake_only: Ežeras
+          reservoir: rezervuaras

           farm: Ūkis
           brownfield: Apleista teritorija
           cemetery: Kapinės
           farm: Ūkis
           brownfield: Apleista teritorija
           cemetery: Kapinės


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

-          school:
-          - Mokykla
-          - universitetas
+          school_only: Mokykla
+          university: universitetas

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

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

           tunnel: Punktyriniai kraštai = tiltas
           bridge: Tamsūs kraštai = tiltas
           private: Privati prieiga
           tunnel: Punktyriniai kraštai = tiltas
           bridge: Tamsūs kraštai = tiltas
           private: Privati prieiga

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 2628d260b4b50fa3bfb79c895e6c771198fefc4d..32cf6cd130a030919b8c05c24342294ad00e6255 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1710,31 +1710,24 @@ lv:
           footway: Gājēju ceļš
           rail: Dzelzceļš
           subway: Metro
           footway: Gājēju ceļš
           rail: Dzelzceļš
           subway: Metro

-          cable:
-          - Trošu ceļš
-          - krēslu pacēlājs
-          runway:
-          - Lidostas skrejceļš
-          - manevrēšanas ceļš
+          cable_car: Trošu ceļš
+          chair_lift: krēslu pacēlājs
+          runway_only: Lidostas skrejceļš
+          taxiway: manevrēšanas ceļš

           apron_only: Lidostas rampa
           admin: Administratīvā robeža
           apron_only: Lidostas rampa
           admin: Administratīvā robeža

-          forest:
-          - Mežs
-          - Pirmatnējs mežs
+          forest_only: Mežs
+          wood: Pirmatnējs mežs

           golf: Golfa laukums
           park: Parks
           golf: Golfa laukums
           park: Parks

-          common:
-          - Koplietošanas zeme
-          - Pļava
-          - dārzs
+          common_only: 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:
-          - Ezeri
-          - ūdenskrātuves
+          lake_only: Ezeri
+          reservoir: ūdenskrātuves

           farm: Saimniecība
           brownfield: Nekopta vieta
           cemetery: Kapsēta
           farm: Saimniecība
           brownfield: Nekopta vieta
           cemetery: Kapsēta


@@ -1743,14 +1736,12 @@ lv:
           centre: Sporta centrs
           reserve: Dabas rezervāts
           military: Militārā zona
           centre: Sporta centrs
           reserve: Dabas rezervāts
           military: Militārā zona

-          school:
-          - Skola
-          - universitāte
+          school_only: Skola
+          university: universitāte

           building: Ēka
           station: Dzelzceļa stacija
           building: Ēka
           station: Dzelzceļa stacija

-          summit:
-          - Virsotne
-          - smaile
+          summit_only: Virsotne
+          peak: smaile

           tunnel: Tunelis
           bridge: Tilts
           private: Privāta pieeja
           tunnel: Tunelis
           bridge: Tilts
           private: Privāta pieeja

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 14cab7a2d02a42579b2c33593ff250ff991df68b..d5da2a398ebd4f354bb9ee2913566e088c84b7cb 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -2343,32 +2343,24 @@ mk:
           tram_only: Трамвај
           trolleybus: Тролејбус
           bus: Автобус
           tram_only: Трамвај
           trolleybus: Тролејбус
           bus: Автобус

-          cable:
-          - Клупна жичница
-          - клупна жичница
-          runway:
-          - Аеродромска писта
-          - рулажна патека
+          cable_car: Клупна жичница
+          chair_lift: Клупна жичница
+          runway_only: Аеродромска писта
+          taxiway: Рулажна патека

           apron_only: Аеродромска платформа
           admin: Административна граница
           apron_only: Аеродромска платформа
           admin: Административна граница

-          orchard:
-          - Овоштарник
-          - лозје
-          forest:
-          - Шума
-          - шума
+          orchard_only: Овоштарник
+          vineyard: Лозје
+          forest_only: Шума
+          wood: Шума

           farmland: Земјоделско земјиште
           farmland: Земјоделско земјиште

-          grass:
-          - Трева
-          - ливада
+          grass_only: Трева
+          meadow: Ливада

           bare_rock: Гола карпа
           sand: Песок
           golf: Голф-терен
           park: Парк
           bare_rock: Гола карпа
           sand: Песок
           golf: Голф-терен
           park: Парк

-          common:
-          - Општествена земја
-          - ливада
-          - градина
+          common_only: Општествена земја

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


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

-          lake:
-          - Езеро
-          - резервоар
+          lake_only: Езеро
+          reservoir: Резервоар

           intermittent_water: Повремена водна површина
           glacier: Ледник
           reef: Гребен
           intermittent_water: Повремена водна површина
           glacier: Ледник
           reef: Гребен


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

-          school:
-          - Училиште
-          - универзитет
-          - болница
+          school_only: Училиште
+          university: Универзитет
+          hospital: Болница

           building: Значајно здание
           station: Железничка станица
           building: Значајно здание
           station: Железничка станица

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

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


@@ -2646,6 +2635,7 @@ mk:
       read_gpx: Читање на приватни ГПС-траги
       write_gpx: Подигање на ГПС-траги
       write_notes: Менување на белешки
       read_gpx: Читање на приватни ГПС-траги
       write_gpx: Подигање на ГПС-траги
       write_notes: Менување на белешки

+      write_redactions: Прикриј податоци за картата

       read_email: Читање на корисничка е-пошта
       skip_authorization: Автоодобрување на прилог
   oauth_clients:
       read_email: Читање на корисничка е-пошта
       skip_authorization: Автоодобрување на прилог
   oauth_clients:

diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index dde4c0ca6514c8fa9e64dae8a7536dbe3603894a..86f0d903e769cd134dd496c1ac1e1ee4964996f3 100644 (file)
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -1172,29 +1172,23 @@ mr:
           footway: पदपथ
           rail: लोहमार्ग
           subway: मेट्रो
           footway: पदपथ
           rail: लोहमार्ग
           subway: मेट्रो

-          cable:
-          - रज्जुमार्ग
-          - खुर्ची उद्वाहन
-          runway:
-          - विमानतळ धावपट्टी
-          - खेचमार्ग
+          cable_car: रज्जुमार्ग
+          chair_lift: खुर्ची उद्वाहन
+          runway_only: विमानतळ धावपट्टी
+          taxiway: खेचमार्ग

           apron_only: विमानतळावरील भरणतळ
           admin: प्रशासकीय सीमा
           apron_only: विमानतळावरील भरणतळ
           admin: प्रशासकीय सीमा

-          forest:
-          - वन
-          - जंगल
+          forest_only: वन
+          wood: जंगल

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

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

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

-          lake:
-          - तलाव
-          - जलाशय
+          lake_only: तलाव
+          reservoir: जलाशय

           farm: मळा
           cemetery: दफनभूमी
           allotments: वाटप
           farm: मळा
           cemetery: दफनभूमी
           allotments: वाटप


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

-          school:
-          - शाळा
-          - विद्यापीठ
+          school_only: शाळा
+          university: विद्यापीठ

           building: महत्वपूर्ण इमारत
           station: रेल्वे स्थानक
           building: महत्वपूर्ण इमारत
           station: रेल्वे स्थानक

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

           tunnel: तुटक कड = बोगदा
           bridge: काळी कड = पूल
           private: खाजगी प्रवेश
           tunnel: तुटक कड = बोगदा
           bridge: काळी कड = पूल
           private: खाजगी प्रवेश

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 53ef6cc7ec3a61efe2ab6d90636612cf74117b1b..925636d5ee9d184230ee4929e7e5ceaca0d15524 100644 (file)
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1724,30 +1724,24 @@ ms:
           footway: Laluan pejalan kaki
           rail: Landasan keretapi
           subway: Landasan bawah tanah
           footway: Laluan pejalan kaki
           rail: Landasan keretapi
           subway: Landasan bawah tanah

-          cable:
-          - Kereta kabel
-          - lif kerusi
-          runway:
-          - Landasan kapal terbang
-          - jalan rayap
+          cable_car: Kereta kabel
+          chair_lift: lif kerusi
+          runway_only: Landasan kapal terbang
+          taxiway: jalan rayap

           apron_only: Kawasan gerak lapangan terbang
           admin: Sempadan pentadbiran
           apron_only: Kawasan gerak lapangan terbang
           admin: Sempadan pentadbiran

-          forest:
-          - Hutan
-          - Hutan kecil
+          forest_only: Hutan
+          wood: Hutan kecil

           golf: Padang golf
           park: Taman
           golf: Padang golf
           park: Taman

-          common:
-          - Tanah awam
-          - padang rumput
+          common_only: 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:
-          - Tasik
-          - takungan
+          lake_only: Tasik
+          reservoir: takungan

           farm: Ladang
           brownfield: Tanah terbiar
           cemetery: Perkuburan
           farm: Ladang
           brownfield: Tanah terbiar
           cemetery: Perkuburan


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

-          school:
-          - Sekolah
-          - universiti
+          school_only: Sekolah
+          university: universiti

           building: Bangunan penting
           station: Stesen keretapi
           building: Bangunan penting
           station: Stesen keretapi

-          summit:
-          - Kemuncak
-          - puncak
+          summit_only: Kemuncak
+          peak: puncak

           tunnel: Kasing bertitik-titik = terowong
           bridge: Kasing hitam = jambatan
           private: Jalan masuk persendirian
           tunnel: Kasing bertitik-titik = terowong
           bridge: Kasing hitam = jambatan
           private: Jalan masuk persendirian

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

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

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

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

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

-          school:
-          - ကျောင်း
-          - တက္ကသိုလ်
+          school_only: ကျောင်း
+          university: တက္ကသိုလ်

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

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 0ac7517f03f74337ba5c1f0631872cb4eecf8061..82e7bc73492668bd97a6345eb5b0117094228230 100644 (file)
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -1841,30 +1841,24 @@ nb:
           footway: Gangvei
           rail: Jernbane
           subway: Undergrunnsbane
           footway: Gangvei
           rail: Jernbane
           subway: Undergrunnsbane

-          cable:
-          - Kabelvogn
-          - stolheis
-          runway:
-          - Flystripe
-          - taksebane
+          cable_car: Kabelvogn
+          chair_lift: stolheis
+          runway_only: Flystripe
+          taxiway: taksebane

           apron_only: terminal
           admin: Administrativ grense
           apron_only: terminal
           admin: Administrativ grense

-          forest:
-          - Skog
-          - Ved
+          forest_only: Skog
+          wood: Ved

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

-          common:
-          - Vanlig
-          - eng
+          common_only: 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:
-          - Innsjø
-          - reservoar
+          lake_only: Innsjø
+          reservoir: reservoar

           farm: Gård
           brownfield: Tidligere industriområde
           cemetery: Gravplass
           farm: Gård
           brownfield: Tidligere industriområde
           cemetery: Gravplass


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

-          school:
-          - Skole
-          - universitet
+          school_only: Skole
+          university: universitet

           building: Viktig bygning
           station: Jernbanestasjon
           building: Viktig bygning
           station: Jernbanestasjon

-          summit:
-          - Topp
-          - fjelltopp
+          summit_only: Topp
+          peak: fjelltopp

           tunnel: Streket kant = tunnel
           bridge: Sort kant = bru
           private: Privat tilgang
           tunnel: Streket kant = tunnel
           bridge: Sort kant = bru
           private: Privat tilgang

diff --git a/config/locales/nds.yml b/config/locales/nds.yml
index 5cf4239c9f706a3cc681252e3241f5b1dffa1c47..0c30d907d9f0a66baab55a9ad89995525cdfde8d 100644 (file)
--- a/config/locales/nds.yml
+++ b/config/locales/nds.yml
@@ -520,30 +520,24 @@ nds:
           footway: Footpadd
           rail: Iesenbahn
           subway: U-Bahn
           footway: Footpadd
           rail: Iesenbahn
           subway: U-Bahn

-          cable:
-          - Kavelbahn
-          - Skilift
-          runway:
-          - Fleger-Lannbahn
-          - Fleger-Rullweg
+          cable_car: Kavelbahn
+          chair_lift: Skilift
+          runway_only: Fleger-Lannbahn
+          taxiway: Fleger-Rullweg

           apron_only: Terminal
           admin: Grenz
           apron_only: Terminal
           admin: Grenz

-          forest:
-          - Forst
-          - Woold
+          forest_only: Forst
+          wood: Woold

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

-          common:
-          - Wisch
-          - Wisch
+          common_only: Wisch

           resident: Wahnrebeed
           retail: Ladenrebeed
           industrial: Industrierebeed
           commercial: Hannelsrebeed
           heathland: Heid
           resident: Wahnrebeed
           retail: Ladenrebeed
           industrial: Industrierebeed
           commercial: Hannelsrebeed
           heathland: Heid

-          lake:
-          - See
-          - Stausee
+          lake_only: See
+          reservoir: Stausee

           farm: Buurnhoff
           brownfield: Industrie-Braakland
           cemetery: Karkhoff
           farm: Buurnhoff
           brownfield: Industrie-Braakland
           cemetery: Karkhoff


@@ -552,14 +546,12 @@ nds:
           centre: Sportzentrum
           reserve: Naturpark
           military: Militärrebeed
           centre: Sportzentrum
           reserve: Naturpark
           military: Militärrebeed

-          school:
-          - School
-          - Universität
+          school_only: School
+          university: Universität

           building: Wichtig Bowark
           station: Bahnhoff
           building: Wichtig Bowark
           station: Bahnhoff

-          summit:
-          - Bargtopp
-          - Bargtopp
+          summit_only: Bargtopp
+          peak: Bargtopp

           tunnel: Strekel-Rand = Tunnel
           bridge: Fett Rand = Brügg
           private: Privat Togang
           tunnel: Strekel-Rand = Tunnel
           bridge: Fett Rand = Brügg
           private: Privat Togang

diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 213f81051a9d9d497d110ca5b421c0e1fc6cd13b..64035c830573d88b93cbd7920bf8dea36428d2b6 100644 (file)
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -991,26 +991,21 @@ ne:
           cycleway: साइकल मार्ग
           rail: रेलमार्ग
           subway: सबवे
           cycleway: साइकल मार्ग
           rail: रेलमार्ग
           subway: सबवे

-          cable:
-          - केबल कार
-          - कुर्सी लिफ्ट
-          forest:
-          - वन
-          - कुञ्ज
+          cable_car: केबल कार
+          chair_lift: कुर्सी लिफ्ट
+          forest_only: वन
+          wood: कुञ्ज

           golf: गल्फ कोर्स
           park: उद्यान
           resident: आवासीय क्षेत्र
           golf: गल्फ कोर्स
           park: उद्यान
           resident: आवासीय क्षेत्र

-          lake:
-          - ताल
-          - मुहान
+          lake_only: ताल
+          reservoir: मुहान

           farm: खेती
           cemetery: अन्त्यष्टी स्थल
           farm: खेती
           cemetery: अन्त्यष्टी स्थल

-          school:
-          - विद्यालय
-          - विश्वविद्यालय
-          summit:
-          - शिखर
-          - शिखर
+          school_only: विद्यालय
+          university: विश्वविद्यालय
+          summit_only: शिखर
+          peak: शिखर

           bicycle_shop: साइकल पसल
           bicycle_parking: साकल पार्किङ
           toilets: शौचालय
           bicycle_shop: साइकल पसल
           bicycle_parking: साकल पार्किङ
           toilets: शौचालय

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 4f552d54be245db608600e4cec16a8c07b81d7b6..96bc183a6157cc2379ddfca2a634755aa73c0e5a 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -2411,32 +2411,24 @@ nl:
           tram_only: Tram
           trolleybus: Trolleybus
           bus: Bus
           tram_only: Tram
           trolleybus: Trolleybus
           bus: Bus

-          cable:
-          - Kabelbaan
-          - stoeltjeslift
-          runway:
-          - Start- en landingsbaan
-          - taxibaan
+          cable_car: Kabelbaan
+          chair_lift: Stoeltjeslift
+          runway_only: Start- en landingsbaan
+          taxiway: Taxibaan

           apron_only: Luchthavenplatform
           admin: Bestuurlijke grens
           apron_only: Luchthavenplatform
           admin: Bestuurlijke grens

-          orchard:
-          - Boomgaard
-          - wijngaard
-          forest:
-          - Bos
-          - bos
+          orchard_only: Boomgaard
+          vineyard: Wijngaard
+          forest_only: Bos
+          wood: Bos

           farmland: Landbouwgrond
           farmland: Landbouwgrond

-          grass:
-          - Gras
-          - weide
+          grass_only: Gras
+          meadow: Weide

           bare_rock: Kale rots
           sand: Zand
           golf: Golfbaan
           park: Park
           bare_rock: Kale rots
           sand: Zand
           golf: Golfbaan
           park: Park

-          common:
-          - Gemene grond
-          - weide
-          - tuin
+          common_only: Gemene grond

           built_up: Bebouwde kom
           resident: Woongebied
           retail: Winkelgebied
           built_up: Bebouwde kom
           resident: Woongebied
           retail: Winkelgebied


@@ -2444,9 +2436,8 @@ nl:
           commercial: Commercieel gebied
           heathland: Heide
           scrubland: Struikgewas
           commercial: Commercieel gebied
           heathland: Heide
           scrubland: Struikgewas

-          lake:
-          - Meer
-          - reservoir
+          lake_only: Meer
+          reservoir: Reservoir

           glacier: Gletsjer
           farm: Boerderij
           brownfield: Braakliggend terrein
           glacier: Gletsjer
           farm: Boerderij
           brownfield: Braakliggend terrein


@@ -2456,14 +2447,12 @@ nl:
           centre: Sportcentrum
           reserve: Natuurreservaat
           military: Militair gebied
           centre: Sportcentrum
           reserve: Natuurreservaat
           military: Militair gebied

-          school:
-          - School
-          - universiteit
+          school_only: School
+          university: Universiteit

           building: Belangrijk gebouw
           station: Spoorwegstation
           building: Belangrijk gebouw
           station: Spoorwegstation

-          summit:
-          - Top
-          - piek
+          summit_only: Top
+          peak: Piek

           tunnel: Tunnel
           bridge: Brug
           private: Privétoegang
           tunnel: Tunnel
           bridge: Brug
           private: Privétoegang


@@ -3027,8 +3016,8 @@ nl:
     helper:
       time_future_html: Vervalt over %{time}.
       until_login: Actief totdat de gebruiker zich aanmeldt.
     helper:
       time_future_html: Vervalt over %{time}.
       until_login: Actief totdat de gebruiker zich aanmeldt.

-      time_future_and_until_login_html: Eindigt in %{time} en nadat de gebruiker ingelogd
-        is.
+      time_future_and_until_login_html: Eindigt in %{time} en nadat de gebruiker zich
+        heeft aangemeld.

       time_past_html: '%{time} vervallen.'
       block_duration:
         hours:
       time_past_html: '%{time} vervallen.'
       block_duration:
         hours:

diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 602d6996ba2e57d02aea997d9338bec8d66a619b..e625cf8e5e1a0ce1a6341593d89810bbef2dda71 100644 (file)
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -2178,30 +2178,24 @@ nn:
           footway: Gangveg
           rail: Jernbane
           subway: Undergrunnsbane
           footway: Gangveg
           rail: Jernbane
           subway: Undergrunnsbane

-          cable:
-          - Kabelvogn
-          - stolheis
-          runway:
-          - Flystripe
-          - taksebane
+          cable_car: Kabelvogn
+          chair_lift: stolheis
+          runway_only: Flystripe
+          taxiway: taksebane

           apron_only: terminal
           admin: Administrativ grense
           apron_only: terminal
           admin: Administrativ grense

-          forest:
-          - Skog
-          - Ved
+          forest_only: Skog
+          wood: Ved

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

-          common:
-          - Vanleg
-          - snever
+          common_only: 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:
-          - Innsjø
-          - reservoar
+          lake_only: Innsjø
+          reservoir: reservoar

           farm: Gard
           brownfield: Tidlegare industriområde
           cemetery: Gravplass
           farm: Gard
           brownfield: Tidlegare industriområde
           cemetery: Gravplass


@@ -2210,14 +2204,12 @@ nn:
           centre: Sportssenter
           reserve: Naturreservat
           military: Militært område
           centre: Sportssenter
           reserve: Naturreservat
           military: Militært område

-          school:
-          - Skule
-          - universitet
+          school_only: Skule
+          university: universitet

           building: Viktig bygning
           station: Jernbanestasjon
           building: Viktig bygning
           station: Jernbanestasjon

-          summit:
-          - Topp
-          - fjelltopp
+          summit_only: Topp
+          peak: fjelltopp

           tunnel: Streka kant = tunnel
           bridge: Sort kant = bru
           private: Privat tilgjenge
           tunnel: Streka kant = tunnel
           bridge: Sort kant = bru
           private: Privat tilgjenge

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 7159f30ebf0bad3a3d3ba9f608ef676aef5bec0c..71db56f7cc8488a24d2f78c31156e439d543c24b 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -1520,31 +1520,25 @@ nqo:
           footway: ߛߋ߲߬ߡߊ߬ߛߌߟߊ
           rail: ߣߍ߰ߛߌߟߊ
           subway: ߘߎ߰ߞߘߐ߬ߛߌߟߊ
           footway: ߛߋ߲߬ߡߊ߬ߛߌߟߊ
           rail: ߣߍ߰ߛߌߟߊ
           subway: ߘߎ߰ߞߘߐ߬ߛߌߟߊ

-          cable:
-          - ߘߎ߲ߞߎߟߎ߲
-          runway:
-          - ߛߊ߲ߡߊߘߊ߲ ߓߏ߬ߙߌ߬ ߛߌߟߊ
-          - ߥߊߟߌߥߊߟߌ ߫ ߛߌߟߊ
+          cable_car: ߘߎ߲ߞߎߟߎ߲
+          runway_only: ߛߊ߲ߡߊߘߊ߲ ߓߏ߬ߙߌ߬ ߛߌߟߊ
+          taxiway: ߥߊߟߌߥߊߟߌ ߫ ߛߌߟߊ

           admin: ߓߐߕߏ߲߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ߬ߞߊ
           admin: ߓߐߕߏ߲߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ߬ߞߊ

-          forest:
-          - ߕߎ
-          - ߦߙߌ
-          common:
-          - ߘߍ߬ߒ߬ߡߊ߬ ߞߣߍ
+          forest_only: ߕߎ
+          wood: ߦߙߌ
+          common_only: ߘߍ߬ߒ߬ߡߊ߬ ߞߣߍ

           resident: ߡߐ߰ߘߐ߬ ߛߌߟߊ
           retail: ߖߎ߬ߟߦߊ߬ ߞߣߍ
           industrial: ߘߍ߲߰ߦߊ߬ߟߌ ߕߌ߲߬ߞߎߘߎ߲
           commercial: ߖߊ߬ߥߏ ߘߌ߲߬ߞߌߙߊ
           resident: ߡߐ߰ߘߐ߬ ߛߌߟߊ
           retail: ߖߎ߬ߟߦߊ߬ ߞߣߍ
           industrial: ߘߍ߲߰ߦߊ߬ߟߌ ߕߌ߲߬ߞߎߘߎ߲
           commercial: ߖߊ߬ߥߏ ߘߌ߲߬ߞߌߙߊ

-          lake:
-          - ߞߐ߰ߖߌ߬ߘߟߊ
+          lake_only: ߞߐ߰ߖߌ߬ߘߟߊ

           farm: ߝߏ߬ߘߏ
           cemetery: ߞߊߓߙߎߟߏ
           centre: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ ߕߊ߲ߓߊ߲
           reserve: ߛߎ߲ߞߎ߲ ߦߙߐ߫ ߟߊߕߏߣߍ߲
           military: ߣߊ߲߬ߕߌ߰ ߕߌ߲ߞߎߘߎ߲
           farm: ߝߏ߬ߘߏ
           cemetery: ߞߊߓߙߎߟߏ
           centre: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ ߕߊ߲ߓߊ߲
           reserve: ߛߎ߲ߞߎ߲ ߦߙߐ߫ ߟߊߕߏߣߍ߲
           military: ߣߊ߲߬ߕߌ߰ ߕߌ߲ߞߎߘߎ߲

-          school:
-          - ߞߊ߬ߙߊ߲߬ߕߊ
-          - ߖߊ߯ߓߘߊ
+          school_only: ߞߊ߬ߙߊ߲߬ߕߊ
+          university: ߖߊ߯ߓߘߊ

           station: ߣߍ߰ߛߌߟߊ ߟߐ߬ߘߊ߮
           construction: ߛߌߟߊ ߡߍ߲ ߟߊ ߦߴߌ ߘߐ߫
           bicycle_shop: ߣߍ߰ߛߏ߬ ߝߎ߲ߞߎ߲
           station: ߣߍ߰ߛߌߟߊ ߟߐ߬ߘߊ߮
           construction: ߛߌߟߊ ߡߍ߲ ߟߊ ߦߴߌ ߘߐ߫
           bicycle_shop: ߣߍ߰ߛߏ߬ ߝߎ߲ߞߎ߲

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index b48d64d00a94d0d42bdf6ee0fbfb2c60e0b92749..9b595294fac58b69e2a67e28ca0963817371d8e1 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -2026,31 +2026,24 @@ oc:
           footway: Via pietonièra
           rail: Via ferrada
           subway: Linha de mètro
           footway: Via pietonièra
           rail: Via ferrada
           subway: Linha de mètro

-          cable:
-          - Teleferic
-          - telesèti
-          runway:
-          - Pista d'aeropòrt
-          - via de circulacion d'aeropòrt
+          cable_car: Teleferic
+          chair_lift: telesèti
+          runway_only: Pista d'aeropòrt
+          taxiway: via de circulacion d'aeropòrt

           apron_only: Estacionament d'avions
           admin: Limit administratiu
           apron_only: Estacionament d'avions
           admin: Limit administratiu

-          forest:
-          - Sèuva
-          - Bòsc
+          forest_only: Sèuva
+          wood: Bòsc

           golf: Percors de gòlf
           park: Pargue
           golf: Percors de gòlf
           park: Pargue

-          common:
-          - Espaci comun
-          - prada
-          - Jardin
+          common_only: 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:
-          - Lac
-          - Sèrva
+          lake_only: Lac
+          reservoir: Sèrva

           farm: Zòna agricòla
           brownfield: Zòna rasada
           cemetery: Cementèri
           farm: Zòna agricòla
           brownfield: Zòna rasada
           cemetery: Cementèri


@@ -2059,14 +2052,12 @@ oc:
           centre: Centre esportiu
           reserve: Resèrva naturala
           military: Zòna militara
           centre: Centre esportiu
           reserve: Resèrva naturala
           military: Zòna militara

-          school:
-          - Escòla
-          - universitat
+          school_only: Escòla
+          university: universitat

           building: Bastissa significativa
           station: Gara ferroviària
           building: Bastissa significativa
           station: Gara ferroviària

-          summit:
-          - Som
-          - pic
+          summit_only: Som
+          peak: pic

           tunnel: Bòrd en puntilhats = tunèl
           bridge: Bòrd negre = pont
           private: Accès privat
           tunnel: Bòrd en puntilhats = tunèl
           bridge: Bòrd negre = pont
           private: Accès privat

diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 9dc918187c5abf46476a217e5c587494e4f0124b..8b1d9913a33ea5c1790792e1967cb92783c67dea 100644 (file)
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -934,43 +934,35 @@ pa:
           footway: ਪੈਦਲ ਰਾਹ
           rail: ਰੇਲਵੇ
           subway: ਸਬ-ਵੇਅ
           footway: ਪੈਦਲ ਰਾਹ
           rail: ਰੇਲਵੇ
           subway: ਸਬ-ਵੇਅ

-          cable:
-          - ਕੇਬਲ ਕਾਰ
-          - ਕੁਰਸੀ ਲਿਫ਼ਟ
-          runway:
-          - ਹਵਾਈ ਅੱਡੇ ਦੀ ਉਡਾਣ ਪੱਟੀ
-          - ਟੈਕਸੀਵੇਅ
+          cable_car: ਕੇਬਲ ਕਾਰ
+          chair_lift: ਕੁਰਸੀ ਲਿਫ਼ਟ
+          runway_only: ਹਵਾਈ ਅੱਡੇ ਦੀ ਉਡਾਣ ਪੱਟੀ
+          taxiway: ਟੈਕਸੀਵੇਅ

           apron_only: ਹਵਾਈ ਅੱਡੇ ਦਾ ਐਪਰਨ
           admin: ਪ੍ਰਸ਼ਾਸਕੀ ਸਰਹੱਦ
           apron_only: ਹਵਾਈ ਅੱਡੇ ਦਾ ਐਪਰਨ
           admin: ਪ੍ਰਸ਼ਾਸਕੀ ਸਰਹੱਦ

-          forest:
-          - ਜੰਗਲ
-          - ਜੰਗਲ
+          forest_only: ਜੰਗਲ
+          wood: ਜੰਗਲ

           golf: ਗੋਲਫ਼ ਮੈਦਾਨ
           park: ਪਾਰਕ
           golf: ਗੋਲਫ਼ ਮੈਦਾਨ
           park: ਪਾਰਕ

-          common:
-          - ਸ਼ਾਮਲਾਟ
-          - ਚਰਗਾਹ
+          common_only: ਸ਼ਾਮਲਾਟ

           resident: ਰਿਹਾਇਸ਼ੀ ਇਲਾਕਾ
           retail: ਪਰਚੂਨ ਖੇਤਰ
           industrial: ਉਦਯੋਗਿਕ ਖੇਤਰ
           commercial: ਵਪਾਰਕ ਖੇਤਰ
           resident: ਰਿਹਾਇਸ਼ੀ ਇਲਾਕਾ
           retail: ਪਰਚੂਨ ਖੇਤਰ
           industrial: ਉਦਯੋਗਿਕ ਖੇਤਰ
           commercial: ਵਪਾਰਕ ਖੇਤਰ

-          lake:
-          - ਝੀਲ
-          - ਕੁੰਡ
+          lake_only: ਝੀਲ
+          reservoir: ਕੁੰਡ

           farm: ਖੇਤ
           cemetery: ਸ਼ਮਸ਼ਾਨ
           pitch: ਖੇਡ ਦੀ ਪਿੱਚ
           centre: ਖੇਡ ਕੇਂਦਰ
           reserve: ਕੁਦਰਤੀ ਰੱਖ
           military: ਫ਼ੌਜੀ ਇਲਾਕਾ
           farm: ਖੇਤ
           cemetery: ਸ਼ਮਸ਼ਾਨ
           pitch: ਖੇਡ ਦੀ ਪਿੱਚ
           centre: ਖੇਡ ਕੇਂਦਰ
           reserve: ਕੁਦਰਤੀ ਰੱਖ
           military: ਫ਼ੌਜੀ ਇਲਾਕਾ

-          school:
-          - ਸਕੂਲ
-          - ਯੂਨੀਵਰਸਿਟੀ
+          school_only: ਸਕੂਲ
+          university: ਯੂਨੀਵਰਸਿਟੀ

           building: ਮਹੱਤਵਪੂਰਨ ਇਮਾਰਤ
           station: ਰੇਲਵੇ ਸਟੇਸ਼ਨ
           building: ਮਹੱਤਵਪੂਰਨ ਇਮਾਰਤ
           station: ਰੇਲਵੇ ਸਟੇਸ਼ਨ

-          summit:
-          - ਸਿਖਰ
-          - ਚੋਟੀ
+          summit_only: ਸਿਖਰ
+          peak: ਚੋਟੀ

           construction: ਉਸਾਰੀ ਹੇਠ ਸੜਕਾਂ
     welcome:
       title: ਜੀ ਆਇਆਂ ਨੂੰ!
           construction: ਉਸਾਰੀ ਹੇਠ ਸੜਕਾਂ
     welcome:
       title: ਜੀ ਆਇਆਂ ਨੂੰ!

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index fff04267082847bfb3ab496cf1a7144edd692fe1..bbcd3b195cd2e894ced8b8ec3745991e7469352b 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -2338,31 +2338,24 @@ pl:
           tram_only: Tramwaj
           trolleybus: Trolejbus
           bus: Autobus
           tram_only: Tramwaj
           trolleybus: Trolejbus
           bus: Autobus

-          cable:
-          - Kolej linowa
-          - wyciąg krzesełkowy
-          runway:
-          - Pas startowy
-          - kołowania
+          cable_car: Kolej linowa
+          chair_lift: wyciąg krzesełkowy
+          runway_only: Pas startowy
+          taxiway: kołowania

           apron_only: Płyta lotniska
           admin: Granica
           apron_only: Płyta lotniska
           admin: Granica

-          forest:
-          - Las
-          - Drzewa
+          forest_only: Las
+          wood: Drzewa

           golf: Pole golfowe
           park: Park
           golf: Pole golfowe
           park: Park

-          common:
-          - Pole
-          - łąka
-          - ogród
+          common_only: 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:
-          - Jezioro
-          - zbiornik
+          lake_only: Jezioro
+          reservoir: zbiornik

           glacier: Lodowiec
           farm: Gospodarstwo rolne
           brownfield: Teren powyburzeniowy
           glacier: Lodowiec
           farm: Gospodarstwo rolne
           brownfield: Teren powyburzeniowy


@@ -2372,14 +2365,12 @@ pl:
           centre: Centrum sportowe
           reserve: Rezerwat przyrody
           military: Teren wojskowy
           centre: Centrum sportowe
           reserve: Rezerwat przyrody
           military: Teren wojskowy

-          school:
-          - Szkoła
-          - uniwersytet
+          school_only: Szkoła
+          university: uniwersytet

           building: Ważny budynek
           station: Stacja kolejowa
           building: Ważny budynek
           station: Stacja kolejowa

-          summit:
-          - Góra
-          - szczyt
+          summit_only: Góra
+          peak: szczyt

           tunnel: Kreskowany obrys – tunel
           bridge: Czarny obrys – most
           private: Dostęp za zezwoleniem
           tunnel: Kreskowany obrys – tunel
           bridge: Czarny obrys – most
           private: Dostęp za zezwoleniem

diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml
index d62471ae546d96b521f60b5f573bee96c38d9503..6563e0965e905543e191c77626588bb808fba1e6 100644 (file)
--- a/config/locales/pnb.yml
+++ b/config/locales/pnb.yml
@@ -1657,31 +1657,24 @@ pnb:
           footway: فُت‌وے
           rail: ریلوے
           subway: سبوے
           footway: فُت‌وے
           rail: ریلوے
           subway: سبوے

-          cable:
-          - کیبل کار
-          - کُرسی لِفٹ
-          runway:
-          - ہوائی اڈے اُڈاݨ پٹی
-          - ٹیکسی‌وے
+          cable_car: کیبل کار
+          chair_lift: کُرسی لِفٹ
+          runway_only: ہوائی اڈے اُڈاݨ پٹی
+          taxiway: ٹیکسی‌وے

           apron_only: ہوائی اڈے دا ایپرن
           admin: پرشاسکی سرحد
           apron_only: ہوائی اڈے دا ایپرن
           admin: پرشاسکی سرحد

-          forest:
-          - رکھّ
-          - جنگل
+          forest_only: رکھّ
+          wood: جنگل

           golf: گولف مَیدان
           park: پارک
           golf: گولف مَیدان
           park: پارک

-          common:
-          - شاملاٹ
-          - چرگاہ
-          - باغ
+          common_only: شاملاٹ

           resident: رہائشی کھیتر
           retail: پرچون کھیتر
           industrial: سناتی کھیتر
           commercial: وپارک کھیتر
           heathland: ہیتھ
           resident: رہائشی کھیتر
           retail: پرچون کھیتر
           industrial: سناتی کھیتر
           commercial: وپارک کھیتر
           heathland: ہیتھ

-          lake:
-          - جھیل
-          - کُنڈ
+          lake_only: جھیل
+          reservoir: کُنڈ

           farm: کھیت
           brownfield: براؤنفیلڈ
           cemetery: شمشان
           farm: کھیت
           brownfield: براؤنفیلڈ
           cemetery: شمشان


@@ -1690,14 +1683,12 @@ pnb:
           centre: کھیڈ کیندر
           reserve: کُدرتی رکھّ
           military: فَوجی کھیتر
           centre: کھیڈ کیندر
           reserve: کُدرتی رکھّ
           military: فَوجی کھیتر

-          school:
-          - سکول
-          - یونیورستی
+          school_only: سکول
+          university: یونیورستی

           building: مہتوپورن عمارت
           station: ریلوے سٹیشن
           building: مہتوپورن عمارت
           station: ریلوے سٹیشن

-          summit:
-          - سکھر
-          - چوٹی
+          summit_only: سکھر
+          peak: چوٹی

           tunnel: سُرنگ (ڈیش لائیناں)
           bridge: پُل (کالیاں لائیناں)
           private: نِجی ورتوں
           tunnel: سُرنگ (ڈیش لائیناں)
           bridge: پُل (کالیاں لائیناں)
           private: نِجی ورتوں

diff --git a/config/locales/ps.yml b/config/locales/ps.yml
index 8291fb858fefa4ffe43e98fe2cd852cf720f6f3e..457742e917f0d061a792ce1c70366e28eeadb4ba 100644 (file)
--- a/config/locales/ps.yml
+++ b/config/locales/ps.yml
@@ -368,18 +368,15 @@ ps:
     key:
       table:
         entry:
     key:
       table:
         entry:

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

           park: پارک
           park: پارک

-          lake:
-          - ډنډ
-          - زېرمتون
+          lake_only: ډنډ
+          reservoir: زېرمتون

           farm: کرونده
           cemetery: هديره
           military: پوځي سيمه
           farm: کرونده
           cemetery: هديره
           military: پوځي سيمه

-          school:
-          - ښوونځی
-          - پوهنتون
+          school_only: ښوونځی
+          university: پوهنتون

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

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index ed6107fa54fc6ea48956e3bfda166b24f78ee404..88344532691ed7597eeec53e7779479fd60b502e 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -81,6 +81,12 @@ pt-PT:
       messages:
         invalid_email_address: não parece ser um endereço de correio eletrónico válido
         email_address_not_routable: não é atingível
       messages:
         invalid_email_address: não parece ser um endereço de correio eletrónico válido
         email_address_not_routable: não é atingível

+      models:
+        user_mute:
+          attributes:
+            subject:
+              format: '%{message}'
+          is_already_muted: já está silenciado

     models:
       acl: Aceder à lista de controlo
       changeset: Conjunto de alterações
     models:
       acl: Aceder à lista de controlo
       changeset: Conjunto de alterações


@@ -1809,11 +1815,13 @@ pt-PT:
       to: Para
       subject: Assunto
       date: Data
       to: Para
       subject: Assunto
       date: Data

+      actions: Ações

     message_summary:
       unread_button: Marcar como não lida
       read_button: Marcar como lida
       reply_button: Responder
       destroy_button: Eliminar
     message_summary:
       unread_button: Marcar como não lida
       read_button: Marcar como lida
       reply_button: Responder
       destroy_button: Eliminar

+      unmute_button: Mover para caixa de entrada

     new:
       title: Enviar mensagem
       send_message_to_html: Enviar uma nova mensagem para %{name}
     new:
       title: Enviar mensagem
       send_message_to_html: Enviar uma nova mensagem para %{name}


@@ -1828,12 +1836,18 @@ pt-PT:
       body: Lamentamos, não existe nenhuma mensagem com esse identificador (id).
     outbox:
       title: Caixa de saída
       body: Lamentamos, não existe nenhuma mensagem com esse identificador (id).
     outbox:
       title: Caixa de saída

+      actions: Ações

       messages:
         one: Tens %{count} mensagem enviada
         other: Tens %{count} mensagens enviadas
       no_sent_messages_html: Ainda não tens mensagens enviadas. Porque não entras
         em contacto com algumas %{people_mapping_nearby_link}?
       people_mapping_nearby: pessoas que mapeiam perto de ti
       messages:
         one: Tens %{count} mensagem enviada
         other: Tens %{count} mensagens enviadas
       no_sent_messages_html: Ainda não tens mensagens enviadas. Porque não entras
         em contacto com algumas %{people_mapping_nearby_link}?
       people_mapping_nearby: pessoas que mapeiam perto de ti

+    muted:
+      title: Mensagens Silenciadas
+      messages:
+        one: '%{count} mensagem silenciada'
+        other: Tens %{count} mensagens silenciadas

     reply:
       wrong_user: Estás autenticado como `%{user}', mas a mensagem a que pretendes
         responder não foi enviada para esse utilizador. Por favor, entra na conta
     reply:
       wrong_user: Estás autenticado como `%{user}', mas a mensagem a que pretendes
         responder não foi enviada para esse utilizador. Por favor, entra na conta


@@ -1852,9 +1866,13 @@ pt-PT:
     heading:
       my_inbox: Caixa de entrada
       my_outbox: Caixa de saída
     heading:
       my_inbox: Caixa de entrada
       my_outbox: Caixa de saída

+      muted_messages: Mensagens silenciadas

     mark:
       as_read: Mensagem marcada como lida
       as_unread: Mensagem marcada como não lida
     mark:
       as_read: Mensagem marcada como lida
       as_unread: Mensagem marcada como não lida

+    unmute:
+      notice: A mensagem foi movida para a caixa de entrada
+      error: A mensagem não pôde ser movida para a caixa de entrada.

     destroy:
       destroyed: Mensagem eliminada
   passwords:
     destroy:
       destroyed: Mensagem eliminada
   passwords:


@@ -2347,6 +2365,7 @@ pt-PT:
           primary: Estrada primária
           secondary: Estrada secundária
           unclassified: Estrada sem classificação
           primary: Estrada primária
           secondary: Estrada secundária
           unclassified: Estrada sem classificação

+          pedestrian: Caminho pedestre

           track: Estrada florestal ou agrícola
           bridleway: Via equestre
           cycleway: Ciclovia
           track: Estrada florestal ou agrícola
           bridleway: Via equestre
           cycleway: Ciclovia


@@ -2362,31 +2381,37 @@ pt-PT:
           tram_only: Elétrico
           trolleybus: Troleicarro
           bus: Autocarro
           tram_only: Elétrico
           trolleybus: Troleicarro
           bus: Autocarro

-          cable:
-          - Teleférico
-          - telecadeira
-          runway:
-          - Pista de aviação
-          - Via de circulação
+          cable_car: Teleférico
+          chair_lift: Teleférico
+          runway_only: Pista de aviação
+          taxiway: Via de circulação

           apron_only: Estacionamento de aviões
           admin: Fronteira administrativa
           apron_only: Estacionamento de aviões
           admin: Fronteira administrativa

-          forest:
-          - Floresta gerida
-          - Bosque
+          orchard_only: Pomar
+          vineyard: Vinha
+          forest_only: Floresta gerida
+          wood: Bosque
+          farmland: Terreno agrícola
+          grass_only: Relva
+          meadow: Prado
+          bare_rock: Rocha exposta
+          sand: Areia

           golf: Campo de golfe
           park: Parque público
           golf: Campo de golfe
           park: Parque público

-          common:
-          - Terrenos comunitários
-          - prado
-          - Jardim
+          common_only: Terrenos comunitários
+          built_up: Zona edificada

           resident: Área residencial
           retail: Área de retalho
           industrial: Área industrial
           commercial: Área comercial
           heathland: Charneca
           resident: Área residencial
           retail: Área de retalho
           industrial: Área industrial
           commercial: Área comercial
           heathland: Charneca

-          lake:
-          - Lago
-          - reservatório hidrográfico
+          scrubland: Matagal
+          lake_only: Lago
+          reservoir: Reservatório
+          intermittent_water: Corpo de água intermitente
+          glacier: Glaciar
+          reef: Recife
+          wetland: Zona húmida

           farm: Quinta
           brownfield: Baldio industrial
           cemetery: Cemitério
           farm: Quinta
           brownfield: Baldio industrial
           cemetery: Cemitério


@@ -2395,14 +2420,13 @@ pt-PT:
           centre: Centro desportivo
           reserve: Reserva natural
           military: Área militar
           centre: Centro desportivo
           reserve: Reserva natural
           military: Área militar

-          school:
-          - Escola
-          - universidade
+          school_only: Escola
+          university: Universidade
+          hospital: Hospital

           building: Edifício importante
           station: Estação ferroviária
           building: Edifício importante
           station: Estação ferroviária

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

           tunnel: Linha tracejada = túnel
           bridge: Linha cheia = ponte
           private: Acesso privado
           tunnel: Linha tracejada = túnel
           bridge: Linha cheia = ponte
           private: Acesso privado


@@ -2613,6 +2637,7 @@ pt-PT:
       oauth1_settings: Definições OAuth 1
       oauth2_applications: Aplicações OAuth 2
       oauth2_authorizations: Autorizações OAuth 2
       oauth1_settings: Definições OAuth 1
       oauth2_applications: Aplicações OAuth 2
       oauth2_authorizations: Autorizações OAuth 2

+      muted_users: Utilizadores Silenciados

   oauth:
     authorize:
       title: Autorizar Acesso À Tua Conta
   oauth:
     authorize:
       title: Autorizar Acesso À Tua Conta


@@ -2650,6 +2675,7 @@ pt-PT:
       read_gpx: Ler rotas GPS privadas
       write_gpx: Enviar rotas GPS
       write_notes: Modificar notas
       read_gpx: Ler rotas GPS privadas
       write_gpx: Enviar rotas GPS
       write_notes: Modificar notas

+      write_redactions: Rever dados do mapa

       read_email: ‎Ler e-mail de utilizador
       skip_authorization: Aprovar a aplicação automaticamente
   oauth_clients:
       read_email: ‎Ler e-mail de utilizador
       skip_authorization: Aprovar a aplicação automaticamente
   oauth_clients:


@@ -2828,6 +2854,8 @@ pt-PT:
       my_dashboard: Painel de Controlo
       blocks on me: Quem me bloqueou
       blocks by me: Os meus bloqueios
       my_dashboard: Painel de Controlo
       blocks on me: Quem me bloqueou
       blocks by me: Os meus bloqueios

+      create_mute: Silenciar este utilizador
+      destroy_mute: Ativar este utilizador

       edit_profile: Editar Perfil
       send message: Enviar mensagem
       diary: Diário
       edit_profile: Editar Perfil
       send message: Enviar mensagem
       diary: Diário


@@ -3028,6 +3056,32 @@ pt-PT:
       showing_page: Página %{page}
       next: Seguinte »
       previous: « Anterior
       showing_page: Página %{page}
       next: Seguinte »
       previous: « Anterior

+  user_mutes:
+    index:
+      title: Utilizadores Silenciados
+      my_muted_users: Os meus utilizadores silenciados
+      you_have_muted_n_users:
+        one: Silenciaste %{count} utilizador
+        other: Silenciaste %{count} utilizadores
+      user_mute_explainer: As mensagens de utilizadores silenciados são movidas para
+        uma caixa de entrada separada e não receberás notificações por e-mail.
+      user_mute_admins_and_moderators: Podes silenciar administradores e moderadores,
+        mas as suas mensagens não serão silenciadas.
+      table:
+        thead:
+          muted_user: Utilizador Silenciado
+          actions: Ações
+        tbody:
+          unmute: Ativar
+          send_message: Enviar mensagem
+    create:
+      notice: Silenciaste %{name}.
+      error: |-
+        %{name} não pôde ser silenciado.
+        %{full_message}.
+    destroy:
+      notice: Ativaste %{name}.
+      error: O utilizador não pôde ser silenciado. Por favor, tenta novamente.

   notes:
     index:
       title: Notas submetidas ou comentadas por %{user}
   notes:
     index:
       title: Notas submetidas ou comentadas por %{user}

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 7e3d1a1e2764944c8ce49e424e8c501e36673c70..36ac29c48453befb9a4d146fb5cd2e98efbe4f94 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -7,6 +7,7 @@
 # Author: BraulioBezerra
 # Author: Brunomelnic
 # Author: Cainamarques
 # Author: BraulioBezerra
 # Author: Brunomelnic
 # Author: Cainamarques

+# Author: CorraleH

 # Author: Crazymadlover
 # Author: Cristofer Alves
 # Author: Danieldegroot2
 # Author: Crazymadlover
 # Author: Cristofer Alves
 # Author: Danieldegroot2


@@ -2375,31 +2376,26 @@ pt:
           footway: Caminho de pedestre
           rail: Ferrovia
           subway: Metrô
           footway: Caminho de pedestre
           rail: Ferrovia
           subway: Metrô

-          cable:
-          - Bonde aéreo
-          - telecadeira
-          runway:
-          - Pista de Pouso
-          - pista de taxiamento
+          cable_car: Bonde aéreo
+          chair_lift: Teleférico
+          runway_only: Pista de Pouso
+          taxiway: pista de taxiamento

           apron_only: Pátio de aeródromo
           admin: Limite administrativo
           apron_only: Pátio de aeródromo
           admin: Limite administrativo

-          forest:
-          - Floresta manejada
-          - Bosque nativo
+          vineyard: Vinha
+          forest_only: Floresta manejada
+          wood: Bosque nativo
+          meadow: Prado

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

-          common:
-          - Baldio comunitário
-          - prado
-          - Jardim
+          common_only: 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:
-          - Lago
-          - lago artificial
+          lake_only: Lago
+          reservoir: Reservatório

           farm: Lavoura
           brownfield: Terreno abandonado
           cemetery: Cemitério secular
           farm: Lavoura
           brownfield: Terreno abandonado
           cemetery: Cemitério secular


@@ -2408,14 +2404,13 @@ pt:
           centre: Centro/clube esportivo
           reserve: Reserva ambiental
           military: Área militar
           centre: Centro/clube esportivo
           reserve: Reserva ambiental
           military: Área militar

-          school:
-          - Escola
-          - universidade
+          school_only: Escola
+          university: universidade
+          hospital: Hospital

           building: Edifício importante
           station: Estação ferroviária
           building: Edifício importante
           station: Estação ferroviária

-          summit:
-          - Cume
-          - cume
+          summit_only: Cume
+          peak: cume

           tunnel: Túnel (contorno tracejado)
           bridge: Ponte/viaduto (contorno contínuo)
           private: Acesso restrito
           tunnel: Túnel (contorno tracejado)
           bridge: Ponte/viaduto (contorno contínuo)
           private: Acesso restrito


@@ -2660,6 +2655,7 @@ pt:
       read_gpx: Ler rotas GPS privadas
       write_gpx: Enviar rotas GPS
       write_notes: Modificar notas
       read_gpx: Ler rotas GPS privadas
       write_gpx: Enviar rotas GPS
       write_notes: Modificar notas

+      write_redactions: Rever dados do mapa

       read_email: Ler o endereço de e-mail do usuário
       skip_authorization: Aplicação de aprovação automática
   oauth_clients:
       read_email: Ler o endereço de e-mail do usuário
       skip_authorization: Aplicação de aprovação automática
   oauth_clients:

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 487a3b5ba09f4df5b8c5e9fd2947423dc6023218..aedbac347457c2e85c538d59807801c120fe8864 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -2359,31 +2359,24 @@ ro:
           footway: Trotuar
           rail: Cale ferată
           subway: Stație de metrou
           footway: Trotuar
           rail: Cale ferată
           subway: Stație de metrou

-          cable:
-          - Telecabină
-          - Telescaun
-          runway:
-          - Pistă de Aeroport
-          - taxiway
+          cable_car: Telecabină
+          chair_lift: Telescaun
+          runway_only: Pistă de Aeroport
+          taxiway: taxiway

           apron_only: Aeronavă
           admin: Graniță administrativă
           apron_only: Aeronavă
           admin: Graniță administrativă

-          forest:
-          - Pădure
-          - Lemn
+          forest_only: Pădure
+          wood: Lemn

           golf: Teren de golf
           park: Parc
           golf: Teren de golf
           park: Parc

-          common:
-          - Comun
-          - luncă
-          - grădină
+          common_only: Comun

           resident: Zonă rezidențială
           retail: Spațiul de retail
           industrial: Zonă industrială
           commercial: Zonă comercială
           heathland: Landă
           resident: Zonă rezidențială
           retail: Spațiul de retail
           industrial: Zonă industrială
           commercial: Zonă comercială
           heathland: Landă

-          lake:
-          - Lac
-          - Rezervor
+          lake_only: Lac
+          reservoir: Rezervor

           farm: Fermă
           brownfield: Terenuri industriale dezafectate
           cemetery: Cimitir
           farm: Fermă
           brownfield: Terenuri industriale dezafectate
           cemetery: Cimitir


@@ -2392,14 +2385,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:
-          - Școală
-          - Universitate
+          school_only: Școală
+          university: Universitate

           building: Clădire importantă
           station: Gară
           building: Clădire importantă
           station: Gară

-          summit:
-          - Vârf de munte
-          - Vârf
+          summit_only: Vârf de munte
+          peak: Vârf

           tunnel: Dashed casing = tunel
           bridge: Black casing = pod
           private: Acces privat
           tunnel: Dashed casing = tunel
           bridge: Black casing = pod
           private: Acces privat

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 82a8c0db155750a7aeca28e3f7d2407dde543992..0ba248a414f70258bda8363cc89b3b8e34a710ab 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1830,6 +1830,7 @@ ru:
       to: Кому
       subject: Тема
       date: Дата
       to: Кому
       subject: Тема
       date: Дата

+      actions: Действия

     message_summary:
       unread_button: Пометить как непрочитанное
       read_button: Пометить как прочитанное
     message_summary:
       unread_button: Пометить как непрочитанное
       read_button: Пометить как прочитанное


@@ -1855,6 +1856,7 @@ ru:
         Извините, но сообщения с таким ID нет.
     outbox:
       title: Исходящие
         Извините, но сообщения с таким ID нет.
     outbox:
       title: Исходящие

+      actions: Действия

       messages:
         few: У вас %{count} отправленных сообщения
         many: У вас %{count} отправленных сообщений
       messages:
         few: У вас %{count} отправленных сообщения
         many: У вас %{count} отправленных сообщений


@@ -2316,39 +2318,30 @@ ru:
           tram_only: Трамвай
           trolleybus: Троллейбус
           bus: Автобус
           tram_only: Трамвай
           trolleybus: Троллейбус
           bus: Автобус

-          cable:
-          - Канатная дорога
-          - кресельный подъёмник
-          runway:
-          - Взлётно-посадочная полоса аэропорта
-          - рулёжная дорожка
+          cable_car: Канатная дорога
+          chair_lift: кресельный подъёмник
+          runway_only: Взлётно-посадочная полоса аэропорта
+          taxiway: рулёжная дорожка

           apron_only: Перрон аэродрома
           admin: Административная граница
           apron_only: Перрон аэродрома
           admin: Административная граница

-          orchard:
-          - Фруктовый сад
-          - виноградник
-          forest:
-          - Лес
-          - Роща
+          orchard_only: Фруктовый сад
+          vineyard: Виноградник
+          forest_only: Лес
+          wood: Роща

           farmland: Сельхозугодья
           farmland: Сельхозугодья

-          grass:
-          - Трава
-          - луг
+          grass_only: Трава
+          meadow: Луг

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

-          common:
-          - Общественная земля
-          - луг
-          - сад
+          common_only: Общественная земля

           built_up: Площадь застройки
           resident: Жилой район
           retail: Торговый район
           industrial: Промышленный район
           commercial: Коммерческий район
           heathland: Вересковая пустошь
           built_up: Площадь застройки
           resident: Жилой район
           retail: Торговый район
           industrial: Промышленный район
           commercial: Коммерческий район
           heathland: Вересковая пустошь

-          lake:
-          - Озеро
-          - водохранилище
+          lake_only: Озеро
+          reservoir: Водохранилище

           glacier: Ледник
           farm: Ферма
           brownfield: Расчистка под застройку
           glacier: Ледник
           farm: Ферма
           brownfield: Расчистка под застройку


@@ -2358,15 +2351,13 @@ ru:
           centre: Спортивный центр
           reserve: Заповедник
           military: Военная территория
           centre: Спортивный центр
           reserve: Заповедник
           military: Военная территория

-          school:
-          - Школа
-          - университет
-          - больница
+          school_only: Школа
+          university: Университет
+          hospital: Больница

           building: Значительное здание
           station: Железнодорожная станция
           building: Значительное здание
           station: Железнодорожная станция

-          summit:
-          - Вершина
-          - пик
+          summit_only: Вершина
+          peak: Вершина горы

           tunnel: Туннель (пунктир)
           bridge: Мост (жирная линия)
           private: Частный доступ
           tunnel: Туннель (пунктир)
           bridge: Мост (жирная линия)
           private: Частный доступ


@@ -2990,6 +2981,13 @@ ru:
       showing_page: Страница %{page}
       next: Следующая →
       previous: ← Предыдущая
       showing_page: Страница %{page}
       next: Следующая →
       previous: ← Предыдущая

+  user_mutes:
+    index:
+      table:
+        thead:
+          actions: Действия
+        tbody:
+          send_message: Отправить сообщение

   notes:
     index:
       title: Заметки, созданные или прокомментированный участником %{user}
   notes:
     index:
       title: Заметки, созданные или прокомментированный участником %{user}

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index 89835b0abd435e2c686a570cea1ce3e43c7c3600..a37e7b87bcb478b1e4ace7bbfd9bc53510f10da9 100644 (file)
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -583,12 +583,10 @@ sat:
       table:
         entry:
           footway: ᱛᱟᱲᱟᱢᱦᱚᱨ
       table:
         entry:
           footway: ᱛᱟᱲᱟᱢᱦᱚᱨ

-          forest:
-          - ᱵᱤᱨ
-          - ᱠᱟᱴᱷ
+          forest_only: ᱵᱤᱨ
+          wood: ᱠᱟᱴᱷ

           park: ᱵᱟᱜᱟᱱ
           park: ᱵᱟᱜᱟᱱ

-          school:
-          - ᱤᱛᱩᱱ ᱟᱥᱲᱟ
+          school_only: ᱤᱛᱩᱱ ᱟᱥᱲᱟ

           bicycle_shop: ᱥᱟᱭᱠᱤᱞ ᱫᱩᱠᱟᱹᱱ
           bicycle_parking: ᱥᱟᱭᱠᱤᱞ ᱯᱟᱨᱠᱤᱝ
           toilets: ᱴᱚᱭᱞᱮᱴᱠᱚ
           bicycle_shop: ᱥᱟᱭᱠᱤᱞ ᱫᱩᱠᱟᱹᱱ
           bicycle_parking: ᱥᱟᱭᱠᱤᱞ ᱯᱟᱨᱠᱤᱝ
           toilets: ᱴᱚᱭᱞᱮᱴᱠᱚ

diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index f127b9bf0b3218d99966214c4109970193410d71..17c5f2b4055a98feba1e565767dd8a8897f063a0 100644 (file)
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -2361,31 +2361,24 @@ sc:
           footway: Caminu pro pedones
           rail: Ferrovia
           subway: Metropolitana
           footway: Caminu pro pedones
           rail: Ferrovia
           subway: Metropolitana

-          cable:
-          - Funivia
-          - ascensore carrotzina
-          runway:
-          - Pista de aeroportu
-          - carrera de furriada
+          cable_car: Funivia
+          chair_lift: ascensore carrotzina
+          runway_only: Pista de aeroportu
+          taxiway: carrera de furriada

           apron_only: Àrea de parchègiu de sos aèreos
           admin: Làcana amministrativa
           apron_only: Àrea de parchègiu de sos aèreos
           admin: Làcana amministrativa

-          forest:
-          - Litu
-          - Buscu
+          forest_only: Litu
+          wood: Buscu

           golf: Campu de golf
           park: Parcu
           golf: Campu de golf
           park: Parcu

-          common:
-          - Comunu
-          - pradu
-          - giardinu
+          common_only: 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:
-          - Lagu
-          - riserva de abba
+          lake_only: Lagu
+          reservoir: riserva de abba

           farm: Fatoria
           brownfield: Terrinu industriale abbandonadu
           cemetery: Campusantu
           farm: Fatoria
           brownfield: Terrinu industriale abbandonadu
           cemetery: Campusantu


@@ -2394,14 +2387,12 @@ sc:
           centre: Tzentru isportivu
           reserve: Reserva naturale
           military: Zona militare
           centre: Tzentru isportivu
           reserve: Reserva naturale
           military: Zona militare

-          school:
-          - Iscola
-          - universidade
+          school_only: Iscola
+          university: universidade

           building: Edifìtziu significativu
           station: Istatzione ferroviària
           building: Edifìtziu significativu
           station: Istatzione ferroviària

-          summit:
-          - Cùcuru de monte
-          - cùcuru
+          summit_only: Cùcuru de monte
+          peak: cùcuru

           tunnel: Lìnia trategiada = galleria
           bridge: Oros nieddos = ponte
           private: Atzessu privadu
           tunnel: Lìnia trategiada = galleria
           bridge: Oros nieddos = ponte
           private: Atzessu privadu

diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index f8b75d1efa1a5e377a99a1c33561073e84164fed..735573c2f61257c3b719a11e223023423f916099 100644 (file)
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -1516,30 +1516,24 @@ scn:
           footway: Caminu pidunali
           rail: Ferruvìa
           subway: Mitrupulitana
           footway: Caminu pidunali
           rail: Ferruvìa
           subway: Mitrupulitana

-          cable:
-          - Funivìa
-          - seggiuvìa
-          runway:
-          - Pista d’attirraggiu
-          - pista di rullaggiu
+          cable_car: Funivìa
+          chair_lift: seggiuvìa
+          runway_only: Pista d’attirraggiu
+          taxiway: pista di rullaggiu

           apron_only: Ària di parcheggiu ariupurtuali
           admin: Cunfini amministrativu
           apron_only: Ària di parcheggiu ariupurtuali
           admin: Cunfini amministrativu

-          forest:
-          - Furesta
-          - Voscu
+          forest_only: Furesta
+          wood: Voscu

           golf: Campu di golf
           park: Villa
           golf: Campu di golf
           park: Villa

-          common:
-          - Cumuni
-          - Pratu
+          common_only: 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:
-          - Lacu
-          - lacu artificiali
+          lake_only: Lacu
+          reservoir: lacu artificiali

           farm: Massarìa
           brownfield: Zona di bunìfica
           cemetery: Cimiteru
           farm: Massarìa
           brownfield: Zona di bunìfica
           cemetery: Cimiteru


@@ -1548,14 +1542,12 @@ scn:
           centre: Centru spurtivu
           reserve: Riserva naturali
           military: Zona militari
           centre: Centru spurtivu
           reserve: Riserva naturali
           military: Zona militari

-          school:
-          - Scola
-          - univirsità
+          school_only: Scola
+          university: univirsità

           building: Edificiu mpurtanti
           station: Stazzioni dâ ferruvìa
           building: Edificiu mpurtanti
           station: Stazzioni dâ ferruvìa

-          summit:
-          - Muntagna
-          - Muntagna
+          summit_only: Muntagna
+          peak: Muntagna

           tunnel: Cuntornu trattiatu = jallarìa
           bridge: Cuntornu niurittu = ponti
           private: Accessu privatu
           tunnel: Cuntornu trattiatu = jallarìa
           bridge: Cuntornu niurittu = ponti
           private: Accessu privatu

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index a3b2fda1e1f6541c60d310dd08eba8b226c3f6ce..fc7e1ed5350cd42408236d4f49a3205426f61dfa 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -916,21 +916,18 @@ sco:
     key:
       table:
         entry:
     key:
       table:
         entry:

-          forest:
-            1: Wid
+          wood: Wid

           golf: Gowf coorse
           park: Pairk
           resident: Residential aurie
           retail: Retail aurie
           industrial: Industrial aurie
           commercial: Commercial aurie
           golf: Gowf coorse
           park: Pairk
           resident: Residential aurie
           retail: Retail aurie
           industrial: Industrial aurie
           commercial: Commercial aurie

-          lake:
-          - Loch
+          lake_only: Loch

           farm: Ferm
           military: Militar aurie
           farm: Ferm
           military: Militar aurie

-          school:
-          - Schuil
-          - varsity
+          school_only: Schuil
+          university: varsity

           building: Signeeficant biggin
     welcome:
       title: Walcome!
           building: Signeeficant biggin
     welcome:
       title: Walcome!

diff --git a/config/locales/sh.yml b/config/locales/sh.yml
index fe97e855a43855b77e785a54e26d653cfaf0c534..1e6d91e3d74ac748df64ce8e9de602f73afd9be5 100644 (file)
--- a/config/locales/sh.yml
+++ b/config/locales/sh.yml
@@ -729,30 +729,24 @@ sh:
           footway: Pješačka staza
           rail: Željeznica
           subway: Podzemna željeznica
           footway: Pješačka staza
           rail: Željeznica
           subway: Podzemna željeznica

-          cable:
-          - Kabinska žičara
-          - sedežnica
-          runway:
-          - Aerodromska pista
-          - rulna staza
+          cable_car: Kabinska žičara
+          chair_lift: sedežnica
+          runway_only: Aerodromska pista
+          taxiway: rulna staza

           apron_only: Parking za avione
           admin: Administrativna granica
           apron_only: Parking za avione
           admin: Administrativna granica

-          forest:
-          - Šuma
-          - Šume (prirodne, neodržavane)
+          forest_only: Šuma
+          wood: Šume (prirodne, neodržavane)

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

-          common:
-          - Travnjaci
-          - livada
+          common_only: 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:
-          - Jezero
-          - rezervoar
+          lake_only: Jezero
+          reservoir: rezervoar

           farm: Farma
           brownfield: Gradilište
           cemetery: Groblje
           farm: Farma
           brownfield: Gradilište
           cemetery: Groblje


@@ -761,14 +755,12 @@ sh:
           centre: Sportski centar
           reserve: Rezervat prirode
           military: Vojno područje
           centre: Sportski centar
           reserve: Rezervat prirode
           military: Vojno područje

-          school:
-          - Škola
-          - univerzitet
+          school_only: Škola
+          university: univerzitet

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

-          summit:
-          - Vrh
-          - vrh
+          summit_only: Vrh
+          peak: vrh

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

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 080d69e8d51e7437c6d5a6c4bcd52f0e1e1a26f5..3467431d07ff06bb547a0a4d418b55c7d097f2fa 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -2119,30 +2119,24 @@ sk:
           footway: Chodník pre peších
           rail: Železnica
           subway: Metro
           footway: Chodník pre peších
           rail: Železnica
           subway: Metro

-          cable:
-          - Lanovka
-          - sedačková lanovka
-          runway:
-          - Letisková dráha
-          - pojazdová dráha
+          cable_car: Lanovka
+          chair_lift: sedačková lanovka
+          runway_only: Letisková dráha
+          taxiway: pojazdová dráha

           apron_only: Letisková odbavovacia plocha
           admin: Administratívne hranice
           apron_only: Letisková odbavovacia plocha
           admin: Administratívne hranice

-          forest:
-          - Les (udržiavaný)
-          - Les (neudržiavaný)
+          forest_only: Les (udržiavaný)
+          wood: Les (neudržiavaný)

           golf: Golfové ihrisko
           park: Park
           golf: Golfové ihrisko
           park: Park

-          common:
-          - Pastvina
-          - lúka
+          common_only: 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:
-          - Jazero
-          - nádrž
+          lake_only: Jazero
+          reservoir: nádrž

           farm: Farma
           brownfield: Zborenisko
           cemetery: Cintorín
           farm: Farma
           brownfield: Zborenisko
           cemetery: Cintorín


@@ -2151,14 +2145,12 @@ sk:
           centre: Športové centrum
           reserve: Prírodná rezervácia
           military: Vojenský priestor
           centre: Športové centrum
           reserve: Prírodná rezervácia
           military: Vojenský priestor

-          school:
-          - Škola
-          - univerzita
+          school_only: Škola
+          university: univerzita

           building: Významná budova
           station: Železničná stanica
           building: Významná budova
           station: Železničná stanica

-          summit:
-          - Vrchol
-          - vrchol
+          summit_only: Vrchol
+          peak: vrchol

           tunnel: Čiarkovaný obrys = tunel
           bridge: Čireny obrys = most
           private: Súkromný prístup
           tunnel: Čiarkovaný obrys = tunel
           bridge: Čireny obrys = most
           private: Súkromný prístup

diff --git a/config/locales/skr-arab.yml b/config/locales/skr-arab.yml
index c793e7e775120f4d72880cdd0697ad271b88d111..4bd17ca3c032273e787a6c4b3a51012d7285e520 100644 (file)
--- a/config/locales/skr-arab.yml
+++ b/config/locales/skr-arab.yml
@@ -1217,35 +1217,26 @@ skr-arab:
           tram_only: ٹرام
           trolleybus: ٹرالی بس
           bus: بس
           tram_only: ٹرام
           trolleybus: ٹرالی بس
           bus: بس

-          cable:
-          - کیبل کار
-          - چیئر لفٹ
-          orchard:
-          - بغیچا
-          forest:
-          - جنگل
-          - لکڑ
-          grass:
-          - گھا
-          - چراگاہ
+          cable_car: کیبل کار
+          chair_lift: چیئر لفٹ
+          orchard_only: بغیچا
+          forest_only: جنگل
+          wood: لکڑ
+          grass_only: گھا
+          meadow: چراگاہ

           sand: ریت
           golf: گولف مَیدان
           park: پارک
           sand: ریت
           golf: گولف مَیدان
           park: پارک

-          common:
-          - وقف
-          - چراگاہ
-          - باغ
+          common_only: وقف

           retail: پرچون علاقہ
           industrial: صنعتی علاقہ
           commercial: کمرشل ایریا
           retail: پرچون علاقہ
           industrial: صنعتی علاقہ
           commercial: کمرشل ایریا

-          lake:
-          - جھیل
+          lake_only: جھیل

           glacier: گلیشیئر
           farm: کھیت
           glacier: گلیشیئر
           farm: کھیت

-          school:
-          - سکول
-          - یونی ورسٹی
-          - ہسپتال
+          school_only: سکول
+          university: یونی ورسٹی
+          hospital: ہسپتال

           station: ریلوے ٹیشݨ
           bus_stop: بساں دا اݙا
           stop: اݙہ
           station: ریلوے ٹیشݨ
           bus_stop: بساں دا اݙا
           stop: اݙہ

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 75e5e936ccab920a3ddc06e2f3a3bf4fc7d33752..c221c9d4b41cc29e661cbd38e64e1362476e41a3 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -2421,32 +2421,24 @@ sl:
           tram_only: Tramvaj
           trolleybus: Trolejbus
           bus: Avtobus
           tram_only: Tramvaj
           trolleybus: Trolejbus
           bus: Avtobus

-          cable:
-          - Nihalka
-          - sedežnica
-          runway:
-          - Vzletno-pristajalna steza
-          - povezave
+          cable_car: Nihalka
+          chair_lift: Sedežnica
+          runway_only: Vzletno-pristajalna steza
+          taxiway: Vozna steza

           apron_only: Letališka ploščad
           admin: Upravna razmejitev
           apron_only: Letališka ploščad
           admin: Upravna razmejitev

-          orchard:
-          - Sadovnjak
-          - vinograd
-          forest:
-          - Gozd
-          - gozd
+          orchard_only: Sadovnjak
+          vineyard: Vinograd
+          forest_only: Gozd
+          wood: Gozd

           farmland: Kmetijsko zemljišče
           farmland: Kmetijsko zemljišče

-          grass:
-          - Trava
-          - travnik
+          grass_only: Trava
+          meadow: Travnik

           bare_rock: Gola skala
           sand: Pesek
           golf: Igrišče za golf
           park: Park
           bare_rock: Gola skala
           sand: Pesek
           golf: Igrišče za golf
           park: Park

-          common:
-          - Travniki
-          - travnik
-          - vrt
+          common_only: Travniki

           built_up: Pozidano območje
           resident: Naselje
           retail: Trgovinsko območje
           built_up: Pozidano območje
           resident: Naselje
           retail: Trgovinsko območje


@@ -2454,9 +2446,8 @@ sl:
           commercial: Poslovno območje
           heathland: Grmičevje
           scrubland: Grmičevje
           commercial: Poslovno območje
           heathland: Grmičevje
           scrubland: Grmičevje

-          lake:
-          - Jezero
-          - vodni zbiralnik
+          lake_only: Jezero
+          reservoir: Vodni zbiralnik

           intermittent_water: Presihajoče vodno telo
           glacier: Ledenik
           reef: Greben
           intermittent_water: Presihajoče vodno telo
           glacier: Ledenik
           reef: Greben


@@ -2469,15 +2460,13 @@ sl:
           centre: Športni center
           reserve: Naravni rezervat
           military: Vojaško območje
           centre: Športni center
           reserve: Naravni rezervat
           military: Vojaško območje

-          school:
-          - Šola
-          - univerza
-          - bolnišnica
+          school_only: Šola
+          university: Univerza
+          hospital: Bolnišnica

           building: Pomembna stavba
           station: Železniška postaja
           building: Pomembna stavba
           station: Železniška postaja

-          summit:
-          - Vrh
-          - vrh
+          summit_only: Vrh
+          peak: Vrh

           tunnel: Črtkana obroba = predor
           bridge: Krepka obroba = most
           private: Zasebni dostop
           tunnel: Črtkana obroba = predor
           bridge: Krepka obroba = most
           private: Zasebni dostop


@@ -2727,6 +2716,7 @@ sl:
       read_gpx: Branje zasebnih sledi GPS
       write_gpx: Nalaganje sledi GPS
       write_notes: Spreminjanje opomb
       read_gpx: Branje zasebnih sledi GPS
       write_gpx: Nalaganje sledi GPS
       write_notes: Spreminjanje opomb

+      write_redactions: Skrij podatke na zemljevidu

       read_email: Branje uporabnikovega e-poštnega naslova
       skip_authorization: Samodejna odobritev aplikacije
   oauth_clients:
       read_email: Branje uporabnikovega e-poštnega naslova
       skip_authorization: Samodejna odobritev aplikacije
   oauth_clients:


@@ -3071,11 +3061,11 @@ sl:
     blocks_on:
       title: Blokiranja uporabnika %{name}
       heading_html: Seznam blokiranj uporabnika %{name}
     blocks_on:
       title: Blokiranja uporabnika %{name}
       heading_html: Seznam blokiranj uporabnika %{name}

-      empty: Uporabnik/ca %{name} še ni bil/a blokiran/a.
+      empty: Uporabnik_ca %{name} še ni bil_a blokiran_a.

     blocks_by:
       title: Dana blokiranja uporabnika_ce %{name}
       heading_html: Seznam izvedenih blokiranj uporabnika %{name}
     blocks_by:
       title: Dana blokiranja uporabnika_ce %{name}
       heading_html: Seznam izvedenih blokiranj uporabnika %{name}

-      empty: Uporabnik/ca %{name} ni blokiral/a še nikogar.
+      empty: Uporabnik_ca %{name} ni blokiral_a še nikogar.

     show:
       title: '%{block_by} je blokiral uporabnika %{block_on}'
       heading_html: '%{block_by} je blokiral uporabnika %{block_on}'
     show:
       title: '%{block_by} je blokiral uporabnika %{block_on}'
       heading_html: '%{block_by} je blokiral uporabnika %{block_on}'

diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 240b48c9f771bbf4a71fbb26a182ec66c9ac9c18..b4dd43ef2db2700219fc538ce01e4e4284cbe353 100644 (file)
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1182,14 +1182,12 @@ sq:
         entry:
           centre: Qendër sportive
           military: Zonë ushtarake
         entry:
           centre: Qendër sportive
           military: Zonë ushtarake

-          school:
-          - Shkollë
-          - Universitet
+          school_only: Shkollë
+          university: Universitet

           building: Ndërtesë
           station: Stacioni hekurudhor
           building: Ndërtesë
           station: Stacioni hekurudhor

-          summit:
-          - Samit
-          - majë
+          summit_only: Samit
+          peak: majë

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

diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index a0cb37ae5be5ba30c8f407170106b030eecf25a5..3125108f284fd414a0e7d1a2b53b5a93e549d022 100644 (file)
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1032,30 +1032,24 @@ sr-Latn:
           footway: Pešačka staza
           rail: Železnička pruga
           subway: Podzemna železnica
           footway: Pešačka staza
           rail: Železnička pruga
           subway: Podzemna železnica

-          cable:
-          - Žičara
-          - sedišnica
-          runway:
-          - Aerodromska pista
-          - rulne staze
+          cable_car: Žičara
+          chair_lift: sedišnica
+          runway_only: Aerodromska pista
+          taxiway: rulne staze

           apron_only: Aerodromski peron
           admin: Administrativna granica
           apron_only: Aerodromski peron
           admin: Administrativna granica

-          forest:
-          - Šuma
-          - Šuma
+          forest_only: Šuma
+          wood: Šuma

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

-          common:
-          - Poljana
-          - livada
+          common_only: 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:
-          - Jezero
-          - rezervoar
+          lake_only: Jezero
+          reservoir: rezervoar

           farm: Farma
           brownfield: Građevinsko zemljište
           cemetery: Groblje
           farm: Farma
           brownfield: Građevinsko zemljište
           cemetery: Groblje


@@ -1064,14 +1058,12 @@ sr-Latn:
           centre: Sportski centar
           reserve: Rezervat prirode
           military: Vojno područje
           centre: Sportski centar
           reserve: Rezervat prirode
           military: Vojno područje

-          school:
-          - Škola
-          - univerzitet
+          school_only: Škola
+          university: univerzitet

           building: Značajna zgrada
           station: Železnička stanica
           building: Značajna zgrada
           station: Železnička stanica

-          summit:
-          - Uzvišenje
-          - vrh
+          summit_only: Uzvišenje
+          peak: vrh

           tunnel: Isprekidan okvir – tunel
           bridge: Crni okvir – most
           private: Privatni posed
           tunnel: Isprekidan okvir – tunel
           bridge: Crni okvir – most
           private: Privatni posed

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 0412f37e4214956908e6c3c8111e5c133dfac740..6a982b2130f54eb25b703677f5916e1b76621f6c 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1672,30 +1672,25 @@ sr:
           subway: Подземна железница
           trolleybus: Тролејбус
           bus: Аутобус
           subway: Подземна железница
           trolleybus: Тролејбус
           bus: Аутобус

-          cable:
-          - Жичара
-          - седишница
-          runway:
-          - Аеродромска писта
-          - рулне стазе
+          cable_car: Жичара
+          chair_lift: седишница
+          runway_only: Аеродромска писта
+          taxiway: Рулна стаза

           apron_only: Аеродромски перон
           admin: Административна граница
           apron_only: Аеродромски перон
           admin: Административна граница

-          forest:
-          - Шума
-          - шума
+          forest_only: Шума
+          wood: Шума
+          meadow: Ливада

           golf: Голф терен
           park: Парк
           golf: Голф терен
           park: Парк

-          common:
-          - Пољана
-          - ливада
+          common_only: Пољана

           resident: Стамбено подручје
           retail: Малопродајно подручје
           industrial: Индустријско подручје
           commercial: Пословно подручје
           heathland: Пустош
           resident: Стамбено подручје
           retail: Малопродајно подручје
           industrial: Индустријско подручје
           commercial: Пословно подручје
           heathland: Пустош

-          lake:
-          - Језеро
-          - резервоар
+          lake_only: Језеро
+          reservoir: Резервоар

           farm: Фарма
           brownfield: Грађевинско земљиште
           cemetery: Гробље
           farm: Фарма
           brownfield: Грађевинско земљиште
           cemetery: Гробље


@@ -1704,14 +1699,13 @@ sr:
           centre: Спортски центар
           reserve: Резерват природе
           military: Војно подручје
           centre: Спортски центар
           reserve: Резерват природе
           military: Војно подручје

-          school:
-          - Школа
-          - универзитет
+          school_only: Школа
+          university: Универзитет
+          hospital: Болница

           building: Значајна зграда
           station: Железничка станица
           building: Значајна зграда
           station: Железничка станица

-          summit:
-          - Узвишење
-          - врх
+          summit_only: Узвишење
+          peak: Врх

           tunnel: Испрекидан оквир – тунел
           bridge: Црни оквир – мост
           private: Приватни посед
           tunnel: Испрекидан оквир – тунел
           bridge: Црни оквир – мост
           private: Приватни посед

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 3a49387ba3d4c924050876051bf2c0b971fc279f..792778330ffaf61f414070a4a1eb2dacfd5ef4c7 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -2323,31 +2323,24 @@ sv:
           footway: Gångväg
           rail: Järnväg
           subway: Tunnelbana
           footway: Gångväg
           rail: Järnväg
           subway: Tunnelbana

-          cable:
-          - Linbana
-          - stollift
-          runway:
-          - Landningsbana
-          - taxibana
+          cable_car: Linbana
+          chair_lift: stollift
+          runway_only: Landningsbana
+          taxiway: taxibana

           apron_only: Flygplatsplatta
           admin: Administrativ gräns
           apron_only: Flygplatsplatta
           admin: Administrativ gräns

-          forest:
-          - Kulturskog
-          - Naturskog
+          forest_only: Kulturskog
+          wood: Naturskog

           golf: Golfbana
           park: Park
           golf: Golfbana
           park: Park

-          common:
-          - Allmänning
-          - äng
-          - trädgård
+          common_only: 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:
-          - Sjö
-          - vattenmagasin
+          lake_only: Sjö
+          reservoir: vattenmagasin

           farm: Bondgård
           brownfield: Förfallen industritomt
           cemetery: Begravningsplats
           farm: Bondgård
           brownfield: Förfallen industritomt
           cemetery: Begravningsplats


@@ -2356,14 +2349,12 @@ sv:
           centre: Idrottsanläggning
           reserve: Naturreservat
           military: Militärområde
           centre: Idrottsanläggning
           reserve: Naturreservat
           military: Militärområde

-          school:
-          - Skola
-          - universitet
+          school_only: Skola
+          university: universitet

           building: Viktig byggnad
           station: Järnvägsstation
           building: Viktig byggnad
           station: Järnvägsstation

-          summit:
-          - Höjd
-          - topp
+          summit_only: Höjd
+          peak: topp

           tunnel: Streckade kanter = tunnel
           bridge: Svarta kanter = bro
           private: Privat tillgång
           tunnel: Streckade kanter = tunnel
           bridge: Svarta kanter = bro
           private: Privat tillgång

diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 04d5acb8a8b5f54b200c3148e4587db58b52952e..85e7d5faf78b6b1859e01c227b3f87fe4cc1070c 100644 (file)
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -41,7 +41,7 @@ ta:
         update: புதுப்பி
       redaction:
         create: படித்திருத்தத்தை உருவாக்கவும்
         update: புதுப்பி
       redaction:
         create: படித்திருத்தத்தை உருவாக்கவும்

-        update: பà®\9fிதிரà¯\81தà¯\8dததà¯\8dதà¯\88à®\9aà¯\8d à®\9aà¯\87மிà®\95à¯\8dà®\95வà¯\81à®®à¯\8d
+        update: பà®\9fிதà¯\8dதிரà¯\81தà¯\8dததà¯\8dதà¯\88à®\9aà¯\8d à®\9aà¯\87மி

       trace:
         create: பதிவேற்று
         update: மாற்றங்களை சேமி
       trace:
         create: பதிவேற்று
         update: மாற்றங்களை சேமி


@@ -83,7 +83,7 @@ ta:
       tracepoint: சுவடு புள்ளி
       tracetag: சுவடு இணைப்பு
       user: பயனர்
       tracepoint: சுவடு புள்ளி
       tracetag: சுவடு இணைப்பு
       user: பயனர்

-      user_preference: பயனரà¯\8d விரà¯\81பà¯\8dபதà¯\8dதà¯\87à®°à¯\8dவà¯\81
+      user_preference: பயனரà¯\8d விரà¯\81பà¯\8dபமà¯\8d

       user_token: பயனர் அடையாளம்
       way: வழி
       way_node: வழி முனையம்
       user_token: பயனர் அடையாளம்
       way: வழி
       way_node: வழி முனையம்


@@ -617,7 +617,7 @@ ta:
       title: தகவலை வாசிக்கவும்
       reply_button: பதிலளி
       unread_button: வாசிக்கப்படாததாக  குறியிடு
       title: தகவலை வாசிக்கவும்
       reply_button: பதிலளி
       unread_button: வாசிக்கப்படாததாக  குறியிடு

-      destroy_button: நீக்குக
+      destroy_button: நீக்கு

     sent_message_summary:
       destroy_button: நீக்கு
     destroy:
     sent_message_summary:
       destroy_button: நீக்கு
     destroy:


@@ -671,7 +671,7 @@ ta:
     export:
       title: ஏற்றுமதி செய்
       licence: உரிமம்
     export:
       title: ஏற்றுமதி செய்
       licence: உரிமம்

-      options: விரà¯\81பà¯\8dபதà¯\8d தà¯\87à®°à¯\8dவுகள்
+      options: தà¯\86ரிவுகள்

       format: வடிவமைப்பு
       scale: அளவுவீதம்
       max: அதிகபட்சம்
       format: வடிவமைப்பு
       scale: அளவுவீதம்
       max: அதிகபட்சம்


@@ -683,7 +683,7 @@ ta:
       search_results: தேடல் முடிவுகள்
       close: மூடு
     search:
       search_results: தேடல் முடிவுகள்
       close: மூடு
     search:

-      search: தà¯\87à®\9fலà¯\8d
+      search: தà¯\87à®\9fà¯\81

       submit_text: செல்
     key:
       table:
       submit_text: செல்
     key:
       table:


@@ -692,28 +692,23 @@ ta:
           secondary: இரண்டாம் நிலை சாலை
           unclassified: வகைப்படுத்தாத சாலை
           rail: இரயில்வே
           secondary: இரண்டாம் நிலை சாலை
           unclassified: வகைப்படுத்தாத சாலை
           rail: இரயில்வே

-          forest:
-          - காடு
-          - விறகு
+          forest_only: காடு
+          wood: விறகு

           park: பூங்கா
           park: பூங்கா

-          common:
-          - பொதுவான
+          common_only: பொதுவான

           industrial: தொழிற்சாலை பகுதி
           commercial: வணிக பகுதி
           industrial: தொழிற்சாலை பகுதி
           commercial: வணிக பகுதி

-          lake:
-          - ஏரி
-          - நீர்த்தேக்கம்
+          lake_only: ஏரி
+          reservoir: நீர்த்தேக்கம்

           farm: பண்ணை
           centre: விளையாட்டு மையம்
           military: ராணுவ பகுதி
           farm: பண்ணை
           centre: விளையாட்டு மையம்
           military: ராணுவ பகுதி

-          school:
-          - பள்ளி
-          - பல்கலைக்கழகம்
+          school_only: பள்ளி
+          university: பல்கலைக்கழகம்

           building: குறிப்பிடத்தக்க கட்டிடம்
           station: தொடர்வண்டி நிலையம்
           building: குறிப்பிடத்தக்க கட்டிடம்
           station: தொடர்வண்டி நிலையம்

-          summit:
-          - உச்சி மாநாடு
-          - உயரமான இடம்
+          summit_only: உச்சி மாநாடு
+          peak: உயரமான இடம்

           private: தனியார் அனுமதி
           construction: சாலைகளில்  கட்டுமானப் பணிகள் நடந்து வருகின்றன.
           toilets: கழிவறைகள்
           private: தனியார் அனுமதி
           construction: சாலைகளில்  கட்டுமானப் பணிகள் நடந்து வருகின்றன.
           toilets: கழிவறைகள்


@@ -742,7 +737,7 @@ ta:
       tags: 'குறிச்சொற்கள்:'
       none: ஏதுமில்லை
       edit_trace: இந்த சுவடை திருத்து
       tags: 'குறிச்சொற்கள்:'
       none: ஏதுமில்லை
       edit_trace: இந்த சுவடை திருத்து

-      delete_trace: à®\87நà¯\8dத à®\9aà¯\81வà®\9fà¯\88 நà¯\80à®\95à¯\8dà®\95வà¯\81à®®à¯\8d
+      delete_trace: à®\87à®\9aà¯\8dà®\9aà¯\81à®\9aà¯\81வà®\9fà¯\8dà®\9fà¯\88 நà¯\80à®\95à¯\8dà®\95à¯\81

       trace_not_found: சுவடு காணப்படவில்லை!
     trace:
       more: மேலும்
       trace_not_found: சுவடு காணப்படவில்லை!
     trace:
       more: மேலும்


@@ -802,7 +797,7 @@ ta:
       confirm_user: இந்த பயனரை உறுதிசெய்
       hide_user: இந்த பயனரை மறை
       unhide_user: இந்த பயனரை மறைத்ததை நீக்கு
       confirm_user: இந்த பயனரை உறுதிசெய்
       hide_user: இந்த பயனரை மறை
       unhide_user: இந்த பயனரை மறைத்ததை நீக்கு

-      delete_user: à®\87பà¯\8dபயனரà¯\88 நà¯\80à®\95à¯\8dà®\95வà¯\81à®®à¯\8d
+      delete_user: à®\87பà¯\8dபயனரà¯\88 நà¯\80à®\95à¯\8dà®\95à¯\81

       confirm: உறுதிசெய்
     index:
       title: பயனர்கள்
       confirm: உறுதிசெய்
     index:
       title: பயனர்கள்

diff --git a/config/locales/te.yml b/config/locales/te.yml
index b3fbbda7374032da72908bd4e1bc074a0aad2061..9fb0262585de97846038e9428b4bbdc14b68646d 100644 (file)
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -2003,29 +2003,23 @@ te:
           footway: కాల్దారి
           rail: రైలుమార్గం
           subway: కిందారి
           footway: కాల్దారి
           rail: రైలుమార్గం
           subway: కిందారి

-          cable:
-          - కేబుల్ కారు
-          - చెయిర్ లిఫ్ట్
-          runway:
-          - విమానాశ్రయం రన్‌వే
-          - టాక్సీ వే
+          cable_car: కేబుల్ కారు
+          chair_lift: చెయిర్ లిఫ్ట్
+          runway_only: విమానాశ్రయం రన్‌వే
+          taxiway: టాక్సీ వే

           apron_only: విమానాశ్రయం ఏప్రాన్
           admin: పరిపాలనా సరిహద్దు
           apron_only: విమానాశ్రయం ఏప్రాన్
           admin: పరిపాలనా సరిహద్దు

-          forest:
-          - అడవి
-          - కలప
+          forest_only: అడవి
+          wood: కలప

           golf: గోల్ఫ్ కోర్సు
           park: పార్కు
           golf: గోల్ఫ్ కోర్సు
           park: పార్కు

-          common:
-          - పచ్చికబయలు
-          - పచ్చికబయలు
+          common_only: పచ్చికబయలు

           resident: నివాస ప్రాంతం
           retail: రిటెయిల్ ప్రదేశం
           industrial: పారిశ్రామిక ప్రదేశం
           commercial: వాణిజ్య ప్రదేశం
           resident: నివాస ప్రాంతం
           retail: రిటెయిల్ ప్రదేశం
           industrial: పారిశ్రామిక ప్రదేశం
           commercial: వాణిజ్య ప్రదేశం

-          lake:
-          - సరస్సు
-          - జలాశయం
+          lake_only: సరస్సు
+          reservoir: జలాశయం

           farm: పొలాలు
           brownfield: బ్రౌన్‌ఫీల్డ్ స్థలం
           cemetery: స్మశానం
           farm: పొలాలు
           brownfield: బ్రౌన్‌ఫీల్డ్ స్థలం
           cemetery: స్మశానం


@@ -2033,13 +2027,11 @@ te:
           centre: క్రీడా కేంద్రం
           reserve: ప్రకృతి సంరక్షణ కేంద్రం
           military: మిలిటరీ ప్రదేశం
           centre: క్రీడా కేంద్రం
           reserve: ప్రకృతి సంరక్షణ కేంద్రం
           military: మిలిటరీ ప్రదేశం

-          school:
-          - పాఠశాల
-          - విశ్వవిద్యాలయం
+          school_only: పాఠశాల
+          university: విశ్వవిద్యాలయం

           building: ప్రముఖ కట్టడము
           station: రైల్వే స్టేషన్
           building: ప్రముఖ కట్టడము
           station: రైల్వే స్టేషన్

-          summit:
-            1: శిఖరం
+          peak: శిఖరం

           bridge: Black casing = వంతెన
           construction: నిర్మాణంలో ఉన్న రహదార్లు
           bicycle_shop: సైకిలు దుకాణం
           bridge: Black casing = వంతెన
           construction: నిర్మాణంలో ఉన్న రహదార్లు
           bicycle_shop: సైకిలు దుకాణం

diff --git a/config/locales/th.yml b/config/locales/th.yml
index 17399a6b3cb8e0d9083c5d811b21ea610de629a3..35d9a2b0d885c3e86a5f83b173048f7553ced53b 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1647,30 +1647,24 @@ th:
           footway: ทางเดินเท้า
           rail: ทางรถไฟ
           subway: รถไฟใต้ดิน
           footway: ทางเดินเท้า
           rail: ทางรถไฟ
           subway: รถไฟใต้ดิน

-          cable:
-          - รถกระเช้า
-          - รถกระเช้าเปลือย
-          runway:
-          - ทางวิ่งสนามบิน
-          - ทางขับเครื่องบิน
+          cable_car: รถกระเช้า
+          chair_lift: รถกระเช้าเปลือย
+          runway_only: ทางวิ่งสนามบิน
+          taxiway: ทางขับเครื่องบิน

           apron_only: โรงซ่อมบำรุงเครื่องบิน
           admin: ขอบเขตการปกครอง
           apron_only: โรงซ่อมบำรุงเครื่องบิน
           admin: ขอบเขตการปกครอง

-          forest:
-          - ป่า
-          - ไม้
+          forest_only: ป่า
+          wood: ไม้

           golf: สนามกอล์ฟ
           park: สวน
           golf: สนามกอล์ฟ
           park: สวน

-          common:
-          - ที่ส่วนกลาง
-          - ทุ่งหญ้า
+          common_only: ที่ส่วนกลาง

           resident: เขตที่พักอาศัย
           retail: พื้นที่พาณิชยกรรม
           industrial: พื้นที่อุตสาหกรรม
           commercial: พื้นที่พาณิชยกรรม
           heathland: ทุ่งไม้พุ่ม
           resident: เขตที่พักอาศัย
           retail: พื้นที่พาณิชยกรรม
           industrial: พื้นที่อุตสาหกรรม
           commercial: พื้นที่พาณิชยกรรม
           heathland: ทุ่งไม้พุ่ม

-          lake:
-          - ทะเลสาบ
-          - อ่างเก็บน้ำ
+          lake_only: ทะเลสาบ
+          reservoir: อ่างเก็บน้ำ

           farm: ไร่นา
           brownfield: พื้นที่อุตสาหกรรมเดิม
           cemetery: สุสาน
           farm: ไร่นา
           brownfield: พื้นที่อุตสาหกรรมเดิม
           cemetery: สุสาน


@@ -1679,14 +1673,12 @@ th:
           centre: ศูนย์กีฬา
           reserve: พื้นที่สงวนธรรมชาติ
           military: เขตทหาร
           centre: ศูนย์กีฬา
           reserve: พื้นที่สงวนธรรมชาติ
           military: เขตทหาร

-          school:
-          - โรงเรียน
-          - มหาวิทยาลัย
+          school_only: โรงเรียน
+          university: มหาวิทยาลัย

           building: อาคารสำคัญ
           station: สถานีรถไฟ
           building: อาคารสำคัญ
           station: สถานีรถไฟ

-          summit:
-          - ยอดเขา
-          - ยอดเขา
+          summit_only: ยอดเขา
+          peak: ยอดเขา

           tunnel: เส้นประ = อุโมงค์
           bridge: เส้นทึบ = สะพาน
           private: พื้นที่ส่วนบุคคล
           tunnel: เส้นประ = อุโมงค์
           bridge: เส้นทึบ = สะพาน
           private: พื้นที่ส่วนบุคคล

diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 82a23cbfeff5c9dd5e7825e233abcc3a6fee4cd2..379c97d2b04159baf2f459e61dd6f64b6bba84d2 100644 (file)
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -1688,31 +1688,24 @@ tl:
           footway: Lakaran ng tao
           rail: Daambakal
           subway: Daanang pang-ilalim
           footway: Lakaran ng tao
           rail: Daambakal
           subway: Daanang pang-ilalim

-          cable:
-          - Kotse ng kable
-          - upuang inaangat
-          runway:
-          - Rampa ng Paliparan
-          - daanan ng taksi
+          cable_car: Kotse ng kable
+          chair_lift: upuang inaangat
+          runway_only: Rampa ng Paliparan
+          taxiway: daanan ng taksi

           apron_only: Tapis ng paliparan
           admin: Hangganang pampangangasiwa
           apron_only: Tapis ng paliparan
           admin: Hangganang pampangangasiwa

-          forest:
-          - Gubat
-          - Kahoy
+          forest_only: Gubat
+          wood: Kahoy

           golf: Kurso ng golp
           park: Liwasan
           golf: Kurso ng golp
           park: Liwasan

-          common:
-          - Karaniwan
-          - kaparangan
-          - halamanan
+          common_only: 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:
-          - Lawa
-          - tinggalan ng tubig
+          lake_only: Lawa
+          reservoir: tinggalan ng tubig

           farm: Bukid
           brownfield: Pook ng kayumangging bukirin
           cemetery: Libingan
           farm: Bukid
           brownfield: Pook ng kayumangging bukirin
           cemetery: Libingan


@@ -1721,14 +1714,12 @@ 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:
-          - Paaralan
-          - pamantasan
+          school_only: Paaralan
+          university: pamantasan

           building: Makabuluhang gusali
           station: Himpilan ng daambakal
           building: Makabuluhang gusali
           station: Himpilan ng daambakal

-          summit:
-          - Taluktok
-          - tugatog
+          summit_only: Taluktok
+          peak: tugatog

           tunnel: Ginitlingang pambalot = lagusan
           bridge: Itim na pambalot = tulay
           private: Pribadong pagpunta
           tunnel: Ginitlingang pambalot = lagusan
           bridge: Itim na pambalot = tulay
           private: Pribadong pagpunta

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index bcf4e3ebf2132e747cc156b2eb9220807c82fe93..ab4c8538ff8d608322335cc8785a059b85d799f1 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -91,6 +91,12 @@ tr:
       messages:
         invalid_email_address: geçerli bir e-posta adresi gibi görünmüyor
         email_address_not_routable: yönlendirilebilir değil
       messages:
         invalid_email_address: geçerli bir e-posta adresi gibi görünmüyor
         email_address_not_routable: yönlendirilebilir değil

+      models:
+        user_mute:
+          attributes:
+            subject:
+              format: '%{message}'
+          is_already_muted: zaten sessize alındı

     models:
       acl: Erişim Kontrol Listesi
       changeset: Değişiklik Kaydı
     models:
       acl: Erişim Kontrol Listesi
       changeset: Değişiklik Kaydı


@@ -1813,11 +1819,13 @@ tr:
       to: Alıcı
       subject: Konu
       date: Tarih
       to: Alıcı
       subject: Konu
       date: Tarih

+      actions: Eylemler

     message_summary:
       unread_button: Okunmadı olarak işaretle
       read_button: Okundu olarak işaretle
       reply_button: Yanıtla
       destroy_button: Sil
     message_summary:
       unread_button: Okunmadı olarak işaretle
       read_button: Okundu olarak işaretle
       reply_button: Yanıtla
       destroy_button: Sil

+      unmute_button: Gelen Kutusuna Taşı

     new:
       title: Mesaj gönder
       send_message_to_html: '%{name} kullanıcısına yeni bir mesaj gönder'
     new:
       title: Mesaj gönder
       send_message_to_html: '%{name} kullanıcısına yeni bir mesaj gönder'


@@ -1832,12 +1840,18 @@ tr:
       body: Üzgünüz, bu kimlik ile bir mesaj yok.
     outbox:
       title: Giden kutusu
       body: Üzgünüz, bu kimlik ile bir mesaj yok.
     outbox:
       title: Giden kutusu

+      actions: Eylemler

       messages:
         one: '%{count} mesaj gönderdiniz'
         other: ' %{count} mesaj gönderdiniz'
       no_sent_messages_html: 'Henüz kimseye mesaj göndermediniz. Yakındaki insanlarla
         iletişime geçmeye ne dersiniz? Deneyin: %{people_mapping_nearby_link}'
       people_mapping_nearby: yakın çevredeki haritacılar
       messages:
         one: '%{count} mesaj gönderdiniz'
         other: ' %{count} mesaj gönderdiniz'
       no_sent_messages_html: 'Henüz kimseye mesaj göndermediniz. Yakındaki insanlarla
         iletişime geçmeye ne dersiniz? Deneyin: %{people_mapping_nearby_link}'
       people_mapping_nearby: yakın çevredeki haritacılar

+    muted:
+      title: Sessize Alınan Mesajlar
+      messages:
+        one: '%{count} sessize alınan mesaj'
+        other: '%{count} sessize alınan mesajınız var'

     reply:
       wrong_user: '`%{user}'' olarak oturum açtınız fakat yanıtlamasını istediğiniz
         mesaj kullanıcıya gönderilmedi. Yanıtlamak için lütfen doğru kullanıcı olarak
     reply:
       wrong_user: '`%{user}'' olarak oturum açtınız fakat yanıtlamasını istediğiniz
         mesaj kullanıcıya gönderilmedi. Yanıtlamak için lütfen doğru kullanıcı olarak


@@ -1856,9 +1870,13 @@ tr:
     heading:
       my_inbox: Gelen kutusu
       my_outbox: Giden Kutum
     heading:
       my_inbox: Gelen kutusu
       my_outbox: Giden Kutum

+      muted_messages: Sessize alınan mesajlar

     mark:
       as_read: Mesaj okundu olarak işaretlendi
       as_unread: Mesaj okunmadı olarak işaretlendi
     mark:
       as_read: Mesaj okundu olarak işaretlendi
       as_unread: Mesaj okunmadı olarak işaretlendi

+    unmute:
+      notice: Mesaj, gelen kutusuna taşındı
+      error: Mesaj, gelen kutusuna taşınamadı.

     destroy:
       destroyed: Mesaj silindi
   passwords:
     destroy:
       destroyed: Mesaj silindi
   passwords:


@@ -2379,32 +2397,24 @@ tr:
           tram_only: Tramvay
           trolleybus: Troleybüs
           bus: Otobüs
           tram_only: Tramvay
           trolleybus: Troleybüs
           bus: Otobüs

-          cable:
-          - Teleferik
-          - gondol
-          runway:
-          - Uçuş pisti
-          - Uçak pisti
+          cable_car: Teleferik
+          chair_lift: Telesiyej
+          runway_only: Uçuş pisti
+          taxiway: Taksi yolu

           apron_only: Havaalanı apronu
           admin: İdari sınırı
           apron_only: Havaalanı apronu
           admin: İdari sınırı

-          orchard:
-          - Meyve bahçesi
-          - üzüm bağı
-          forest:
-          - Orman
-          - orman
+          orchard_only: Meyve bahçesi
+          vineyard: Üzüm bağı
+          forest_only: Orman
+          wood: Koru

           farmland: Tarım arazisi
           farmland: Tarım arazisi

-          grass:
-          - Çimen
-          - çayır
+          grass_only: Çimen
+          meadow: Çayır

           bare_rock: Çıplak kaya
           sand: Kum
           golf: Golf sahası
           park: Park
           bare_rock: Çıplak kaya
           sand: Kum
           golf: Golf sahası
           park: Park

-          common:
-          - Çimen
-          - mera
-          - bahçe
+          common_only: Ç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


@@ -2412,9 +2422,8 @@ 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:
-          - Göl
-          - rezervuar
+          lake_only: Göl
+          reservoir: Rezervuar

           intermittent_water: Aralıklı su birikintisi
           glacier: Buzul
           reef: Resif
           intermittent_water: Aralıklı su birikintisi
           glacier: Buzul
           reef: Resif


@@ -2427,15 +2436,13 @@ 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:
-          - Okul
-          - Üniversite
-          - hastane
+          school_only: Okul
+          university: Üniversite
+          hospital: Hastane

           building: Önemli yapı
           station: Gar
           building: Önemli yapı
           station: Gar

-          summit:
-          - Zirve
-          - Dağ
+          summit_only: Zirve
+          peak: Zirve

           tunnel: çizgili kenar = tünel
           bridge: Siyah kenar = köprü
           private: Özel giriş
           tunnel: çizgili kenar = tünel
           bridge: Siyah kenar = köprü
           private: Özel giriş


@@ -2648,6 +2655,7 @@ tr:
       oauth1_settings: OAuth 1 ayarları
       oauth2_applications: OAuth 2 uygulamaları
       oauth2_authorizations: OAuth 2 yetkilendirmeleri
       oauth1_settings: OAuth 1 ayarları
       oauth2_applications: OAuth 2 uygulamaları
       oauth2_authorizations: OAuth 2 yetkilendirmeleri

+      muted_users: Sessize Alınan Kullanıcılar

   oauth:
     authorize:
       title: Hesabınıza erişimi yetkilendirin
   oauth:
     authorize:
       title: Hesabınıza erişimi yetkilendirin


@@ -2684,6 +2692,7 @@ tr:
       read_gpx: Özel GPS izlerini oku
       write_gpx: GPS izlerini yükle
       write_notes: Notları değiştir
       read_gpx: Özel GPS izlerini oku
       write_gpx: GPS izlerini yükle
       write_notes: Notları değiştir

+      write_redactions: Harita verilerini düzelt

       read_email: Kullanıcı e-posta adresini oku
       skip_authorization: Başvuruyu otomatik onayla
   oauth_clients:
       read_email: Kullanıcı e-posta adresini oku
       skip_authorization: Başvuruyu otomatik onayla
   oauth_clients:


@@ -2860,6 +2869,8 @@ tr:
       my_dashboard: Gösterge Panelim
       blocks on me: Engellendiklerim
       blocks by me: Engellediklerim
       my_dashboard: Gösterge Panelim
       blocks on me: Engellendiklerim
       blocks by me: Engellediklerim

+      create_mute: Bu kullanıcıyı sessize al
+      destroy_mute: Bu kullanıcının sesini aç

       edit_profile: Profili Düzenle
       send message: Mesaj Gönder
       diary: Günlük
       edit_profile: Profili Düzenle
       send message: Mesaj Gönder
       diary: Günlük


@@ -3059,6 +3070,30 @@ tr:
       showing_page: '%{page}. sayfa'
       next: Sonraki »
       previous: « Önceki
       showing_page: '%{page}. sayfa'
       next: Sonraki »
       previous: « Önceki

+  user_mutes:
+    index:
+      title: Sessize Alınan Kullanıcılar
+      my_muted_users: Sessize alınan kullanıcılarım
+      you_have_muted_n_users:
+        one: '%{count} kullanıcıyı sessize aldınız'
+        other: '%{count} kullanıcıyı sessize aldınız'
+      user_mute_explainer: Sessize alınan kullanıcıların mesajları ayrı bir gelen
+        kutusuna taşınır ve e-posta bildirimleri almazsınız.
+      user_mute_admins_and_moderators: Yöneticileri ve moderatörleri sessize alabilirsiniz
+        ancak mesajları sessize alınmayacaktır.
+      table:
+        thead:
+          muted_user: Sessize Alınan Kullanıcı
+          actions: Eylemler
+        tbody:
+          unmute: Sesi Aç
+          send_message: Mesaj gönder
+    create:
+      notice: '%{name} kullanıcısını sessize aldınız.'
+      error: '%{name} sessize alınamadı. %{full_message}.'
+    destroy:
+      notice: '%{name} kullanıcısının sesini açtınız.'
+      error: Kullanıcının sesi açılamadı. Lütfen tekrar deneyin.

   notes:
     index:
       title: '%{user} tarafından gönderilen veya yorumlanan notlar'
   notes:
     index:
       title: '%{user} tarafından gönderilen veya yorumlanan notlar'

diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index ab3cc032767105d928403d8d28c22f3eba405f34..72c8788f05c21a542025daeec15ee1a7576dd779 100644 (file)
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -893,30 +893,24 @@ tt:
           cycleway: Әйләнаяк юлы
           rail: Тимер юл
           subway: Метро
           cycleway: Әйләнаяк юлы
           rail: Тимер юл
           subway: Метро

-          cable:
-          - Канат юлы
+          cable_car: Канат юлы

           admin: Административ чик
           admin: Административ чик

-          forest:
-          - Урман
-          - Агачлык
+          forest_only: Урман
+          wood: Агачлык

           park: Парк
           park: Парк

-          common:
-            1: болын

           resident: Торак районы
           industrial: Сәнәгый район
           heathland: Буш җир
           resident: Торак районы
           industrial: Сәнәгый район
           heathland: Буш җир

-          lake:
-          - Күл
-          - сусаклагыч
+          lake_only: Күл
+          reservoir: сусаклагыч

           farm: Ферма
           cemetery: Зират
           pitch: Спорт мәйданчыгы
           centre: Спорт үзәге
           reserve: Тыюлык
           military: Хәрби зона
           farm: Ферма
           cemetery: Зират
           pitch: Спорт мәйданчыгы
           centre: Спорт үзәге
           reserve: Тыюлык
           military: Хәрби зона

-          school:
-          - Мәктәп
-          - университет
+          school_only: Мәктәп
+          university: университет

           station: Тимер юл станциясе
           toilets: Бәдрәф
   traces:
           station: Тимер юл станциясе
           toilets: Бәдрәф
   traces:

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 5d2374817cda15f96d8fb513deced386079bcd42..1cd0d0b75249e45b0cd3569da8c98bbe52970fd0 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -2411,31 +2411,24 @@ uk:
           tram_only: Трамвай
           trolleybus: Тролейбус
           bus: Автобус
           tram_only: Трамвай
           trolleybus: Тролейбус
           bus: Автобус

-          cable:
-          - Канатна дорога
-          - крісельний підйомник
-          runway:
-          - Злітно-посадкова смуга аеропорту
-          - руліжна доріжка
+          cable_car: Канатна дорога
+          chair_lift: крісельний підйомник
+          runway_only: Злітно-посадкова смуга аеропорту
+          taxiway: руліжна доріжка

           apron_only: Перон аеропорту
           admin: Адміністративна межа
           apron_only: Перон аеропорту
           admin: Адміністративна межа

-          forest:
-          - Ліс
-          - Дерева
+          forest_only: Ліс
+          wood: Дерева

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

-          common:
-          - Суспільні землі
-          - левада
-          - сад
+          common_only: Суспільні землі

           resident: Жила зона
           retail: Торговельний район
           industrial: Промисловий район
           commercial: Бізнесова зона
           heathland: Пустище
           resident: Жила зона
           retail: Торговельний район
           industrial: Промисловий район
           commercial: Бізнесова зона
           heathland: Пустище

-          lake:
-          - Озеро
-          - водосховище
+          lake_only: Озеро
+          reservoir: водосховище

           farm: Ферма
           brownfield: Покинута зона
           cemetery: Кладовище
           farm: Ферма
           brownfield: Покинута зона
           cemetery: Кладовище


@@ -2444,14 +2437,12 @@ uk:
           centre: Спортивний центр
           reserve: Заповідник
           military: Військова зона
           centre: Спортивний центр
           reserve: Заповідник
           military: Військова зона

-          school:
-          - Школа
-          - університет
+          school_only: Школа
+          university: університет

           building: Значна споруда
           station: Залізнична станція
           building: Значна споруда
           station: Залізнична станція

-          summit:
-          - Вершина
-          - пік
+          summit_only: Вершина
+          peak: пік

           tunnel: Тунель (пунктиром)
           bridge: Міст (жирна лінія)
           private: Приватний доступ
           tunnel: Тунель (пунктиром)
           bridge: Міст (жирна лінія)
           private: Приватний доступ

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 5884da8522ba7934b1fbf0a6ed0c368505e9fff4..c9b53e83151dcf10c09742d10c84da5e653ecd25 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -2023,31 +2023,24 @@ vi:
           footway: Đường đi bộ
           rail: Đường sắt
           subway: Đường ngầm
           footway: Đường đi bộ
           rail: Đường sắt
           subway: Đường ngầm

-          cable:
-          - Đường xe cáp
-          - ghế cáp treo
-          runway:
-          - Đường băng
-          - đường băng
+          cable_car: Đường xe cáp
+          chair_lift: ghế cáp treo
+          runway_only: Đường băng
+          taxiway: đường băng

           apron_only: Sân đậu máy bay
           admin: Biên giới hành chính
           apron_only: Sân đậu máy bay
           admin: Biên giới hành chính

-          forest:
-          - Rừng trồng cây
-          - Rừng
+          forest_only: Rừng trồng cây
+          wood: Rừng

           golf: Sân golf
           park: Công viên
           golf: Sân golf
           park: Công viên

-          common:
-          - Đất công
-          - bãi cỏ
-          - vườn
+          common_only: Đấ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:
-          - Hồ
-          - hồ chứa nước
+          lake_only: Hồ
+          reservoir: hồ chứa nước

           farm: Ruộng
           brownfield: Cánh đồng nâu
           cemetery: Nghĩa địa
           farm: Ruộng
           brownfield: Cánh đồng nâu
           cemetery: Nghĩa địa


@@ -2056,14 +2049,12 @@ 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:
-          - Trường học
-          - đại học
+          school_only: Trường học
+          university: đại học

           building: Kiến trúc quan trọng
           station: Nhà ga
           building: Kiến trúc quan trọng
           station: Nhà ga

-          summit:
-          - Đỉnh núi
-          - đồi
+          summit_only: Đỉnh núi
+          peak: đồi

           tunnel: Đường đứt nét = đường hầm
           bridge: Đường rắn = cầu
           private: Đường riêng
           tunnel: Đường đứt nét = đường hầm
           bridge: Đường rắn = cầu
           private: Đường riêng

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 6e1dca55a5284aaa266d94659a7696e13df32c10..ec77e424a867645b812f662819039bf4663d2cd1 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -125,7 +125,10 @@ zh-CN:
         email_address_not_routable: 不可路由
       models:
         user_mute:
         email_address_not_routable: 不可路由
       models:
         user_mute:

-          is_already_muted: 已禁言
+          attributes:
+            subject:
+              format: '%{message}'
+          is_already_muted: 已弱化

     models:
       acl: 访问控制列表
       changeset: 变更集
     models:
       acl: 访问控制列表
       changeset: 变更集


@@ -338,6 +341,7 @@ zh-CN:
         retain_notes: 您的地图注记与注记中的评论，如果有，将被保留，但不可见。
         retain_changeset_discussions: 您在变更集下的讨论，如果有，将被保留。
         retain_email: 您的电子邮件地址将被保留。
         retain_notes: 您的地图注记与注记中的评论，如果有，将被保留，但不可见。
         retain_changeset_discussions: 您在变更集下的讨论，如果有，将被保留。
         retain_email: 您的电子邮件地址将被保留。

+        recent_editing_html: 因为您最近有做出编辑，目前无法删除您的账号。%{time} 后才可删除。

         confirm_delete: 您确定吗？
         cancel: 取消
   accounts:
         confirm_delete: 您确定吗？
         cancel: 取消
   accounts:


@@ -1538,7 +1542,7 @@ zh-CN:
       title_html: 举报%{link}
       missing_params: 不能创建新的举报
       disclaimer:
       title_html: 举报%{link}
       missing_params: 不能创建新的举报
       disclaimer:

-        intro: 在发送您的举报至网站版主前，请确保：
+        intro: 在发送您的举报至网站仲裁员前，请确保：

         not_just_mistake: 您确信这个问题不只是失误
         unable_to_fix: 您无法自行修复问题，或通过您的伙伴社群成员帮助下修复
         resolve_with_user: 您已尝试与有关用户解决问题
         not_just_mistake: 您确信这个问题不只是失误
         unable_to_fix: 您无法自行修复问题，或通过您的伙伴社群成员帮助下修复
         resolve_with_user: 您已尝试与有关用户解决问题


@@ -1749,6 +1753,7 @@ zh-CN:
       read_button: 标记为已读
       reply_button: 回复
       destroy_button: 删除
       read_button: 标记为已读
       reply_button: 回复
       destroy_button: 删除

+      unmute_button: 移至收件箱

     new:
       title: 发消息
       send_message_to_html: 发送新信息给%{name}
     new:
       title: 发消息
       send_message_to_html: 发送新信息给%{name}


@@ -1762,15 +1767,21 @@ zh-CN:
       body: 对不起，没有具有该 id 的消息。
     outbox:
       title: 发件箱
       body: 对不起，没有具有该 id 的消息。
     outbox:
       title: 发件箱

+      actions: 操作

       messages:
         one: 您有 %{count} 条已发送信息
         other: 您有 %{count} 条已发送信息
       no_sent_messages_html: 您尚未发送信息。何不联系一些%{people_mapping_nearby_link}?
       people_mapping_nearby: 在附近绘制地图的人
       messages:
         one: 您有 %{count} 条已发送信息
         other: 您有 %{count} 条已发送信息
       no_sent_messages_html: 您尚未发送信息。何不联系一些%{people_mapping_nearby_link}?
       people_mapping_nearby: 在附近绘制地图的人

+    muted:
+      title: 已弱化消息
+      messages:
+        one: 1 条弱化消息
+        other: 您有 %{count} 条弱化消息

     reply:
       wrong_user: 您已经以 '%{user}' 的身份登录，但是您想要回复的消息并非寄给这个用户。请以正确的用户身份登录以回复这个消息。
     show:
     reply:
       wrong_user: 您已经以 '%{user}' 的身份登录，但是您想要回复的消息并非寄给这个用户。请以正确的用户身份登录以回复这个消息。
     show:

-      title: 阅读信息
+      title: 阅读消息

       reply_button: 回复
       unread_button: 标记为未读
       destroy_button: 删除
       reply_button: 回复
       unread_button: 标记为未读
       destroy_button: 删除


@@ -1781,9 +1792,13 @@ zh-CN:
     heading:
       my_inbox: 我的收件箱
       my_outbox: 我的发件箱
     heading:
       my_inbox: 我的收件箱
       my_outbox: 我的发件箱

+      muted_messages: 已弱化消息

     mark:
       as_read: 标记消息为已读
       as_unread: 标记消息为未读
     mark:
       as_read: 标记消息为已读
       as_unread: 标记消息为未读

+    unmute:
+      notice: 消息已移至收件箱
+      error: 无法将消息移至收件箱。

     destroy:
       destroyed: 消息已删除
   passwords:
     destroy:
       destroyed: 消息已删除
   passwords:


@@ -1963,8 +1978,8 @@ zh-CN:
         introduction_1_osm_foundation: OpenStreetMap 基金会
         introduction_2_html: 只要你表明来源为OpenStreetMap及其贡献者，你就可以自由地复制、分发、传送和改编我们的数据。如果你想转换或者以我们的数据为基础进行创作，你只能采用相同的许可协议发表你的作品。完整的%{legal_code_link}阐明了你的权利和义务。
         introduction_2_legal_code: 法律条款
         introduction_1_osm_foundation: OpenStreetMap 基金会
         introduction_2_html: 只要你表明来源为OpenStreetMap及其贡献者，你就可以自由地复制、分发、传送和改编我们的数据。如果你想转换或者以我们的数据为基础进行创作，你只能采用相同的许可协议发表你的作品。完整的%{legal_code_link}阐明了你的权利和义务。
         introduction_2_legal_code: 法律条款

-        introduction_3_html: 我们的文档根据 %{creative_commons_link} 许可 (CC BY-SA 2.0) 获得许可。
-        introduction_3_creative_commons: Creative Commons Attribution-ShareAlike 2.0
+        introduction_3_html: 我们的文档根据 %{creative_commons_link} 许可协议（CC BY-SA 2.0）获得许可。
+        introduction_3_creative_commons: 知识共享署名-相同方式共享 2.0

         credit_title_html: 如何表明作者是 OpenStreetMap
         credit_1_html: 当您使用 OpenStreetMap 的数据，您会被要求遵循两件事：
         credit_2_1: 通过显示我们的版权声明为 OpenStreetMap 提供署名。
         credit_title_html: 如何表明作者是 OpenStreetMap
         credit_1_html: 当您使用 OpenStreetMap 的数据，您会被要求遵循两件事：
         credit_2_1: 通过显示我们的版权声明为 OpenStreetMap 提供署名。


@@ -2002,12 +2017,13 @@ zh-CN:
            行政边界合并或开发，由澳大利亚联邦根据 %{cc_licence_link} 许可。
         contributors_au_australia: 澳大利亚
         contributors_au_geoscape_australia: Geoscape Australia
            行政边界合并或开发，由澳大利亚联邦根据 %{cc_licence_link} 许可。
         contributors_au_australia: 澳大利亚
         contributors_au_geoscape_australia: Geoscape Australia

-        contributors_au_cc_licence: Creative Commons Attribution 4.0 International
-          licence (CC BY 4.0)
+        contributors_au_cc_licence: 知识共享署名-相同方式共享 4.0 国际许可协议（CC BY 4.0）

         contributors_ca_credit_html: '%{canada}：含有来自GeoBase®，GeoGratis（©
           加拿大自然资源部），CanVec（© 加拿大自然资源部）和StatCan（加拿大统计局地理处）的数据。'
         contributors_ca_canada: 加拿大
         contributors_ca_credit_html: '%{canada}：含有来自GeoBase®，GeoGratis（©
           加拿大自然资源部），CanVec（© 加拿大自然资源部）和StatCan（加拿大统计局地理处）的数据。'
         contributors_ca_canada: 加拿大

-        contributors_cz_cc_licence: 知识共享署名-相同方式共享4.0国际（CC BY 4.0）
+        contributors_cz_credit_html: '%{czechia}：含有来自国家土地测量与地籍管理局依据%{cc_licence_link}许可的数据'
+        contributors_cz_czechia: 捷克
+        contributors_cz_cc_licence: 知识共享署名-相同方式共享 4.0 国际许可协议（CC BY 4.0）

         contributors_fi_credit_html: |-
           %{finland}：包含来自芬兰地形数据库的
           国家土地调查
         contributors_fi_credit_html: |-
           %{finland}：包含来自芬兰地形数据库的
           国家土地调查


@@ -2201,6 +2217,7 @@ zh-CN:
           primary: 一级道路
           secondary: 二级道路
           unclassified: 无等级道路
           primary: 一级道路
           secondary: 二级道路
           unclassified: 无等级道路

+          pedestrian: 人行道

           track: 小路
           bridleway: 马道
           cycleway: 自行车道
           track: 小路
           bridleway: 马道
           cycleway: 自行车道


@@ -2209,38 +2226,44 @@ zh-CN:
           cycleway_local: 本地自行车道
           footway: 步道
           rail: 铁路
           cycleway_local: 本地自行车道
           footway: 步道
           rail: 铁路

+          train: 火车

           subway: 地铁
           subway: 地铁

-          cable:
-          - 缆车
-          - 吊椅缆车
-          runway:
-          - 机场跑道
-          - 滑行道
+          ferry: 渡船
+          light_rail: 轻轨
+          tram_only: 有轨电车
+          trolleybus: 无轨电车
+          bus: 公共汽车
+          cable_car: 缆车
+          chair_lift: 吊椅缆车
+          runway_only: 机场跑道
+          taxiway: 滑行道

           apron_only: 机场停机坪
           admin: 行政区边界
           apron_only: 机场停机坪
           admin: 行政区边界

-          orchard:
-          - 果园
-          - 葡萄园
-          forest:
-          - 森林
-          - 林
-          grass:
-          - 草坪
+          orchard_only: 果园
+          vineyard: 葡萄园
+          forest_only: 森林
+          wood: 树林
+          farmland: 农田
+          grass_only: 草坪
+          meadow: 草甸

           bare_rock: 裸岩
           bare_rock: 裸岩

+          sand: 沙地

           golf: 高尔夫球场
           park: 公园
           golf: 高尔夫球场
           park: 公园

-          common:
-          - 公地
-          - 草甸
-          - 花园
+          common_only: 公地
+          built_up: 建成区

           resident: 居住区
           retail: 零售区
           industrial: 工业区
           commercial: 商业区
           heathland: 荒原
           resident: 居住区
           retail: 零售区
           industrial: 工业区
           commercial: 商业区
           heathland: 荒原

-          lake:
-          - 湖
-          - 水库
+          scrubland: 灌木丛林地
+          lake_only: 湖
+          reservoir: 水库
+          intermittent_water: 间歇性水体
+          glacier: 冰川
+          reef: 礁
+          wetland: 湿地

           farm: 农场
           brownfield: 棕地
           cemetery: 坟场
           farm: 农场
           brownfield: 棕地
           cemetery: 坟场


@@ -2249,20 +2272,20 @@ zh-CN:
           centre: 体育馆
           reserve: 自然保护区
           military: 军事区
           centre: 体育馆
           reserve: 自然保护区
           military: 军事区

-          school:
-          - 学校
-          - 大学
-          - 医院
+          school_only: 学校
+          university: 大学
+          hospital: 医院

           building: 特殊建筑物
           station: 火车站
           building: 特殊建筑物
           station: 火车站

-          summit:
-          - 山峰
-          - 高峰
+          summit_only: 山峰
+          peak: 山峰

           tunnel: 双虚线=隧道
           bridge: 双实线=桥
           tunnel: 双虚线=隧道
           bridge: 双实线=桥

-          private: 私人
-          destination: 目的地进入权
+          private: 私人通行
+          destination: 目的地通行

           construction: 在建道路
           construction: 在建道路

+          bus_stop: 公共汽车站
+          stop: 停车站

           bicycle_shop: 自行车店
           bicycle_parking: 自行车停车场
           toilets: 厕所
           bicycle_shop: 自行车店
           bicycle_parking: 自行车停车场
           toilets: 厕所


@@ -2295,6 +2318,7 @@ zh-CN:
         imports: 导入
         automated_edits: 自动化编辑
       start_mapping: 开始绘制地图
         imports: 导入
         automated_edits: 自动化编辑
       start_mapping: 开始绘制地图

+      continue_authorization: 继续授权

       add_a_note:
         title: 没有时间编辑？添加注记！
         para_1: 如果您这是想做一些微小改动而没有时间登录来学习如何编辑，那添加注记是非常容易的。
       add_a_note:
         title: 没有时间编辑？添加注记！
         para_1: 如果您这是想做一些微小改动而没有时间登录来学习如何编辑，那添加注记是非常容易的。


@@ -2427,6 +2451,7 @@ zh-CN:
       oauth1_settings: OAuth 1设置
       oauth2_applications: OAuth 2应用程序
       oauth2_authorizations: OAuth 2授权
       oauth1_settings: OAuth 1设置
       oauth2_applications: OAuth 2应用程序
       oauth2_authorizations: OAuth 2授权

+      muted_users: 已弱化用户

   oauth:
     authorize:
       title: 授权访问您的账户
   oauth:
     authorize:
       title: 授权访问您的账户


@@ -2461,6 +2486,7 @@ zh-CN:
       read_gpx: 读取私人GPS轨迹
       write_gpx: 上传GPS轨迹
       write_notes: 修改备注
       read_gpx: 读取私人GPS轨迹
       write_gpx: 上传GPS轨迹
       write_notes: 修改备注

+      write_redactions: 编写地图数据

       read_email: 查看用户邮箱地址
       skip_authorization: 自动核准应用
   oauth_clients:
       read_email: 查看用户邮箱地址
       skip_authorization: 自动核准应用
   oauth_clients:


@@ -2609,7 +2635,8 @@ zh-CN:
       my_dashboard: 我的综合面板
       blocks on me: 我的封禁
       blocks by me: 被我封禁
       my_dashboard: 我的综合面板
       blocks on me: 我的封禁
       blocks by me: 被我封禁

-      create_mute: 禁言此用户
+      create_mute: 弱化此用户
+      destroy_mute: 取消弱化此用户

       edit_profile: 编辑个人资料
       send message: 发送消息
       diary: 日记
       edit_profile: 编辑个人资料
       send message: 发送消息
       diary: 日记


@@ -2629,13 +2656,16 @@ zh-CN:
       spam score: 垃圾邮件评分：
       role:
         administrator: 此用户是管理员
       spam score: 垃圾邮件评分：
       role:
         administrator: 此用户是管理员

-        moderator: 此用户是版主
+        moderator: 此用户是仲裁员
+        importer: 此用户是导入者

         grant:
           administrator: 授予管理员权限
         grant:
           administrator: 授予管理员权限

-          moderator: 授予管理员权限
+          moderator: 授予仲裁员权限
+          importer: 授予导入者权限

         revoke:
           administrator: 撤销管理员权限
         revoke:
           administrator: 撤销管理员权限

-          moderator: 撤销管理员权限
+          moderator: 撤销仲裁员权限
+          importer: 撤销导入者权限

       block_history: 激活的封禁
       moderator_history: 执行封禁者
       comments: 评论
       block_history: 激活的封禁
       moderator_history: 执行封禁者
       comments: 评论


@@ -2699,8 +2729,8 @@ zh-CN:
       fail: 无法吊销用户 '%{name}' 角色 '%{role}'。请检查用户和角色是否都正确。
   user_blocks:
     model:
       fail: 无法吊销用户 '%{name}' 角色 '%{role}'。请检查用户和角色是否都正确。
   user_blocks:
     model:

-      non_moderator_update: 必须为管理员才能创建或更新一个封禁。
-      non_moderator_revoke: 必须为管理员才能撤消块。
+      non_moderator_update: 必须为仲裁员才能创建或更新一个封禁。
+      non_moderator_revoke: 必须为仲裁员才能撤消封禁。

     not_found:
       sorry: 对不起，未找到 ID 为 %{id} 的用户封禁。
       back: 返回索引
     not_found:
       sorry: 对不起，未找到 ID 为 %{id} 的用户封禁。
       back: 返回索引


@@ -2721,7 +2751,7 @@ zh-CN:
     create:
       flash: 已建立对用户 %{name} 的封禁
     update:
     create:
       flash: 已建立对用户 %{name} 的封禁
     update:

-      only_creator_can_edit: 只有执行封禁的管理员能编辑它。
+      only_creator_can_edit: 只有执行此封禁的仲裁员才能编辑。

       success: 封禁已更新。
     index:
       title: 用户的封禁
       success: 封禁已更新。
     index:
       title: 用户的封禁


@@ -2793,8 +2823,27 @@ zh-CN:
       next: 下一页 »
       previous: « 上一页
   user_mutes:
       next: 下一页 »
       previous: « 上一页
   user_mutes:

+    index:
+      title: 已弱化用户
+      my_muted_users: 我已弱化的用户
+      you_have_muted_n_users:
+        one: 您已弱化 1 名用户
+        other: 您已弱化 %{count} 名用户
+      user_mute_explainer: 已弱化用户的消息会被移至单独的收件箱，您不会收到电子邮件通知。
+      user_mute_admins_and_moderators: 您可以弱化管理员和仲裁员，但仍会收到他们的消息通知。
+      table:
+        thead:
+          muted_user: 已弱化用户
+          actions: 操作
+        tbody:
+          unmute: 取消弱化
+          send_message: 发送消息
+    create:
+      notice: 您已弱化%{name}。
+      error: 无法弱化%{name}。%{full_message}。

     destroy:
     destroy:

-      error: 无法解除用户禁言。请再试一次。
+      notice: 您取消弱化了%{name}。
+      error: 无法取消弱化用户。请再试一次。

   notes:
     index:
       title: '%{user} 提交或评论的注记'
   notes:
     index:
       title: '%{user} 提交或评论的注记'


@@ -2916,6 +2965,7 @@ zh-CN:
       map_data_zoom_in_tooltip: 放大地图以查看数据
       queryfeature_tooltip: 查询特征
       queryfeature_disabled_tooltip: 放大以查询特征
       map_data_zoom_in_tooltip: 放大地图以查看数据
       queryfeature_tooltip: 查询特征
       queryfeature_disabled_tooltip: 放大以查询特征

+      embed_html_disabled: HTML 嵌入不适用于此地图图层

     changesets:
       show:
         comment: 评论
     changesets:
       show:
         comment: 评论

diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index bc7c4b0bed31fee50901be3d1403f5460e50dad0..55dc7a619e9fdbf2bc3c071892641abcf0849afd 100644 (file)
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1140,29 +1140,25 @@ zh-HK:
           motorway: 高速公路
           rail: 鐵路
           subway: 地鐵
           motorway: 高速公路
           rail: 鐵路
           subway: 地鐵

-          runway:
-          - 機場跑道
+          runway_only: 機場跑道

           apron_only: 機場停機坪
           admin: 行政邊界
           apron_only: 機場停機坪
           admin: 行政邊界

-          forest:
-          - 森林
+          forest_only: 森林

           golf: 哥爾夫球場
           park: 公園
           resident: 住宅區
           industrial: 工業區
           commercial: 商業區
           golf: 哥爾夫球場
           park: 公園
           resident: 住宅區
           industrial: 工業區
           commercial: 商業區

-          lake:
-          - 湖泊
-          - 水庫
+          lake_only: 湖泊
+          reservoir: 水庫

           brownfield: 棕地
           cemetery: 墓地
           pitch: 運動場
           centre: 運動中心
           reserve: 自然保護區
           military: 軍事區
           brownfield: 棕地
           cemetery: 墓地
           pitch: 運動場
           centre: 運動中心
           reserve: 自然保護區
           military: 軍事區

-          school:
-          - 學校
-          - 大學
+          school_only: 學校
+          university: 大學

           station: 火車站
           bicycle_shop: 單車店
           bicycle_parking: 單車停泊處
           station: 火車站
           bicycle_shop: 單車店
           bicycle_parking: 單車停泊處

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 4ba40cc1dfb20cd9f3cc6e6ee969cc70cab677c0..2f31c6cfe41b2b9d55b895651adeb94f0bc7fa8c 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -2204,32 +2204,24 @@ zh-TW:
           tram_only: 路面電車
           trolleybus: 無軌電車
           bus: 公車
           tram_only: 路面電車
           trolleybus: 無軌電車
           bus: 公車

-          cable:
-          - 大型纜車
-          - 升降吊椅
-          runway:
-          - 機場跑道
-          - 滑行道
+          cable_car: 大型纜車
+          chair_lift: 升降吊椅
+          runway_only: 機場跑道
+          taxiway: 滑行道

           apron_only: 機場停機坪
           admin: 行政區邊界
           apron_only: 機場停機坪
           admin: 行政區邊界

-          orchard:
-          - 果園
-          - 葡萄園
-          forest:
-          - 森林
-          - 森林
+          orchard_only: 果園
+          vineyard: 葡萄園
+          forest_only: 森林
+          wood: 森林

           farmland: 農地
           farmland: 農地

-          grass:
-          - 草坪
-          - 牧草地
+          grass_only: 草坪
+          meadow: 牧草地

           bare_rock: 裸岩
           sand: 沙地
           golf: 高爾夫球場
           park: 公園
           bare_rock: 裸岩
           sand: 沙地
           golf: 高爾夫球場
           park: 公園

-          common:
-          - 共有地
-          - 野草地
-          - 花園
+          common_only: 共有地

           built_up: 組成面積
           resident: 住宅區
           retail: 商店區
           built_up: 組成面積
           resident: 住宅區
           retail: 商店區


@@ -2237,9 +2229,8 @@ zh-TW:
           commercial: 商業區
           heathland: 石楠荒地
           scrubland: 灌木叢林地
           commercial: 商業區
           heathland: 石楠荒地
           scrubland: 灌木叢林地

-          lake:
-          - 湖泊
-          - 水庫
+          lake_only: 湖泊
+          reservoir: 水庫

           intermittent_water: 間歇性水體
           glacier: 冰河
           reef: 礁
           intermittent_water: 間歇性水體
           glacier: 冰河
           reef: 礁


@@ -2252,15 +2243,13 @@ zh-TW:
           centre: 運動中心
           reserve: 自然保護區
           military: 軍事區
           centre: 運動中心
           reserve: 自然保護區
           military: 軍事區

-          school:
-          - 學校
-          - 大學
-          - 醫院
+          school_only: 學校
+          university: 大學
+          hospital: 醫院

           building: 重要建築
           station: 鐵路車站
           building: 重要建築
           station: 鐵路車站

-          summit:
-          - 頂峰
-          - 山峰
+          summit_only: 頂峰
+          peak: 山峰

           tunnel: 虛線邊框 = 隧道
           bridge: 黑線邊框 = 橋樑
           private: 私人進出
           tunnel: 虛線邊框 = 隧道
           bridge: 黑線邊框 = 橋樑
           private: 私人進出


@@ -2476,6 +2465,7 @@ zh-TW:
       read_gpx: 讀取私人 GPS 軌跡
       write_gpx: 上傳 GPS 軌跡
       write_notes: 修改註記
       read_gpx: 讀取私人 GPS 軌跡
       write_gpx: 上傳 GPS 軌跡
       write_notes: 修改註記

+      write_redactions: 編寫地圖資料

       read_email: 讀取使用者電子郵件位址
       skip_authorization: 自動核准申請
   oauth_clients:
       read_email: 讀取使用者電子郵件位址
       skip_authorization: 自動核准申請
   oauth_clients: