Localisation updates from https://translatewiki.net.

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 894ebe35d56486e2f3301018eaa9a86c09508be0..b3254f882f643d27e596399b1ac8039a0f6482b2 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -1727,9 +1727,7 @@ af:
           runway:
           - Aanloopbaan
           - vliegtuigrybaan
-          apron:
-          - Lughaweplatform
-          - terminaal
+          apron_only: Lughaweplatform
           admin: Administratiewe grens
           forest:
           - Woud

diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index 5b0b5bcdbbf44d11bcfd04965e48c5df48bd8b63..f698e2cce41ca001bde000c3c31b0b6fd44773d2 100644 (file)
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -918,9 +918,7 @@ aln:
           runway:
           - Aeroporti i pistës
           - taxiway
-          apron:
-          - aeroportit Aeroporti
-          - terminal
+          apron_only: aeroportit Aeroporti
           admin: kufitare administrative
           forest:
           - Pyll

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 3ca038228a34ca453d65b7c4ddec66120a9c546a..52f258f89048c6e78fdd15e80a8bfb0f6bfc40c5 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -17,6 +17,7 @@
 # Author: FiberAhmed
 # Author: Gravitystorm
 # Author: Grille chompa
+# Author: Hanzo64
 # Author: HitomiAkane
 # Author: Houcinee1
 # Author: Hubaishan
@@ -2196,6 +2197,7 @@ ar:
           primary: طريق رئيسي
           secondary: طريق ثانوي
           unclassified: طريق غير مصنّف
+          pedestrian: طريق للمشاة
           track: مسار
           bridleway: مسلك خيول
           cycleway: طريق دراجات
@@ -2211,9 +2213,7 @@ ar:
           runway:
           - مدرج مطار
           - مدرج مطار لمناورات الطائرات
-          apron:
-          - ساحة مطار
-          - صالة مطار
+          apron_only: ساحة مطار
           admin: حدود إدارية
           forest:
           - غابة

diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index a42394593d1ff63167152bf2cbc0d9dbbf4b34f8..13da35bcec0f9ea4efd08fce4ccd11218a97f7b6 100644 (file)
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -783,9 +783,7 @@ arz:
           runway:
           - مدرج مطار للإقلاع/الهبوط
           - مدرج مطار لمناورات الطائرات
-          apron:
-          - ساحه مطار
-          - صاله مطار
+          apron_only: ساحه مطار
           admin: حدود إدارية
           forest:
           - غابة

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 044c990c62317927d9ab70fa11cdeb999f7b109b..572d8f05db30edbb0ff4414fb2312806b90d2b33 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -1712,9 +1712,7 @@ ast:
           runway:
           - Pista d'aeropuertu
           - cai de rodaxe
-          apron:
-          - Aparcamientu d'aviones
-          - terminal
+          apron_only: Aparcamientu d'aviones
           admin: Llende alministrativa
           forest:
           - Área forestal

diff --git a/config/locales/az.yml b/config/locales/az.yml
index 1005881ba42105833b28dcc7f2ca8c6e2d92f46d..f7c3ce4b7cd98067bd945d9a2b9b4ee4fa2477b7 100644 (file)
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -988,8 +988,6 @@ az:
           subway: Metro
           runway:
           - Aeroport uçuş-enmə zolağı
-          apron:
-            1: terminal
           admin: Administrativ sərhəd
           forest:
           - Meşə

diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index e1f3cc62202564740087d3d8206639353a18d9e1..d8514017419bc5178318a7db5bdc0622cd486797 100644 (file)
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -1175,9 +1175,7 @@ be-Tarask:
           runway:
           - Узьлётная паласа
           - рулёжная дарога
-          apron:
-          - Пэрон аэрапорта
-          - тэрмінал
+          apron_only: Пэрон аэрапорта
           admin: Адміністрацыйная мяжа
           forest:
           - Лес

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 1ba5364c4fe3bc68c7cbb778973e40b11071db92..5f4b64934cb1d38049afc50ca4a28ebfee3299db 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1720,20 +1720,21 @@ be:
           cycleway_local: Веладарожка мясцовага значэння
           footway: Пешаходная дарожка
           rail: Чыгунка
+          train: Цягнік
           subway: Метро
+          trolleybus: Тралейбус
+          bus: Аўтобус
           cable:
           - Канатная дарога
           - Крэсельны пад'ёмнік
           runway:
           - Узлетна-пасадачная паласа
           - рулёжная дарожка
-          apron:
-          - Перон аэрапорта
-          - тэрмінал
+          apron_only: Перон аэрапорта
           admin: Адміністрацыйная мяжа
           forest:
           - Лес
-          - Ð\9fушча
+          - пушча
           golf: Поле для гольфа
           park: Парк
           common:
@@ -1747,6 +1748,7 @@ be:
           lake:
           - Возера
           - вадасховішча
+          glacier: Ляднік
           farm: Ферма
           brownfield: Ачышчаная пляцоўка для забудовы
           cemetery: Могілкі

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 4f6378fd47d79f17503a086dbbe82f121d7af67b..cfc70cad6bd6c8f819a14f799e1a1d7185a713c6 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1665,9 +1665,7 @@ bg:
           runway:
           - Летищна писта
           - път за рулиране
-          apron:
-          - Летищен перон
-          - терминал
+          apron_only: Летищен перон
           admin: Административна граница
           forest:
           - Гора

diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 1095046e490f66888265d60c3dc48ebd952ae9fb..f033732c19c09efd90c985abb8a9c35d01172911 100644 (file)
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -1745,8 +1745,6 @@ bn:
           bus: বাস
           cable:
           - ক্যাবল কার
-          apron:
-            1: টার্মিনাল
           admin: প্রশাসনিক সীমানা
           orchard:
           - ফলবাগিচা

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 5eb5192e5a12e10f25ab065d99752152dcccb987..a31fddd8a6cfc6b7fc16f21a486314c4e6e7e9f5 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -2219,6 +2219,7 @@ br:
           primary: Hent bras
           secondary: Hent bihan
           unclassified: Hent n'eo ket rummet
+          pedestrian: Hent evit an dud war-droad
           track: Roudenn
           bridleway: Hent evit kezeg
           cycleway: Roudenn divrodegoù
@@ -2240,9 +2241,7 @@ br:
           runway:
           - Roudenn evit an taksioù
           - Roudenn evit an taksioù
-          apron:
-          - Roudenn aerborzh
-          - termenva
+          apron_only: Roudenn aerborzh
           admin: Bevenn velestradurel
           orchard:
           - Gwerje
@@ -2273,6 +2272,8 @@ br:
           - Lenn
           - mirlec'h
           glacier: Skorneg
+          reef: Karreg
+          wetland: Takad gleborek
           farm: Ti-feurm
           brownfield: Takad greanterezh
           cemetery: Bered
@@ -2284,6 +2285,7 @@ br:
           school:
           - Skol
           - skol-veur
+          - ospital
           building: Savadur pouezus
           station: Porzh-houarn
           summit:

diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index c3bff741d75b876725a67fa035ebc6c41577840f..d4c1f28f3b3f16923ed13ed9c2f0fb5b81f54536 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1202,9 +1202,7 @@ bs:
           runway:
           - Aerodromska pista
           - Aerodromska rulna staza
-          apron:
-          - Parking za avione
-          - terminal
+          apron_only: Parking za avione
           admin: Administrativna granica
           forest:
           - Šume (održavane, od šumarije)

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index a2e56911158f2382994b323dda771be5c1d1613b..08e59e4bd90af3bb4eaf70d757db6e4dc5e1a53b 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -2296,9 +2296,7 @@ ca:
           runway:
           - Pista d'aeroport
           - carrer de rodatge
-          apron:
-          - Estacionament d'avions
-          - terminal
+          apron_only: Estacionament d'avions
           admin: Límit administratiu
           forest:
           - Bosc

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index fc61154623c3e56e88bbef45ce3c3cf6244036a7..6207523811a25f522b88efd2bb494e0eda1b3f87 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -2401,9 +2401,7 @@ cs:
           runway:
           - Vzletová a přistávací dráha
           - pojezdová dráha
-          apron:
-          - Letištní odbavovací plocha
-          - terminál
+          apron_only: Letištní odbavovací plocha
           admin: Administrativní hranice
           forest:
           - Les

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index bef5eccd6de3ef51753a30f884a495305eed1109..16052c304b68ed482c9d04acce1599ad6b838d45 100644 (file)
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1933,9 +1933,7 @@ cy:
           runway:
           - Llwybr glanio
           - thacsiffordd maes awyr
-          apron:
-          - Llain
-          - therminws maes awyr
+          apron_only: Llain
           admin: Ffin gweinyddol
           forest:
           - Coedwig

diff --git a/config/locales/da.yml b/config/locales/da.yml
index a1e1c4524f89d2b1d17b0b4ed6b156f43f827be5..b4aab0c729e2ea3e08a190ade36e7e010828fb25 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1857,6 +1857,8 @@ da:
       flash token bad: Kunne ikke finde denne nøgle, prøv at kontrollere URL'en?
     update:
       flash changed: Din adgangskode er ændret.
+      flash token bad: Fandt ikke den der nøgle. Kunne du måske prøve på at tjekke
+        URL'en?
   preferences:
     show:
       title: Mine præferencer
@@ -2324,6 +2326,7 @@ da:
           primary: Hovedvej (primærrute)
           secondary: Hovedvej (sekundærrute)
           unclassified: Anden vej
