Merge remote-tracking branch 'upstream/pull/3561'

diff --git a/Gemfile.lock b/Gemfile.lock
index a1bfe20fcb47df9b50f9be478607b348ff1a2eeb..0fb7dad30bc24585ebbeb40fa32db2aa12560544 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -86,7 +86,7 @@ GEM
     autoprefixer-rails (10.4.7.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.594.0)
+    aws-partitions (1.595.0)
     aws-sdk-core (3.131.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
@@ -115,7 +115,7 @@ GEM
       smart_properties
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.11.1)
+    bootsnap (1.12.0)
       msgpack (~> 1.2)
     bootstrap (4.5.3)
       autoprefixer-rails (>= 9.1.0)
@@ -433,7 +433,7 @@ GEM
       parser (>= 3.1.1.0)
     rubocop-minitest (0.20.0)
       rubocop (>= 0.90, < 2.0)
-    rubocop-performance (1.14.0)
+    rubocop-performance (1.14.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.14.2)
@@ -460,7 +460,7 @@ GEM
       sprockets-rails
       tilt
     secure_headers (6.3.3)
-    selenium-webdriver (4.2.0)
+    selenium-webdriver (4.2.1)
       childprocess (>= 0.5, < 5.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 6f27102d5b8b658362a3c2b0200edef0454530ae..6ab496365b30c444e120c1792e060ed657910468 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -791,7 +791,6 @@ af:
           window_construction: Vensterraamwerk
           winery: Wynboer
           "yes": Handwerkwinkel
-        crossing: Kruis
         emergency:
           access_point: Reddingsdienstoegangspunt
           ambulance_station: Ambulansstasie
@@ -812,6 +811,7 @@ af:
           bus_stop: Bushalte
           construction: Weg in aanbou
           corridor: Korridor
+          crossing: Kruis
           cycleway: Fietspad
           elevator: Hysbak
           emergency_access_point: Noodtoeganspunt

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index b9fa5643181aeb56b667ca0cd668c64d12b27b26..e9066686173ce109e1368aa05a8f4b30c56d3940 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Ali1
+# Author: Asma
 # Author: Aude
 # Author: Ayatun
 # Author: Azouz.anis
@@ -2011,6 +2012,7 @@ ar:
           common:
           - شائع
           - مرج
+          - حديقة
           retail: منطقة بيع بالمفرق
           industrial: منطقة صناعية
           commercial: منطقة تجارية

diff --git a/config/locales/br.yml b/config/locales/br.yml
index e9f8071c488905fe95f8d05ba885d445ec6c9d9d..3422c3953a78809efc82cab887d643ea63e9af57 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -826,7 +826,6 @@ br:
           tailor: Kemener
           winery: Domani gwinierezh
           "yes": Stal artizanelezh
-        crossing: Kroashent
         emergency:
           access_point: Lec'h moned
           ambulance_station: Sanailh ambulañsoù
@@ -846,6 +845,7 @@ br:
           bus_stop: Arsav bus
           construction: Chanter gourhent
           corridor: Trepas
+          crossing: Kroashent
           cycleway: Roudenn divrodegoù
           elevator: Pignerez
           emergency_access_point: Poent moned trummadoù

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 6214bb6e48afd985e7387990d3f5db5b7331a229..31983fb0f0807d770bc603d967a01364a90b8fed 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -680,8 +680,8 @@ ca:
         aeroway:
           aerodrome: Aeròdrom
           airstrip: Aeròdrom
-          apron: Plataforma d'estacionament
-          gate: Porta
+          apron: Àrea d'estacionament d'aeroport
+          gate: Porta d'aeroport
           hangar: Hangar
           helipad: Heliport
           holding_position: Punt d'espera
@@ -690,7 +690,7 @@ ca:
           runway: Pista
           taxilane: Carril de taxi
           taxiway: Carrer de rodatge
-          terminal: Terminal
+          terminal: Terminal d'aeroport
           windsock: Mànega de vent
         amenity:
           animal_boarding: Hotel de Mascotes
@@ -736,7 +736,7 @@ ca:
           fire_station: Parc de bombers
           food_court: Àrea de restauració
           fountain: Font ornamental
-          fuel: Benzinera
+          fuel: Estació de servei
           gambling: Jocs d'atzar
           grave_yard: Cementiri
           grit_bin: Contenidor de sal
@@ -892,7 +892,6 @@ ca:
           window_construction: Construcció de finestres
           winery: Bodega
           "yes": Botiga d'artesania
-        crossing: Encreuament
         emergency:
           access_point: Punt d'accés
           ambulance_station: Base d'ambulàncies
@@ -913,6 +912,7 @@ ca:
           bus_stop: Parada d'autobús
           construction: Carretera en construcció
           corridor: Passadís
+          crossing: Encreuament
           cycleway: Carril bici
           elevator: Ascensor
           emergency_access_point: Accés d'emergència
@@ -1000,8 +1000,8 @@ ca:
           brownfield: Terra no urbanitzada
           cemetery: Cementiri
           commercial: Zona comercial
-          conservation: Conservació
-          construction: Construcció
+          conservation: Espai protegit
+          construction: Zona en construcció
           farmland: Terres de conreu
           farmyard: Corral
           forest: Bosc
@@ -1022,7 +1022,7 @@ ca:
           reservoir: Embassament
           reservoir_watershed: Conca de l'embassament
           residential: Àrea residencial
-          retail: Zona comercial
+          retail: Àrea comercial
           village_green: Prat municipal
           vineyard: Vinya
           "yes": Ús del terreny
@@ -1380,7 +1380,7 @@ ca:
           artwork: Obra d'art
           attraction: Atracció
           bed_and_breakfast: Bed and breakfast
-          cabin: Cabanya
+          cabin: Cabanya turística
           camp_pitch: Parcel·la de càmping
           camp_site: Càmping
           caravan_site: Càmping per a caravanes
@@ -2111,7 +2111,7 @@ ca:
           titulars dels drets d'autor.
         infringement_2_html: Si penseu que hi ha material protegit per drets d'autor
           que ha estat afegit a la base de dades d'OpenStreetMap o a aquest web, si
-          us plau aneu a la pàgina web dedicada al <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">Procediment
+          us plau aneu a la pàgina web dedicada al <a href="http://wiki.osmfoundation.org/wiki/License/Takedown_procedure">Procediment
           per eliminar dades protegides pels drets d'autor</a> o empleneu aquest <a
           href="https://dmca.openstreetmap.org/">formulari en línia</a>.
         trademarks_title_html: <span id="trademarks"></span>Marques registrades
@@ -2314,6 +2314,7 @@ ca:
           common:
           - Àrea comunal
           - prat
+          - jardí
           retail: Àrea comercial
           industrial: Zona industrial
           commercial: Zona comercial
@@ -2691,7 +2692,7 @@ ca:
       consider_pd: A més de tot l'anterior, accepto que les meves contribucions siguin
         de domini públic
       consider_pd_why: què és això?
-      consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
+      consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
       guidance_html: 'Informació per ajudar a entendre aquests termes: un <a href="%{summary}">resum
         llegible per humans</a> i algunes <a href="%{translations}">traduccions informals</a>'
       continue: Continua

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 4e0c16df03786f418c89261874129e509add940a..133a9618237862563c39ba799abd69b500d2c93c 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -910,7 +910,6 @@ cs:
           window_construction: Konstrukce oken
           winery: Vinařství
           "yes": Řemeslná dílna
-        crossing: Přechod
         emergency:
           access_point: Přístupový bod
           ambulance_station: Stanoviště záchranné služby
@@ -931,6 +930,7 @@ cs:
           bus_stop: Autobusová zastávka
           construction: Silnice ve výstavbě
           corridor: Koridor
+          crossing: Přechod
           cycleway: Cyklostezka
           elevator: Výtah
           emergency_access_point: Nouzový lokalizační bod
@@ -1401,7 +1401,7 @@ cs:
           artwork: Umělecké dílo
           attraction: Turistická atrakce
           bed_and_breakfast: Ubytování Bed & Breakfast
-          cabin: Chatka
+          cabin: Turistická útulna
           camp_pitch: Místo pro kempování
           camp_site: Tábořiště, kemp
           caravan_site: Autokemping
@@ -2314,6 +2314,7 @@ cs:
           common:
           - Pastvina
           - louka
+          - zahrada
           retail: Nákupní oblast
           industrial: Průmyslová oblast
           commercial: Kancelářská oblast

diff --git a/config/locales/da.yml b/config/locales/da.yml
index d33a14f6c7a8dbbe91cd25adbb13405c66a264ca..e8107f05a777ae71c8f4b86e877553128838942c 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -883,7 +883,6 @@ da:
           window_construction: Vinduessnedker
           winery: Vingård
           "yes": Håndsværksbutik
-        crossing: Fodgængerfelt
         emergency:
           access_point: Redningspunkt
           ambulance_station: Ambulancestation
@@ -904,6 +903,7 @@ da:
           bus_stop: Busstoppested
           construction: Vej under konstruktion
           corridor: Korridor
+          crossing: Fodgængerfelt
           cycleway: Cykelsti
           elevator: Elevator
           emergency_access_point: Nødudgangspunkt

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 542d2770e3b96cb93f6a5ace383939d8f3699bf1..34b608a88e0f061e028c746fcf6c7d856a92aff3 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -944,7 +944,6 @@ de:
           window_construction: Fensterbauer
           winery: Weingut
           "yes": Handwerksgeschäft
-        crossing: Überquerung
         emergency:
           access_point: Zugangspunkt
           ambulance_station: Rettungswache
@@ -965,6 +964,7 @@ de:
           bus_stop: Bushaltestelle
           construction: Straße im Bau
           corridor: Flur
+          crossing: Überquerung
           cycleway: Radweg
           elevator: Lift
           emergency_access_point: Notrufpunkt

diff --git a/config/locales/el.yml b/config/locales/el.yml
index 359ebbe62a16827d36224e7c393973cd2889f9a1..286211c8906ab73738f97f09606c7b17b572aa8b 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -866,7 +866,6 @@ el:
           tailor: Ράφτης
           winery: Οινοποιείο
           "yes": Κατάστημα τεχνών
-        crossing: Διάβαση
         emergency:
           access_point: Σημείο Πρόσβασης
           ambulance_station: Σταθμός ασθενοφόρων
@@ -883,6 +882,7 @@ el:
           bus_stop: Στάση λεωφορείου
           construction: Δρόμος υπό κατασκευή
           corridor: Διάδρομος
+          crossing: Διάβαση
           cycleway: Ποδηλατόδρομος
           elevator: Ανελκυστήρας
           emergency_access_point: Σημείο πρόσβασης έκτακτης ανάγκης

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0aa0ad555a2e45216b27dc6fb89eff4aedbbeef4..7bcaf4f448592ef701d001eaf8c83df15e8d9980 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -822,7 +822,6 @@ en:
           window_construction: "Window Construction"
           winery: "Winery"
           "yes": "Craft Shop"
-        crossing: "Crossing"
         emergency:
           access_point: "Access Point"
           ambulance_station: "Ambulance Station"
@@ -843,6 +842,7 @@ en:
           bus_stop: "Bus Stop"
           construction: "Highway under Construction"
           corridor: "Corridor"
+          crossing: "Crossing"
           cycleway: "Cycle Path"
           elevator: "Elevator"
           emergency_access_point: "Emergency Access Point"

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 9a4c96a8c67d815a9397626452c7decd009bffe5..a8bb9b834aabb28ea593566d7120df205f990c4a 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -872,7 +872,6 @@ eo:
           window_construction: Laborejo de fenestr-faristo
           winery: Vinejo
           "yes": Metiejo
-        crossing: Trapasejo
         emergency:
           access_point: Vivsava rekonebla signo
           ambulance_station: Ambulanca stacio
@@ -893,6 +892,7 @@ eo:
           bus_stop: Haltejo aŭtobusa
           construction: Vojo konstruata
           corridor: Koridoro
+          crossing: Trapasejo
           cycleway: Bicikovojo
           elevator: Lifto
           emergency_access_point: Vivsava rekonebla signo

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 609255ebcc2aa6e25b9546a71b163260370d50f7..0b9af4f5d58ebb3da71f10593377db7df5400a80 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -940,7 +940,6 @@ es:
           window_construction: Construcción de ventanas
           winery: Bodega
           "yes": Tienda de artesanía
-        crossing: Cruce
         emergency:
           access_point: Punto de acceso
           ambulance_station: Base de ambulancias
@@ -961,6 +960,7 @@ es:
           bus_stop: Parada de autobuses
           construction: Calle o carretera en construcción
           corridor: Corredor
+          crossing: Cruce
           cycleway: Bicisenda
           elevator: Ascensor
           emergency_access_point: Acceso de emergencia

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 3478e651d25c9e693824982b094aba3c7ca433e3..5a0e2837d7a5e5bc3df3f9a8941652b6d2abd986 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -869,7 +869,6 @@ fi:
           tailor: Räätäli
           winery: Viinitila
           "yes": Käsityömyymälä
-        crossing: Suojatie
         emergency:
           ambulance_station: Ensihoitoasema
           assembly_point: kohtaamispaikka
@@ -887,6 +886,7 @@ fi:
           bus_stop: Bussipysäkki
           construction: Rakenteilla oleva tie
           corridor: käytävä
+          crossing: Suojatie
           cycleway: Pyörätie
           elevator: Hissi
           emergency_access_point: Hätätilapaikka

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index ca9bb81435d4f0be023c4740ab1f951bd07cebba..2258beb0c08623013a661435159e2fef54d6029d 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -958,7 +958,6 @@ fr:
           window_construction: Construction de fenêtre
           winery: Domaine viticole
           "yes": Boutique d’artisanat
-        crossing: Croisement
         emergency:
           access_point: Point d’accès
           ambulance_station: Dépôt d’ambulances
@@ -979,6 +978,7 @@ fr:
           bus_stop: Arrêt de bus
           construction: Route en construction
           corridor: Couloir
+          crossing: Croisement
           cycleway: Piste cyclable
           elevator: Ascenseur
           emergency_access_point: Point d’accès d’urgence

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 5188ed3e88b51a620ca5ea8758e66568ccb5b3a8..aa5f699ab31b68541e39c875b98deee40621ca9a 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -851,7 +851,6 @@ fy:
           window_construction: Kezinebedriuw
           winery: Wynmakkerij
           "yes": Ambachtlik bedriuw
-        crossing: Oerstekplak
         emergency:
           access_point: Rêdingspunt
           ambulance_station: Ambulânsepost
@@ -872,6 +871,7 @@ fy:
           bus_stop: Bushalte
           construction: Wei yn oanlis
           corridor: Korridor
+          crossing: Oerstekplak
           cycleway: Fytspaad
           elevator: Lift
           emergency_access_point: Rêdingspunt

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 044bb240a5683c2ab7d0238802baca4b281cc22c..b3ef3cd2ab972a984df7b843c14b90de099043fa 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -843,7 +843,6 @@ gl:
           window_construction: Construtor de xanelas
           winery: Adega
           "yes": Tenda de artesanía
-        crossing: Paso
         emergency:
           access_point: Punto de acceso
           ambulance_station: Base de ambulancias
@@ -864,6 +863,7 @@ gl:
           bus_stop: Parada de bus
           construction: Autoestrada baixo construción
           corridor: Corredor
+          crossing: Paso
           cycleway: Senda ciclista
           elevator: Ascensor
           emergency_access_point: Punto de acceso de emerxencia

diff --git a/config/locales/he.yml b/config/locales/he.yml
index aa83810801bd083700c8128c26327d8acc50e637..7460b893dfcda472d98b8a6814b1df1fb17ce222 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -908,7 +908,6 @@ he:
           window_construction: הרכבת חלונות
           winery: יקב
           "yes": חנות מלאכת־יד
-        crossing: מעבר
         emergency:
           access_point: נקודת גישה
           ambulance_station: תחנת אמבולנסים
@@ -929,6 +928,7 @@ he:
           bus_stop: תחנת אוטובוס
           construction: דרך בבנייה
           corridor: פרוזדור
+          crossing: מעבר
           cycleway: נתיב אופניים
           elevator: מעלית
           emergency_access_point: נקודת ציון לחירום

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index d96bd6eb86f70281c1808773b4b6a80dff8fca72..42e03e1a9d5303abc905d59d22805f30ff05e150 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -883,7 +883,6 @@ hu:
           window_construction: Ablakkészítő
           winery: Borászat
           "yes": Kézműves bolt
-        crossing: Gyalogosátkelő
         emergency:
           access_point: Mentési pont
           ambulance_station: Mentőállomás
@@ -904,6 +903,7 @@ hu:
           bus_stop: Buszmegálló
           construction: Épülő út
           corridor: Folyosó
+          crossing: Gyalogosátkelő
           cycleway: Kerékpárút
           elevator: Lift
           emergency_access_point: Mentési pont

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index e968f818b21b527cf7177b5651c57961a14d5088..fe18934ad2436c596e82e29583e5f09426cfdfdc 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -859,7 +859,6 @@ ia:
           window_construction: Construction de fenestras
           winery: Vinia
           "yes": Boteca de artisanato
-        crossing: Transversamento
         emergency:
           access_point: Puncto de accesso
           ambulance_station: Station de ambulantias
@@ -880,6 +879,7 @@ ia:
           bus_stop: Halto de autobus
           construction: Strata in construction
           corridor: Corridor
+          crossing: Transversamento
           cycleway: Pista cyclabile
           elevator: Ascensor
           emergency_access_point: Puncto de accesso de emergentia

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 3552270a85d0b1e6ec7300bff1798d27c1032847..29c92753fb10dc33fa7cec749021e42bd5016da6 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -881,7 +881,6 @@ is:
           window_construction: Gluggasmíði
           winery: Víngerð
           "yes": Handverkshús
-        crossing: Götugangur
         emergency:
           access_point: Aðgangspunktur
           ambulance_station: Sjúkrabílastöð
@@ -902,6 +901,7 @@ is:
           bus_stop: Strætisvagnabiðstöð
           construction: Hraðbraut í byggingu
           corridor: Gangur
+          crossing: Götugangur
           cycleway: Hjólastígur
           elevator: Lyfta
           emergency_access_point: Neyðaraðgangur

diff --git a/config/locales/it.yml b/config/locales/it.yml
index acf9332478530d7eb2a44b7028d5f4f01e9462d9..dd64c9d1809c20fabbe5d10992fbc680006c0f84 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -916,7 +916,6 @@ it:
           window_construction: Costruttore di finestre
           winery: Cantina vinicola
           "yes": Negozio di Artigianato
-        crossing: Attraversamento
         emergency:
           access_point: Punto d'accesso
           ambulance_station: Stazione delle ambulanze
@@ -937,6 +936,7 @@ it:
           bus_stop: Fermata dell'autobus
           construction: Strada in costruzione
           corridor: Corridoio
+          crossing: Attraversamento
           cycleway: Percorso ciclabile
           elevator: Ascensore
           emergency_access_point: Punto di accesso di emergenza
@@ -2354,6 +2354,7 @@ it:
           common:
           - Area comune
           - prato
+          - giardino
           retail: Zona con negozi
           industrial: Zona industriale
           commercial: Zona di uffici

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index c72eca3943bf9ec58462235b68da6c9123577e52..58bf6f2f825b4fc96801f8cbe01dc4b7d28be841 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -863,7 +863,6 @@ ja:
           window_construction: サッシ施工業
           winery: ワイン醸造所
           "yes": 手芸店
-        crossing: 交差点
         emergency:
           access_point: アクセスポイント
           ambulance_station: 消防署
@@ -884,6 +883,7 @@ ja:
           bus_stop: バス停
           construction: 建設中の高速道路
           corridor: 通路
+          crossing: 交差点
           cycleway: 自転車道
           elevator: エレベータ
           emergency_access_point: 緊急アクセスポイント

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 5b6f9dea7984d81eab4ca1825da4fe0eb194a33d..eb8f126de0076a7aa2730c89e129c70298987314 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -807,7 +807,6 @@ lb:
           window_construction: Fënsterbauer
           winery: Wäigutt
           "yes": Handwierksgeschäft
-        crossing: Kräizung
         emergency:
           access_point: Zougangspunkt
           ambulance_station: Rettungswaach
@@ -828,6 +827,7 @@ lb:
           bus_stop: Busarrêt
           construction: Autobunn (am Bau)
           corridor: Couloir
+          crossing: Kräizung
           cycleway: Véloswee
           elevator: Lift
           emergency_access_point: Noutruffpunkt

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 273175aea0b18eb5e98e78f97b2d3cf253054011..e70eaa7f6ef6f012ff8aeca7fe3ccfeda535910c 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -863,7 +863,6 @@ mk:
           window_construction: Изработка на прозорци
           winery: Винарија
           "yes": Занаетчиски дуќан
-        crossing: Премин
         emergency:
           access_point: Пристапна точка
           ambulance_station: Итна помош
@@ -884,6 +883,7 @@ mk:
           bus_stop: Автобуска постојка
           construction: Автопат во изградба
           corridor: Премин
+          crossing: Премин
           cycleway: Велосипедска патека
           elevator: Лифт
           emergency_access_point: Прва помош

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 155e257c38cdc80df785f7049d6700ebf6486ffd..16143023413228f2873ddf4d526e0df58b2a69ae 100644 (file)
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -10,12 +10,13 @@
 # Author: Pizza1016
 # Author: SNN95
 # Author: Tofeiku
+# Author: Ultron90
 # Author: Zulfadli51
 ---
 ms:
   time:
     formats:
-      friendly: '%e %B %Y, %H:%M'
+      friendly: '%e %B %Y pada %H:%M'
   helpers:
     file:
       prompt: Pilih fail
@@ -24,19 +25,22 @@ ms:
         create: Simpan
       diary_entry:
         create: Terbitkan
-        update: Kemas kini
+        update: Kemaskini
       issue_comment:
-        create: Berikan Komen
+        create: Tambah ulasan
       message:
-        create: Kirim
+        create: Hantar
       client_application:
         create: Daftar
         update: Kemas kini
+      doorkeeper_application:
+        create: Daftar
+        update: Kemaskini
       redaction:
         create: Cipta redaksi
         update: Simpan redaksi
       trace:
-        create: Muat naik
+        create: Muatnaik
         update: Simpan Perubahan
       user_block:
         create: Buat sekatan
@@ -83,7 +87,7 @@ ms:
       way_tag: Tag Jalan
     attributes:
       client_application:
-        name: Nama (Diperlukan)
+        name: Nama (Perlu)
         callback_url: URL Panggil Balik
         support_url: URL Sokongan
       diary_comment:
@@ -94,6 +98,8 @@ ms:
         latitude: Garis Lintang
         longitude: Garis Bujur
         language: Bahasa
+      doorkeeper/application:
+        name: Nama
       friend:
         user: Pengguna
         friend: Rakan
@@ -194,6 +200,12 @@ ms:
       entry:
         comment: Komen
         full: Nota penuh
+  account:
+    deletions:
+      show:
+        delete_account: Hapus Akaun
+        confirm_delete: Anda pasti?
+        cancel: Batal
   accounts:
     edit:
       title: Sunting akaun
@@ -231,13 +243,16 @@ ms:
         link text: apakah ini?
       save changes button: Simpan Perubahan
       make edits public button: Umumkan semua suntingan saya
+      delete_account: Hapus Akaun...
     update:
       success_confirm_needed: Maklumat pengguna berjaya dikemaskinikan. Semak e-mel
         anda untuk pesanan untuk mengesahkan alamat e-mel baru anda.
       success: Maklumat pengguna berjaya dikemaskinikan.
+    destroy:
+      success: Akaun Terhapus.
   browse:
-    created: Dicipta
-    closed: Ditutup
+    created: Tercipta
+    closed: Tertutup
     created_html: Dicipta <abbr title='%{title}'>%{time}</abbr>
     closed_html: Ditutup <abbr title='%{title}'>%{time}</abbr>
     created_by_html: Dicipta <abbr title='%{title}'>%{time}</abbr> oleh %{user}

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 890158fac4352d31a51851891fd32f13f32be902..6f82be53ab4ecb316b2530b6e5d4e462e642c7a3 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -919,7 +919,6 @@ nl:
           window_construction: Raamconstructie
           winery: Wijnboer
           "yes": Ambachtswinkel
-        crossing: Oversteekplaats
         emergency:
           access_point: Rendez-vouspunt voor reddingsdiensten
           ambulance_station: Ambulancepost
@@ -940,6 +939,7 @@ nl:
           bus_stop: Bushalte
           construction: Weg in aanleg
           corridor: Corridor
+          crossing: Oversteekplaats
           cycleway: Fietspad
           elevator: Lift
           emergency_access_point: Noodafslag

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 4095ef8fe9b6cffb0de3b9e0c253e1ee6827ae3f..3c3469cb6c3994e33e856e470bb28664c69e6bb3 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -828,7 +828,6 @@ oc:
           window_construction: Construccion de fenèstras
           winery: Domeni viticòla
           "yes": Botiga d'artesanat
-        crossing: Crosament
         emergency:
           access_point: Ponch d'accès
           ambulance_station: Depaus d'ambulància
@@ -849,6 +848,7 @@ oc:
           bus_stop: Arrèst de bus
           construction: Autorota en construccion
           corridor: Corredor
+          crossing: Crosament
           cycleway: Pista ciclabla
           elevator: Ascensor
           emergency_access_point: Punt d'accès d'urgéncia

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 8bf21b27c94ffffac8c556d3a5896e5882d40fef..8d783d09fabd1176b0833e16daec1eda8d667050 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -951,7 +951,6 @@ pl:
           window_construction: Montaż okien
           winery: Winiarnia
           "yes": Warsztat
-        crossing: Przejście
         emergency:
           access_point: Punkt dla służb ratowniczych
           ambulance_station: Stacja pogotowia ratunkowego
@@ -972,6 +971,7 @@ pl:
           bus_stop: Przystanek autobusowy
           construction: Droga w trakcie budowy
           corridor: Korytarz
+          crossing: Przejście
           cycleway: Droga rowerowa
           elevator: Winda
           emergency_access_point: Punkt dla służb ratowniczych

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index b1cbf7eee86b714b393dc710068e102851f06fa2..ea1731fe5859deb3233ca5de6d88fe1eef9af68d 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -913,7 +913,6 @@ pt-BR:
           window_construction: Construção de janela
           winery: Adega
           "yes": Loja de Artesanato
-        crossing: Cruzando
         emergency:
           access_point: Ponto de acesso
           ambulance_station: Posto de Ambulâncias
@@ -934,6 +933,7 @@ pt-BR:
           bus_stop: Ponto de ônibus
           construction: Via em Construção
           corridor: Corredor
+          crossing: Cruzando
           cycleway: Ciclovia
           elevator: Elevador
           emergency_access_point: Ponto de Resgate Emergencial

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 97aaab50e3833917e0cfcbefe723b47539dc7119..5cdd4bda5bc9d831288f7a78a67b97c35d160268 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -908,7 +908,6 @@ pt-PT:
           window_construction: Caixilharia
           winery: Adega
           "yes": Loja de artesanato
-        crossing: Passadeira
         emergency:
           access_point: Ponto de acesso
           ambulance_station: Estação de ambulâncias
@@ -929,6 +928,7 @@ pt-PT:
           bus_stop: Paragem de autocarro
           construction: Estrada em construção
           corridor: Corredor
+          crossing: Passadeira
           cycleway: Ciclovia
           elevator: Elevador
           emergency_access_point: Ponto de acesso de emergência

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 1b5dd755fd960aa7fe446d9a572bcfa3db77e4f4..5294730f299a990a2253f4cfdcbb1a26f5028709 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -853,7 +853,6 @@ ro:
           window_construction: Construcție ferestre
           winery: Domeniu viticol
           "yes": Magazin de artizanat
-        crossing: Trecere de pietoni
         emergency:
           access_point: Punct de acces
           ambulance_station: Stație de ambulanță
@@ -874,6 +873,7 @@ ro:
           bus_stop: Stație de autobuz
           construction: Drum în construcție
           corridor: Coridor
+          crossing: Trecere de pietoni
           cycleway: Pistă de biciclete
           elevator: Lift
           emergency_access_point: Punct de acces de urgență

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 956e78eff7fe20294e371bc34f07d7b02cba1f88..635787010858a49db3f3930346ec4e98e7b91fe4 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -873,7 +873,6 @@ sk:
           window_construction: Montáž okien
           winery: Vináreň
           "yes": Remeselná dielňa
-        crossing: Priechod
         emergency:
           access_point: Prístupový bod
           ambulance_station: Stanica záchrannej služby
@@ -891,6 +890,7 @@ sk:
           bus_guideway: Bus so sprievodcom
           bus_stop: Zastávka autobusu
           construction: Cesta vo výstavbe
+          crossing: Priechod
           cycleway: Cyklistický chodník
           elevator: Výťah
           emergency_access_point: Stanica prvej pomoci

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 2b2cf9bc0f3c9bcf2abadebfc2c6d480e35054cb..cdf01169062669b3790b2306bfd47b5c3876f5a1 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -766,7 +766,6 @@ sl:
           tailor: Krojač
           winery: Vinogradništvo
           "yes": Obrtnik
-        crossing: Prehod
         emergency:
           access_point: Zbirno mesto
           ambulance_station: Reševalna postaja
@@ -783,6 +782,7 @@ sl:
           bus_guideway: Turistični avtobus
           bus_stop: Avtobusna postaja
           construction: Cesta v izgradnji
+          crossing: Prehod
           cycleway: Kolesarska steza
           elevator: Dvigalo
           emergency_access_point: Dostop za interventna vozila

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 88e9c3ba7acd71c51ced3dc42007e8ddb8f3895d..639d5cff1b7b2b460462ad09bbe7c0c5e608bc0c 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -911,7 +911,6 @@ sv:
           window_construction: Fönsterkonstruktion
           winery: Vingård
           "yes": Hantverksbutik
-        crossing: Övergångsställe
         emergency:
           access_point: Åtkomstpunkt
           ambulance_station: Ambulansstation
@@ -932,6 +931,7 @@ sv:
           bus_stop: Busshållplats
           construction: Väg under byggnad
           corridor: Korridor
+          crossing: Övergångsställe
           cycleway: Cykelspår
           elevator: Hiss
           emergency_access_point: Utryckningsplats

diff --git a/config/locales/te.yml b/config/locales/te.yml
index 5e82eab18bf2e773ba831e83867daeb4c18fa549..03f91a13c16266421aa2bb53d852587319b3230d 100644 (file)
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -865,7 +865,6 @@ te:
           window_construction: కిటికీ తయారీ
           winery: వైనరీ
           "yes": క్రాఫ్టు దుకాణం
-        crossing: క్రాసింగు
         emergency:
           access_point: Access Point
           ambulance_station: అంబులెన్సు కేంద్రం
@@ -886,6 +885,7 @@ te:
           bus_stop: బస్ స్టాపు
           construction: నిర్మాణంలో ఉన్న హైవే
           corridor: నడవా
+          crossing: క్రాసింగు
           cycleway: సైకిలు దారి
           elevator: లిఫ్టు
           emergency_access_point: అత్యవసర యాక్సెస్ స్థానం

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 9bd8a84abae28c5b7101be931be8b8abdf72017a..676f46fa3d200c211ebfd00f62d74c5db21557f8 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -915,7 +915,6 @@ tr:
           window_construction: Pencere Üreticisi
           winery: Şaraphane
           "yes": El Sanatları Mağazası
-        crossing: Geçit
         emergency:
           access_point: Erişim Noktası
           ambulance_station: Ambulans İstasyonu
@@ -936,6 +935,7 @@ tr:
           bus_stop: Otobüs Durağı
           construction: Yapım Aşamasında Karayolu
           corridor: Koridor
+          crossing: Geçit
           cycleway: Bisiklet Yolu
           elevator: Asansör
           emergency_access_point: Acil Erişim Noktası

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 91752f914a74bd2b6537c5bfceadbdfbf12ccf87..768f79bf86391383ce29bda414606ccfcdc3f6cd 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -93,7 +93,7 @@ uk:
       diary_comment: Коментарі щоденника
       diary_entry: Запис щоденника
       friend: Друг
-      issue: Ð\9fÑ\80облема
+      issue: Ð\97веÑ\80неннÑ\8f
       language: Мова
       message: Повідомлення
       node: Точка
@@ -110,7 +110,7 @@ uk:
       relation: Зв’язок
       relation_member: Елемент зв’язку
       relation_tag: Теґ зв’язку
-      report: Ð\97вÑ\96Ñ\82
+      report: СкаÑ\80га
       session: Сеанс
       trace: Трек
       tracepoint: Точка треку
@@ -939,7 +939,6 @@ uk:
           window_construction: Майстер віконних конструкцій
           winery: Виноробня
           "yes": Товари для рукоділля
-        crossing: Переправа
         emergency:
           access_point: Точка доступу
           ambulance_station: Станція швидкої медичної допомоги
@@ -960,6 +959,7 @@ uk:
           bus_stop: Автобусна зупинка
           construction: Будівництво автомагістралі
           corridor: Коридор
+          crossing: Переправа
           cycleway: Велодоріжка
           elevator: Ліфт
           emergency_access_point: Пункт швидкої допомоги
@@ -1492,16 +1492,16 @@ uk:
       more_results: Більше результатів
   issues:
     index:
-      title: Ð\9fÑ\80облеми
+      title: Ð\97веÑ\80неннÑ\8f
       select_status: Вибрати статус
       select_type: Вибрати тип
       select_last_updated_by: Вибрати останнього редактора
       reported_user: Мапер, на якого поскаржились
       not_updated: Не оновлювалось
       search: Пошук
-      search_guidance: 'Ð\97найÑ\82и пÑ\80облемÑ\83:'
+      search_guidance: 'Ð\9fоÑ\88Ñ\83к Ð\97веÑ\80ненÑ\8c:'
       user_not_found: Такого учасника не існує
-      issues_not_found: Такі проблеми не знайдені
+      issues_not_found: Таке звернення не знайдене
       status: Статус
       reports: Скарги
       last_updated: Останнє оновлення
@@ -1513,7 +1513,7 @@ uk:
         few: '%{count} Скарги'
         many: '%{count} Скарг'
         other: ""
-      reported_item: Ð\9eÑ\81каÑ\80жено
+      reported_item: Ð\9fÑ\80о Ñ\89о
       states:
         ignored: Проігноровано
         open: Відкрито
@@ -1523,7 +1523,7 @@ uk:
       successful_update: Вашу скаргу було оновлено
       provide_details: Будь ласка, додайте потрібні деталі
     show:
-      title: '%{status} Скарга #%{issue_id}'
+      title: 'Звернення #%{issue_id} - %{status}'
       reports:
         zero: Скарг немає
         one: 1 скарга
@@ -1532,30 +1532,30 @@ uk:
       report_created_at: Вперше повідомлено %{datetime}
       last_resolved_at: В останнє розв'язано %{datetime}
       last_updated_at: В останнє оновлено %{datetime}, %{displayname}
-      resolve: Роз'вязано
+      resolve: Розв'язати
       ignore: Ігнорувати
       reopen: Повторно відкрити
-      reports_of_this_issue: СкаÑ\80ги на Ñ\86Ñ\8e проблему
+      reports_of_this_issue: Ð\9fовÑ\96домленнÑ\8f пÑ\80о проблему
       read_reports: Читати скарги
       new_reports: Нові скарги
-      other_issues_against_this_user: Інші скарги на цього учасника
+      other_issues_against_this_user: Інші звернення щодо цього учасника
       no_other_issues: Немає інших скарг на цього учасника
-      comments_on_this_issue: Ð\9aоменÑ\82аÑ\80Ñ\96 до Ñ\86Ñ\96Ñ\94Ñ\97 пÑ\80облеми
+      comments_on_this_issue: Ð\9aоменÑ\82аÑ\80Ñ\96 до Ñ\86Ñ\8cого звеÑ\80неннÑ\8f
     resolve:
-      resolved: СÑ\82аÑ\82Ñ\83Ñ\81 пÑ\80облеми був змінений на 'Розв’язано'
+      resolved: СÑ\82аÑ\82Ñ\83Ñ\81 звеÑ\80неннÑ\8f був змінений на 'Розв’язано'
     ignore:
-      ignored: СÑ\82аÑ\82Ñ\83Ñ\81 пÑ\80облеми був змінений на 'Проігноровано'
+      ignored: СÑ\82аÑ\82Ñ\83Ñ\81 звеÑ\80неннÑ\8f був змінений на 'Проігноровано'
     reopen:
       reopened: Статус проблеми був змінений на 'Відкрито'
     comments:
       comment_from_html: Коментар від %{user_link}, %{comment_created_at}
-      reassign_param: Ð\9fеÑ\80епÑ\80изнаÑ\87иÑ\82и пÑ\80облемÑ\83?
+      reassign_param: Ð\9fеÑ\80епÑ\80изнаÑ\87иÑ\82и звеÑ\80неннÑ\8f?
     reports:
       reported_by_html: Повідомлено як %{category}, %{user}, %{updated_at}
     helper:
       reportable_title:
         diary_comment: '%{entry_title}, коментар #%{comment_id}'
-        note: 'Ð\9fÑ\80имÑ\96тка #%{note_id}'
+        note: 'Ð\9dоÑ\82атка #%{note_id}'
   issue_comments:
     create:
       comment_created: Коментар створено
@@ -1569,8 +1569,8 @@ uk:
         not_just_mistake: Ви впевненні що це не звичайна помилка
         unable_to_fix: Ви не можете виправити проблему самі або за допомогою інших
           маперів з вашої спільноти
-        resolve_with_user: Ð\92и намагалиÑ\81Ñ\8c Ñ\80озв'Ñ\8fзаÑ\82и пÑ\80облемÑ\83 Ñ\8fка Ñ\81Ñ\82алаÑ\81Ñ\8f Ñ\87еÑ\80ез зазнаÑ\87еного
-          учасника
+        resolve_with_user: Ð\92и вже намагалиÑ\81Ñ\8c Ñ\80озв'Ñ\8fзаÑ\82и пÑ\80облемÑ\83 Ñ\8fка Ñ\81Ñ\82алаÑ\81Ñ\8f Ñ\87еÑ\80ез
+          зазначеного учасника
       categories:
         diary_entry:
           spam_label: Цей допис в щоденнику містить або сам є спамом
@@ -1609,7 +1609,7 @@ uk:
     edit: Редагувати
     history: Історія
     export: Експорт
-    issues: Ð\9fÑ\80облеми
+    issues: Ð\97веÑ\80неннÑ\8f
     data: Дані
     export_data: Експортувати дані
     gps_traces: GPS-треки
@@ -2627,19 +2627,19 @@ uk:
     edit:
       title: Змінити дані вашого застосунку
     show:
-      title: Ð\9fодÑ\80обиÑ\86Ñ\96 OAuth для %{app_name}
+      title: Ð\9fаÑ\80амеÑ\82Ñ\80и OAuth для %{app_name}
       key: 'Ключ абонента:'
       secret: 'Секретна фраза абонента:'
       url: 'URL маркеру запита:'
       access_url: 'URL маркер доступу:'
       authorize_url: 'URL авторизації:'
       support_notice: Ми підтримуємо підписи HMAC-SHA1 (рекомендується) і RSA-SHA1.
-      edit: Ð\97мÑ\96ниÑ\82и подÑ\80обиÑ\86Ñ\96
+      edit: Ð\97мÑ\96ниÑ\82и паÑ\80амеÑ\82Ñ\80и
       delete: Вилучити клієнта
       confirm: Ви впевнені?
       requests: 'Запит наступних дозволів з налаштувань:'
     index:
-      title: Ð\94еÑ\82алÑ\96 OAuth
+      title: Ð\9fаÑ\80амеÑ\82Ñ\80и OAuth
       my_tokens: Мої автентифіковані застосунки
       list_tokens: 'Наступні токени були видані для застосунків на ваше ім’я:'
       application: Назва застосунка
@@ -2651,7 +2651,7 @@ uk:
         тим, як він зможе зробити OAuth-запит до цієї служби.
       oauth: OAuth
       registered_apps: 'У вас зареєстровані такі клієнтські застосунки:'
-      register_new: Ð\97аÑ\80еÑ\94Ñ\81Ñ\82Ñ\80Ñ\83ваÑ\82и ваÑ\88 застосунок
+      register_new: Ð\97аÑ\80еÑ\94Ñ\81Ñ\82Ñ\80Ñ\83ваÑ\82и новий застосунок
     form:
       requests: 'Отримувати наступні дозволи:'
     not_found:

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index fcb94dbb7746f584fcdb1a4aaa6b4e46c41dcb78..0dbf9e2c1814d4f00d7126b8168dd1553ab69f37 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -854,7 +854,6 @@ vi:
           tailor: Tiệm May
           winery: Nhà máy Rượu vang
           "yes": Doanh nghiệp Thủ công
-        crossing: Lối Qua đường
         emergency:
           ambulance_station: Trạm Xe cứu thương
           assembly_point: Điểm Tập trung Khẩn cấp
@@ -870,6 +869,7 @@ vi:
           bus_stop: Trạm Xe buýt
           construction: Đường Đang Xây
           corridor: Hành lang
+          crossing: Lối Qua đường
           cycleway: Đường Xe đạp
           elevator: Thang máy
           emergency_access_point: Địa điểm Truy nhập Khẩn cấp

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 56532439c02137e785b2253348e5af33e5fc53da..9b28af138983a1e04a808bf7732773ed0fd6ba73 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -901,7 +901,6 @@ zh-CN:
           window_construction: 窗户施工
           winery: 酿酒厂
           "yes": 工艺品店
-        crossing: 十字路口
         emergency:
           access_point: 存储点
           ambulance_station: 救护站
@@ -922,6 +921,7 @@ zh-CN:
           bus_stop: 公共汽车站
           construction: 在建公路
           corridor: 走廊
+          crossing: 十字路口
           cycleway: 自行车道
           elevator: 电梯
           emergency_access_point: 紧急求救点

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index de07f7163ed2d21a2acecde80a0bfabd31f74886..0312a72e83e4f006948328763bf2a2c0496e09c9 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -869,7 +869,6 @@ zh-TW:
           window_construction: 窗戶建設
           winery: 酒廠
           "yes": 工藝品店
-        crossing: 路口
         emergency:
           access_point: 進入點
           ambulance_station: 急救站
@@ -890,6 +889,7 @@ zh-TW:
           bus_stop: 公車站
           construction: 建造中道路
           corridor: 走廊
+          crossing: 路口
           cycleway: 自行車道
           elevator: 電梯
           emergency_access_point: 緊急聯絡點

diff --git a/config/locales/zh-hk.yml b/config/locales/zh-hk.yml
index b26dcf4786614ab85b5fab957f585c80dca69672..b2ea1ba749a1d07c82dc724e2088799b93851e7a 100644 (file)
--- a/config/locales/zh-hk.yml
+++ b/config/locales/zh-hk.yml
@@ -546,7 +546,6 @@ zh-hk:
           window_construction: 窗戶建設
           winery: 釀酒廠
           "yes": 工藝品商店
-        crossing: 十字路口
         emergency:
           access_point: 進入點
           ambulance_station: 急救站
@@ -567,6 +566,7 @@ zh-hk:
           bus_stop: 巴士站
           construction: 建造中公路
           corridor: 走廊
+          crossing: 十字路口
           cycleway: 單車徑
           elevator: 電梯
           emergency_access_point: 緊急聯絡點

diff --git a/yarn.lock b/yarn.lock
index 98e8d3fcf96759ecb58f192bfcfc3ff543070cfb..92ab2a7324d97ca1ef3fdf9c51d76fc5025de6aa 100644 (file)
--- a/yarn.lock
+++ b/yarn.lock
@@ -189,9 +189,9 @@ eslint-visitor-keys@^3.3.0:
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
 eslint@^8.0.0:
-  version "8.16.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.16.0.tgz#6d936e2d524599f2a86c708483b4c372c5d3bbae"
-  integrity sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==
+  version "8.17.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.17.0.tgz#1cfc4b6b6912f77d24b874ca1506b0fe09328c21"
+  integrity sha512-gq0m0BTJfci60Fz4nczYxNAlED+sMcihltndR8t9t1evnU/azx53x3t2UHXC/uRjcbvRw/XctpaNygSTcQD+Iw==
   dependencies:
     "@eslint/eslintrc" "^1.3.0"
     "@humanwhocodes/config-array" "^0.9.2"