Localisation updates from https://translatewiki.net.

diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index 9c511cccf741d6816b6282ebcdd3a0ab64ae0c87..00c2b74e7098daa79a19416f9d09d858421d2125 100644 (file)
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -753,23 +753,15 @@ be-Tarask:
         поўнага адрасу ‘OpenStreetMap’), на opendatacommons.org і, пры
         неабходнасьці, на www.creativecommons.org.
       more_title_html: Даведацца болей
         поўнага адрасу ‘OpenStreetMap’), на opendatacommons.org і, пры
         неабходнасьці, на www.creativecommons.org.
       more_title_html: Даведацца болей

-      more_1_html: |-
-        Даведайцеся болей пра выкарыстаньне нашых зьвестак і пра спасыланьне на нас на <a
-        href="http://osmfoundation.org/Licence">старонцы ліцэнзіі OSMF</a> і <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">старонцы адказаў
-        і пытаньняў</a>.
+      more_1_html: Даведайцеся болей пра выкарыстаньне нашых зьвестак і пра спасыланьне
+        на нас на <a href="https://osmfoundation.org/Licence">старонцы ліцэнзіі OSMF</a>.

       more_2_html: |-
         Хоць OpenStreetMap ёсьць адкрытымі зьвесткамі, мы ня здольныя прадаставіць бяскоштны API мапаў для староньніх распрацоўнікаў. Глядзіце нашыя <a href="https://operations.osmfoundation.org/policies/api/">правілы карыстаньня API</a>, <a href="https://operations.osmfoundation.org/policies/tiles/">правілы карыстаньня частак мапаў</a>
         і <a href="https://operations.osmfoundation.org/policies/nominatim/">правілы карыстаньня Nominatim</a>.
       contributors_title_html: Нашыя ўдзельнікі
       more_2_html: |-
         Хоць OpenStreetMap ёсьць адкрытымі зьвесткамі, мы ня здольныя прадаставіць бяскоштны API мапаў для староньніх распрацоўнікаў. Глядзіце нашыя <a href="https://operations.osmfoundation.org/policies/api/">правілы карыстаньня API</a>, <a href="https://operations.osmfoundation.org/policies/tiles/">правілы карыстаньня частак мапаў</a>
         і <a href="https://operations.osmfoundation.org/policies/nominatim/">правілы карыстаньня Nominatim</a>.
       contributors_title_html: Нашыя ўдзельнікі

-      contributors_intro_html: |-
-        Нашая ліцэнзія CC BY-SA патрабуе ад Вас &ldquo;падаць арыгінальнага аўтара
-        у адпаведнасьці з асаблівасьцямі носьбітаў інфармацыі ці іншых выкарыстоўваемых сродкаў
-        &rdquo;. Звычайныя ўдзельнікі OSM не патрабуюць пазначэньня аўтарства
-        болей чым &ldquo;удзельнікі OpenStreetMap
-        &rdquo;, але ў OpenStreetMap ёсьць зьвесткі з нацыянальных
-        картаграфічных агенцтваў ці іншых падобных крыніцаў,
-        таму, магчыма, мае сэнс спасылацца непасрэдна на іх
-        як на крыніцу, ці дадаць спасылку на гэтую старонку.
+      contributors_intro_html: 'Нашы аўтары — гэта тысячы асобаў. Мы таксама ўключаем
+        зьвесткі з вольнай ліцэнзіяй ад нацыянальных картаграфічных службаў і зь іншых
+        крыніц, сярод іх:'

       contributors_at_html: |-
         <strong>Аўстрыя</strong>: Утрымлівае зьвесткі
         <a href="http://data.wien.gv.at/">горада Вены</a> на ўмовах
       contributors_at_html: |-
         <strong>Аўстрыя</strong>: Утрымлівае зьвесткі
         <a href="http://data.wien.gv.at/">горада Вены</a> на ўмовах

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 005236535e813543cb1a589bda9a0a64c6b996f5..ab533285bbfc4f1fd387d685c84dcb1ca448769f 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1223,6 +1223,7 @@ bg:
       creator: Автор
       ago_html: преди %{when}
   javascripts:
       creator: Автор
       ago_html: преди %{when}
   javascripts:

+    close: Затваряне

     share:
       title: Споделяне
       cancel: Отказ
     share:
       title: Споделяне
       cancel: Отказ

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 494862455e47bcbb05ac8e104f7eafafa7c39cc8..aa0cb2fe8e556df1a5bc3ada09e1627aa4ef50d4 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -2473,7 +2473,7 @@ cs:
         slight_left_without_exit: Mírně vlevo na %{name}
         via_point_without_exit: (zastávka)
         follow_without_exit: Jeďte po %{name}
         slight_left_without_exit: Mírně vlevo na %{name}
         via_point_without_exit: (zastávka)
         follow_without_exit: Jeďte po %{name}

-        roundabout_without_exit: Z kruhovém objezdu vyjeďte výjezdem vedoucím do %{name}
+        roundabout_without_exit: Z kruhového objezdu vyjeďte na %{name}

         leave_roundabout_without_exit: Vyjeďte z kruhového objezdu – %{name}
         stay_roundabout_without_exit: Zůstaňte na kruhovém objezdu – %{name}
         start_without_exit: Začněte na %{name}
         leave_roundabout_without_exit: Vyjeďte z kruhového objezdu – %{name}
         stay_roundabout_without_exit: Zůstaňte na kruhovém objezdu – %{name}
         start_without_exit: Začněte na %{name}

diff --git a/config/locales/el.yml b/config/locales/el.yml
index 9ee78689556d9e9e3373e629c839591a3569b36f..7f8a768ebd06447d40bcfabf8355fe19f67c8483 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -751,7 +751,7 @@ el:
           watermill: Νερόμυλος
           water_tower: Πύργος νερού
           water_well: Πηγάδι
           watermill: Νερόμυλος
           water_tower: Πύργος νερού
           water_well: Πηγάδι

-          water_works: Î\88Ï\81γα νεÏ\81οÏ\8d
+          water_works: Î\88Ï\81γα ΥδάÏ\84Ï\89ν

           windmill: Αερόμυλος
           works: Εργοστάσιο
           "yes": Τεχνητό
           windmill: Αερόμυλος
           works: Εργοστάσιο
           "yes": Τεχνητό

diff --git a/config/locales/es.yml b/config/locales/es.yml
index e4b653e9e6d9019d70eb77675d6476b2e93b9a5e..533fe886aeb2ae663d414919b7e28902b5fa7ca4 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -2481,7 +2481,7 @@ es:
         slight_left_without_exit: Gire un poco a la izquierda hacia %{name}
         via_point_without_exit: (punto intermedio)
         follow_without_exit: Siga %{name}
         slight_left_without_exit: Gire un poco a la izquierda hacia %{name}
         via_point_without_exit: (punto intermedio)
         follow_without_exit: Siga %{name}

-        roundabout_without_exit: En la rotonda, tomar %{name}
+        roundabout_without_exit: En la rotonda, tomar salida hacia %{name}

         leave_roundabout_without_exit: Salir de la rotonda - %{name}
         stay_roundabout_without_exit: Permanecer en la rotonda - %{name}
         start_without_exit: Comenzar en %{name}
         leave_roundabout_without_exit: Salir de la rotonda - %{name}
         stay_roundabout_without_exit: Permanecer en la rotonda - %{name}
         start_without_exit: Comenzar en %{name}

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 0ff701014e98983514ef9507004c6dc399ddc3d4..c9026357ab905e08b005e65fe68fd0bab272c669 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -898,6 +898,7 @@ fi:
           optician: Optikko
           organic: Luomukauppa
           outdoor: Ulkoiluvälinekauppa
           optician: Optikko
           organic: Luomukauppa
           outdoor: Ulkoiluvälinekauppa

+          paint: Maalikauppa

           pet: Eläinkauppa
           pharmacy: Apteekki
           photo: Valokuvausliike
           pet: Eläinkauppa
           pharmacy: Apteekki
           photo: Valokuvausliike


@@ -2414,6 +2415,7 @@ fi:
         turn_left_without_exit: Käänny vasemmalle tielle %{name}
         offramp_left_without_exit: Poistu vasemmalle liittymään tielle %{name}
         onramp_left_without_exit: Käänny vasemmalle liittymään tielle %{name}
         turn_left_without_exit: Käänny vasemmalle tielle %{name}
         offramp_left_without_exit: Poistu vasemmalle liittymään tielle %{name}
         onramp_left_without_exit: Käänny vasemmalle liittymään tielle %{name}

+        onramp_left_without_directions: Käänny vasemmalle rampille

         endofroad_left_without_exit: Tienpäässä käänny vasemmalle tielle %{name}
         merge_left_without_exit: Liity vasemmalle tielle %{name}
         fork_left_without_exit: Liittymässä ryhmity vasemmalle suuntaan %{name}
         endofroad_left_without_exit: Tienpäässä käänny vasemmalle tielle %{name}
         merge_left_without_exit: Liity vasemmalle tielle %{name}
         fork_left_without_exit: Liittymässä ryhmity vasemmalle suuntaan %{name}

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 7d4bddd27a8803f4865da04ede95f32af22ac528..cfe1cf68de911904339f341ec9688d9541f97b49 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1565,6 +1565,7 @@ is:
       where_am_i: Hvar er þetta?
       where_am_i_title: Notar leitarvélina til að lýsa núverandi staðsetningu á kortinu
       submit_text: Byrja
       where_am_i: Hvar er þetta?
       where_am_i_title: Notar leitarvélina til að lýsa núverandi staðsetningu á kortinu
       submit_text: Byrja

+      reverse_directions_text: Snúa stefnu við

     key:
       table:
         entry:
     key:
       table:
         entry:


@@ -2488,7 +2489,15 @@ is:
         continue_without_exit: Haltu áfram á %{name}
         slight_right_without_exit: Beygðu lítillega til hægri yfir á %{name}
         offramp_right_without_exit: Farðu á rampinn til hægri yfir á %{name}
         continue_without_exit: Haltu áfram á %{name}
         slight_right_without_exit: Beygðu lítillega til hægri yfir á %{name}
         offramp_right_without_exit: Farðu á rampinn til hægri yfir á %{name}

+        offramp_right_with_directions: Farðu á rampinn til hægri í áttina að %{directions}
+        offramp_right_with_name_and_directions: Farðu á rampinn til hægri á %{name},
+          í áttina að %{directions}
+        offramp_right_without_directions: Farðu á rampinn til hægri

         onramp_right_without_exit: Beygðu til hægri á rampinum inn á %{name}
         onramp_right_without_exit: Beygðu til hægri á rampinum inn á %{name}

+        onramp_right_with_directions: Beygðu til hægri á rampinn í áttina að %{directions}
+        onramp_right_with_name_and_directions: Beygðu til hægri á rampinn til %{name},
+          í áttina að %{directions}
+        onramp_right_without_directions: Beygðu til hægri á rampinn

         endofroad_right_without_exit: Við enda vegarins skaltu beygja til hægri inn
           á %{name}
         merge_right_without_exit: Hliðraðu þér inn á akreinina til hægri inn á %{name}
         endofroad_right_without_exit: Við enda vegarins skaltu beygja til hægri inn
           á %{name}
         merge_right_without_exit: Hliðraðu þér inn á akreinina til hægri inn á %{name}


@@ -2499,7 +2508,15 @@ is:
         sharp_left_without_exit: Kröpp vinstribeygja inn á %{name}
         turn_left_without_exit: Beygðu til vinstri yfir á %{name}
         offramp_left_without_exit: Farðu á rampinn til vinstri yfir á %{name}
         sharp_left_without_exit: Kröpp vinstribeygja inn á %{name}
         turn_left_without_exit: Beygðu til vinstri yfir á %{name}
         offramp_left_without_exit: Farðu á rampinn til vinstri yfir á %{name}

+        offramp_left_with_directions: Farðu á rampinn til vinstri í áttina að %{directions}
+        offramp_left_with_name_and_directions: Farðu á rampinn til vinstri á %{name},
+          í áttina að %{directions}
+        offramp_left_without_directions: Farðu á rampinn til vinstri

         onramp_left_without_exit: Beygðu til vinstri á rampinum inn á %{name}
         onramp_left_without_exit: Beygðu til vinstri á rampinum inn á %{name}