+          pedestrian: Gågade
           track: Hjulspor
           bridleway: Ridesti
           cycleway: Cykelsti
@@ -2336,6 +2339,8 @@ da:
           subway: Undergrundsbane
           ferry: Færge
           light_rail: Letbane
+          tram_only: Sporvogn
+          trolleybus: Trolleybus
           bus: Bus
           cable:
           - Kabelvogn
@@ -2343,27 +2348,40 @@ da:
           runway:
           - Landingsbane
           - taxibane
-          apron:
-          - Lufthavnsforplads
-          - terminal
+          apron_only: Lufthavnsforplads
           admin: Administrativ grænse
+          orchard:
+          - Plantage
+          - vingård
           forest:
           - Skov
-          - Skov
+          - træ
+          farmland: Landbrugsjord
+          grass:
+          - Græs
+          - eng
+          bare_rock: Blottet klippe
+          sand: Sand
           golf: Golfbane
           park: Park
           common:
           - Fælled
           - eng
           - have
+          built_up: Bebygget område
           resident: Boligområde
           retail: Detailhandelsområde
           industrial: Industriområde
           commercial: Erhvervsområde
           heathland: Hede
+          scrubland: Buskads
           lake:
           - Sø
           - reservoir
+          intermittent_water: Periodisk vandmasse
+          glacier: Gletsjer
+          reef: Rev
+          wetland: Vådområde
           farm: Gård
           brownfield: Tidligere industriområde
           cemetery: Begravelsesplads
@@ -2375,6 +2393,7 @@ da:
           school:
           - Skole
           - universitet
+          - sygehus
           building: Vigtig bygning
           station: Togstation
           summit:

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 771077d16ad0edfa8645f99a4015d73df8d9d773..25943af1aab8044f29ef3f5387c276ede88d0741 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2418,9 +2418,7 @@ de:
           runway:
           - Start- und Landebahn
           - Rollbahn
-          apron:
-          - Flughafenvorfeld
-          - Terminal
+          apron_only: Flughafenvorfeld
           admin: Landesgrenzen, sonstige Grenzen
           forest:
           - Wald

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index cb0df309e1a53cd1fc9d0454bd6e89ace60f6b6e..1cc685d29d73a23dec8f8a30335933bdc0be107d 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -910,8 +910,6 @@ diq:
           track: Raya Herın
           bridleway: Raya Ancınıştan
           cycleway: Raya Bisiklet
-          apron:
-            1: terminal
           forest:
           - Mêşe
           - Meşe

diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index cecb54c52abf7e6aa94b995457c18c0c45665d77..a21067b81d17c936787cce1164c7d5fff565f9fc 100644 (file)
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -1273,9 +1273,7 @@ dsb:
           runway:
           - Pśizemjeńska cera
           - lětadłowa cera
-          apron:
-          - Pśedpólo lětanišća
-          - terminal
+          apron_only: Pśedpólo lětanišća
           admin: Zastojnstwowa granica
           forest:
           - Góla

diff --git a/config/locales/el.yml b/config/locales/el.yml
index b69b339dee1bab5fb5f31305a7e05513f1ccdb88..cb6dbda5b6a4af29d9e6e3199e65e5f8afc3fd7a 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -2346,9 +2346,7 @@ el:
           runway:
           - Διάδρομος Αεροδρομίου
           - τροχόδρομος
-          apron:
-          - Πίστα προσγείωσης αεροδρομίου
-          - τερματικός σταθμός
+          apron_only: Πίστα προσγείωσης αεροδρομίου
           admin: Διοικητικό όριο
           forest:
           - Δάσος

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index cf783e60b76c2bc8954bb3999719343afca05c9d..406cf67525a6ed7d5b80317ef1845bb7b0a05d8d 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1601,9 +1601,7 @@ en-GB:
           runway:
           - Airport Runway
           - taxiway
-          apron:
-          - Airport apron
-          - terminal
+          apron_only: Airport apron
           admin: Administrative boundary
           forest:
           - Forest

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 85e621e84c89b5a59fede85f0a155e8353f15f05..fb92079a5f230d2845adff128cdc042f4ee66db7 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -2298,6 +2298,7 @@ eo:
           primary: Vojo unua-ranga
           secondary: Vojo dua-ranga
           unclassified: Vojo kvara-ranga
+          pedestrian: Piedirada strato
           track: Vojo kampa
           bridleway: Ĉevalvojo
           cycleway: Bicikla vojo
@@ -2319,9 +2320,7 @@ eo:
           runway:
           - Avia dromo
           - aŭtokur-strato
-          apron:
-          - Aviadil-parkumejo
-          - flugstacio
+          apron_only: Aviadil-parkumejo
           admin: Administra limo
           orchard:
           - Fruktoĝardeno
@@ -2351,7 +2350,10 @@ eo:
           lake:
           - Lago
           - akvorezervujo
+          intermittent_water: Sezona akvujo
           glacier: Glacirivero
+          reef: Rifo
+          wetland: Malsekejo
           farm: Farmobieno
           brownfield: Antaŭ-konstruejo (post-malkonstruado)
           cemetery: Tombejo
@@ -2363,6 +2365,7 @@ eo:
           school:
           - Lernejo
           - universitato
+          - malsanulejo
           building: Grava konstruaĵo
           station: Stacidomo
           summit:

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 70e74fe1e415853f8657ce43360be60c5489f7c4..f7895e0306f38c9e1f7abb6b7ca317a375ba87ea 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -2442,9 +2442,7 @@ es:
           runway:
           - Pista de aeropuerto
           - Calle de rodaje
-          apron:
-          - Rampa aeroportuaria
-          - terminal
+          apron_only: Rampa aeroportuaria
           admin: Límite administrativo
           forest:
           - Bosque

diff --git a/config/locales/et.yml b/config/locales/et.yml
index 1b8935965a11d4d56532aa8ddfa3fbf0325d7cbd..03b14cb181a64fb773edb98fa9cd93945d3dce8e 100644 (file)
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1813,9 +1813,7 @@ et:
           runway:
           - Lennurada
           - ruleerimistee
-          apron:
-          - Lennujaama perroon
-          - terminal
+          apron_only: Lennujaama perroon
           admin: Halduspiir
           forest:
           - Tulundusmets

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 11babb2456dabc41b6aa3e6c1b881c2df1c863c4..14c672e47eddf85d9b71a4c3d72281bbd987bf21 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -2214,9 +2214,7 @@ eu:
           runway:
           - Aireportuko Pista
           - taxi bidea
-          apron:
-          - Aireportu plataforma
-          - terminala
+          apron_only: Aireportu plataforma
           admin: Muga administratiboa
           forest:
           - Baso

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 065950d0129d7340265d9137fb447a931d7e9aca..42169f006969d3673598e516a5291dc705e80927 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -2104,9 +2104,7 @@ fa:
           runway:
           - باند فرودگاه
           - خزش‌راه
-          apron:
-          - پیشگاه فرودگاه
-          - پایانه
+          apron_only: پیشگاه فرودگاه
           admin: مرز اداری
           forest:
           - جنگل

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index ab0dcfb1ecd67b9cd524b1887e9e454c5c06c4b8..0609411e641f969b1c965a5a49ef288f7aec0898 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -2213,9 +2213,7 @@ fi:
           runway:
           - Lentokentän kiitotie
           - rullaustie
-          apron:
-          - Lentokentän asemataso
-          - terminaali
+          apron_only: Lentokentän asemataso
           admin: Hallinnollinen raja
           forest:
           - Talousmetsä

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 55a25b5cc50607ef04af8394cc6a3349f954d79a..87376d3dec45453d86f5fe7680f8d26d07b1eaff 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -90,6 +90,7 @@
 # Author: Vcalame
 # Author: Vega
 # Author: Verdy p
+# Author: Vikoula5
 # Author: Windes
 # Author: Wladek92
 # Author: Yodaspirine
@@ -2470,6 +2471,7 @@ fr:
           primary: Route principale
           secondary: Route secondaire
           unclassified: Route non classifiée
+          pedestrian: Rue piétonne
           track: Piste
           bridleway: Sentier équestre
           cycleway: Piste cyclable
@@ -2481,6 +2483,7 @@ fr:
           train: Train
           subway: Ligne de métro
           ferry: Ferry
+          light_rail: Voie ferrée légère
           tram_only: Tramway
           trolleybus: Trolleybus
           bus: Bus
@@ -2490,9 +2493,7 @@ fr:
           runway:
           - Piste d’aéroport
           - piste de circulation d’un aéroport
-          apron:
-          - Stationnement d’avions
-          - terminal
+          apron_only: Stationnement d’avions
           admin: Limite administrative
           orchard:
           - Verger
@@ -2518,10 +2519,14 @@ fr:
           industrial: Zone industrielle
           commercial: Zone tertiaire
           heathland: Lande
+          scrubland: Fruticée
           lake:
           - Lac
           - bassin de retenue
+          intermittent_water: plan d’eau intermittent
           glacier: Glacier
+          reef: Récif
+          wetland: Zone humide
           farm: Zone agricole
           brownfield: Zone de démolition
           cemetery: Cimetière
@@ -2533,6 +2538,7 @@ fr:
           school:
           - École
           - université
+          - hôpital
           building: Bâtiment important
           station: Gare ferroviaire
           summit:
@@ -2544,6 +2550,7 @@ fr:
           destination: Accès réservé aux riverains
           construction: Routes en construction
           bus_stop: Arrêt de bus
+          stop: Arrêt
           bicycle_shop: Magasin de vélos
           bicycle_parking: Parking à vélos
           toilets: Toilettes

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index a5b35ef01365c0718fc15429a977cbb1548b9fd9..35fc8db8423271a8e4b8b1222326caea55002d19 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -1272,8 +1272,6 @@ fur:
           subway: Metropolitane
           runway:
           - Piste dal aeropuart
-          apron:
-            1: terminâl
           admin: Confin aministratîf
           forest:
           - Bosc

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index b071a2976f520207643fa467a52d67a7db27fe2b..3715335c096220b64dcc946029fd555ae29e5abd 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -2042,9 +2042,7 @@ fy:
           runway:
           - Start-/lânings-
           - taksybaan lofthaven
-          apron:
-          - Platfoarm
-          - passazjiershal lofth.
+          apron_only: Platfoarm
           admin: Bestjoerlike grins
           forest:
           - Bosk

diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 307ff82ce7549845ec6189819f12c33d76f9c93e..759fcf9c13d4e1a99daa3519ad962e0ec7a7aa47 100644 (file)
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -1549,9 +1549,7 @@ ga:
           runway:
           - Rúidbhealach Aerfoirt
           - bealach innealta
-          apron:
-          - Naprún Aerfoirt
-          - críochfort
+          apron_only: Naprún Aerfoirt
           admin: Teorainn riaracháin
           forest:
           - Foraois

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index af5e6d0887f96aaf093bfb67a25fb40eadcb7636..e1583a91f04307394b1e82a04ad0c6e90452a8bb 100644 (file)
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -1,37 +1,114 @@
 # Messages for kréyòl Gwadloup (kréyòl Gwadloup)
 # Exported from translatewiki.net
 # Export driver: phpyaml
+# Author: Istwalezanti
 # Author: Léon973
 ---
 gcf:
+  helpers:
+    submit:
+      diary_comment:
+        create: Komantasyon
+      diary_entry:
+        create: Voyé
+      issue_comment:
+        create: Jouté komantasyon
+      message:
+        create: Voyé
   activerecord:
+    models:
+      country: Péyi
+      friend: Zanmi
+      language: Lang
+      message: Mésaj
+      user: Itilizatè
     attributes:
+      client_application:
+        allow_write_api: Modifyé kat-la
+      diary_entry:
+        latitude: latitid
+        longitude: lonjitid
+        language_code: Lang
+      friend:
+        user: Itilizatè
+        friend: Sendika
+      trace:
+        user: Itilizatè
+        latitude: Latitid
+        longitude: Lonjitid
       user:
         home_lat: 'Latitid:'
-        home_lon: 'Longitid:'
+        home_lon: 'Lonjitid:'
+        languages: Lang ou simyé
+        pass_crypt: Kòd a-w
+        pass_crypt_confirmation: Konfimé kòd a-w la
     help:
       user:
         new_email: (Pa janmen maké piblikman)
+  auth:
+    providers:
+      wikipedia: Wikipédya
+  api:
+    notes:
+      entry:
+        comment: Komantasyon
+  account:
+    deletions:
+      show:
+        title: Néyantizé kont a-w la
+        warning: Penga! Si-w ka néyantizé kont a-w, ou ka pèdi-y poubon é ou pé ké
+          pésa woutini-y ankò.
+        delete_account: Néyantizé on kont
+        delete_introduction: |-
+          Ou pé NÉYANTIZÉ kont OpenStreetMap a-w èvè bouton-la.
+          Kanmensa ou pou sav sa:
+        delete_display_name: Tinon a-w la ké néyantizé, é nenpòt kimoun ké pé sèvi
+          épi-y èvè on dòt kont.
+        retain_caveats: 'Kanmenmsa, OpenStreetMap ké woutyenn dotwa kamo asi-w, menmsi
+          sé aprédavwa ou néyantizé kont a-w la:'
+        retain_email: Nou ké chonjé email a-w la.
+        recent_editing_html: |-
+          Davwa ou sòti modifyé biten, nou pé pa néyantizé kont a-w ankò.
+          Nou ké pé fè-y adan %{time}
+        confirm_delete: Ès ou sèkten?
   accounts:
     edit:
+      title: Modifyé kont a-w la
       my settings: Mes options
+      openid:
+        link text: Ka sa yé?
       public editing:
         enabled: Aktif. Y pa anonnim, y pé édité doné.
         enabled link text: Ka sa yé?
         disabled: Inaktif y pé pa édité doné ; tout édision pasé anonim.
-        disabled link text: Poukwa an pé pa édité?
+        disabled link text: Pouki an pé pa modifyé?
+      contributor terms:
+        link text: Ka sa yé?
       save changes button: Enrèjisré tout chanjman
+      delete_account: Néyantizé kont a-w...
     go_public:
-      heading: 'Édision piblik:'
+      heading: 'Édisyon piblik:'
+      currently_not_public: Konyéla, Ponmoun pa konnèt aki-w lè ou ka modifyé on biten,
+        larèstan itilizatè pa sav voyé-w mésaj é yo pé pa sav ola ou yé. Pou montré
+        sa ou modifyé é kité larèstan itilizatè palé ba-w asi twèl-la, Pijé asi bouton-la.
       make_edits_public_button: Mèt tou sa an fè piblik
     update:
       success_confirm_needed: Enfowmasion asi itilisatè la bien anrèjistré. Gadé bwet
         imél aw pou konfirmé adres nouvo imél aw
       success: Efowmasion asi itilisatè la bien anrejistré.
+    destroy:
+      success: Kont néyantizé.
   browse:
+    download_xml: Chantyé XML
+    location: 'Ki koté:'
     changeset:
+      comment: Komantasyon (%{count})
+      hidden_comment_by_html: Komantasyon ou dévwè a %{user} %{time_ago}
+      comment_by_html: Komantasyon a %{user} %{time_ago}
       changesetxml: Niméwo Chanjeman XML
       osmchangexml: osmChanjeman XML
+      join_discussion: Konèkté-w pou jwenn bokantaj-la
+      discussion: Bokantaj
     containing_relation:
       entry_html: Rèlasion %{relation_name}
       entry_role_html: Rèlasion %{relation_name} (adan wol %{relation_role})
@@ -40,92 +117,351 @@ gcf:
     start_rjs:
       load_data: Chajé sé doné la
       loading: Y ka chajé...
+    tag_details:
+      wikipedia_link: Kotéfèy %{page} asi Wikipégya
+      telephone_link: Kriyé %{phone_number}
+    query:
+      introduction: Pijé asi kat-la pou jwenn biten toupréla.
+      nearby: Biten pa lwen
+  changesets:
+    changeset_paging_nav:
+      showing_page: Kotéfèy %{page}
+      previous: Pwochenn
+    changesets:
+      comment: Komantasyon
   dashboards:
     contact:
       km away: '%{count} km'
     popup:
       your location: Koté ou yé
       nearby mapper: Arpantè owa aw
+      friend: Zanmi
     show:
+      my friends: Zanmi a-w
       no friends: Ou poko ni pon zanmi
-      nearby users: 'Itilizatè owa aw :'
-      no nearby users: Ou poko ni itilizatè owa aw.
+      nearby users: 'Itilizatè owa a-w :'
+      no nearby users: Ou poko ni itilizatè owa a-w.
   diary_entries:
     new:
       title: Nouvel nèf an jounal la
     form:
       location: 'Ki koté:'
-      use_map_link: Sèvi èvè kat la
+      use_map_link: Sèvi èvè kat-la
     index:
       new: Nouvel nèf an jounal la
-      new_title: Mèt on nouvel nèf an jounal aw
-      no_entries: Pa ni nouvel an jounal aw
+      new_title: Mèt on nouvèl nèf an jounal a-w
+      my_diary: Jounal a-w la
+      no_entries: Pa ni nouvèl an jounal a-w
       recent_entries: 'Nouvel fré:'
-      older_entries: Nouvel rasi
-      newer_entries: Nouvel pi fré
+      older_entries: Nouvèl rasi
+      newer_entries: Nouvèl pi fré
     edit:
       marker_text: Ola jounal la ka koumansé
+    show:
+      leave_a_comment: Kité on komantasyon
     no_such_entry:
-      heading: 'Pa ti ni nouvel èvè niméwo la sa : %{id}'
-      body: Woy, pa ti ni pon nouvel adan jounal la ouben komantè èvè niméwo la sa
-        %{id}. Kontrolé lòtograf la ouben lien la ou kliké asiy la pa bon.
+      heading: 'Pa tini nouvel èvè niméwo-lasa : %{id}'
+      body: Woy, pa tini pon nouvèl adan jounal la ouben komantè èvè niméwo lasa %{id}.
+        Kontwolé lòtograf la ouben lyen la ou kliké asiy la pa bon.
     diary_entry:
       posted_by_html: Sé %{link_user} ki voyé sa , koté %{created} i maké an %{language_link}
-      comment_link: Palé asi nouvel la sa
-      reply_link: Réponn nouvel la sa
+      comment_link: Palé asi nouvèl-lasa
+      reply_link: Réponn nouvèl-lasa
       comment_count:
         one: On Komantè
         other: '%{count} Komantè'
-      edit_link: Modifié nouvel la sa
+      no_comments: Pa ni komantasyon
+      edit_link: Modifyé nouvèl-lasa
     diary_comment:
       comment_from_html: Komantè a %{link_user} koté %{comment_created_at}