+        onramp_left_with_directions: Beygðu til vinstri á rampinn í áttina að %{directions}
+        onramp_left_with_name_and_directions: Beygðu til vinstri á rampinn til %{name},
+          í áttina að %{directions}
+        onramp_left_without_directions: Beygðu til vinstri á rampinn

         endofroad_left_without_exit: Við enda vegarins skaltu beygja til vinstri inn
           á %{name}
         merge_left_without_exit: Hliðraðu þér inn á akreinina til vinstri inn á %{name}
         endofroad_left_without_exit: Við enda vegarins skaltu beygja til vinstri inn
           á %{name}
         merge_left_without_exit: Hliðraðu þér inn á akreinina til vinstri inn á %{name}


@@ -2507,10 +2524,10 @@ is:
         slight_left_without_exit: Beygðu lítillega til vinstri yfir á %{name}
         via_point_without_exit: (um punkt)
         follow_without_exit: Fylgja %{name}
         slight_left_without_exit: Beygðu lítillega til vinstri yfir á %{name}
         via_point_without_exit: (um punkt)
         follow_without_exit: Fylgja %{name}

-        roundabout_without_exit: Í hringtorginu, beygðu á %{name}
+        roundabout_without_exit: Ã\8d hringtorginu, beygðu útaf á %{name}

         leave_roundabout_without_exit: Farðu út úr hringtorginu - %{name}
         stay_roundabout_without_exit: Vertu áfram á hringtorginu - %{name}
         leave_roundabout_without_exit: Farðu út úr hringtorginu - %{name}
         stay_roundabout_without_exit: Vertu áfram á hringtorginu - %{name}

-        start_without_exit: Byrjaðu við endann á %{name}
+        start_without_exit: Byrjaðu á %{name}

         destination_without_exit: Farðu á leiðarenda
         against_oneway_without_exit: Farðu á móti einstefnu á %{name}
         end_oneway_without_exit: Einstefna endar á %{name}
         destination_without_exit: Farðu á leiðarenda
         against_oneway_without_exit: Farðu á móti einstefnu á %{name}
         end_oneway_without_exit: Einstefna endar á %{name}

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 8aae93cec4070d57c62ca403141b7890279f0572..3f9c0832400330ab197241334e6da9db550c4244 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -168,6 +168,8 @@ it:
         title_comment: Gruppo di modifiche %{id} - %{comment}
       join_discussion: Accedi per unirti alla discussione
       discussion: Discussione
         title_comment: Gruppo di modifiche %{id} - %{comment}
       join_discussion: Accedi per unirti alla discussione
       discussion: Discussione

+      still_open: Il gruppo di modifiche è ancora aperto - le discussioni saranno
+        disponibili quando verrà chiuso.

     node:
       title: 'Nodo: %{name}'
       history_title: 'Cronologia nodo: %{name}'
     node:
       title: 'Nodo: %{name}'
       history_title: 'Cronologia nodo: %{name}'


@@ -437,12 +439,18 @@ it:
           chair_lift: Seggiovia
           drag_lift: Sciovia
           gondola: Cabinovia
           chair_lift: Seggiovia
           drag_lift: Sciovia
           gondola: Cabinovia

+          platter: Skilift a piattello
+          pylon: Pilone

           station: Stazione funivia
           station: Stazione funivia

+          t-bar: Skilift ad ancora

         aeroway:
           aerodrome: Aerodromo
         aeroway:
           aerodrome: Aerodromo

+          airstrip: Pista di atterraggio

           apron: Piazzale di sosta
           gate: Gate
           apron: Piazzale di sosta
           gate: Gate

+          hangar: Hangar

           helipad: Elisuperficie
           helipad: Elisuperficie

+          holding_position: Posizione di attesa

           parking_position: Posizione di parcheggio
           runway: Pista
           taxiway: Pista di rullaggio
           parking_position: Posizione di parcheggio
           runway: Pista
           taxiway: Pista di rullaggio


@@ -489,6 +497,7 @@ it:
           fuel: Stazione di rifornimento
           gambling: Gioco d'azzardo
           grave_yard: Cimitero
           fuel: Stazione di rifornimento
           gambling: Gioco d'azzardo
           grave_yard: Cimitero

+          grit_bin: Contenitore antigelo

           hospital: Ospedale
           hunting_stand: Postazione di caccia
           ice_cream: Gelateria
           hospital: Ospedale
           hunting_stand: Postazione di caccia
           ice_cream: Gelateria


@@ -502,6 +511,7 @@ it:
           office: Ufficio
           parking: Parcheggio
           parking_entrance: Entrata del parcheggio
           office: Ufficio
           parking: Parcheggio
           parking_entrance: Entrata del parcheggio

+          parking_space: Posto di parcheggio

           pharmacy: Farmacia
           place_of_worship: Luogo di culto
           police: Polizia
           pharmacy: Farmacia
           place_of_worship: Luogo di culto
           police: Polizia


@@ -535,6 +545,7 @@ it:
           village_hall: Municipio
           waste_basket: Cestino rifiuti
           waste_disposal: Smaltimento dei rifiuti
           village_hall: Municipio
           waste_basket: Cestino rifiuti
           waste_disposal: Smaltimento dei rifiuti

+          water_point: Punto di rifornimento acqua

           youth_centre: Centro Giovanile
         boundary:
           administrative: Confine amministrativo
           youth_centre: Centro Giovanile
         boundary:
           administrative: Confine amministrativo


@@ -543,6 +554,7 @@ it:
           protected_area: Area protetta
         bridge:
           aqueduct: Acquedotto
           protected_area: Area protetta
         bridge:
           aqueduct: Acquedotto

+          boardwalk: Passerella

           suspension: Ponte sospeso
           swing: Ponte girevole
           viaduct: Viadotto
           suspension: Ponte sospeso
           swing: Ponte girevole
           viaduct: Viadotto


@@ -562,6 +574,7 @@ it:
           "yes": Negozio di Artigianato
         emergency:
           ambulance_station: Stazione delle ambulanze
           "yes": Negozio di Artigianato
         emergency:
           ambulance_station: Stazione delle ambulanze

+          assembly_point: Punto di ritrovo

           defibrillator: Defibrillatore
           landing_site: Luogo per l'atterraggio di emergenza
           phone: Telefono di emergenza
           defibrillator: Defibrillatore
           landing_site: Luogo per l'atterraggio di emergenza
           phone: Telefono di emergenza


@@ -573,11 +586,13 @@ it:
           bus_guideway: Corsia autobus a guida vincolata
           bus_stop: Fermata dell'autobus
           construction: Strada in costruzione
           bus_guideway: Corsia autobus a guida vincolata
           bus_stop: Fermata dell'autobus
           construction: Strada in costruzione

+          corridor: Corridoio

           cycleway: Percorso ciclabile
           elevator: Ascensore
           emergency_access_point: Colonnina SOS
           footway: Percorso pedonale
           ford: Guado
           cycleway: Percorso ciclabile
           elevator: Ascensore
           emergency_access_point: Colonnina SOS
           footway: Percorso pedonale
           ford: Guado

+          give_way: Segnale di dare precedenza

           living_street: Living Street
           milestone: Pietra miliare
           motorway: Autostrada
           living_street: Living Street
           milestone: Pietra miliare
           motorway: Autostrada


@@ -609,6 +624,7 @@ it:
           trail: Percorso escursionistico
           trunk: Superstrada
           trunk_link: Superstrada
           trail: Percorso escursionistico
           trunk: Superstrada
           trunk_link: Superstrada

+          turning_loop: Anello di inversione di marcia

           unclassified: Strada non classificata
           "yes": Strada
         historic:
           unclassified: Strada non classificata
           "yes": Strada
         historic:


@@ -678,6 +694,7 @@ it:
           bird_hide: Osservatorio Camuffato
           common: Area comune (UK)
           dog_park: Parco per cani
           bird_hide: Osservatorio Camuffato
           common: Area comune (UK)
           dog_park: Parco per cani

+          firepit: Braciere

           fishing: Riserva di pesca
           fitness_centre: Centro Fitness
           fitness_station: Centro fitness
           fishing: Riserva di pesca
           fitness_centre: Centro Fitness
           fitness_station: Centro fitness


@@ -702,19 +719,36 @@ it:
           water_park: Parco acquatico
           "yes": Tempo libero
         man_made:
           water_park: Parco acquatico
           "yes": Tempo libero
         man_made:

+          adit: Galleria mineraria
+          beacon: Fanale
+          beehive: Alveare

           breakwater: Frangiflutti
           bridge: Ponte
           breakwater: Frangiflutti
           bridge: Ponte

+          bunker_silo: Bunker
+          chimney: Ciminiera
+          crane: Gru
+          dyke: Argine
+          embankment: Terrapieno
+          flagpole: Asta portabandiera

           gasometer: Gasometro
           gasometer: Gasometro

+          kiln: Fornace

           lighthouse: Faro
           lighthouse: Faro

+          mast: Pilone
+          mine: Miniera

           mineshaft: Pozzo minerario
           monitoring_station: Stazione di monitoraggio
           petroleum_well: Pozzo petrolifero
           pier: Molo
           pipeline: Tubazione
           mineshaft: Pozzo minerario
           monitoring_station: Stazione di monitoraggio
           petroleum_well: Pozzo petrolifero
           pier: Molo
           pipeline: Tubazione

+          silo: Silo
+          storage_tank: Cisterna di stoccaggio

           surveillance: Sorveglianza
           tower: Torre
           surveillance: Sorveglianza
           tower: Torre

+          wastewater_plant: Impianto di depurazione delle acque

           watermill: Mulino ad acqua
           water_tower: Torre dell'acqua
           watermill: Mulino ad acqua
           water_tower: Torre dell'acqua

+          water_well: Pozzo
+          water_works: Impianto idrico

           windmill: Mulino a vento
           works: Fabbrica
           "yes": Artificiale
           windmill: Mulino a vento
           works: Fabbrica
           "yes": Artificiale


@@ -722,6 +756,7 @@ it:
           airfield: Aeroporto militare
           barracks: Caserma
           bunker: Bunker
           airfield: Aeroporto militare
           barracks: Caserma
           bunker: Bunker

+          "yes": Militare

         mountain_pass:
           "yes": Passo di montagna
         natural:
         mountain_pass:
           "yes": Passo di montagna
         natural:


@@ -774,6 +809,7 @@ it:
           estate_agent: Agente immobiliare
           government: Ufficio governativo
           insurance: Agenzia di assicurazione
           estate_agent: Agente immobiliare
           government: Ufficio governativo
           insurance: Agenzia di assicurazione

+          it: Ufficio IT

           lawyer: Avvocato
           ngo: Ufficio di una ONG (Organizzazione Non Governativa)
           telecommunication: Ufficio di telecomunicazioni
           lawyer: Avvocato
           ngo: Ufficio di una ONG (Organizzazione Non Governativa)
           telecommunication: Ufficio di telecomunicazioni


@@ -782,6 +818,7 @@ it:
         place:
           allotments: Orti casalinghi
           city: Città
         place:
           allotments: Orti casalinghi
           city: Città

+          city_block: Blocco urbano

           country: Nazione
           county: Contea (in Italia NON usare)
           farm: Area agricola
           country: Nazione
           county: Contea (in Italia NON usare)
           farm: Area agricola


@@ -795,6 +832,7 @@ it:
           municipality: Comune
           neighbourhood: Quartiere
           postcode: CAP
           municipality: Comune
           neighbourhood: Quartiere
           postcode: CAP

+          quarter: Quartiere

           region: Provincia
           sea: Mare
           square: Piazza
           region: Provincia
           sea: Mare
           square: Piazza


@@ -836,6 +874,7 @@ it:
           beauty: Prodotti cosmetici
           beverages: Negozio bevande
           bicycle: Negozio biciclette
           beauty: Prodotti cosmetici
           beverages: Negozio bevande
           bicycle: Negozio biciclette

+          bookmaker: Centro scommesse

           books: Libreria
           boutique: Boutique
           butcher: Macellaio
           books: Libreria
           boutique: Boutique
           butcher: Macellaio


@@ -891,6 +930,8 @@ it:
           optician: Ottico
           organic: Negozio di prodotti naturali ed ecologici
           outdoor: Negozio di articoli per sport all'aperto
           optician: Ottico
           organic: Negozio di prodotti naturali ed ecologici
           outdoor: Negozio di articoli per sport all'aperto