+      hide_link: Dévwè komantasyon-lasa
+    location:
+      view: Vwè
+    comments:
+      comment: Komantasyon
+      older_comments: Pli vyé komantasyon
+  doorkeeper:
+    scopes:
+      phone: Vwè liméwo a téléfòn a-w
+  errors:
+    forbidden:
+      title: Défandi
+  friendships:
+    make_friend:
+      heading: Mèt %{user} adan sé zanmi a-w la?
+      button: Jouté on zanmi
+      success: Alè-la %{name} sé sendika a-w la!
+      failed: Malérèzsò, Zingchap toupannan joutaj a %{name} adan sé zanmi a-w la
+      already_a_friend: '%{name} ja zanmi a-w'
+      limit_exceeded: |-
+        Pa ni enpé tan ou jwenn zanmi kon tilili.
+        Atann tibwen avan ou ka séyé trapé dòt ankò.
+    remove_friend:
+      heading: Kasé-lo èvè %{user}?
+      button: Woté on zanmi
+      success: '%{name} pa zanmi a-w ankò.'
+      not_a_friend: '%{name} pa zanmi a-w'
+  geocoder:
+    search_osm_nominatim:
+      prefix:
+        aerialway:
+          chair_lift: Sizé a kab
+        aeroway:
+          aerodrome: Layodwòm
+          terminal: Tèminal a layopò
+        amenity:
+          bench: ban-fennyan
+          bicycle_rental: Lwéyaj a biskèt
+          boat_rental: Lwéyaj a bato
+          brothel: Kaz a bòbò
+          bus_station: Istòp a bis
+          cinema: Siléma
+          clock: Lòlòj
+          dentist: Dòktè a dan
+          doctors: Dòktè
+          hospital: Lopital
+          kindergarten: Tipoulayé
+          language_school: Lékòl a lang
+          library: Kaz a Liv
+          music_school: Lékòl a mizik
+          nightclub: Bwat
+          parking: Ga
+          pharmacy: Fanmasi
+          police: Manblo
+          prison: Lajòl
+          school: Lékòl
+          townhall: Lanméri
+          waste_basket: Bwètazòdi
+        bridge:
+          "yes": Pon
+        building:
+          church: Batiman a Légliz
+          hospital: Batiman a lopital
+          hotel: Batiman a Lotèl
+          house: Kaz
+          kindergarten: Batiman a tipoulayé
+          roof: Fètay
+          ruins: Batiman Kanni
+          school: Batiman lékòl
+          "yes": Batiman
+        emergency:
+          defibrillator: Bouwèkyè
+          siren: Kòn
+        highway:
+          cycleway: Chimen a biskèt
+          motorway: Lotowout
+          motorway_junction: Britèl lotowout
+          motorway_link: Lotowout
+          primary: Chimen a gouvèlman
+          primary_link: Chimen a gouvèlman
+          road: Chimen
+          speed_camera: Rada
+          street_lamp: Révèbè
+          traffic_mirror: Glas a lari
+          trunk: Wokad
+          trunk_link: Wokad
+          unclassified: Chimen san kad
+          "yes": Wout
+        historic:
+          aircraft: Vyé avyon
+          bomb_crater: Tou a dyab fèt parapòt a bonm
+          cannon: Kannon
+          castle: Chato
+          church: Légliz
+          house: Kaz
+          railway: Chimen fè a listwa
+          ruins: Rèstan
+          tower: Tou
+          "yes": Vi a listwa
+        junction:
+          "yes": Fouchèt a Chimen
+        landuse:
+          cemetery: Simityè
+          forest: Granbwa
+          grass: Zèb
+          railway: Chimen fè
+          reservoir: Rézèvwa
+        leisure:
+          garden: Haden
+          stadium: Istad
+        man_made:
+          bridge: Pon
+          flagpole: lakomèt
+          snow_cannon: Kannon a lannèj
+          storage_tank: Sitèn
+          tower: Tou
+          windmill: Moulen
+          works: Lizin
+        natural:
+          bay: Lans
+          beach: Bòdlanmè
+          cliff: Falèz
+          crater: Tou a dyab
+          forest: Granbwa
+          geyser: Tijaj
+          hill: Mòn
+          island: Lilèt
+          mud: Labou
+          peninsula: Pwent
+          rock: Wòch
+          sand: Sab
+          tree: Pyébwa
+          volcano: Vòlkan
+          water: Glo
+        place:
+          archipelago: bann-zil
+          city: Vil prensipal
+          country: Péyi
+          house: Kaz
+          island: Lilèt
+          islet: Tililèt
+          locality: Koté
+          sea: Lanmè
+          town: Vil
+          village: Vilaj
+          "yes": Koté
+        railway:
+          construction: Chimen fè yo ka konstwi
+          halt: Laga
+          junction: Fouchèt a chimen fè
+          level_crossing: Janbaj féwovyè
+          rail: Chimen fè
+        shop:
+          bicycle: Boutik a bisiklèt
+          books: Boutik a liv
+          cheese: Boutik a fomaj
+          florist: Boutik a flè
+          mall: bann-boutik
+          optician: Boutik a linèt
+          perfumery: Boutik a losyon
+          seafood: Manjé lannè
+          shoes: Boutik a Soulyé
+          "yes": Lolo
+        tourism:
+          hotel: Lotèl
+          information: Kamo
+          museum: Mizé
+        tunnel:
+          "yes": Tinèl
+        waterway:
+          canal: Kannal
+          drain: Dalo
+          river: Rivyè
+          stream: Ravin
+          waterfall: Sodo
+      types:
+        cities: Vil prensipal
+        towns: Vil
+  issues:
+    index:
+      search: Chaché
+      states:
+        open: Ouvè
+    show:
+      ignore: Dévwè
+  reports:
+    new:
+      categories:
+        diary_entry:
+          other_label: Dòt
+        diary_comment:
+          other_label: Dòt
+        user:
+          other_label: Dòt
+        note:
+          other_label: Dòt
   layouts:
+    home: Ay akaz
     logout: Chapé
     log_in: Rantré
-    sign_up: Enskriw
+    sign_up: Enskri-w
+    start_mapping: Koumansé kataj-la
     edit: Modifié
     history: Istwa sa ou fè
     export: Voyé déwò
     gps_traces: Chimen GPS
     user_diaries: Jounal
     tag_line: Lyannaj pou kat lib
+    intro_header: Kontan vwè-w asi OpenStreetMap!
+    intro_text: Openstreetmap, sé on kat a lèmonn-la ki fèt parapòt a moun kon-w é
+      lib pou sèvi épi-y évè on lisans lib.
     osm_offline: Base a doné a OpenStreetMap dékonekté atchelman ; Yo ka fè on gwo
       travay enpòtan asi-y pou-y maché bien.
     osm_read_only: Atchelman ou pé li selamn base a doné a OpenStreetMap ; Yo ka fè
       on gwo travay enpòtan asi-y pou-y maché bien.
     donate: Ba OpenStreetMap on Fòs, %{link} Pou fè matériel la vansé.
+    help: Anmwé
     make_a_donation:
       text: Ba OpenStreetMap On Fòs
+    more: Plis
+  user_mailer:
+    note_comment_notification:
+      commented:
+        subject_own: '[OpenStreetMap] %{commenter} voyé on komantasyon asi on biten
+          ou maké'
+        subject_other: '[OpenStreetMap] %{commenter} voyé on komantasyon asi on maké
+          ki ka kriyé-w'
+        your_note: '%{commenter} kité on komantasyon asi on biten ou maké asi kat-la
+          ora a %{place}'
+        your_note_html: '%{commenter} lésé on komantasyon asi on biten ou maké asi
+          kat-la pasi %{place}'
+        commented_note_html: '%{commenter} kité on komantasyon anlè on maké a kat
+          ou konmanté. Maké-la ora a %{place}.'
+    changeset_comment_notification:
+      commented:
+        subject_own: '[OpenStreetMap] %{commenter} voyé on komantasyon asi yonn a
+          krèy a modifikasyon a-w'
+        subject_other: '[OpenStreetMap] %{commenter} voyé on komantasyon asi on modifikasyon
+          i ka kriyé-w'
   confirmations:
     confirm:
       heading: Konfirmé kont a itilizatè la
       press confirm button: Apiyé asi bouton la ki an ba pou konfirmé kont aw aktif
         menm.
       button: Konfirmé
+      click_here: pijé kotésit
     confirm_email:
       heading: Konfirmé chanjman a adres imél aw
       press confirm button: Apiyé asi bouton la ki an ba pou konfirmé nouvo adres
         imél aw.
       button: Konfirmé
+  messages:
+    new:
+      send_message_to_html: Voyé on dòt mésaj ba %{name}
   passwords:
     new:
       heading: Ou pèd kòd aw?
       email address: 'Adres imél aw :'
       new password button: Voyé on nouvo kòd
+  preferences:
+    show:
+      title: Sa ou simyé
+      preferred_languages: Lang ou pisimyé
   profiles:
     edit:
+      gravatar:
+        gravatar: Sèvi épi Gravatar
+        what_is_gravatar: Ka ki Gravatar?
+        disabled: Yo étenn Gravatar.
       home location: 'La ou ka rété :'
       no home location: Ou po ko mèt la ou ka rété.
       update home location on click: Eskè y fo modifié la ou ka rété lè ou ka kliké
         asi kat la?
   sessions:
     new:
+      title: Konèkté-w
       heading: Konekté
       email or username: 'Adres imél ouben nom itilizaté aw :'
       password: 'Kòd aw:'
-      lost password link: Ou pèd kòd aw?
+      lost password link: Ou pèd kòd a-w?
       login_button: Konektéw
+      auth_providers:
+        wikipedia:
+          title: Konèkté-w épi Wikipédya
   site:
+    copyright:
+      native:
+        mapping_link: koumansé kataj-la
     index:
       js_1: Ou ka sèvi èvè on navigatè ki pa ka sipòté Javascript ouben Javascript
         éten.
@@ -144,9 +480,39 @@ gcf:
       search: Chèché
       where_am_i: Ki moun an yé?
       submit_text: Voyé
+    key:
+      table:
+        entry:
+          train: Tren
+          forest:
+          - Granbwa
+          grass:
+          - Zèb
+          common:
+            2: Haden
+          cemetery: Simityè
+          school:
+            0: Lékòl
+            2: Lopital
+    welcome:
+      rules:
+        title: Larèl-la!
+      add_a_note:
+        the_map: Kat-la
+  traces:
+    new:
+      help: Anmwé
+  oauth_clients:
+    show:
+      confirm: Ès ou sèkten?
   users:
     new:
       no_auto_account_create: Malérezman, alè kilé, nou pé pa ouvè kont automatikman.
+    terms:
+      legale_names:
+        france: Frans
+        italy: Itali
+        rest_of_world: Larèstan a lèmonn-la
     no_such_user:
       body: Malérezman, pa ti ni pon itilisatè èvè non la sa %{user}. Kontrolé lòtograf
         la ouben lien la ou kliké asiy la pa bon.
@@ -154,7 +520,9 @@ gcf:
       my diary: Jounal an mwen
       my edits: Édision an mwen
       my traces: Chimen an mwen
+      my messages: Sé mésaj a-w la
       my settings: Opsion an mwen
+      my_preferences: Sa ou simyé
       send message: Voyé on mésaj
       diary: Jounal
       edits: Édision
@@ -164,4 +532,33 @@ gcf:
       mapper since: 'Arpantè dèpi:'
     go_public:
       flash success: Tou sa ou fè jis alè ki lé piblik ou pa otorizé édité.
+  user_blocks:
+    show:
+      confirm: Ès ou sèkten?
+  notes:
+    index:
+      last_changed: Dènyé lèwvwè yo modifyé-y
+  javascripts:
+    share:
+      title: Simé
+    map:
+      locate:
+        title: Montré la ou yé
+    site:
+      edit_tooltip: Modifyé kat-la
+      createnote_tooltip: Jouté on komantasyon asi kat-la
+    changesets:
+      show:
+        comment: Komantasyon
+    directions:
+      engines:
+        fossgis_valhalla_bicycle: biskèt (Valhalla)
+      errors:
+        no_place: Malérèzsò, yo pa sav ola '%{place}' yé.
+      instructions:
+        continue_without_exit: Kontinyé asi %{name}
+        slight_right_without_exit: Touné tibwen an dwèt a-w asi %{name}
+  redactions:
+    show:
+      confirm: Ès ou sèkten?
 ...

diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 54f892df1d44ff86b47650f9c84613baf77b1304..9b3b77e6cd0314f02d87a22f8a24e1c5f9ad5e4f 100644 (file)
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1403,9 +1403,7 @@ gd:
           runway:
           - Raon-laighe puirt-adhair
           - Raon-cuairteachaidh
-          apron:
-          - Aparan puirt-adhair
-          - Tèirmineal
+          apron_only: Aparan puirt-adhair
           admin: Crìoch rianachd
           forest:
           - Coille

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index e897fa70b4705ff0abcdc04ceab4357a824a25f6..773e59ad9980334f22424c6771f9d4519252d9e4 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -2373,27 +2373,40 @@ gl:
           runway:
           - Pista do aeroporto
           - vía de circulación do aeroporto
-          apron:
-          - Plataforma do aeroporto
-          - terminal
+          apron_only: Plataforma do aeroporto
           admin: Límite administrativo
+          orchard:
+          - Horta
+          - viñedo
           forest:
           - Bosque
-          - Bosque
+          - bosque
+          farmland: Terra de labranza
+          grass:
+          - Herba
+          - pradaría
+          bare_rock: Rocha núa
+          sand: Area
           golf: Campo de golf
           park: Parque
           common:
           - Espazo común
           - pradaría
           - xardín
+          built_up: Zona edificada
           resident: Zona residencial
           retail: Zona comercial
           industrial: Zona industrial
           commercial: Zona de oficinas
           heathland: Breixeira
+          scrubland: Matogueira
           lake:
           - Lagoa
           - encoro
+          intermittent_water: Masa de auga intermitente
+          glacier: Glaciar
+          reef: Arrecife
+          wetland: Pantano
           farm: Granxa
           brownfield: Lugar baldío
           cemetery: Cemiterio
@@ -2405,6 +2418,7 @@ gl:
           school:
           - Escola
           - universidade
+          - hospital
           building: Edificio significativo
           station: Estación de ferrocarrís
           summit:

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 11cc0416f798b0ad1e3b17dc1a8b15fd8e1b6fb2..f1f83ee2fc0cc19c1c0e6a8141a48951b01deab8 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1183,7 +1183,7 @@ he:
           fjord: פיורד
           forest: יער
           geyser: גייזר
-          glacier: קרחון
+          glacier: קרחון יבשתי
           grassland: ערבה
           heath: בתה
           hill: גבעה
@@ -2366,27 +2366,40 @@ he:
           runway:
           - מסלול נחיתה
           - דרך למוניות
-          apron:
-          - רחבת חניה למטוסים
-          - מסוף
+          apron_only: רחבת חניה למטוסים
           admin: גבול שטח שיפוט
+          orchard:
+          - מטע
+          - כרם
           forest:
           - יער
           - חורשה
+          farmland: שטח חקלאי
+          grass:
+          - דשא
+          - מרעה
+          bare_rock: סלע חשוף
+          sand: חול
           golf: מסלול גולף
           park: פארק
           common:
           - מרעה
           - מרעה
           - גן
+          built_up: שטח בנוי
           resident: אזור מגורים
           retail: אזור קמעונאי
           industrial: אזור תעשייה
           commercial: אזור מסחרי
           heathland: שדה פרא
+          scrubland: בתה
           lake:
           - אגם
           - מאגר
+          intermittent_water: גוף מים תקופתי
+          glacier: קרחון יבשתי
+          reef: שונית
+          wetland: ביצה
           farm: חווה
           brownfield: אזור תעשייה נטוש
           cemetery: בית עלמין
@@ -2398,6 +2411,7 @@ he:
           school:
           - בית ספר
           - אוניברסיטה
+          - בית חולים
           building: בניין בעל חשיבות
           station: תחנת רכבת
           summit:

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 85cb4a1c3eb6c1140b5172b12d8e52fe392231f7..ed8f74f569747d8ec46bbf49102e4535a32ee1f2 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1431,9 +1431,7 @@ hr:
           runway:
           - Aerodromska pista
           - aerodromske ceste (za avione)
-          apron:
-          - Parking za avione (apron)
-          - terminal
+          apron_only: Parking za avione (apron)
           admin: Administrativna granica
           forest:
           - Šuma (održavane, od šumarije)

diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index a1fb987f8cbdca12a9bd3e5f8e2b0c88948edccf..48d3c9287682d5f1c0a578a0d36dbbbf9a7339db 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -2015,9 +2015,7 @@ hsb:
           runway:
           - Přizemišćo
           - lětadłowa jězdnja
-          apron:
-          - Lětanišćowe předpolo
-          - terminal
+          apron_only: Lětanišćowe předpolo
           admin: Zarjadniska hranica
           forest:
           - Hajina

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 270d9cb426557ffe386a58c9d85c6d58cdc72905..503b686d9e09be0642dd273833f07c1ccc1e3855 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -2245,9 +2245,7 @@ hu:
           runway:
           - Kifutópálya
           - gurulóút
-          apron:
-          - Forgalmi előtér
-          - utasterminál
+          apron_only: Forgalmi előtér
           admin: Közigazgatási határ
           orchard:
           - Gyümölcsös

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 23b7aedc209c1e1f32d609ec56a9dd379a5de3fa..8e2be854515f0f7f6bc76b00a2b9b302e15321c7 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -2346,9 +2346,7 @@ ia:
           runway:
           - Pista de aeroporto
           - via de circulation pro aviones
-          apron:
-          - Platteforma pro aviones
-          - terminal
+          apron_only: Platteforma pro aviones
           admin: Limite administrative
           orchard:
           - Verdiero

diff --git a/config/locales/id.yml b/config/locales/id.yml
index f784789791b8344efc42d6d098b7ee82e3e35ae6..89e0561a0d509e94f8d84d4c09fd302dcb97ef43 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -2299,9 +2299,7 @@ id:
           runway:
           - Landasan bandara
           - landas hubung
-          apron:
-          - Tempat Parkir Pesawat
-          - terminal
+          apron_only: Tempat Parkir Pesawat
           admin: Batas administrasi
           forest:
           - Hutan

diff --git a/config/locales/is.yml b/config/locales/is.yml
index ff41ede59e4264aeb10ee2770914b33592add9fd..d16474ce5af6cddbc6447d6d9be521a5b0750517 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -2375,9 +2375,7 @@ is:
           runway:
           - Flugbraut
           - akstursbraut
-          apron:
-          - Flughlað
-          - flugstöð
+          apron_only: Flughlað
           admin: Stjórnsýslumörk
           forest:
           - Ræktaður skógur