+          paint: Negozio di vernici
+          pawnbroker: Banco dei pegni

           pet: Negozio animali
           pharmacy: Farmacia
           photo: Articoli fotografici
           pet: Negozio animali
           pharmacy: Farmacia
           photo: Articoli fotografici


@@ -901,10 +942,13 @@ it:
           stationery: Cartoleria
           supermarket: Supermercato
           tailor: Sarto
           stationery: Cartoleria
           supermarket: Supermercato
           tailor: Sarto

+          ticket: Biglietteria

           tobacco: Tabaccheria
           toys: Negozio di giocattoli
           travel_agency: Agenzia di viaggi
           tyres: Negozio di pneumatici
           tobacco: Tabaccheria
           toys: Negozio di giocattoli
           travel_agency: Agenzia di viaggi
           tyres: Negozio di pneumatici

+          vacant: Spazio commerciale libero
+          variety_store: Negozio a prezzi fissi

           video: Videoteca
           wine: Negozio di vini
           "yes": Negozio
           video: Videoteca
           wine: Negozio di vini
           "yes": Negozio


@@ -1514,6 +1558,7 @@ it:
       where_am_i: Dove lo trovo?
       where_am_i_title: Descrivi la posizione attuale usando il motore di ricerca
       submit_text: Vai
       where_am_i: Dove lo trovo?
       where_am_i_title: Descrivi la posizione attuale usando il motore di ricerca
       submit_text: Vai

+      reverse_directions_text: Inverti la marcia

     key:
       table:
         entry:
     key:
       table:
         entry:


@@ -2049,7 +2094,7 @@ it:
       public editing:
         heading: 'Modifiche pubbliche:'
         enabled: Abilitate. Non anonimo con il permesso di modificare i dati.
       public editing:
         heading: 'Modifiche pubbliche:'
         enabled: Abilitate. Non anonimo con il permesso di modificare i dati.

-        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits

         enabled link text: che cos'è questo?
         disabled: Disabilitate senza il permesso di modificare i dati, tutte le modifiche
           precedenti sono anonime.
         enabled link text: che cos'è questo?
         disabled: Disabilitate senza il permesso di modificare i dati, tutte le modifiche
           precedenti sono anonime.


@@ -2186,6 +2231,8 @@ it:
       not_a_role: La stringa `%{role}' non è un ruolo valido.
       already_has_role: L'utente possiede già il ruolo %{role}.
       doesnt_have_role: L'utente non possiede il ruolo %{role}.
       not_a_role: La stringa `%{role}' non è un ruolo valido.
       already_has_role: L'utente possiede già il ruolo %{role}.
       doesnt_have_role: L'utente non possiede il ruolo %{role}.

+      not_revoke_admin_current_user: Impossibile rimuovere i privilegi di amministratore
+        all'utente corrente.

     grant:
       title: Conferma l'assegnazione del ruolo
       heading: Conferma l'assegnazione del ruolo
     grant:
       title: Conferma l'assegnazione del ruolo
       heading: Conferma l'assegnazione del ruolo


@@ -2410,6 +2457,9 @@ it:
         intro: Ti sei accorto di un errore o di qualcosa che manca? Fallo sapere agli
           altri mappatori così possono correggerlo. Sposta il puntatore nella posizione
           esatta e inserisci una nota per spiegare il problema.
         intro: Ti sei accorto di un errore o di qualcosa che manca? Fallo sapere agli
           altri mappatori così possono correggerlo. Sposta il puntatore nella posizione
           esatta e inserisci una nota per spiegare il problema.

+        advice: La tua nota è pubblica e potrebbe essere utilizzata per aggiornare
+          la mappa, pertanto non inserire informazioni personali e neppure dati provenienti
+          da mappe protette da copyright oppure elenchi.

         add: Aggiungi la nota
       show:
         anonymous_warning: Questa nota include commenti da parte di utenti anonimi
         add: Aggiungi la nota
       show:
         anonymous_warning: Questa nota include commenti da parte di utenti anonimi


@@ -2441,7 +2491,15 @@ it:
         continue_without_exit: Prosegui su %{name}
         slight_right_without_exit: Svolta leggermente a destra in %{name}
         offramp_right_without_exit: Prendi la rampa sulla destra in %{name}
         continue_without_exit: Prosegui su %{name}
         slight_right_without_exit: Svolta leggermente a destra in %{name}
         offramp_right_without_exit: Prendi la rampa sulla destra in %{name}

+        offramp_right_with_directions: Prendi la rampa a destra in direzione %{directions}
+        offramp_right_with_name_and_directions: Prendi la rampa a destra su %{name},
+          in direzione %{directions}
+        offramp_right_without_directions: Prendi la rampa a destra

         onramp_right_without_exit: Gira a destra sulla rampa in %{name}
         onramp_right_without_exit: Gira a destra sulla rampa in %{name}

+        onramp_right_with_directions: Gira a destra sulla rampa in direzione %{directions}
+        onramp_right_with_name_and_directions: Gira a destra sulla rampa su %{name},
+          in direzione %{directions}
+        onramp_right_without_directions: Gira a destra sulla rampa

         endofroad_right_without_exit: Alla fine della strada svolta a destra in %{name}
         merge_right_without_exit: Immettiti a destra in %{name}
         fork_right_without_exit: Al bivio svolta a destra in %{name}
         endofroad_right_without_exit: Alla fine della strada svolta a destra in %{name}
         merge_right_without_exit: Immettiti a destra in %{name}
         fork_right_without_exit: Al bivio svolta a destra in %{name}


@@ -2451,14 +2509,22 @@ it:
         sharp_left_without_exit: Svolta tutto a sinistra in %{name}
         turn_left_without_exit: Svolta a sinistra in %{name}
         offramp_left_without_exit: Prendi la rampa sulla sinistra in %{name}
         sharp_left_without_exit: Svolta tutto a sinistra in %{name}
         turn_left_without_exit: Svolta a sinistra in %{name}
         offramp_left_without_exit: Prendi la rampa sulla sinistra in %{name}

+        offramp_left_with_directions: Prendi la rampa  a sinistra in direzione %{directions}
+        offramp_left_with_name_and_directions: Prendi la rampa a sinistra su %{name},
+          in direzione %{directions}
+        offramp_left_without_directions: Prendi la rampa a sinistra

         onramp_left_without_exit: Gira a sinistra sulla rampa in %{name}
         onramp_left_without_exit: Gira a sinistra sulla rampa in %{name}

+        onramp_left_with_directions: Gira a sinistra alla rampa in direzione %{directions}
+        onramp_left_with_name_and_directions: Gira a sinistra alla rampa su %{name},
+          in direzione %{directions}
+        onramp_left_without_directions: Gira a sinistra sulla rampa

         endofroad_left_without_exit: Alla fine della strada svolta a sinistra in %{name}
         merge_left_without_exit: Immettiti a sinistra in %{name}
         fork_left_without_exit: Al bivio svolta a sinistra in %{name}
         slight_left_without_exit: Svolta leggermente a sinistra in %{name}
         via_point_without_exit: (punto di passaggio)
         follow_without_exit: Segui %{name}
         endofroad_left_without_exit: Alla fine della strada svolta a sinistra in %{name}
         merge_left_without_exit: Immettiti a sinistra in %{name}
         fork_left_without_exit: Al bivio svolta a sinistra in %{name}
         slight_left_without_exit: Svolta leggermente a sinistra in %{name}
         via_point_without_exit: (punto di passaggio)
         follow_without_exit: Segui %{name}

-        roundabout_without_exit: Alla rotonda prendi %{name}
+        roundabout_without_exit: Alla rotonda prendi l'uscita su %{name}

         leave_roundabout_without_exit: Esci dalla rotonda - %{name}
         stay_roundabout_without_exit: Rimani sulla rotonda - %{name}
         start_without_exit: Inizia a %{name}
         leave_roundabout_without_exit: Esci dalla rotonda - %{name}
         stay_roundabout_without_exit: Rimani sulla rotonda - %{name}
         start_without_exit: Inizia a %{name}

diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 9fbf91b4119b3e2873bbc73fb2831b20ad43bafa..2ea45ac9863789e1da6b9947545533ce139b3561 100644 (file)
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -426,7 +426,7 @@ ku-Latn:
           holding_position: Cihê sekinandinê ji bo balafiran
           parking_position: Pozîsyona Parkê
           runway: Pîsta teyareyê
           holding_position: Cihê sekinandinê ji bo balafiran
           parking_position: Pozîsyona Parkê
           runway: Pîsta teyareyê

-          taxiway: Rêya taksiyê
+          taxiway: Rêya balafirgehê

           terminal: Termînal
         amenity:
           animal_shelter: Sitargeha Heywanan
           terminal: Termînal
         amenity:
           animal_shelter: Sitargeha Heywanan


@@ -1003,7 +1003,7 @@ ku-Latn:
     sign_up_tooltip: Ji bo ku tu guherandinan bikî hesabek çêbike
     edit: Biguherîne
     history: Dîrok
     sign_up_tooltip: Ji bo ku tu guherandinan bikî hesabek çêbike
     edit: Biguherîne
     history: Dîrok

-    export: Eksport bike
+    export: Derxîne

     data: Dane
     export_data: Daneyan derxîne derve
     gps_traces: Şopên GPSê
     data: Dane
     export_data: Daneyan derxîne derve
     gps_traces: Şopên GPSê


@@ -1367,9 +1367,50 @@ ku-Latn:
     note_comment_notification:
       anonymous: Bikarhênerek anonîm
       greeting: Merheba,
     note_comment_notification:
       anonymous: Bikarhênerek anonîm
       greeting: Merheba,

+      commented:
+        subject_own: '[OpenStreetMap] %{commenter} li ser notekî te şiroveyek nivîsand'
+        subject_other: '[OpenStreetMap] %{commenter} li ser notek ku tu pê eleqedar
+          dibî şiroveyek nivîsand'
+        your_note: '%{commenter} li ser notekî te yê nexşeyê a nêzîkî %{place} şiroveyek
+          berda.'
+        commented_note: '%{commenter} li ser notekî te yê nexşeyê a ku te şiroveyek
+          berdabû şiroveyek nivîsand. Ev not nêzîkî %{place} (y)e.'
+      closed:
+        subject_own: '[OpenStreetMap] %{commenter} yek ji notên te çareser kir'
+        subject_other: '[OpenStreetMap] %{commenter} notek ku tu pê eleqedar dibî
+          çareser kir'
+        your_note: '%{commenter} yek ji notên te yên nexşeyê a nêzîkî %{place} çareser
+          kir.'
+        commented_note: '%{commenter} notekî nexşeyê yê ku te şiroveyek berdabû çareser
+          kir. Ev not nêzîkî %{place} (y)e.'
+      reopened:
+        subject_own: '[OpenStreetMap] %{commenter} yek ji notên te ji nû ve aktîv
+          kir'
+        subject_other: '[OpenStreetMap] %{commenter} notek ku tu pê eleqedar dibî
+          ji nû ve aktîv kir'
+        your_note: '%{commenter} yek ji notên te yên nexşeyê a nêzîkî %{place} ji
+          nû ve da aktîvkirin.'
+        commented_note: '%{commenter} notekî nexşeyê yê ku te şiroveyek berdabû jinûve
+          da aktîvkirin. Ev not nêzîkî %{place} (y)e.'
+      details: Dêtayên zêdetir yên derbarê notê de hûn dikarin ji %{url} bibînin.

     changeset_comment_notification:
       hi: Merheba %{to_user},
       greeting: Merheba,
     changeset_comment_notification:
       hi: Merheba %{to_user},
       greeting: Merheba,

+      commented:
+        subject_own: '[OpenStreetMap] %{commenter} yek ji desteyên te yên guherandinê
+          şiroveyek nivîsand'
+        subject_other: '[OpenStreetMap] %{commenter} desteyekî guherandinê ê ku tu
+          pê eleqedar dibî şirove kir'
+        your_changeset: '%{commenter} li ser desteyekî te yê guherandinê ê ku di %{time}
+          de hatibû çêkirin, şiroveyek berda'
+        commented_changeset: '%{commenter} li ser desteya guhertinê yê ku tu dişopînî
+          şiroveyek berda, ji aliyê %{changeset_author} ve di %{time} de hatiye çêkirin'
+        partial_changeset_with_comment: tevî şiroveya '%{changeset_comment}'
+        partial_changeset_without_comment: bêyî şirove
+      details: Dêtayên zêdetir yên derbarê desteya guherandinê de hûn dikarin ji %{url}
+        bibînin.
+      unsubscribe: Ji bo ku ji abonetiya rojanekirinên vê desteya guherandinê derbikevî,
+        here %{url} û bitikîne ser "Abonetiyê betal bike".

   message:
     inbox:
       title: Qutiya hatiyan
   message:
     inbox:
       title: Qutiya hatiyan


@@ -1385,6 +1426,9 @@ ku-Latn:
       from: Ji
       subject: Mijar
       date: Dîrok
       from: Ji
       subject: Mijar
       date: Dîrok

+      no_messages_yet: Hêj peyama te tine ye. Çima ji ser %{people_mapping_nearby_link}
+        bi kesên nêzîkê xwe re nakevî îrtîbatê?
+      people_mapping_nearby: lînka nexşesazên li derdorên nêzîk

     message_summary:
       unread_button: Wek nexwendî nîşan bide
       read_button: Wek xwendî nîşan bide
     message_summary:
       unread_button: Wek nexwendî nîşan bide
       read_button: Wek xwendî nîşan bide


@@ -1398,13 +1442,30 @@ ku-Latn:
       send_button: Bişîne
       back_to_inbox: Vegere qutiya hatiyan
       message_sent: Peyam hate şandin
       send_button: Bişîne
       back_to_inbox: Vegere qutiya hatiyan
       message_sent: Peyam hate şandin

+      limit_exceeded: Te di wextekî kurt de gelek peyaman şand. Xêra xwe berî ku tu
+        zêdetir peyaman bişînî hinekî bisekine.

     no_such_message:
       title: Mesajek wek vê tine ye
       heading: Mesajek wek vê tine ye
     no_such_message:
       title: Mesajek wek vê tine ye
       heading: Mesajek wek vê tine ye

+      body: Li me bibore, bi vê id'yê ti peyam tine ye.

     outbox:
     outbox:

+      title: Qutiya çûyiyan
+      my_inbox: '%{inbox_link}'
+      inbox: Qutiya min a hatiyan
+      outbox: Qutiya min a çûyiyan
+      messages:
+        one: Te %{count} peyam şand
+        other: Te %{count} peyaman şand

       to: Ji bo
       subject: Mijar
       date: Dîrok
       to: Ji bo
       subject: Mijar
       date: Dîrok

+      no_sent_messages: Te hêj ji kesî re peyam neşandiye. Çima ji ser %{people_mapping_nearby_link}
+        bi hinek kesên nêzîkê xwe re nakevî îrtîbatê?
+      people_mapping_nearby: lînka nexşesazên li derdorên nêzîk
+    reply:
+      wrong_user: Te wek `%{user}' têket, lê peyamê ku te dixwest were cewabdayîn
+        ji wî/wê bikarhênerê re nehate şandin. Xêra xwe ji bo cewabdanê wekî bikarhênerê
+        rast têbikeve.

     read:
       title: Peyamê bixwîne
       from: Ji
     read:
       title: Peyamê bixwîne
       from: Ji


@@ -1415,6 +1476,9 @@ ku-Latn:
       delete_button: Jê bibe
       back: Paşve vegere
       to: Ji bo
       delete_button: Jê bibe
       back: Paşve vegere
       to: Ji bo

+      wrong_user: Te wek `%{user}' têket, lê peyamê ku dihate xwestin ku tu wê bixwînî
+        ji aliyê wî/wê bikarhênerê ve an jî ji wî/wê bikarhênerê re nehatiye şandin.
+        Xêra xwe ji bo xwendinê wekî bikarhênerê rast têbikeve.

     sent_message_summary:
       delete_button: Jê bibe
     mark:
     sent_message_summary:
       delete_button: Jê bibe
     mark:


@@ -1424,33 +1488,148 @@ ku-Latn:
       deleted: Payam hate jêbirin
   site:
     index:
       deleted: Payam hate jêbirin
   site:
     index:

+      js_1: Tu an gerokek ku piştgiriyê nade JavaScriptê bi kar tînî an jî JavaScript
+        hatiye neçalakkirin.
+      js_2: OpenStreetMap ji bo nîşandana nexşeya xwe ya şemetok JavaScriptê bi kar
+        tîne.
+      permalink: Lînka daîmî
+      shortlink: Lînka kurt

       createnote: Notek binivîse
       createnote: Notek binivîse

+      license:
+        copyright: Mafê daneriyê ya OpenStreetMapê û beşdarên me, di bin lîsansa vekirî
+          de ne
+      remote_failed: Sererastkirin bi ser neket - jê piştrast be ku JOSM an jî Merkaartor
+        hatiye sazkirin û vebijêrka jidûrve kontrolê hatiye aktîvkirin

     edit:
     edit:

+      not_public: Te sereratkirinên xwe wek ji herkesî re vekirî eyar nekir.
+      not_public_description: Heta ku hûn vê yekê bikin hûn ê nikaribin nexşeyê biguherînin.
+        Sererastkirinên xwe ji ser rûpela %{user_page} dikarî wek ji herkesê re vekirî
+        eyar bikî.

       user_page_link: rûpela bikarhêner
       user_page_link: rûpela bikarhêner