diff --git a/config/locales/it.yml b/config/locales/it.yml
index f37d1cd40f5b0799e84091566f16203d0d3d131b..77ff19189419d370681cea0e02ae8d2f611b81d1 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -2388,9 +2388,7 @@ it:
           runway:
           - Pista di decollo/atterraggio
           - pista di rullaggio
-          apron:
-          - Area di parcheggio aeroportuale
-          - terminal
+          apron_only: Area di parcheggio aeroportuale
           admin: Confine amministrativo
           forest:
           - Foresta

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 59c333407036e35120ee1ff305d1c119b6b1cbfe..029246a215545e5c38e2ef4f0c81258d004c255c 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -12,6 +12,7 @@
 # Author: Ffff23
 # Author: Foomin10
 # Author: Fryed-peach
+# Author: Great ones
 # Author: Hayashi
 # Author: Higa4
 # Author: Hiro884
@@ -274,6 +275,7 @@ ja:
         reopened_at_by_html: '%{user}さんが%{when}に再開'
       rss:
         title: OpenStreetMap メモ
+        description_all: 報告されたメモ、コメントされたメモ、または閉じられたメモのリスト
         description_area: あなたのエリア [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
           に関する注記で報告済みまたはコメント付きあるいは解決済みの一覧
         description_item: メモ %{id} の RSS フィード
@@ -300,6 +302,7 @@ ja:
         retain_notes: 日記のエントリと日記のコメントがある場合は保持されますが、表示されません。
         retain_changeset_discussions: 変更セットのディスカッションがあれば、保持されます。
         retain_email: メールアドレスは保持されます。
+        recent_editing_html: 最近編集したため、現在アカウントを削除できません。 %{time}以内に削除可能になります。
         confirm_delete: 本当によろしいですか?
         cancel: キャンセル
   accounts:
@@ -329,7 +332,12 @@ ja:
       delete_account: アカウントを削除
     go_public:
       heading: 公開編集
+      currently_not_public: 現在、あなたの編集内容は匿名であり、他の人があなたにメッセージを送ったり、あなたの位置情報を確認したりすることはできません。編集内容を表示し、Web
+        サイトを通じて他の人があなたに連絡できるようにするには、下のボタンをクリックしてください。
+      only_public_can_edit: 0.6 API 変更以来,地図データを公開ユーザーだけが編集できます.
       find_out_why: 理由を明らかにする
+      email_not_revealed: あなたのメールアドレスが公開されることはありません
+      not_reversible: このアクションを元に戻すことはできず、すべての新規ユーザーはデフォルトで公開になります。
       make_edits_public_button: 自分の編集をすべて公開する
     update:
       success_confirm_needed: 利用者情報を更新しました。新着メールを確認して新しいメール アドレスを検証してください。
@@ -2025,9 +2033,7 @@ ja:
           runway:
           - 空港滑走路
           - 空港誘導路
-          apron:
-          - 空港ビル
-          - 空港ターミナル
+          apron_only: 空港ビル
           admin: 行政境界
           forest:
           - 森

diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index ddfda10d3cf0d660e50c31180c61e32721b25c8e..4398b4f8bc6e845d524eb511df8aff11a5ec46a3 100644 (file)
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -946,8 +946,6 @@ ka:
           - საბაგირო გზა
           runway:
           - აეროპორტის ასაფრენ-დასაფრენი ბილიკი
-          apron:
-            1: ტერმინალი
           admin: ადმინისტრაციული საზღვარი
           forest:
           - ტყე

diff --git a/config/locales/kk-cyrl.yml b/config/locales/kk-cyrl.yml
index 70ce2e561f950c41f80c211a8bf19460cc6bf137..4de40ff46666f1a24c7cd8055b4640e98885448b 100644 (file)
--- a/config/locales/kk-cyrl.yml
+++ b/config/locales/kk-cyrl.yml
@@ -972,9 +972,7 @@ kk-cyrl:
           unclassified: Жергілікті жол
           rail: Темір жол
           subway: Метро
-          apron:
-          - Әуежай перроны
-          - терминал
+          apron_only: Әуежай перроны
           admin: Әкімшілік шекара
           forest:
           - Орман

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index fe86617634d85c48dde9ecb91f30e527c088a814..a86a672d90108c0b22d5efc0853a746d32759fe7 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -2163,9 +2163,7 @@ ko:
           runway:
           - 공항 활주로
           - 공항 유도로
-          apron:
-          - 공항 계류장
-          - 터미널
+          apron_only: 공항 계류장
           admin: 행정 구역 경계
           forest:
           - 숲

diff --git a/config/locales/ksh.yml b/config/locales/ksh.yml
index 7a66b3b7381908a2b9d08d4ed584c73668912671..448a17c969136938aef3ae80d632ab8fc1b88ffc 100644 (file)
--- a/config/locales/ksh.yml
+++ b/config/locales/ksh.yml
@@ -284,9 +284,7 @@ ksh:
           runway:
           - Startbahn, Landebahn
           - Rollwääsch om Fluchhaaven
-          apron:
-          - Halldepläz om Fluchveäld
-          - Terminal em Fluchhaaven
+          apron_only: Halldepläz om Fluchveäld
           admin: Verwalldongsjränz
           forest:
           - Wald, Bösch

diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index f57f04e549d59807cf3d822c1e3abd74a12a3f68..5afc8eb1d3aa7ae6b2cd6362d04ea1a0d15b4267 100644 (file)
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -2118,9 +2118,7 @@ ku-Latn:
           runway:
           - Pîsta balafirgehê
           - rêya balafirgehê yê çûnûhatinê
-          apron:
-          - Aprona balafirgehê
-          - termînal
+          apron_only: Aprona balafirgehê
           admin: Sînorê îdarî
           forest:
           - Daristan

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 6c94d0318edb806d64287c377f6632a929ccf041..c4ee5b312dac9c13f0dd9e73a1b881b40351b4b7 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -2025,6 +2025,7 @@ lb:
           main_road: Haaptstrooss
           secondary: Niewestrooss
           unclassified: Net klasséiert Strooss
+          pedestrian: Foussgängerwee
           track: Spuer
           bridleway: Wee fir Päerd
           cycleway: Vëlospiste
@@ -2044,8 +2045,6 @@ lb:
           runway:
           - Start- a Landebunn
           - Rullbunn
-          apron:
-            1: Terminal
           admin: Verwaltungsgrenz
           orchard:
           - Bongert

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 67ee66150ef2663f4570799c4e2c7df3c9ae34bc..e7d529f9db0cd7cf785f9faf52f7cfa90cb464ce 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -2086,9 +2086,7 @@ lt:
           runway:
           - Kilimo takas
           - Riedėjimo takas
-          apron:
-          - Oro uosto lėktuvų aikštelė
-          - terminalas
+          apron_only: Oro uosto lėktuvų aikštelė
           admin: Administracinės ribos
           forest:
           - Miškas

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index d6888259615de419e4850a0fbd6258c73c4dd59e..4a5db17d0203ee63709aa11c576953c17ab49674 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1718,9 +1718,7 @@ lv:
           runway:
           - Lidostas skrejceļš
           - manevrēšanas ceļš
-          apron:
-          - Lidostas rampa
-          - termināls
+          apron_only: Lidostas rampa
           admin: Administratīvā robeža
           forest:
           - Mežs

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index e6ef55920bb246549898ab28ee527012efa21bdf..e294170239255ccef34dbf57d3730b2848256495 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -2311,6 +2311,7 @@ mk:
           primary: Главен пат
           secondary: Спореден пат
           unclassified: Некласификуван пат
+          pedestrian: Пешачки пат
           track: Патека
           bridleway: Пешачко-влечен пат
           cycleway: Велосипедска патека
@@ -2332,9 +2333,7 @@ mk:
           runway:
           - Аеродромска писта
           - рулажна патека
-          apron:
-          - Аеродромска платформа
-          - терминал
+          apron_only: Аеродромска платформа
           admin: Административна граница
           orchard:
           - Овоштарник

diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index cc9dbf375dd7c7278111ef9486e04bfd067f61be..a36aef78319ce4eb61d0874abcd1a4aac9025d72 100644 (file)
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -1178,9 +1178,7 @@ mr:
           runway:
           - विमानतळ धावपट्टी
           - खेचमार्ग
-          apron:
-          - विमानतळावरील भरणतळ
-          - अग्र
+          apron_only: विमानतळावरील भरणतळ
           admin: प्रशासकीय सीमा
           forest:
           - वन

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index acae71ce5e321c72c68134bbb5d4121abd504b93..018d07a11bec2c8594b983b04ded9591a9e41856 100644 (file)
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1730,9 +1730,7 @@ ms:
           runway:
           - Landasan kapal terbang
           - jalan rayap
-          apron:
-          - Kawasan gerak lapangan terbang
-          - terminal
+          apron_only: Kawasan gerak lapangan terbang
           admin: Sempadan pentadbiran
           forest:
           - Hutan

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 6343448f9d5b4fe78c660c317bb98026d4193241..1eeef56682dea942d5fe2409c1aed1eb2407e200 100644 (file)
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -1848,9 +1848,7 @@ nb:
           runway:
           - Flystripe
           - taksebane
-          apron:
-          - terminal
-          - terminal
+          apron_only: terminal
           admin: Administrativ grense
           forest:
           - Skog

diff --git a/config/locales/nds.yml b/config/locales/nds.yml
index 5bd26d17f56ff2f08caa429a597015a5bcf1744b..f2f3ac9045a0f63c30e7124c863d32624aca75f0 100644 (file)
--- a/config/locales/nds.yml
+++ b/config/locales/nds.yml
@@ -526,9 +526,7 @@ nds:
           runway:
           - Fleger-Lannbahn
           - Fleger-Rullweg
-          apron:
-          - Terminal
-          - Terminal
+          apron_only: Terminal
           admin: Grenz
           forest:
           - Forst

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 7e062e4db71d276bcb3f6e0b2a58ea050f868a6b..b5971982117292a2ff598c6e805e6ee3e3c6ea89 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -2419,9 +2419,7 @@ nl:
           runway:
           - Start- en landingsbaan
           - taxibaan
-          apron:
-          - Luchthavenplatform
-          - terminal
+          apron_only: Luchthavenplatform
           admin: Bestuurlijke grens
           orchard:
           - Boomgaard

diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index cfe6c6e73efa06cc371afac7288fd00db79683b2..a4dafa2ba257511e7441d1481f354b053e6bb256 100644 (file)
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -2186,9 +2186,7 @@ nn:
           runway:
           - Flystripe
           - taksebane
-          apron:
-          - terminal
-          - terminal
+          apron_only: terminal
           admin: Administrativ grense
           forest:
           - Skog

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 2d5c09e6c3a533498ae6c964e8c21563c14e96d2..0d50fc7a83849b512005be328dec2d76d4d5ae8e 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -2034,9 +2034,7 @@ oc:
           runway:
           - Pista d'aeropòrt
           - via de circulacion d'aeropòrt
-          apron:
-          - Estacionament d'avions
-          - terminal
+          apron_only: Estacionament d'avions
           admin: Limit administratiu
           forest:
           - Sèuva

diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index d9d5014a1f4b197bb8beee8f1179ea735ed0bc09..2a94f79c87605745afd092a304bfbe70774d4890 100644 (file)
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -940,9 +940,7 @@ pa:
           runway:
           - ਹਵਾਈ ਅੱਡੇ ਦੀ ਉਡਾਣ ਪੱਟੀ
           - ਟੈਕਸੀਵੇਅ
-          apron:
-          - ਹਵਾਈ ਅੱਡੇ ਦਾ ਐਪਰਨ
-          - ਟਰਮੀਨਲ
+          apron_only: ਹਵਾਈ ਅੱਡੇ ਦਾ ਐਪਰਨ
           admin: ਪ੍ਰਸ਼ਾਸਕੀ ਸਰਹੱਦ
           forest:
           - ਜੰਗਲ

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 323b1f642c450a9adddf40e06eec4ae99262b5af..894fafb7d589ab4acc472e2e76332c695c005068 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -2346,9 +2346,7 @@ pl:
           runway:
           - Pas startowy
           - kołowania
-          apron:
-          - Płyta lotniska
-          - terminal
+          apron_only: Płyta lotniska
           admin: Granica
           forest:
           - Las

diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml
index 2dd6866a5ab553ce6e1d679de9b5f302a98adf67..df3e6be86560f1f8690b4b13b35ba384c997a376 100644 (file)
--- a/config/locales/pnb.yml
+++ b/config/locales/pnb.yml
@@ -1665,9 +1665,7 @@ pnb:
           runway:
           - ہوائی اڈے اُڈاݨ پٹی
           - ٹیکسی‌وے
-          apron:
-          - ہوائی اڈے دا ایپرن
-          - ٹرمینل
+          apron_only: ہوائی اڈے دا ایپرن
           admin: پرشاسکی سرحد
           forest:
           - رکھّ

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 3c55aa9147205b1f1b5c01f8bea579e15a8f12f2..281c5c40abf0f81d4fbf4dd78ad7d6194bdf2b2f 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -2370,9 +2370,7 @@ pt-PT:
           runway:
           - Pista de aviação
           - Via de circulação
-          apron:
-          - Estacionamento de aviões
-          - terminal de aeroporto
+          apron_only: Estacionamento de aviões
           admin: Fronteira administrativa
           forest:
           - Floresta gerida

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index bfe33da70d976e86a22687111dcc34bb02ac4e24..014c0ad0e89539b6aa23ce348c61e14b8fdfd716 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -2383,9 +2383,7 @@ pt:
           runway:
           - Pista de Pouso
           - pista de taxiamento
-          apron:
-          - Pátio de aeródromo
-          - terminal
+          apron_only: Pátio de aeródromo
           admin: Limite administrativo
           forest:
           - Floresta manejada

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 59464b3d0ea9801e08ea4f034fe43f114f91a64e..c100b59e4fc93d0392ff36cbbd9e982e59710be2 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -2367,9 +2367,7 @@ ro:
           runway:
           - Pistă de Aeroport
           - taxiway
-          apron:
-          - Aeronavă
-          - terminal
+          apron_only: Aeronavă
           admin: Graniță administrativă
           forest:
           - Pădure

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 7a1eadc3b9bf6bba30329689b95b9550c1bae5d7..1e6b9cc18632eeaa9ee1c2974af38687a8a8239d 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -2312,26 +2312,37 @@ ru:
           cycleway_local: Велодорожка местного значения
           footway: Пешеходная дорожка
           rail: Железная дорога
+          train: Поезд
           subway: Линия метро
+          ferry: Паром
+          tram_only: Трамвай
+          trolleybus: Троллейбус
+          bus: Автобус
           cable:
           - Канатная дорога
           - кресельный подъёмник
           runway:
           - Взлётно-посадочная полоса аэропорта
           - рулёжная дорожка
-          apron:
-          - Перрон аэродрома
-          - терминал
+          apron_only: Перрон аэродрома
           admin: Административная граница
+          orchard:
+          - Фруктовый сад
+          - виноградник
           forest:
           - Лес
           - Роща
+          farmland: Сельхозугодья
+          grass:
+          - Трава
+          - луг
           golf: Площадка для гольфа
           park: Парк
           common:
           - Общественная земля
           - луг
           - сад
+          built_up: Площадь застройки
           resident: Жилой район
           retail: Торговый район
           industrial: Промышленный район
@@ -2340,6 +2351,7 @@ ru:
           lake:
           - Озеро
           - водохранилище
+          glacier: Ледник
           farm: Ферма
           brownfield: Расчистка под застройку
           cemetery: Кладбище
@@ -2351,6 +2363,7 @@ ru:
           school:
           - Школа
           - университет
+          - больница
           building: Значительное здание
           station: Железнодорожная станция
           summit:
@@ -2361,6 +2374,7 @@ ru:
           private: Частный доступ
           destination: Целевой доступ
           construction: Строительство дороги
+          bus_stop: Автобусная остановка
           bicycle_shop: Магазин велосипедов
           bicycle_parking: Парковка для велосипедов
           toilets: Туалет

diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index b795f76dd8c4c4a38f253b37bc63a23acaec1713..ae7add49f06268ca3d8551e0ea65d4326518a6c1 100644 (file)
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -2369,9 +2369,7 @@ sc:
           runway:
           - Pista de aeroportu
           - carrera de furriada
-          apron:
-          - Àrea de parchègiu de sos aèreos
-          - terminale
+          apron_only: Àrea de parchègiu de sos aèreos
           admin: Làcana amministrativa
           forest:
           - Litu

diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index 18388fb6909929304614993f4604a2e685f290fd..0ccb00045e5a145e701df5ab4c93f1c2ff91e530 100644 (file)
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -1522,9 +1522,7 @@ scn:
           runway:
           - Pista d’attirraggiu
           - pista di rullaggiu
-          apron:
-          - Ària di parcheggiu ariupurtuali
-          - terminal
+          apron_only: Ària di parcheggiu ariupurtuali
           admin: Cunfini amministrativu
           forest:
           - Furesta

diff --git a/config/locales/sh.yml b/config/locales/sh.yml
index 1b791110c500e7a9b32c6f4a2cd05b34839abc2d..9f8ef52283768fd7fe2288a8476d16731fff3c06 100644 (file)
--- a/config/locales/sh.yml
+++ b/config/locales/sh.yml
@@ -736,9 +736,7 @@ sh:
           runway:
           - Aerodromska pista
           - rulna staza
-          apron:
-          - Parking za avione
-          - terminal
+          apron_only: Parking za avione
           admin: Administrativna granica
           forest:
           - Šuma

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index b8e2c6c48c06f52573e8b9aaf6133c8ba26fd00d..68fc7960fd0d4c2f7a7a90e3bcf77541bea58cb2 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -2127,9 +2127,7 @@ sk:
           runway:
           - Letisková dráha
           - pojazdová dráha
-          apron:
-          - Letisková odbavovacia plocha
-          - terminál
+          apron_only: Letisková odbavovacia plocha
           admin: Administratívne hranice
           forest:
           - Les (udržiavaný)

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 9e4bfa9200ed7d641e2aa2aec182240b1bee0b27..6558df7436a83554cb4436fe8a2833b67e352957 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1897,6 +1897,8 @@ sl:
         naslov URL.
     update:
       flash changed: Vaše geslo je bilo spremenjeno.
+      flash token bad: Tega žetona ni bilo mogoče najti.  Predlagamo, da preverite
+        naslov URL.
   preferences:
     show:
       title: Moje prilagoditve
@@ -2385,6 +2387,7 @@ sl:
           primary: Glavna cesta
           secondary: Regionalna cesta
           unclassified: Ostale ceste izven naselij
+          pedestrian: Pot za pešce
           track: Kolovoz
           bridleway: Jahalna pot
           cycleway: Kolesarska steza
@@ -2393,34 +2396,53 @@ sl:
           cycleway_local: Krajevna kolesarska steza
           footway: Pešpot
           rail: Železnica
+          train: Vlak
           subway: Podzemna železnica
+          ferry: Trajekt
+          light_rail: Lahka železnica
+          tram_only: Tramvaj
+          trolleybus: Trolejbus
+          bus: Avtobus
           cable:
           - Nihalka
           - sedežnica
           runway:
           - Vzletno-pristajalna steza
           - povezave
-          apron:
-          - Letališka ploščad
-          - terminal
+          apron_only: Letališka ploščad
           admin: Upravna razmejitev
+          orchard:
+          - Sadovnjak
+          - vinograd
           forest:
           - Gozd
-          - Pragozd
+          - gozd
+          farmland: Kmetijsko zemljišče
+          grass:
+          - Trava
+          - travnik
+          bare_rock: Gola skala
+          sand: Pesek
           golf: Igrišče za golf
           park: Park
           common:
           - Travniki
           - travnik
           - vrt
+          built_up: Pozidano območje
           resident: Naselje
           retail: Trgovinsko območje
           industrial: Industrijsko območje
           commercial: Poslovno območje
           heathland: Grmičevje
+          scrubland: Grmičevje
           lake:
           - Jezero
           - vodni zbiralnik
+          intermittent_water: Presihajoče vodno telo
+          glacier: Ledenik
+          reef: Greben
+          wetland: Mokrišče
           farm: Kmetija
           brownfield: Gradbišče
           cemetery: Pokopališče
@@ -2432,6 +2454,7 @@ sl:
           school:
           - Šola
           - univerza
+          - bolnišnica
           building: Pomembna stavba
           station: Železniška postaja
           summit:
@@ -2442,6 +2465,8 @@ sl:
           private: Zasebni dostop
           destination: Dovoljeno za dostavo
           construction: Ceste v gradnji
+          bus_stop: Avtobusno postajališče
+          stop: Postajališče
           bicycle_shop: Kolesarska trgovina
           bicycle_parking: Parkirišče za kolesa
           toilets: Stranišče
@@ -3310,7 +3335,7 @@ sl:
       add_note: Tu dodaj opombo
       show_address: Prikaži naslov
       query_features: Preveri značilnosti
-      centre_map: Premakni na sredino
+      centre_map: Osredini zemljevid tukaj
   redactions:
     edit:
       heading: Uredi redakcijo

diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index eedf47e7cd9f4ba3604d0d545d3489e01eee07db..db977c51107301e618c0975e6e05bf568268f778 100644 (file)
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1038,9 +1038,7 @@ sr-Latn:
           runway:
           - Aerodromska pista
           - rulne staze
-          apron:
-          - Aerodromski peron
-          - terminal
+          apron_only: Aerodromski peron
           admin: Administrativna granica
           forest:
           - Šuma

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 09e0ccb90af79fb15a601256769306a4d303df05..f74a57e4a91319057f20613012348d93f9bb4a67 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1678,9 +1678,7 @@ sr:
           runway:
           - Аеродромска писта
           - рулне стазе
-          apron:
-          - Аеродромски перон
-          - терминал
+          apron_only: Аеродромски перон
           admin: Административна граница
           forest:
           - Шума

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 1d75fbcb5dcd6e1bf085c9e6f604f8c9548b9a9a..9efb4fbf67184e74c95f21fe85116de9864080f1 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -2331,9 +2331,7 @@ sv:
           runway:
           - Landningsbana
           - taxibana
-          apron:
-          - Flygplatsplatta
-          - terminal
+          apron_only: Flygplatsplatta
           admin: Administrativ gräns
           forest:
           - Kulturskog

diff --git a/config/locales/te.yml b/config/locales/te.yml
index 382a2e6f430af0f829cd9e34c27ed7412ee8d5d1..4cd8020c2f9cb3d742e7da93228e092572008d34 100644 (file)
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -2011,9 +2011,7 @@ te:
           runway:
           - విమానాశ్రయం రన్‌వే
           - టాక్సీ వే
-          apron:
-          - విమానాశ్రయం ఏప్రాన్
-          - టర్మినల్
+          apron_only: విమానాశ్రయం ఏప్రాన్
           admin: పరిపాలనా సరిహద్దు
           forest:
           - అడవి

diff --git a/config/locales/th.yml b/config/locales/th.yml
index f9ae71818c1f8205cb84aac8b53f7c702ec5229e..b38c9a6f7789f77b72432efcdbceda9d594595e9 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1655,9 +1655,7 @@ th:
           runway:
           - ทางวิ่งสนามบิน
           - ทางขับเครื่องบิน
-          apron:
-          - โรงซ่อมบำรุงเครื่องบิน
-          - อาคารผู้โดยสาร
+          apron_only: โรงซ่อมบำรุงเครื่องบิน
           admin: ขอบเขตการปกครอง
           forest:
           - ป่า

diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index d6a9ddcde5d816b9ffcc578f44a90206c0bc3ab1..0ff6ac89f3b79280cf1dd014836a55c4ed201364 100644 (file)
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -1696,9 +1696,7 @@ tl:
           runway:
           - Rampa ng Paliparan
           - daanan ng taksi
-          apron:
-          - Tapis ng paliparan
-          - terminal
+          apron_only: Tapis ng paliparan
           admin: Hangganang pampangangasiwa
           forest:
           - Gubat

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 21649d62fbf02b1ca256af898fc62dd9d3354194..4d3d8bdae8790632ad41e2f04e9b1fbd7320496e 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -2379,9 +2379,7 @@ tr:
           runway:
           - Uçuş pisti
           - Uçak pisti
-          apron:
-          - Havaalanı apronu
-          - terminal
+          apron_only: Havaalanı apronu
           admin: İdari sınırı
           forest:
           - Orman

diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index 4803bc536a9e2a318796b493b430d494845abb72..a88e4a2643ef640d6428acfa9d1a5e46e0c7f9cb 100644 (file)
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -894,8 +894,6 @@ tt:
           subway: Метро
           cable:
           - Канат юлы
-          apron:
-            1: терминал
           admin: Административ чик
           forest:
           - Урман

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 0011f22c2d26432afcf417edf8b1d7633561d60c..764e0db8ef46aa48cdee726c5e1aa154dfec462c 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -44,6 +44,7 @@
 # Author: Vlad5250
 # Author: Ypryima
 # Author: Yurkoy
+# Author: Ǝlʞıɯ
 # Author: Ата
 # Author: Драгун
 # Author: Пан Хаунд
@@ -2396,6 +2397,7 @@ uk:
           primary: Головна дорога
           secondary: Другорядна дорога
           unclassified: Дорога без класифікації
+          pedestrian: Пішохідна доріжка
           track: Путівець
           bridleway: Дорога для їзди кіньми
           cycleway: Велодоріжка
@@ -2417,9 +2419,7 @@ uk:
           runway:
           - Злітно-посадкова смуга аеропорту
           - руліжна доріжка
-          apron:
-          - Перон аеропорту
-          - термінал
+          apron_only: Перон аеропорту
           admin: Адміністративна межа
           forest:
           - Ліс

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 0ae844b51933ea741cd387fb1864ffd2bd4d11e3..512f7e2b3cb2816129f8cd4ab1c4a0867065b204 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -2031,9 +2031,7 @@ vi:
           runway:
           - Đường băng
           - đường băng
-          apron:
-          - Sân đậu máy bay
-          - nhà ga hành khách
+          apron_only: Sân đậu máy bay
           admin: Biên giới hành chính
           forest:
           - Rừng trồng cây

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 4d42dfa11e21be516885c293ee7a051067a8c971..dea0b2ba349e11762aa43371eaa510fb93e466ed 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -2214,9 +2214,7 @@ zh-CN:
           runway:
           - 机场跑道
           - 滑行道
-          apron:
-          - 机场停机坪
-          - 航站楼
+          apron_only: 机场停机坪
           admin: 行政区边界
           orchard:
           - 果园

diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 7afe87c39c5bd3e5c47c41c183128f119d800c21..bc7c4b0bed31fee50901be3d1403f5460e50dad0 100644 (file)
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1142,9 +1142,7 @@ zh-HK:
           subway: 地鐵
           runway:
           - 機場跑道
-          apron:
-          - 機場停機坪
-          - 客運大樓
+          apron_only: 機場停機坪
           admin: 行政邊界
           forest:
           - 森林

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 3ce9fe47510e02ef529f42f9e3c9739093883003..008ab780dc8b5cfa83359a4ca1ab828710d8ed3f 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -921,7 +921,7 @@ zh-TW:
           motorway_link: 高速公路聯絡道
           passing_place: 避車彎
           path: 小徑
-          pedestrian: 行人路
+          pedestrian: 人行道
           platform: 月台
           primary: 一級道路
           primary_link: 一級道路聯絡道
@@ -2172,6 +2172,7 @@ zh-TW:
           primary: 一級道路
           secondary: 二級道路
           unclassified: 無編制道路
+          pedestrian: 人行道
           track: 產業道路
           bridleway: 馬道
           cycleway: 自行車道
@@ -2193,9 +2194,7 @@ zh-TW:
           runway:
           - 機場跑道
           - 滑行道
-          apron:
-          - 機場停機坪
-          - 航廈
+          apron_only: 機場停機坪
           admin: 行政區邊界
           orchard:
           - 果園