+      anon_edits_link_text: Hîn bibe ku ev rewş çima wisa bûye.
+      flash_player_required: Ji bo ku edîtora OpenStreetMap Flashê yê bi navê Potlatch
+        bi kar bînî, ihtîyaca te bi Flash playerê heye. Tu dikarî <a href="https://get.adobe.com/flashplayer/">Flash
+        Playerê ji ser Adobe.com'ê daxînî</a>. Ji bo sererastkirina OpenStreetMapê
+        <a href="https://wiki.openstreetmap.org/wiki/Editing">gelek vebijêrkên din</a>
+        jî hene.
+      potlatch_unsaved_changes: Guherandinên te yên neqeydkirî hene. (Ji bo di Potlatchê
+        de qeyd bikî, divê gava ku guherandinê xwe di moda zindî de dikî, rê an jî
+        nuqteya ku vêga heyî bibijêrî, û heke bişkokek qeydkirinê hebe bitikînî ser
+        qeyd bike'yê.)
+      potlatch2_not_configured: Potlach 2 nehate vesazkirin - ji bo zêdetir agahiyan
+        xêra xwe binêre https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
+      potlatch2_unsaved_changes: Guherandinên te yên neqeydkirî hene. (Ji bo ku di
+        Potlatch 2'ê de qeyd bikî bitikîne ser qeyd bike'yê.)
+      id_not_configured: iD nehatiye mîhengkirin
+      no_iframe_support: Geroka te piştgiriyê nade iframe'yên HTML ku ji bo nişandana
+        vê taybetmendiyê lazim e.

     sidebar:
     sidebar:

+      search_results: Encamên lêgerînê

       close: Bigire
     search:
       search: Lêbigere
       close: Bigire
     search:
       search: Lêbigere

+      get_directions: Tarîfa riyê bistîne
+      get_directions_title: Di navbera du nuqteyan de rê nîşanî min bide

       from: Ji
       to: Ji bo
       where_am_i: Ev li ku ye?
       from: Ji
       to: Ji bo
       where_am_i: Ev li ku ye?

+      where_am_i_title: Bi motora lêgerînê wê cihê ku tu lê yî tesbît bike

       submit_text: Here
       submit_text: Here

+      reverse_directions_text: Aliyê ters

     key:
       table:
         entry:
     key:
       table:
         entry:

+          motorway: Otorê
+          main_road: Rêya sereke
+          trunk: Rêya sereke
+          primary: Rêya bi dereceya yekem
+          secondary: Rêya bi dereceya duyem
+          unclassified: Rêya nesinifandî
+          track: Rêya ji xweliyê
+          bridleway: Rêyên siwaran
+          cycleway: Rêya bisiklêtê
+          cycleway_national: Rêya bisiklêtê ya neteweyî
+          cycleway_regional: Rêya bisiklêtê ya herêmî
+          cycleway_local: Rêya bisiklêtê ya mehelî
+          footway: Rêya peyayan
+          rail: Rêhesin
+          subway: Metro
+          tram:
+          - Rêya trênê yê bi xeta teng
+          - tramway
+          cable:
+          - Teleferîk
+          - teleferîk
+          runway:
+          - Pîsta balafirgehê
+          - rêya balafirgehê yê çûnûhatinê
+          apron:
+          - Aprona balafirgehê
+          - termînal
+          admin: Sînorê îdarî
+          forest: Daristan
+          wood: Daristan
+          golf: Cihê golfê
+          park: Park
+          resident: Cihê îkametê
+          common:
+          - Erda mişterek
+          - mêrg
+          retail: Saheya Perakendeyê (Maxazayan)
+          industrial: Cihê endustriyê
+          commercial: Herêma bazirganiyê
+          heathland: Erdê qeraç
+          lake:
+          - Gol
+          - mexzen

           farm: Cotgeh
           farm: Cotgeh

+          brownfield: Erdê vala

           cemetery: Gorristan
           cemetery: Gorristan

+          allotments: Bax û bostan
+          pitch: Saheya sporê
+          centre: Navenda sporê
+          reserve: Herêma muhefezekirî ya tebîetê
+          military: Qada eskerî

           school:
           - Dibistan
           school:
           - Dibistan

+          - zanîngeh
+          building: Avahiya girîng
+          station: Stasyona trênê
+          summit:
+          - Lûtke
+          - lûtke
+          tunnel: Xeta qutqutî = tûnel
+          bridge: Xeta reş = pir
+          private: Têketina taybet
+          destination: Cihê gihiştinê
+          construction: Rêyên di merheleya çêkirinê de ne
+          bicycle_shop: Bisiklêtfiroş
+          bicycle_parking: Parka bisiklêtê
+          toilets: Tiwalet

     richtext_area:
       edit: Biguherîne
       preview: Pêşdîtin
     markdown_help:
     richtext_area:
       edit: Biguherîne
       preview: Pêşdîtin
     markdown_help:

+      title_html: |-
+        Bi <a href="https://daringfireball.net/projects/markdown/">Markdown</a>
+        hate analîzkirin
+      headings: Sernivîs
+      heading: Sernivîs
+      subheading: Sernivîsa binî
+      unordered: Lîsta nerêzkirî
+      ordered: Lîsta rêzkirî
+      first: Hêmana yekem
+      second: Hêmana duyem

       link: Girêdan
       text: Nivîs
       image: Wêne
       link: Girêdan
       text: Nivîs
       image: Wêne

+      alt: Nivîsa alternatîv

       url: URL
   trace:
       url: URL
   trace:

+    visibility:
+      private: Xisûsî (tenê wekî nuqteyên anonîm û nerêzkirî tê belavkirin)
+      public: Giştî (di lîsta şopandinê de û wekî anonîm, bi nuqteyên nerêzkirî têne
+        xuyan)

     edit:
       edit: biguherîne
       owner: 'Xweyî:'
     edit:
       edit: biguherîne
       owner: 'Xweyî:'

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 04a59c4c0e413e60ef7fe9111957ceefe4d03d02..51055a42a3517988285eddfb6b35efba8201a441 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -1294,6 +1294,7 @@ lb:
         roundabout_without_exit: Am Kreesverkéier huelt d'Ausfaart op %{name}
         leave_roundabout_without_exit: Aus dem Kreesverkéier erausgoen - %{name}
         stay_roundabout_without_exit: Am Kreesverkéier bleiwen - %{name}
         roundabout_without_exit: Am Kreesverkéier huelt d'Ausfaart op %{name}
         leave_roundabout_without_exit: Aus dem Kreesverkéier erausgoen - %{name}
         stay_roundabout_without_exit: Am Kreesverkéier bleiwen - %{name}

+        start_without_exit: Bei %{name} ufänken

         turn_left_with_exit: Am  Kreesverkéier lénks ofbéien op %{name}
         slight_left_with_exit: Am Kreesverkéier liicht no lénks op %{name} ofbéien
         turn_right_with_exit: Am Kreesverkéier riets ofbéien op %{name}
         turn_left_with_exit: Am  Kreesverkéier lénks ofbéien op %{name}
         slight_left_with_exit: Am Kreesverkéier liicht no lénks op %{name} ofbéien
         turn_right_with_exit: Am Kreesverkéier riets ofbéien op %{name}

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index f58c760c311444c3939cfebc44ebe1079d18302c..f1f7a59911e0963d7d1623a796349dd7b446e506 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -7,6 +7,7 @@
 # Author: Garas
 # Author: Macofe
 # Author: Mantak111
 # Author: Garas
 # Author: Macofe
 # Author: Mantak111

+# Author: Manvydasz

 # Author: Matasg
 # Author: Pauliuz
 # Author: Pdxx
 # Author: Matasg
 # Author: Pauliuz
 # Author: Pdxx


@@ -352,7 +353,7 @@ lt:
       map_image: Žemėlapio vaizdas (rodo standartinį sluoksnį)
       embeddable_html: Pritaikomas HTML
       licence: Licencija
       map_image: Žemėlapio vaizdas (rodo standartinį sluoksnį)
       embeddable_html: Pritaikomas HTML
       licence: Licencija

-      export_details: OpenStreetMap duomenų licencija - <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open
+      export_details: OpenStreetMap duomenų licencija - <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open

         Data Commons Open Database License</a> (ODbL).
       too_large:
         advice: 'Jei aukščiau pateiktas eksportas nepavyko, pabandykite vieną iš žemiau
         Data Commons Open Database License</a> (ODbL).
       too_large:
         advice: 'Jei aukščiau pateiktas eksportas nepavyko, pabandykite vieną iš žemiau


@@ -393,14 +394,14 @@ lt:
   geocoder:
     search:
       title:
   geocoder:
     search:
       title:

-        latlon: <a href="http://openstreetmap.org/">Vidiniai</a> rezultatai
+        latlon: <a href="https://openstreetmap.org/">Vidiniai</a> rezultatai

         uk_postcode: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
           rezultatai
         uk_postcode: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
           rezultatai

-        ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a> rezultatai
-        osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        ca_postcode: <a href="https://geocoder.ca/">Geocoder.CA</a> rezultatai
+        osm_nominatim: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a> rezultatai
         geonames: <a href="http://www.geonames.org/">GeoNames</a> rezultatai
           Nominatim</a> rezultatai
         geonames: <a href="http://www.geonames.org/">GeoNames</a> rezultatai

-        osm_nominatim_reverse: Rezultatai iš <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim_reverse: Rezultatai iš <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>
         geonames_reverse: Rezultatai iš <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
           Nominatim</a>
         geonames_reverse: Rezultatai iš <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:


@@ -933,7 +934,7 @@ lt:
         level10: Priemiesčio riba
     description:
       title:
         level10: Priemiesčio riba
     description:
       title:

-        osm_nominatim: Vietovė nustatyta pagal <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: Vietovė nustatyta pagal <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>
         geonames: Vietovė nustatyta pagal <a href="http://www.geonames.org/">GeoNames</a>
       types:
           Nominatim</a>
         geonames: Vietovė nustatyta pagal <a href="http://www.geonames.org/">GeoNames</a>
       types:


@@ -968,8 +969,8 @@ lt:
     intro_text: OpenStreetMap yra pasaulio žemėlapis, kuriamas žmonių, tokių kaip
       jūs. Jis atviras ir laisvas - naudojamas pagal atvirą licenciją.
     intro_2_create_account: sukurti naudotojo paskyrą
     intro_text: OpenStreetMap yra pasaulio žemėlapis, kuriamas žmonių, tokių kaip
       jūs. Jis atviras ir laisvas - naudojamas pagal atvirą licenciją.
     intro_2_create_account: sukurti naudotojo paskyrą

-    partners_html: Serveris palaikomas %{ucl}, %{ic} ir %{bytemark}, ir kiti %{partners}.
-    partners_ucl: UCL VR centras
+    partners_html: Serveris palaikomas %{ucl}, %{bytemark}, %{ic} ir kiti %{partners}.
+    partners_ucl: UCL

     partners_ic: Imperial College London
     partners_bytemark: Bytemark serveris
     partners_partners: partneriai
     partners_ic: Imperial College London
     partners_bytemark: Bytemark serveris
     partners_partners: partneriai


@@ -1206,7 +1207,7 @@ lt:
       description: Pagalba kompanijoms ir organizacijoms pereinant į OpenStreetMap
         paremtus žemėlapius ir kitas paslaugas.
     wiki:
       description: Pagalba kompanijoms ir organizacijoms pereinant į OpenStreetMap
         paremtus žemėlapius ir kitas paslaugas.
     wiki:

-      url: http://wiki.openstreetmap.org/
+      url: https://wiki.openstreetmap.org/

       title: wiki.openstreetmap.org
       description: Naršykite OSM detalios dokumentacijos wiki.
   about_page:
       title: wiki.openstreetmap.org
       description: Naršykite OSM detalios dokumentacijos wiki.
   about_page:


@@ -1465,7 +1466,7 @@ lt:
       get_directions_title: Rasti maršruto nurodymus tarp dviejų taškų
       from: Iš
       to: Iki
       get_directions_title: Rasti maršruto nurodymus tarp dviejų taškų
       from: Iš
       to: Iki

-      where_am_i: Kur aš dabar?
+      where_am_i: Kur tai yra?

       where_am_i_title: Apibūdinti dabartinę poziciją naudojant paieškos variklį
       submit_text: Rodyti
     key:
       where_am_i_title: Apibūdinti dabartinę poziciją naudojant paieškos variklį
       submit_text: Rodyti
     key:


@@ -1985,12 +1986,12 @@ lt:
       email never displayed publicly: (niekada viešai nerodomas)
       external auth: 'Išorinė autentikacija:'
       openid:
       email never displayed publicly: (niekada viešai nerodomas)
       external auth: 'Išorinė autentikacija:'
       openid:

-        link: http://wiki.OpenStreetMap.org/wiki/OpenID
+        link: https://wiki.OpenStreetMap.org/wiki/OpenID

         link text: kas tai?
       public editing:
         heading: 'Viešas keitimas:'
         enabled: Įjungtas. Nėra anoniminis ir gali keisti duomenis.
         link text: kas tai?
       public editing:
         heading: 'Viešas keitimas:'
         enabled: Įjungtas. Nėra anoniminis ir gali keisti duomenis.

-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits

         enabled link text: kas tai?
         disabled: Išjungtas ir negali keisti duomenų, visi ankstesni pakeitimai yra
           anonimiški.
         enabled link text: kas tai?
         disabled: Išjungtas ir negali keisti duomenų, visi ankstesni pakeitimai yra
           anonimiški.

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 6f246ddd05dcb4d9e8be20f9c8a5f6e49d2ccdef..7e9566021be92fdf6d0e4582ac626dc57b0bca9f 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -340,7 +340,7 @@ oc:
       map_image: Imatge de mapa (aficha un calc normal)
       embeddable_html: HTML incorporable.
       licence: Licéncia
       map_image: Imatge de mapa (aficha un calc normal)
       embeddable_html: HTML incorporable.
       licence: Licéncia

-      export_details: Las donadas d’OpenStreetMap son publicadas jos la <a href="http://opendatacommons.org/licenses/odbl/1.0/">licéncia
+      export_details: Las donadas d’OpenStreetMap son publicadas jos la <a href="https://opendatacommons.org/licenses/odbl/1.0/">licéncia

         Open Data Commons ­– Basa de donadas Dobèrta</a> (ODbL).
       too_large:
         advice: 'Se l’expòrt çaisús fracassa, envisatjatz l’utilizacion d’una de las
         Open Data Commons ­– Basa de donadas Dobèrta</a> (ODbL).
       too_large:
         advice: 'Se l’expòrt çaisús fracassa, envisatjatz l’utilizacion d’una de las


@@ -381,14 +381,14 @@ oc:
   geocoder:
     search:
       title:
   geocoder:
     search:
       title:

-        latlon: Resultats <a href="http://openstreetmap.org/">intèrnes</a>
+        latlon: Resultats <a href="https://openstreetmap.org/">intèrnes</a>

         uk_postcode: Resultats dempuèi <a href="http://www.npemap.org.uk/">NPEMap
           / FreeThe Postcode</a>
         uk_postcode: Resultats dempuèi <a href="http://www.npemap.org.uk/">NPEMap
           / FreeThe Postcode</a>

-        ca_postcode: Resultats dempuèi <a href="http://geocoder.ca/">Geocoder.CA</a>
-        osm_nominatim: Resultats de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        ca_postcode: Resultats dempuèi <a href="https://geocoder.ca/">Geocoder.CA</a>
+        osm_nominatim: Resultats de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>
         geonames: Resultats dempuèi <a href="http://www.geonames.org/">GeoNames</a>
           Nominatim</a>
         geonames: Resultats dempuèi <a href="http://www.geonames.org/">GeoNames</a>

-        osm_nominatim_reverse: Resultats de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim_reverse: Resultats de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>
         geonames_reverse: Resultats de <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
           Nominatim</a>
         geonames_reverse: Resultats de <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:


@@ -398,12 +398,19 @@ oc:
           chair_lift: Telesèti
           drag_lift: Telesquí
           gondola: Telecabina
           chair_lift: Telesèti
           drag_lift: Telesquí
           gondola: Telecabina

+          platter: Montaplat
+          pylon: Pilòne

           station: Gara de telecabina
           station: Gara de telecabina

+          t-bar: Montabarra en T

         aeroway:
           aerodrome: Aerodròm
         aeroway:
           aerodrome: Aerodròm

+          airstrip: Pista d’aterrissatge

           apron: Taulièr
           gate: Pòrta
           apron: Taulièr
           gate: Pòrta

+          hangar: Envan

           helipad: Elipòrt
           helipad: Elipòrt

+          holding_position: Posicion d’espèra
+          parking_position: Plaça de parcatge

           runway: Pista
           taxiway: Via de manòbra
           terminal: Terminal
           runway: Pista
           taxiway: Via de manòbra
           terminal: Terminal


@@ -449,6 +456,7 @@ oc:
           fuel: Carburant
           gambling: Jòcs d'azard
           grave_yard: Cementèri
           fuel: Carburant
           gambling: Jòcs d'azard
           grave_yard: Cementèri

+          grit_bin: Nauc de sal

           hospital: Espital
           hunting_stand: Taulièr de tir
           ice_cream: Crema glaçada
           hospital: Espital
           hunting_stand: Taulièr de tir
           ice_cream: Crema glaçada


@@ -462,6 +470,7 @@ oc:
           office: Burèu
           parking: Parcatge
           parking_entrance: Entrada del parcatge
           office: Burèu
           parking: Parcatge
           parking_entrance: Entrada del parcatge

+          parking_space: Plaça de parcatge

           pharmacy: Farmàcia
           place_of_worship: Luòc de culte
           police: Polícia
           pharmacy: Farmàcia
           place_of_worship: Luòc de culte
           police: Polícia


@@ -495,6 +504,7 @@ oc:
           village_hall: Sala comunala
           waste_basket: Escobilhièr
           waste_disposal: Eliminacion de degalhs
           village_hall: Sala comunala
           waste_basket: Escobilhièr
           waste_disposal: Eliminacion de degalhs

+          water_point: Punt d'aiga

           youth_centre: Centre per la joventud
         boundary:
           administrative: Limit administratiu
           youth_centre: Centre per la joventud
         boundary:
           administrative: Limit administratiu


@@ -503,6 +513,7 @@ oc:
           protected_area: Zòna protegida
         bridge:
           aqueduct: Aqüeducte
           protected_area: Zòna protegida
         bridge:
           aqueduct: Aqüeducte

+          boardwalk: Passejada

           suspension: Pont penjat
           swing: Pont virant
           viaduct: Viaducte
           suspension: Pont penjat
           swing: Pont virant
           viaduct: Viaducte


@@ -522,25 +533,31 @@ oc:
           "yes": Botiga d'artesanat
         emergency:
           ambulance_station: Depaus d'ambulància
           "yes": Botiga d'artesanat
         emergency:
           ambulance_station: Depaus d'ambulància

+          assembly_point: Punt d'acampada

           defibrillator: Desfibrillador
           landing_site: Terren d’aterrissatge d’urgéncia
           phone: Telefòn d'urgéncia
           defibrillator: Desfibrillador
           landing_site: Terren d’aterrissatge d’urgéncia
           phone: Telefòn d'urgéncia

+          water_tank: Cistèrna d'aiga d'urgéncia
+          "yes": Urgéncia

         highway:
           abandoned: Autorota abandonada
           bridleway: Camin per cavalièrs
           bus_guideway: Via de bus guidada
           bus_stop: Arrèst de bus
           construction: Autorota en construccion
         highway:
           abandoned: Autorota abandonada
           bridleway: Camin per cavalièrs
           bus_guideway: Via de bus guidada
           bus_stop: Arrèst de bus
           construction: Autorota en construccion

+          corridor: Corredor

           cycleway: Pista ciclabla
           elevator: Ascensor
           emergency_access_point: Punt d'accès d'urgéncia
           footway: Camin pietonièr
           ford: Ga
           cycleway: Pista ciclabla
           elevator: Ascensor
           emergency_access_point: Punt d'accès d'urgéncia
           footway: Camin pietonièr
           ford: Ga

+          give_way: Panèl de cedar lo passatge

           living_street: Carrièra en zòna de rencontre
           milestone: Bòrna quilometrica
           motorway: Autorota
           motorway_junction: Joncion d'autorota
           motorway_link: Rota autorotièra
           living_street: Carrièra en zòna de rencontre
           milestone: Bòrna quilometrica
           motorway: Autorota
           motorway_junction: Joncion d'autorota
           motorway_link: Rota autorotièra

+          passing_place: Endreit de passatge

           path: Camin
           pedestrian: Camin pietonièr
           platform: Plataforma
           path: Camin
           pedestrian: Camin pietonièr
           platform: Plataforma


@@ -557,6 +574,7 @@ oc:
           services: Servicis autorotièrs
           speed_camera: Radar de velocitat
           steps: Escalièr
           services: Servicis autorotièrs
           speed_camera: Radar de velocitat
           steps: Escalièr

+          stop: Panèl d'arrèst

           street_lamp: Lampadari
           tertiary: Rota terciària
           tertiary_link: Rota terciària
           street_lamp: Lampadari
           tertiary: Rota terciària
           tertiary_link: Rota terciària


@@ -565,6 +583,7 @@ oc:
           trail: Pista
           trunk: Via exprèssa
           trunk_link: Via exprèssa
           trail: Pista
           trunk: Via exprèssa
           trunk_link: Via exprèssa

+          turning_loop: Virada en bocla

           unclassified: Rota menora
           "yes": Rota
         historic:
           unclassified: Rota menora
           "yes": Rota
         historic:


@@ -584,6 +603,7 @@ oc:
           manor: Castelet
           memorial: Memorial
           mine: Mina
           manor: Castelet
           memorial: Memorial
           mine: Mina

+          mine_shaft: Potz de mina

           monument: Monument
           roman_road: Via romana
           ruins: Roïnas
           monument: Monument
           roman_road: Via romana
           ruins: Roïnas


@@ -593,6 +613,7 @@ oc:
           wayside_cross: Calvari
           wayside_shrine: Orador
           wreck: Varatge
           wayside_cross: Calvari
           wayside_shrine: Orador
           wreck: Varatge

+          "yes": Site istoric

         junction:
           "yes": Interseccion/Caireforc
         landuse:
         junction:
           "yes": Interseccion/Caireforc
         landuse:


@@ -632,6 +653,7 @@ oc:
           bird_hide: Obsevatòri ornitologic
           common: Terrens comunals
           dog_park: Parc canin
           bird_hide: Obsevatòri ornitologic
           common: Terrens comunals
           dog_park: Parc canin

+          firepit: Fogal

           fishing: Zòna de pesca
           fitness_centre: Utilizacion de las tèrras
           fitness_station: Taulièr de percors de santat
           fishing: Zòna de pesca
           fitness_centre: Utilizacion de las tèrras
           fitness_station: Taulièr de percors de santat


@@ -656,15 +678,46 @@ oc:
           water_park: Pargue aqüatic
           "yes": Lésers
         man_made:
           water_park: Pargue aqüatic
           "yes": Lésers
         man_made:

+          adit: Galariá d'accès
+          beacon: Far
+          beehive: Bornhon
+          breakwater: Copa-ondada
+          bridge: Pont
+          bunker_silo: Bunker
+          chimney: Chemenèia
+          crane: Grua
+          dolphin: Pòste d’amarratge
+          dyke: Dique
+          embankment: Terraplen
+          flagpole: Mat
+          gasometer: Gasomètre
+          groyne: Espiga de plaja
+          kiln: Forn de terralha

           lighthouse: Far
           lighthouse: Far

+          mast: Pilòne
+          mine: Mina
+          mineshaft: Potz de mina
+          monitoring_station: Estacion de susvelhança
+          petroleum_well: Potz petrolifèr
+          pier: Peirada

           pipeline: Pipeline
           pipeline: Pipeline

+          silo: Sièja
+          storage_tank: Cistèrna d'emmagazinatge
+          surveillance: Susvelhança

           tower: Torre
           tower: Torre

+          wastewater_plant: Estacion de tractament de las aigas usadas
+          watermill: Molina
+          water_tower: Castèl d'aiga
+          water_well: Potz
+          water_works: Sistèma idrolic
+          windmill: Molin de vent

           works: Usina
           "yes": Creat per l'òme
         military:
           airfield: Terren d'aviacion militara
           barracks: Casèrna
           bunker: Bunker
           works: Usina
           "yes": Creat per l'òme
         military:
           airfield: Terren d'aviacion militara
           barracks: Casèrna
           bunker: Bunker

+          "yes": Armada

         mountain_pass:
           "yes": Còl de montanha
         natural:
         mountain_pass:
           "yes": Còl de montanha
         natural:


@@ -710,11 +763,14 @@ oc:
           accountant: Comptable
           administrative: Administracion
           architect: Arquitècte
           accountant: Comptable
           administrative: Administracion
           architect: Arquitècte

+          association: Associacion

           company: Societat
           company: Societat

+          educational_institution: Institucion educativa

           employment_agency: Agéncia per l'emplec
           estate_agent: Agent immobilièr
           government: Agéncia governamentala
           insurance: Burèu d'assegurança
           employment_agency: Agéncia per l'emplec
           estate_agent: Agent immobilièr
           government: Agéncia governamentala
           insurance: Burèu d'assegurança

+          it: Burèu d'informacion

           lawyer: Avocat
           ngo: Burèu d'una ONG
           telecommunication: Burèus de telecomunicacion
           lawyer: Avocat
           ngo: Burèu d'una ONG
           telecommunication: Burèus de telecomunicacion


@@ -723,6 +779,7 @@ oc:
         place:
           allotments: Òrts familials
           city: Vila
         place:
           allotments: Òrts familials
           city: Vila

+          city_block: Illa d'ostals

           country: País
           county: Comtat
           farm: Bòria
           country: País
           county: Comtat
           farm: Bòria


@@ -736,8 +793,10 @@ oc:
           municipality: Municipalitat
           neighbourhood: Quartièr
           postcode: Còdi postal
           municipality: Municipalitat
           neighbourhood: Quartièr
           postcode: Còdi postal

+          quarter: Quartièr

           region: Region
           sea: Mar
           region: Region
           sea: Mar

+          square: Plaça

           state: Estat / província
           subdivision: Subdivision
           suburb: Quartier
           state: Estat / província
           subdivision: Subdivision
           suburb: Quartier


@@ -776,6 +835,7 @@ oc:
           beauty: Magazin de produits de beutat
           beverages: Magazin de bevendas
           bicycle: Magazin de bicicletas
           beauty: Magazin de produits de beutat
           beverages: Magazin de bevendas
           bicycle: Magazin de bicicletas

+          bookmaker: Ostal d'escomesas

           books: Librariá
           boutique: Botiga
           butcher: Carnissièr
           books: Librariá
           boutique: Botiga
           butcher: Carnissièr


@@ -814,11 +874,15 @@ oc:
           hairdresser: Cofaire
           hardware: Quicalhariá
           hifi: Magazin Hi-Fi
           hairdresser: Cofaire
           hardware: Quicalhariá
           hifi: Magazin Hi-Fi

+          interior_decoration: Decoracion d'interior

           jewelry: Joielariá
           kiosk: Quiòsque
           jewelry: Joielariá
           kiosk: Quiòsque

+          kitchen: Magasin de cosina

           laundry: Bugadariá
           laundry: Bugadariá

+          lottery: Lotariá

           mall: Galariá mercanda
           market: Mercat
           mall: Galariá mercanda
           market: Mercat

+          massage: Massatge

           mobile_phone: Magazin de telefòns mobils
           motorcycle: Magazin de mòto
           music: Magazin de musica
           mobile_phone: Magazin de telefòns mobils
           motorcycle: Magazin de mòto
           music: Magazin de musica


@@ -826,6 +890,8 @@ oc:
           optician: Optician
           organic: Magazin bio
           outdoor: Magazin d'activitats d'aire liure
           optician: Optician
           organic: Magazin bio
           outdoor: Magazin d'activitats d'aire liure

+          paint: Galariá de pintrura
+          pawnbroker: Prestaire per gatges

           pet: Animalariá
           pharmacy: Farmàcia
           photo: Magazin de fotografia
           pet: Animalariá
           pharmacy: Farmàcia
           photo: Magazin de fotografia


@@ -835,8 +901,13 @@ oc:
           stationery: Papetariá
           supermarket: Supermercat
           tailor: Sartre
           stationery: Papetariá
           supermarket: Supermercat
           tailor: Sartre

+          ticket: Bilhetariá
+          tobacco: Burèu de tabat

           toys: Magazin de joguets
           travel_agency: Agéncia de viatge
           toys: Magazin de joguets
           travel_agency: Agéncia de viatge

+          tyres: Magasin de pneumatics
+          vacant: Comèrci vacant
+          variety_store: Magasin de varietats

           video: Magazin de vidèos
           wine: Cavista
           "yes": Botiga
           video: Magazin de vidèos
           wine: Cavista
           "yes": Botiga


@@ -862,6 +933,7 @@ oc:
           viewpoint: Punt de vista
           zoo: Zoo
         tunnel:
           viewpoint: Punt de vista
           zoo: Zoo
         tunnel:

+          building_passage: Passatge de bastiment

           culvert: Pontet
           "yes": Tunèl
         waterway:
           culvert: Pontet
           "yes": Tunèl
         waterway:


@@ -893,7 +965,7 @@ oc:
         level10: Limit de la banlèga
     description:
       title:
         level10: Limit de la banlèga
     description:
       title:

-        osm_nominatim: Localizacion dempuèi <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: Localizacion dempuèi <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>
         geonames: Localizacion dempuèi <a href="http://www.geonames.org/">GeoNames</a>
       types:
           Nominatim</a>
         geonames: Localizacion dempuèi <a href="http://www.geonames.org/">GeoNames</a>
       types:


@@ -968,17 +1040,18 @@ oc:
     legal_babble:
       title_html: Copyright e Licéncia
       intro_1_html: |-
     legal_babble:
       title_html: Copyright e Licéncia
       intro_1_html: |-

-        OpenStreetMap es un ensemble de <i>donadas dobèrtas</i>, disponiblas jos licéncia liura <a
-        href="http://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL).
+        OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> es un ensemble de <i>donadas dobèrtas</i>, disponiblas jos licéncia liura <a
+        href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL) alprèp de la <a
+        href="https://osmfoundation.org/">Fondacion OpenStreetMap</a> (OSMF).

       intro_2_html: |2-
          Sètz liure de copiar, distribuir, transmetre e adaptar nòstras donadas,
           a condicion que creditetz OpenStreetMap e sos
           contributors. Se modificatz o utilizatz nòstras donadas dins d’autras òbras derivadas,
           las podètz distribuir sonque jos la meteissa licéncia. Lo
       intro_2_html: |2-
          Sètz liure de copiar, distribuir, transmetre e adaptar nòstras donadas,
           a condicion que creditetz OpenStreetMap e sos
           contributors. Se modificatz o utilizatz nòstras donadas dins d’autras òbras derivadas,
           las podètz distribuir sonque jos la meteissa licéncia. Lo

-          <a href="http://opendatacommons.org/licenses/odbl/1.0/">tèxte
+          <a href="https://opendatacommons.org/licenses/odbl/1.0/">tèxte

           legal</a> complet detalha vòstres dreits e responsabilitats.
       intro_3_html: Nòstres carrèus de rendut cartografics, e tanben de nòstra documentacion,
           legal</a> complet detalha vòstres dreits e responsabilitats.
       intro_3_html: Nòstres carrèus de rendut cartografics, e tanben de nòstra documentacion,

-        son disponibles jos la licéncia <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
+        son disponibles jos la licéncia <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative

         Commons paternitat – partiment a l’identic 2.0</a> (CC-BY-SA).
       credit_title_html: Cossí creditar OpenStreetMap
       credit_1_html: Demandam que vòstre crèdit compòrta la mencion « © los contributors
         Commons paternitat – partiment a l’identic 2.0</a> (CC-BY-SA).
       credit_title_html: Cossí creditar OpenStreetMap
       credit_1_html: Demandam que vòstre crèdit compòrta la mencion « © los contributors


@@ -992,7 +1065,7 @@ oc:
       more_title_html: Per trobar mai d’informacions
       more_1_html: |-
         Per obténer mai d’informacions sus cossí reütilizar nòstras donadas e nos creditar, legissètz la <a
       more_title_html: Per trobar mai d’informacions
       more_1_html: |-
         Per obténer mai d’informacions sus cossí reütilizar nòstras donadas e nos creditar, legissètz la <a

-        href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">FAQ legala</a>.
+        href="https://osmfoundation.org/Licence">FAQ legala</a>.

       contributors_title_html: Nòstres contributors
       contributors_fr_html: |-
         <strong>França</strong> : conten de donadas de la
       contributors_title_html: Nòstres contributors
       contributors_fr_html: |-
         <strong>França</strong> : conten de donadas de la


@@ -1040,7 +1113,7 @@ oc:
       title: Autras preocupacions
       explanation_html: "Se sètz preocupat pel biais que nòstras donadas son utilizadas
         o sus lor contengut, consultatz nòstra\n<a href='/copyright'>pagina de dreit
       title: Autras preocupacions
       explanation_html: "Se sètz preocupat pel biais que nòstras donadas son utilizadas
         o sus lor contengut, consultatz nòstra\n<a href='/copyright'>pagina de dreit

-        d’autor</a> per d'informacions mai legalas, o contactar lo \n<a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>grop
+        d’autor</a> per d'informacions mai legalas, o contactar lo \n<a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>grop

         de trabalh OSMF</a> apropriat."
   help_page:
     title: Obténer d’ajuda
         de trabalh OSMF</a> apropriat."
   help_page:
     title: Obténer d’ajuda


@@ -1052,7 +1125,7 @@ oc:
       title: Benvenguda a OSM
       description: Començar amb aqueste guida rapid que cobrís las basas d'OpenStreetMap.
     beginners_guide:
       title: Benvenguda a OSM
       description: Començar amb aqueste guida rapid que cobrís las basas d'OpenStreetMap.
     beginners_guide:

-      url: http://wiki.openstreetmap.org/wiki/OC:Guida_del_debutant
+      url: https://wiki.openstreetmap.org/wiki/FR:Guide_du_d%C3%A9butant

       title: Guida per debutants
       description: Guida pels debutants mantengut per la comunautat.
     help:
       title: Guida per debutants
       description: Guida pels debutants mantengut per la comunautat.
     help:


@@ -1071,7 +1144,7 @@ oc:
     switch2osm:
       title: switch2osm
     wiki:
     switch2osm:
       title: switch2osm
     wiki:

-      url: http://wiki.openstreetmap.org/
+      url: https://wiki.openstreetmap.org/

       title: wiki.openstreetmap.org
       description: Percorrètz lo wiki per la documentacion aprigondida d’OSM
   about_page:
       title: wiki.openstreetmap.org
       description: Percorrètz lo wiki per la documentacion aprigondida d’OSM
   about_page:


@@ -1082,9 +1155,13 @@ oc:
       ferroviàrias e plan mai encara, pertot dins lo mond.
     local_knowledge_title: Coneissença locala
     community_driven_title: Menat per la comunautat
       ferroviàrias e plan mai encara, pertot dins lo mond.
     local_knowledge_title: Coneissença locala
     community_driven_title: Menat per la comunautat

-    community_driven_html: |-
-      La comunautat d’OpenStreetMap es divèrsa, passionada e grossís cada jorn. Nòstres contributors incluisson de cartografes entosiastes, de professionals del GIS, d'ingenhiaires que menan los servidors OSM, d'umanitaris que cartografian las zònas devastadas per una catastròfa e plan mai encara.
-      Per ne saber mai sus la comunautat, consultatz los <a href='%{diary_path}'>annuaris d’utilizaires</a>, <a href='http://blogs.openstreetmap.org/'>los blogs comunautaris</a> e lo site web de la <a href='http://www.osmfoundation.org/'>Fondacion OSM</a>.
+    community_driven_html: "La comunautat d’OpenStreetMap es divèrsa, passionada e
+      grossís cada jorn. Nòstres contributors incluisson de cartografes entosiastes,
+      de professionals del GIS, d'ingenhiaires que menan los servidors OSM, d'umanitaris
+      que cartografian las zònas devastadas per una catastròfa e plan mai encara.\nPer
+      ne saber mai sus la comunautat, consultatz los \n<a href='%{diary_path}'>annuaris
+      d’utilizaires</a>, \n<a href='https://blogs.openstreetmap.org/'>los blogs comunautaris</a>
+      e lo site web de la <a href='https://www.osmfoundation.org/'>Fondacion OSM</a>."

     open_data_title: Donadas liuras
     legal_title: Juridic
     partners_title: Partenaris
     open_data_title: Donadas liuras
     legal_title: Juridic
     partners_title: Partenaris


@@ -1281,9 +1358,10 @@ oc:
       get_directions_title: Trobatz d'itineraris entre dos punts
       from: De
       to: A
       get_directions_title: Trobatz d'itineraris entre dos punts
       from: De
       to: A

-      where_am_i: Ont soi ?
+      where_am_i: Ont es aquò ?

       where_am_i_title: Descriu la posicion actuala en utilizant lo motor de recèrca
       submit_text: Validar
       where_am_i_title: Descriu la posicion actuala en utilizant lo motor de recèrca
       submit_text: Validar

+      reverse_directions_text: Inversar las direccions

     key:
       table:
         entry:
     key:
       table:
         entry:


@@ -1358,7 +1436,7 @@ oc:
       edit: Modificar
       preview: Apercebut
     markdown_help:
       edit: Modificar
       preview: Apercebut
     markdown_help:

-      title_html: Analisat amb <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+      title_html: Analisat amb <a href="https://daringfireball.net/projects/markdown/">Markdown</a>

       headings: Títols
       heading: Títol
       subheading: Sostítol
       headings: Títols
       heading: Títol
       subheading: Sostítol


@@ -1459,7 +1537,7 @@ oc:
       description: Percórrer las darrièras traças GPS telecargadas
       tagged_with: '  balisat amb %{tags}'
       empty_html: Pas res a veire per aquí. <a href='%{upload_link}'>Telecargar una
       description: Percórrer las darrièras traças GPS telecargadas
       tagged_with: '  balisat amb %{tags}'
       empty_html: Pas res a veire per aquí. <a href='%{upload_link}'>Telecargar una

-        traça novèla</a> o per ne saber mai sul traçatge GPS, consultatz la <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>pagina
+        traça novèla</a> o per ne saber mai sul traçatge GPS, consultatz la <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>pagina

         wiki</a>.
     delete:
       scheduled_for_deletion: Pista prevista per la supression
         wiki</a>.
     delete:
       scheduled_for_deletion: Pista prevista per la supression


@@ -1749,12 +1827,12 @@ oc:
       email never displayed publicly: (pas jamai afichat publicament)
       external auth: 'Autenticacion extèrna:'
       openid:
       email never displayed publicly: (pas jamai afichat publicament)
       external auth: 'Autenticacion extèrna:'
       openid:

-        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link: https://wiki.openstreetmap.org/wiki/OpenID

         link text: qu’es aquò ?
       public editing:
         heading: 'Modificacion publica :'
         enabled: Activat. Pas anonim e pòt modificar las donadas.
         link text: qu’es aquò ?
       public editing:
         heading: 'Modificacion publica :'
         enabled: Activat. Pas anonim e pòt modificar las donadas.

-        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits

         enabled link text: qu’es aquò ?
         disabled link text: perqué pòdi pas modificar ?
       public editing note:
         enabled link text: qu’es aquò ?
         disabled link text: perqué pòdi pas modificar ?
       public editing note:


@@ -2080,7 +2158,17 @@ oc:
         continue_without_exit: Contunhar sus %{name}
         slight_right_without_exit: Viratz leugièrament a dreita sus %{name}
         offramp_right_without_exit: Prene la sortida a dreita sus %{name}
         continue_without_exit: Contunhar sus %{name}
         slight_right_without_exit: Viratz leugièrament a dreita sus %{name}
         offramp_right_without_exit: Prene la sortida a dreita sus %{name}

+        offramp_right_with_directions: Prene la via de racòrdament a dreita cap a
+          %{directions}
+        offramp_right_with_name_and_directions: Prene la via de racòrdament a dreita
+          sus %{name}, cap a %{directions}
+        offramp_right_without_directions: Prene la via de racòrdament a dreita

         onramp_right_without_exit: Virar a dreita cap a la sortida sus %{name}
         onramp_right_without_exit: Virar a dreita cap a la sortida sus %{name}

+        onramp_right_with_directions: Virar a dreita sus la via de racòrdament cap
+          a %{directions}
+        onramp_right_with_name_and_directions: Virar a dreita sus la via de racòrdament
+          sus %{name}, cap a %{directions}
+        onramp_right_without_directions: Virar a dreita sus la via de racòrdament

         endofroad_right_without_exit: A la fin de la rota, virar a dreita sus %{name}
         merge_right_without_exit: Rejónher a dreita sus %{name}
         fork_right_without_exit: A la bifurcacion, virar a dreita sus %{name}
         endofroad_right_without_exit: A la fin de la rota, virar a dreita sus %{name}
         merge_right_without_exit: Rejónher a dreita sus %{name}
         fork_right_without_exit: A la bifurcacion, virar a dreita sus %{name}


@@ -2090,17 +2178,27 @@ oc:
         sharp_left_without_exit: Viratz vivament a esquèrra sus %{name}
         turn_left_without_exit: Viratz a esquèrra cap a %{name}
         offramp_left_without_exit: Prene la sortida d'esquèrra fins a %{name}
         sharp_left_without_exit: Viratz vivament a esquèrra sus %{name}
         turn_left_without_exit: Viratz a esquèrra cap a %{name}
         offramp_left_without_exit: Prene la sortida d'esquèrra fins a %{name}

+        offramp_left_with_directions: Prene la via de racòrdament a esquèrra cap a
+          %{directions}
+        offramp_left_with_name_and_directions: Prene la via de racòrdament a esquèrra
+          sus %{name}, cap a %{directions}
+        offramp_left_without_directions: Prene la via de racòrdament a esquèrra

         onramp_left_without_exit: Virar a esquèrra cap a la sortida sus %{name}
         onramp_left_without_exit: Virar a esquèrra cap a la sortida sus %{name}

+        onramp_left_with_directions: Virar a esquèrra sus la via de racòrdament cap
+          a %{directions}
+        onramp_left_with_name_and_directions: Virar a esquèrra sus la via de racòrdament
+          sus %{name}, cap a %{directions}
+        onramp_left_without_directions: Virar a esquèrra sus la via de racòrdament

         endofroad_left_without_exit: A la fin de la rota, virar a esquèrra cap a %{name}
         merge_left_without_exit: Rejónher a esquèrra sus %{name}
         fork_left_without_exit: A la bifurcacion, virar a esquèrra sus %{name}
         slight_left_without_exit: Viratz leugièrament a esquèrra sus %{name}
         via_point_without_exit: (pel punt)
         follow_without_exit: Seguir %{name}
         endofroad_left_without_exit: A la fin de la rota, virar a esquèrra cap a %{name}
         merge_left_without_exit: Rejónher a esquèrra sus %{name}
         fork_left_without_exit: A la bifurcacion, virar a esquèrra sus %{name}
         slight_left_without_exit: Viratz leugièrament a esquèrra sus %{name}
         via_point_without_exit: (pel punt)
         follow_without_exit: Seguir %{name}

-        roundabout_without_exit: A la rotonda, prenètz %{name}
+        roundabout_without_exit: A la rotonda, prenètz cap a %{name}

         leave_roundabout_without_exit: Sortir de la rotonda %{name}
         stay_roundabout_without_exit: Seguir la rotonda - %{name}
         leave_roundabout_without_exit: Sortir de la rotonda %{name}
         stay_roundabout_without_exit: Seguir la rotonda - %{name}

-        start_without_exit: Comença a la fin de %{name}
+        start_without_exit: Començar en %{name}

         destination_without_exit: Atenhètz la destinacion
         against_oneway_without_exit: Remontatz a contrasens sus %{name}
         end_oneway_without_exit: Fin del sens unic a %{name}
         destination_without_exit: Atenhètz la destinacion
         against_oneway_without_exit: Remontatz a contrasens sus %{name}
         end_oneway_without_exit: Fin del sens unic a %{name}

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 4d1e985df370ee582cad410886ff0552a5ae347e..361cbcf4c7617ae34eec9dbaf27f0b8fbb863d33 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -196,8 +196,8 @@ ru:
         title_comment: Пакет правок %{id} — %{comment}
       join_discussion: Войдите в систему, чтобы присоединиться к обсуждению
       discussion: Обсуждение
         title_comment: Пакет правок %{id} — %{comment}
       join_discussion: Войдите в систему, чтобы присоединиться к обсуждению
       discussion: Обсуждение

-      still_open: Пакет правок ещё открыт - обсуждение будет доступно, как только
-        пакет правок будет закрыт.
+      still_open: Пакет правок ещё открыт. Обсуждение будет доступно, как только пакет
+        правок будет закрыт.

     node:
       title: 'Точка: %{name}'
       history_title: 'История точки: %{name}'
     node:
       title: 'Точка: %{name}'
       history_title: 'История точки: %{name}'


@@ -1581,7 +1581,7 @@ ru:
       where_am_i_title: Опишите ваше местоположение, воспользовавшись инструментом
         поиска
       submit_text: Найти
       where_am_i_title: Опишите ваше местоположение, воспользовавшись инструментом
         поиска
       submit_text: Найти

-      reverse_directions_text: Ð\9eбÑ\80аÑ\82нÑ\8bе напÑ\80авлениÑ\8f
+      reverse_directions_text: Ð\9eбÑ\80аÑ\82нÑ\8bй маÑ\80Ñ\88Ñ\80Ñ\83Ñ\82

     key:
       table:
         entry:
     key:
       table:
         entry:


@@ -2522,9 +2522,16 @@ ru:
       instructions:
         continue_without_exit: Продолжите по %{name}
         slight_right_without_exit: Плавно поверните направо на %{name}
       instructions:
         continue_without_exit: Продолжите по %{name}
         slight_right_without_exit: Плавно поверните направо на %{name}

-        offramp_right_without_exit: Сверните направо на съезд к %{name}
-        onramp_right_without_exit: Поверните направо на съезд к %{name}
-        onramp_right_without_directions: Поверните вправо к съезду
+        offramp_right_without_exit: Сверните на правый съезд на %{name}
+        offramp_right_with_directions: Сверните на правый съезд в направлении %{directions}
+        offramp_right_with_name_and_directions: Сверните на правый съезд на %{name}
+          в направлении %{directions}
+        offramp_right_without_directions: Сверните на правый съезд
+        onramp_right_without_exit: Сверните на правый въезд на %{name}
+        onramp_right_with_directions: Сверните на правый въезд в направлении %{directions}
+        onramp_right_with_name_and_directions: Сверните на правый въезд на %{name}
+          в направлении %{directions}
+        onramp_right_without_directions: Сверните на правый въезд

         endofroad_right_without_exit: В конце дороги поверните направо на %{name}
         merge_right_without_exit: Перестройтесь правее на %{name}
         fork_right_without_exit: На развилке поверните направо на %{name}
         endofroad_right_without_exit: В конце дороги поверните направо на %{name}
         merge_right_without_exit: Перестройтесь правее на %{name}
         fork_right_without_exit: На развилке поверните направо на %{name}


@@ -2533,16 +2540,23 @@ ru:
         uturn_without_exit: Развернитесь на %{name}
         sharp_left_without_exit: Резко поверните налево на %{name}
         turn_left_without_exit: Поверните налево на %{name}
         uturn_without_exit: Развернитесь на %{name}
         sharp_left_without_exit: Резко поверните налево на %{name}
         turn_left_without_exit: Поверните налево на %{name}

-        offramp_left_without_exit: Сверните налево на съезд к %{name}
-        onramp_left_without_exit: Поверните налево на съезд к %{name}
-        onramp_left_without_directions: Поверните влево к съезду
+        offramp_left_without_exit: Сверните на левый съезд на %{name}
+        offramp_left_with_directions: Сверните на левый съезд в направлении %{directions}
+        offramp_left_with_name_and_directions: Сверните на левый съезд на %{name}
+          в направлении %{directions}
+        offramp_left_without_directions: Сверните на левый съезд
+        onramp_left_without_exit: Сверните на левый въезд на %{name}
+        onramp_left_with_directions: Сверните на левый въезд в направлении %{directions}
+        onramp_left_with_name_and_directions: Сверните на левый въезд на %{name} в
+          направлении %{directions}
+        onramp_left_without_directions: Сверните на левый въезд

         endofroad_left_without_exit: В конце дороги поверните налево на %{name}
         merge_left_without_exit: Перестройтесь левее на %{name}
         fork_left_without_exit: На развилке поверните налево на %{name}
         slight_left_without_exit: Плавно поверните налево на %{name}
         via_point_without_exit: (через точку)
         follow_without_exit: Следуйте %{name}
         endofroad_left_without_exit: В конце дороги поверните налево на %{name}
         merge_left_without_exit: Перестройтесь левее на %{name}
         fork_left_without_exit: На развилке поверните налево на %{name}
         slight_left_without_exit: Плавно поверните налево на %{name}
         via_point_without_exit: (через точку)
         follow_without_exit: Следуйте %{name}

-        roundabout_without_exit: На развязке сверните к %{name}
+        roundabout_without_exit: На круговой развязке сверните на %{name}

         leave_roundabout_without_exit: Покиньте развязку - %{name}
         stay_roundabout_without_exit: Оставайтесь на развязке - %{name}
         start_without_exit: Начните на %{name}
         leave_roundabout_without_exit: Покиньте развязку - %{name}
         stay_roundabout_without_exit: Оставайтесь на развязке - %{name}
         start_without_exit: Начните на %{name}


@@ -2550,10 +2564,10 @@ ru:
         against_oneway_without_exit: Идите против одностороннего движения на %{name}
         end_oneway_without_exit: Конец одностороннего движения на %{name}
         roundabout_with_exit: На круговой развязке сверните на %{exit}-й съезд к %{name}
         against_oneway_without_exit: Идите против одностороннего движения на %{name}
         end_oneway_without_exit: Конец одностороннего движения на %{name}
         roundabout_with_exit: На круговой развязке сверните на %{exit}-й съезд к %{name}

-        turn_left_with_exit: На круговой развязке поверните налево на %{name}
-        slight_left_with_exit: На круговой развязке плавно поверните налево на %{name}
-        turn_right_with_exit: На круговой развязке поверните направо на %{name}
-        slight_right_with_exit: На круговой развязке плавно поверните направо на %{name}
+        turn_left_with_exit: На круговой развязке сверните налево на %{name}
+        slight_left_with_exit: На круговой развязке плавно сверните налево на %{name}
+        turn_right_with_exit: На круговой развязке сверните направо на %{name}
+        slight_right_with_exit: На круговой развязке плавно сверните направо на %{name}

         continue_with_exit: На круговой развязке продолжайте движение прямо на %{name}
         unnamed: дорога
         courtesy: Маршрут предоставлен %{link}
         continue_with_exit: На круговой развязке продолжайте движение прямо на %{name}
         unnamed: дорога
         courtesy: Маршрут предоставлен %{link}

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index f5c30e1d89ec08da7545858474e8ec448d69460c..90f5cea92daf8a86ef85440dbdf8031cc1a877ba 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -2241,13 +2241,13 @@ zh-CN:
         continue_without_exit: 在%{name}上直走
         slight_right_without_exit: 稍向右转至%{name}
         offramp_right_without_exit: 在右侧上坡前往%{name}
         continue_without_exit: 在%{name}上直走
         slight_right_without_exit: 稍向右转至%{name}
         offramp_right_without_exit: 在右侧上坡前往%{name}

-        offramp_right_with_directions: 以å\8c\9dé\81\93å\90\91å\8f³%{directions}
+        offramp_right_with_directions: ä¸\8aå\8f³ä¾§æ\96\9cå\9d¡ï¼\8cå¾\80%{directions}æ\96¹å\90\91

         offramp_right_with_name_and_directions: 上坡右转至%{name}，往%{directions}方向
         offramp_right_with_name_and_directions: 上坡右转至%{name}，往%{directions}方向

-        offramp_right_without_directions: 走右边的斜坡
+        offramp_right_without_directions: 上右侧斜坡

         onramp_right_without_exit: 右转上坡至%{name}
         onramp_right_without_exit: 右转上坡至%{name}

-        onramp_right_with_directions: å\9c¨å\9d¡é\81\93ä¸\8aå\90\91å\8f³æ\8b\90ï¼\8c转å\90\91%{directions}
+        onramp_right_with_directions: å\90\91å\8f³ä¾§æ\96\9cå\9d¡æ\8b\90å\8e»ï¼\8cå¾\80%{directions}æ\96¹å\90\91

         onramp_right_with_name_and_directions: 上坡右转至%{name}，往%{directions}方向
         onramp_right_with_name_and_directions: 上坡右转至%{name}，往%{directions}方向

-        onramp_right_without_directions: å\90\91å\8f³æ\8b\90å\88°坡道上
+        onramp_right_without_directions: å\8f³è½¬è\87³坡道上

         endofroad_right_without_exit: 在道路尽头右转至%{name}
         merge_right_without_exit: 向右并线至%{name}
         fork_right_without_exit: 在交叉口右转至%{name}
         endofroad_right_without_exit: 在道路尽头右转至%{name}
         merge_right_without_exit: 向右并线至%{name}
         fork_right_without_exit: 在交叉口右转至%{name}


@@ -2257,13 +2257,13 @@ zh-CN:
         sharp_left_without_exit: 向左急转至%{name}
         turn_left_without_exit: 左转至%{name}
         offramp_left_without_exit: 在左侧上坡前往%{name}
         sharp_left_without_exit: 向左急转至%{name}
         turn_left_without_exit: 左转至%{name}
         offramp_left_without_exit: 在左侧上坡前往%{name}

-        offramp_left_with_directions: 以å\8c\9dé\81\93å\90\91å·¦%{directions}
+        offramp_left_with_directions: ä¸\8a左侧æ\96\9cå\9d¡ï¼\8cå¾\80%{directions}æ\96¹å\90\91

         offramp_left_with_name_and_directions: 上坡左转至%{name}，往%{directions}方向
         offramp_left_with_name_and_directions: 上坡左转至%{name}，往%{directions}方向

-        offramp_left_without_directions: 走左边的斜坡
+        offramp_left_without_directions: 上左侧斜坡

         onramp_left_without_exit: 左转上坡至%{name}
         onramp_left_without_exit: 左转上坡至%{name}

-        onramp_left_with_directions: å\9c¨å\9d¡é\81\93ä¸\8aå\90\91å·¦æ\8b\90ï¼\8c转å\90\91%{directions}
+        onramp_left_with_directions: å\90\91左侧æ\96\9cå\9d¡æ\8b\90å\8e»ï¼\8cå¾\80%{directions}æ\96¹å\90\91

         onramp_left_with_name_and_directions: 上坡左转至%{name}，往%{directions}方向
         onramp_left_with_name_and_directions: 上坡左转至%{name}，往%{directions}方向

-        onramp_left_without_directions: å\90\91å·¦æ\8b\90å\88°坡道上
+        onramp_left_without_directions: 左转è\87³坡道上

         endofroad_left_without_exit: 在道路尽头左转至%{name}
         merge_left_without_exit: 向左并线至%{name}
         fork_left_without_exit: 在交叉口左转至%{name}
         endofroad_left_without_exit: 在道路尽头左转至%{name}
         merge_left_without_exit: 向左并线至%{name}
         fork_left_without_exit: 在交叉口左转至%{name}