Localisation updates from https://translatewiki.net.

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 2da4b90fc90124c6bc562773689daf0a680991f9..39012b4f332d57d380ef5c452b4e93019d7ca0d3 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -351,8 +351,6 @@ af:
     search:
       title:
         latlon: Uitslae vooruitspruitend <a href="http://openstreetmap.org/">intern</a>
     search:
       title:
         latlon: Uitslae vooruitspruitend <a href="http://openstreetmap.org/">intern</a>

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

         ca_postcode: Uitslae vanaf <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Uitslae vanaf <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Uitslae vanaf <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Uitslae vanaf <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index 23ab08ead86867ab5c1ac870c0afea45adc3a5b1..adce26988b2c34a76bccb4d8030f88ca38bac04c 100644 (file)
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -239,8 +239,6 @@ aln:
     search:
       title:
         latlon: Rezultatet prej <a href="http://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon: Rezultatet prej <a href="http://openstreetmap.org/">Internal</a>

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

         ca_postcode: Rezultatet prej <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Rezultatet prej <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Rezultatet prej <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Rezultatet prej <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index bb0daccfd08f7a9fa6b58e5f24bfd2f6090ae67b..43d96c790536e39592b30d3e32284ea7f8207381 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -402,8 +402,6 @@ ar:
     search:
       title:
         latlon: نتائج <a href="http://openstreetmap.org/">داخليًا</a>
     search:
       title:
         latlon: نتائج <a href="http://openstreetmap.org/">داخليًا</a>

-        uk_postcode: نتائج من <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
-          Postcode</a>

         ca_postcode: نتائج من <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: نتائج من <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: نتائج من <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: نتائج من <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2135,7 +2133,7 @@ ar:
       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}
+        offramp_right_with_name: خذ الطريق المنحدرة إلى اليمين باتجاه %{name}

         onramp_right_without_exit: اتجه يمينا على منحدر إلى %{name}
         endofroad_right_without_exit: في نهاية الطريق انعطف يمينا إلى %{name}
         merge_right_without_exit: انعطف يمينا إلى %{name}
         onramp_right_without_exit: اتجه يمينا على منحدر إلى %{name}
         endofroad_right_without_exit: في نهاية الطريق انعطف يمينا إلى %{name}
         merge_right_without_exit: انعطف يمينا إلى %{name}


@@ -2143,7 +2141,7 @@ ar:
         turn_right_without_exit: انعطف يمينا إلى %{name}
         uturn_without_exit: انعطف على طول %{name}
         turn_left_without_exit: انعطف يسارا إلى %{name}
         turn_right_without_exit: انعطف يمينا إلى %{name}
         uturn_without_exit: انعطف على طول %{name}
         turn_left_without_exit: انعطف يسارا إلى %{name}

-        offramp_left_without_exit: خذ الطريق المنحدرة إلى اليسار إلى %{name}
+        offramp_left_with_name: خذ الطريق المنحدرة إلى اليسار إلى %{name}

         onramp_left_without_exit: انعطف يسارا على المنحدر إلى %{name}
         endofroad_left_without_exit: في نهاية الطريق انعطف يسارا إلى %{name}
         merge_left_without_exit: انعطف يسارا إلى %{name}
         onramp_left_without_exit: انعطف يسارا على المنحدر إلى %{name}
         endofroad_left_without_exit: في نهاية الطريق انعطف يسارا إلى %{name}
         merge_left_without_exit: انعطف يسارا إلى %{name}

diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index 3079aa99ecee43a02c2a238d2c558dac37b32444..fd7a53749b37647b86e870c04f7b3c626e2b4d3a 100644 (file)
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -210,8 +210,6 @@ arz:
     search:
       title:
         latlon: نتائج <a href="http://openstreetmap.org/">داخليًا</a>
     search:
       title:
         latlon: نتائج <a href="http://openstreetmap.org/">داخليًا</a>

-        uk_postcode: نتائج من <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
-          Postcode</a>

         ca_postcode: نتائج من <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: نتائج من <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: نتائج من <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: نتائج من <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 098f5fdc18546d1a158f0ce00770a6eab0f5f09f..52365626d9fb9b078861ecd758c7c1edc5b88557 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -382,8 +382,6 @@ ast:
     search:
       title:
         latlon: Resultaos <a href="https://openstreetmap.org/">internos</a>
     search:
       title:
         latlon: Resultaos <a href="https://openstreetmap.org/">internos</a>

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

         ca_postcode: Resultaos de <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Resultaos de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Resultaos de <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Resultaos de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2426,14 +2424,14 @@ ast:
       instructions:
         continue_without_exit: Siguir en %{name}
         slight_right_without_exit: Llixeramente a la drecha haza %{name}
       instructions:
         continue_without_exit: Siguir en %{name}
         slight_right_without_exit: Llixeramente a la drecha haza %{name}

-        offramp_right_without_exit: Cueye la rampla a la drecha haza %{name}
+        offramp_right: Toma l'enllaz a la derecha
+        offramp_right_with_name: Cueye la rampla a la drecha haza %{name}

         offramp_right_with_directions: Toma l'enllaz a la derecha hacia %{directions}
         offramp_right_with_directions: Toma l'enllaz a la derecha hacia %{directions}

-        offramp_right_with_name_and_directions: Toma l'enllaz a la derecha pa %{name},
+        offramp_right_with_name_directions: Toma l'enllaz a la derecha pa %{name},

           hacia %{directions}
           hacia %{directions}

-        offramp_right_without_directions: Toma l'enllaz a la derecha

         onramp_right_without_exit: Xira a la drecha na rampla haza %{name}
         onramp_right_with_directions: Xira a la derecha pal enllaz hacia %{directions}
         onramp_right_without_exit: Xira a la drecha na rampla haza %{name}
         onramp_right_with_directions: Xira a la derecha pal enllaz hacia %{directions}

-        onramp_right_with_name_and_directions: Xira a la derecha nel enllaz pa %{name},
+        onramp_right_with_name_directions: Xira a la derecha nel enllaz pa %{name},

           hacia %{directions}
         onramp_right_without_directions: Xira a la derecha pal enllaz
         endofroad_right_without_exit: Al final de la carretera xira a la drecha haza
           hacia %{directions}
         onramp_right_without_directions: Xira a la derecha pal enllaz
         endofroad_right_without_exit: Al final de la carretera xira a la drecha haza


@@ -2445,14 +2443,14 @@ ast:
         uturn_without_exit: Cambiu de sentíu en %{name}
         sharp_left_without_exit: Zarrao a la izquierda haza %{name}
         turn_left_without_exit: Xira a la izquierda haza %{name}
         uturn_without_exit: Cambiu de sentíu en %{name}
         sharp_left_without_exit: Zarrao a la izquierda haza %{name}
         turn_left_without_exit: Xira a la izquierda haza %{name}

-        offramp_left_without_exit: Cueye la rampla a la izquierda haza %{name}
+        offramp_left: Toma l'enllaz a la izquierda
+        offramp_left_with_name: Cueye la rampla a la izquierda haza %{name}

         offramp_left_with_directions: Toma l'enllaz a la izquierda hacia %{directions}
         offramp_left_with_directions: Toma l'enllaz a la izquierda hacia %{directions}

-        offramp_left_with_name_and_directions: Toma l'enllaz a la izquierda pa %{name},
+        offramp_left_with_name_directions: Toma l'enllaz a la izquierda pa %{name},

           hacia %{directions}
           hacia %{directions}

-        offramp_left_without_directions: Toma l'enllaz a la izquierda

         onramp_left_without_exit: Xira a la izquierda na rampla haza %{name}
         onramp_left_with_directions: Xira a la izquierda pal enllaz hacia %{directions}
         onramp_left_without_exit: Xira a la izquierda na rampla haza %{name}
         onramp_left_with_directions: Xira a la izquierda pal enllaz hacia %{directions}

-        onramp_left_with_name_and_directions: Xira a la izquierda nel enllaz pa %{name},
+        onramp_left_with_name_directions: Xira a la izquierda nel enllaz pa %{name},

           hacia %{directions}
         onramp_left_without_directions: Xira a la izquierda nel enllaz
         endofroad_left_without_exit: Al final de la carretera xira a la izquierda
           hacia %{directions}
         onramp_left_without_directions: Xira a la izquierda nel enllaz
         endofroad_left_without_exit: Al final de la carretera xira a la izquierda


@@ -2462,10 +2460,10 @@ ast:
         slight_left_without_exit: Llixeramente a la izquierda haza %{name}
         via_point_without_exit: (pel puntu)
         follow_without_exit: Siguir %{name}
         slight_left_without_exit: Llixeramente a la izquierda haza %{name}
         via_point_without_exit: (pel puntu)
         follow_without_exit: Siguir %{name}

-        roundabout_without_exit: Na rotonda toma %{name}
+        roundabout_without_exit: Na rotonda toma la salida haza %{name}

         leave_roundabout_without_exit: Sal de la rotonda - %{name}
         stay_roundabout_without_exit: Sigui na rotonda - %{name}
         leave_roundabout_without_exit: Sal de la rotonda - %{name}
         stay_roundabout_without_exit: Sigui na rotonda - %{name}

-        start_without_exit: Principia al final de %{name}
+        start_without_exit: Principiar en %{name}

         destination_without_exit: Aportasti al destín
         against_oneway_without_exit: Dir escontra direición per %{name}
         end_oneway_without_exit: Final de sentíu únicu en %{name}
         destination_without_exit: Aportasti al destín
         against_oneway_without_exit: Dir escontra direición per %{name}
         end_oneway_without_exit: Final de sentíu únicu en %{name}

diff --git a/config/locales/az.yml b/config/locales/az.yml
index 947e481a103ffff854f69db419876ed69b63bfad..0aab4d6c4b5ee4775929b05f2d01a683e1451b18 100644 (file)
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -266,8 +266,6 @@ az:
     search:
       title:
         latlon: <a href="http://openstreetmap.org/">Daxili nəticələr</a>
     search:
       title:
         latlon: <a href="http://openstreetmap.org/">Daxili nəticələr</a>

-        uk_postcode: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
-          nəticələri

         ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a> nəticələri
         osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> nəticələri
         ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a> nəticələri
         osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> nəticələri

diff --git a/config/locales/ba.yml b/config/locales/ba.yml
index f1bcdafb62f8048f5a038b300e3ddb492f0cadc8..a8e51a8418f6e5a7563f06eac59f7f260ded8c0c 100644 (file)
--- a/config/locales/ba.yml
+++ b/config/locales/ba.yml
@@ -355,7 +355,6 @@ ba:
         latlon: |2-
 
           <a href="http://openstreetmap.org/">эсендәге һөҙөмтәләр</a>
         latlon: |2-
 
           <a href="http://openstreetmap.org/">эсендәге һөҙөмтәләр</a>

-        uk_postcode: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>һөҙөмтәләре

         ca_postcode: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>алынған
           һөҙөмтәләр
         osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
         ca_postcode: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>алынған
           һөҙөмтәләр
         osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap

diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index 00c2b74e7098daa79a19416f9d09d858421d2125..ac6fb01bfe36fedfdb55a6fafd6759bdf9469ab0 100644 (file)
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -284,8 +284,6 @@ be-Tarask:
     search:
       title:
         latlon: Вынікі з <a href="https://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon: Вынікі з <a href="https://openstreetmap.org/">Internal</a>

-        uk_postcode: Вынікі з <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
-          Postcode</a>

         ca_postcode: Вынікі з <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Вынікі з <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Вынікі з <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Вынікі з <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -763,9 +761,9 @@ be-Tarask:
         зьвесткі з вольнай ліцэнзіяй ад нацыянальных картаграфічных службаў і зь іншых
         крыніц, сярод іх:'
       contributors_at_html: |-
         зьвесткі з вольнай ліцэнзіяй ад нацыянальных картаграфічных службаў і зь іншых
         крыніц, сярод іх:'
       contributors_at_html: |-

-        <strong>Аўстрыя</strong>: Утрымлівае зьвесткі
-        <a href="http://data.wien.gv.at/">горада Вены</a> на ўмовах
-        <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>.
+        <strong>Аўстрыя</strong>: утрымлівае зьвесткі <a href="https://data.wien.gv.at/">гораду Вены</a> (на ўмовах
+        <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>), а таксама земляў <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Форарльбэрг</a> і
+        Тыроль (на ўмовах <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT з дапаўненьнямі</a>).

       contributors_ca_html: |-
         <strong>Канада</strong>: Утрымлівае зьвесткі
         GeoBase&reg;, GeoGratis (&copy; Дэпартамэнта прыродных рэсурсаў
       contributors_ca_html: |-
         <strong>Канада</strong>: Утрымлівае зьвесткі
         GeoBase&reg;, GeoGratis (&copy; Дэпартамэнта прыродных рэсурсаў


@@ -930,9 +928,9 @@ be-Tarask:
         можаце зрабіць Вашыя рэдагаваньні публічнымі на Вашай %{user_page}.
       user_page_link: старонцы карыстальніка
       anon_edits_link_text: Даведацца ў чым справа.
         можаце зрабіць Вашыя рэдагаваньні публічнымі на Вашай %{user_page}.
       user_page_link: старонцы карыстальніка
       anon_edits_link_text: Даведацца ў чым справа.

-      flash_player_required: Каб выкарыстоўваць рэдактар Potlatch неабходны Flash-плэер.
-        Ð\92Ñ\8b можаÑ\86е <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">
-        загрузіць Flash-плэер з Adobe.com</a>. Існуюць і <a href="http://wiki.openstreetmap.org/wiki/Editing">іншыя
+      flash_player_required: Каб выкарыстоўваць Potlatch, флэш-рэдактар для OpenStreetMap,
+        неабÑ\85однÑ\8b Flash-плÑ\8dеÑ\80. Ð\92Ñ\8b можаÑ\86е <a href="https://get.adobe.com/flashplayer/">загÑ\80Ñ\83зÑ\96Ñ\86Ñ\8c
+        Flash-плэер з Adobe.com</a>. Існуюць і <a href="https://wiki.openstreetmap.org/wiki/Editing">іншыя

         магчымасьці</a> для рэдагаваньня OpenStreetMap.
       potlatch_unsaved_changes: Вы маеце незахаваныя зьмены. (Для таго каб захаваць
         зьмены ў Potlatch, Вам неабходна зьняць пазначэньне з цяперашняй дарогі ці
         магчымасьці</a> для рэдагаваньня OpenStreetMap.
       potlatch_unsaved_changes: Вы маеце незахаваныя зьмены. (Для таго каб захаваць
         зьмены ў Potlatch, Вам неабходна зьняць пазначэньне з цяперашняй дарогі ці

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 56a2cdb5f387d73c5aae32547863e241365c93fa..f63a921f0fd8df13f0fadd1c7406872cefa56299 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -387,8 +387,6 @@ be:
     search:
       title:
         latlon: Вынікі з <a href="http://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon: Вынікі з <a href="http://openstreetmap.org/">Internal</a>

-        uk_postcode: Вынінкі з <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
-          Postcode</a>

         ca_postcode: Вынікі з <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Вынікі з <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Вынікі з <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Вынікі з <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2354,7 +2352,7 @@ be:
       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}
+        offramp_right_with_name: Павярніце направа на з'езд да %{name}

         onramp_right_without_exit: Павярніце направа на з'езд да %{name}
         endofroad_right_without_exit: У канцы дарогі павярніце направа на %{name}
         merge_right_without_exit: Перастройцеся ўправа на %{name}
         onramp_right_without_exit: Павярніце направа на з'езд да %{name}
         endofroad_right_without_exit: У канцы дарогі павярніце направа на %{name}
         merge_right_without_exit: Перастройцеся ўправа на %{name}


@@ -2364,7 +2362,7 @@ be:
         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}
+        offramp_left_with_name: Павярніце налева на з'езд да %{name}

         onramp_left_without_exit: Павярніце налева на з'езд да %{name}
         endofroad_left_without_exit: У канцы дарогі павярніце налева на %{name}
         merge_left_without_exit: Перастройцеся ўлева на %{name}
         onramp_left_without_exit: Павярніце налева на з'езд да %{name}
         endofroad_left_without_exit: У канцы дарогі павярніце налева на %{name}
         merge_left_without_exit: Перастройцеся ўлева на %{name}

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index ab533285bbfc4f1fd387d685c84dcb1ca448769f..0861a35cc91d4e319db0082f0d2fab44628bb041 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -96,7 +96,7 @@ bg:
     anonymous: анонимен
     no_comment: (без коментар)
     part_of: Част от
     anonymous: анонимен
     no_comment: (без коментар)
     part_of: Част от

-    download_xml: СвалÑ\8fне на GPX
+    download_xml: Ð\98зÑ\82еглÑ\8fне на XML

     view_history: Показване на историята
     view_details: Вижте детайлите
     location: 'Местоположение:'
     view_history: Показване на историята
     view_details: Вижте детайлите
     location: 'Местоположение:'


@@ -292,8 +292,6 @@ bg:
     search:
       title:
         latlon: <a href="http://openstreetmap.org/">Вътрешни</a> резултати
     search:
       title:
         latlon: <a href="http://openstreetmap.org/">Вътрешни</a> резултати

-        uk_postcode: Резултати от <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
-          Postcode</a>

         ca_postcode: Резултати от <a href="http://geocoder.us/">Geocoder.CA</a>
         osm_nominatim: Резултати от <a href="http://nominatim.openstreetmap.org">OpenStreetMap
           Nominatim</a>
         ca_postcode: Резултати от <a href="http://geocoder.us/">Geocoder.CA</a>
         osm_nominatim: Резултати от <a href="http://nominatim.openstreetmap.org">OpenStreetMap
           Nominatim</a>


@@ -972,7 +970,7 @@ bg:
   trace:
     edit:
       filename: 'Име на файл:'
   trace:
     edit:
       filename: 'Име на файл:'

-      download: сваляне
+      download: изтегляне

       uploaded_at: 'Качени:'
       points: 'Точки:'
       map: карта
       uploaded_at: 'Качени:'
       points: 'Точки:'
       map: карта

diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index a02d8fc40f4f5bce49d6fa08c9778ca0c8a64fc9..f1230b33b514ea3244e71f139159ddbe271f46a2 100644 (file)
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -381,8 +381,6 @@ bn:
     search:
       title:
         latlon: <a href="http://openstreetmap.org/">অভ্যন্তরীণ</a> থেকে ফলাফল
     search:
       title:
         latlon: <a href="http://openstreetmap.org/">অভ্যন্তরীণ</a> থেকে ফলাফল

-        uk_postcode: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
-          থেকে ফলাফল

         ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a> থেকে ফলাফল
         osm_nominatim: <a href="http://nominatim.openstreetmap.org/">ওপেনস্ট্রীটম্যাপ
           নমিনাতিম</a> থেকে ফলাফল
         ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a> থেকে ফলাফল
         osm_nominatim: <a href="http://nominatim.openstreetmap.org/">ওপেনস্ট্রীটম্যাপ
           নমিনাতিম</a> থেকে ফলাফল

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 37f59b46ac21c64d200ebcf9d11cde9960ac71ac..d91474a58992b0bcc3c5b1126be68db6fc49f85f 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -390,8 +390,6 @@ br:
     search:
       title:
         latlon: Disoc'hoù diwar <a href="https://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon: Disoc'hoù diwar <a href="https://openstreetmap.org/">Internal</a>

-        uk_postcode: Disoc'hoù diwar <a href="http://www.npemap.org.uk/">NPEMap /
-          FreeThe Postcode</a>

         ca_postcode: Disoc'hoù diwar <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Disoc'hoù diwar <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Disoc'hoù diwar <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Disoc'hoù diwar <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2456,7 +2454,7 @@ br:
       instructions:
         continue_without_exit: Kenderc'hel war%{name}
         slight_right_without_exit: Troit un tammig a-zehoù war %{name}
       instructions:
         continue_without_exit: Kenderc'hel war%{name}
         slight_right_without_exit: Troit un tammig a-zehoù war %{name}

-        offramp_right_without_exit: Kemer ar vretell dehoù %{name}
+        offramp_right_with_name: Kemer ar vretell dehoù %{name}

         onramp_right_without_exit: Troit a-zehoù war ar bretell war %{name}
         endofroad_right_without_exit: E penn an hent, troit a-zezhoù war %{name}
         merge_right_without_exit: Mont a-zehoù war %{name}
         onramp_right_without_exit: Troit a-zehoù war ar bretell war %{name}
         endofroad_right_without_exit: E penn an hent, troit a-zezhoù war %{name}
         merge_right_without_exit: Mont a-zehoù war %{name}


@@ -2466,7 +2464,7 @@ br:
         uturn_without_exit: Grit hanter dro war %{name}
         sharp_left_without_exit: Troit prim a-gleiz war %{name}
         turn_left_without_exit: Treiñ a-gleiz war %{name}
         uturn_without_exit: Grit hanter dro war %{name}
         sharp_left_without_exit: Troit prim a-gleiz war %{name}
         turn_left_without_exit: Treiñ a-gleiz war %{name}

-        offramp_left_without_exit: Kemer ar vretell gleiz betek %{name}
+        offramp_left_with_name: Kemer ar vretell gleiz betek %{name}

         onramp_left_without_exit: Troit a-gleiz war ar vretell war %{name}
         endofroad_left_without_exit: E penn an hent, troit a-gleiz war %{name}
         merge_left_without_exit: Mont a-gleiz war %{name}
         onramp_left_without_exit: Troit a-gleiz war ar vretell war %{name}
         endofroad_left_without_exit: E penn an hent, troit a-gleiz war %{name}
         merge_left_without_exit: Mont a-gleiz war %{name}

diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 3ab825186c1f59e54df2deb688da02ed65538f1f..a224305321b1425c685219b775c72beb0eed7313 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -325,8 +325,6 @@ bs:
     search:
       title:
         latlon: Rezultati sa <a href="http://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon: Rezultati sa <a href="http://openstreetmap.org/">Internal</a>

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

         ca_postcode: Rezultati sa <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Rezultati sa <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Rezultati sa <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Rezultati sa <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index d6e5cfc59851ae4bc2e3bafb05f755c5334d2b5e..b217efdd715feb0e0679b5b72eb37a2c97194666 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -412,8 +412,6 @@ ca:
     search:
       title:
         latlon: Resultats <a href="http://openstreetmap.org/">propis</a>
     search:
       title:
         latlon: Resultats <a href="http://openstreetmap.org/">propis</a>

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

         ca_postcode: Resultats de <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Resultats de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           nominatim</a>
         ca_postcode: Resultats de <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Resultats de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           nominatim</a>


@@ -2404,7 +2402,7 @@ ca:
       instructions:
         continue_without_exit: Continuar a %{name}
         slight_right_without_exit: Gira lleugerament a la dreta a %{name}
       instructions:
         continue_without_exit: Continuar a %{name}
         slight_right_without_exit: Gira lleugerament a la dreta a %{name}

-        offramp_right_without_exit: Agafeu el carril de la dreta a %{name}
+        offramp_right_with_name: Agafeu el carril de la dreta a %{name}

         onramp_right_without_exit: Gireu a la dreta al carril a %{name}
         endofroad_right_without_exit: Al final de la carretera gireu a la dreta a
           %{name}
         onramp_right_without_exit: Gireu a la dreta al carril a %{name}
         endofroad_right_without_exit: Al final de la carretera gireu a la dreta a
           %{name}


@@ -2415,7 +2413,7 @@ ca:
         uturn_without_exit: Canvi de sentit a %{name}
         sharp_left_without_exit: Gira a l'esquerra a %{name}
         turn_left_without_exit: Gira a l'esquerra per %{name}
         uturn_without_exit: Canvi de sentit a %{name}
         sharp_left_without_exit: Gira a l'esquerra a %{name}
         turn_left_without_exit: Gira a l'esquerra per %{name}

-        offramp_left_without_exit: Agafeu el carril de l'esquerra a %{name}
+        offramp_left_with_name: Agafeu el carril de l'esquerra a %{name}

         onramp_left_without_exit: Gireu a l'esquerra al carril a %{name}
         endofroad_left_without_exit: Al final de la carretera gireu a l'esquerra a
           %{name}
         onramp_left_without_exit: Gireu a l'esquerra al carril a %{name}
         endofroad_left_without_exit: Al final de la carretera gireu a l'esquerra a
           %{name}

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index aa0cb2fe8e556df1a5bc3ada09e1627aa4ef50d4..3f9702cc5cb9ba982f174212517b25fb3a6c10b1 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -414,8 +414,6 @@ cs:
     search:
       title:
         latlon: Výsledky z <a href="https://openstreetmap.org/">interní databáze</a>
     search:
       title:
         latlon: Výsledky z <a href="https://openstreetmap.org/">interní databáze</a>

-        uk_postcode: Výsledky z <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
-          Postcode</a>

         ca_postcode: Výsledky z <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Výsledky z <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Výsledky z <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Výsledky z <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2439,15 +2437,21 @@ cs:
       instructions:
         continue_without_exit: Pokračujte na %{name}
         slight_right_without_exit: Mírně vpravo na %{name}
       instructions:
         continue_without_exit: Pokračujte na %{name}
         slight_right_without_exit: Mírně vpravo na %{name}

-        offramp_right_without_exit: Použijte sjezd vpravo na %{name}
+        offramp_right: Použijte sjezd vpravo
+        offramp_right_with_exit: Použijte výjezd %{exit} vpravo
+        offramp_right_with_exit_name: Použijte výjezd %{exit} vpravo na %{name}
+        offramp_right_with_exit_directions: Použijte výjezd %{exit} vpravo směrem
+          na %{directions}
+        offramp_right_with_exit_name_directions: Použijte výjezd %{exit} vpravo na
+          %{name}, směrem na %{directions}
+        offramp_right_with_name: Použijte sjezd vpravo na %{name}

         offramp_right_with_directions: Použijte sjezd vpravo směrem na %{directions}
         offramp_right_with_directions: Použijte sjezd vpravo směrem na %{directions}

-        offramp_right_with_name_and_directions: Použijte sjezd vpravo na %{name},
-          směrem na %{directions}
-        offramp_right_without_directions: Použijte sjezd vpravo
+        offramp_right_with_name_directions: Použijte sjezd vpravo na %{name}, směrem
+          na %{directions}

         onramp_right_without_exit: Odbočte vpravo na nájezd na %{name}
         onramp_right_with_directions: Odbočte vpravo na nájezd směrem na %{directions}
         onramp_right_without_exit: Odbočte vpravo na nájezd na %{name}
         onramp_right_with_directions: Odbočte vpravo na nájezd směrem na %{directions}

-        onramp_right_with_name_and_directions: Odbočte vpravo na nájezd na %{name},
-          směrem na %{directions}
+        onramp_right_with_name_directions: Odbočte vpravo na nájezd na %{name}, směrem
+          na %{directions}

         onramp_right_without_directions: Odbočte vpravo na nájezd
         endofroad_right_without_exit: Na konci silnice odbočte vpravo na %{name}
         merge_right_without_exit: Připojte se vpravo na %{name}
         onramp_right_without_directions: Odbočte vpravo na nájezd
         endofroad_right_without_exit: Na konci silnice odbočte vpravo na %{name}
         merge_right_without_exit: Připojte se vpravo na %{name}


@@ -2457,15 +2461,21 @@ cs:
         uturn_without_exit: Otočte se na %{name}
         sharp_left_without_exit: Ostře vlevo na %{name}
         turn_left_without_exit: Odbočte vlevo na %{name}
         uturn_without_exit: Otočte se na %{name}
         sharp_left_without_exit: Ostře vlevo na %{name}
         turn_left_without_exit: Odbočte vlevo na %{name}

-        offramp_left_without_exit: Použijte sjezd vlevo na %{name}
+        offramp_left: Použijte sjezd vlevo
+        offramp_left_with_exit: Použijte výjezd %{exit} vlevo
+        offramp_left_with_exit_name: Použijte výjezd %{exit} vlevo na %{name}
+        offramp_left_with_exit_directions: Použijte výjezd %{exit} vlevo směrem na
+          %{directions}
+        offramp_left_with_exit_name_directions: Použijte výjezd %{exit} vlevo na %{name},
+          směrem na %{directions}
+        offramp_left_with_name: Použijte sjezd vlevo na %{name}

         offramp_left_with_directions: Použijte sjezd vlevo směrem na %{directions}
         offramp_left_with_directions: Použijte sjezd vlevo směrem na %{directions}

-        offramp_left_with_name_and_directions: Použijte sjezd vlevo na %{name}, směrem
+        offramp_left_with_name_directions: Použijte sjezd vlevo na %{name}, směrem

           na %{directions}
           na %{directions}

-        offramp_left_without_directions: Použijte sjezd vlevo

         onramp_left_without_exit: Odbočte vlevo na nájezd na %{name}
         onramp_left_with_directions: Odbočte vlevo na nájezd směrem na %{directions}
         onramp_left_without_exit: Odbočte vlevo na nájezd na %{name}
         onramp_left_with_directions: Odbočte vlevo na nájezd směrem na %{directions}

-        onramp_left_with_name_and_directions: Odbočte vlevo na nájezd na %{name},
-          směrem na %{directions}
+        onramp_left_with_name_directions: Odbočte vlevo na nájezd na %{name}, směrem
+          na %{directions}

         onramp_left_without_directions: Odbočte vlevo na nájezd
         endofroad_left_without_exit: Na konci silnice odbočte vlevo na %{name}
         merge_left_without_exit: Připojte se vlevo na %{name}
         onramp_left_without_directions: Odbočte vlevo na nájezd
         endofroad_left_without_exit: Na konci silnice odbočte vlevo na %{name}
         merge_left_without_exit: Připojte se vlevo na %{name}

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 75d720bda2ea92394c37f9c96684a90359ae827f..b232376126f2e310a3b626e62764008360111614 100644 (file)
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -361,8 +361,6 @@ cy:
     search:
       title:
         latlon: Canlyniadau o <a href="http://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon: Canlyniadau o <a href="http://openstreetmap.org/">Internal</a>

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

         ca_postcode: Canlyniadau o <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Canlyniadau o <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Canlyniadau o <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Canlyniadau o <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -377,12 +375,18 @@ cy:
           chair_lift: Cadair godi
           drag_lift: Cadair lusg
           gondola: Lifft Gondola
           chair_lift: Cadair godi
           drag_lift: Cadair lusg
           gondola: Lifft Gondola

+          pylon: Peilon

           station: Gorsaf Awyr
           station: Gorsaf Awyr

+          t-bar: Lifft T-Bar

         aeroway:
           aerodrome: Maesawyr
         aeroway:
           aerodrome: Maesawyr

+          airstrip: Llain Codi

           apron: Ffedog
           gate: Giat
           apron: Ffedog
           gate: Giat

+          hangar: Hangar

           helipad: Pad Hofrennydd
           helipad: Pad Hofrennydd

+          holding_position: Man aros
+          parking_position: Lle Parcio

           runway: Rhedfa Awyr
           taxiway: Safle tacsi
           terminal: Terfynell
           runway: Rhedfa Awyr
           taxiway: Safle tacsi
           terminal: Terfynell


@@ -428,6 +432,7 @@ cy:
           fuel: Tanwydd
           gambling: Gamblo
           grave_yard: Mynwent
           fuel: Tanwydd
           gambling: Gamblo
           grave_yard: Mynwent

+          grit_bin: Bin Gro Mân

           hospital: Ysbyty
           hunting_stand: Llwyfan Hela
           ice_cream: Hufen Iâ
           hospital: Ysbyty
           hunting_stand: Llwyfan Hela
           ice_cream: Hufen Iâ


@@ -441,6 +446,7 @@ cy:
           office: Swyddfa
           parking: Parcio
           parking_entrance: Mynedfa Man Parcio
           office: Swyddfa
           parking: Parcio
           parking_entrance: Mynedfa Man Parcio

+          parking_space: Man Parcio

           pharmacy: Fferyllfa
           place_of_worship: Man addoli
           police: Heddlu
           pharmacy: Fferyllfa
           place_of_worship: Man addoli
           police: Heddlu


@@ -474,6 +480,7 @@ cy:
           village_hall: Neuadd Bentref
           waste_basket: Bin sbwriel
           waste_disposal: Gwaredu Sbwriel
           village_hall: Neuadd Bentref
           waste_basket: Bin sbwriel
           waste_disposal: Gwaredu Sbwriel

+          water_point: Cyflenwad Dŵr

           youth_centre: Canolfan Ieuenctid
         boundary:
           administrative: Ffin Gweinyddol
           youth_centre: Canolfan Ieuenctid
         boundary:
           administrative: Ffin Gweinyddol


@@ -501,25 +508,31 @@ cy:
           "yes": Siop Grefftau
         emergency:
           ambulance_station: Gorsaf Ambiwlans
           "yes": Siop Grefftau
         emergency:
           ambulance_station: Gorsaf Ambiwlans

+          assembly_point: Man Ymgynull

           defibrillator: Diffibriliwr
           landing_site: Man Glanio Mewn Argyfwng
           phone: Ffôn Argyfwng
           defibrillator: Diffibriliwr
           landing_site: Man Glanio Mewn Argyfwng
           phone: Ffôn Argyfwng

+          water_tank: Tanc Dŵr Argyfwng
+          "yes": Argyfwng

         highway:
           abandoned: Hen Briffordd
           bridleway: Llwybr Ceffyl
           bus_guideway: Lon Bysiau
           bus_stop: Stop Bysiau
           construction: Priffordd yn cael ei Adeiladu
         highway:
           abandoned: Hen Briffordd
           bridleway: Llwybr Ceffyl
           bus_guideway: Lon Bysiau
           bus_stop: Stop Bysiau
           construction: Priffordd yn cael ei Adeiladu

+          corridor: Coridor

           cycleway: Llwybr Beicio
           elevator: Codwr
           emergency_access_point: Pwynt Mynediad Argyfwng
           footway: Llwybr Cerdded
           ford: Rhyd
           cycleway: Llwybr Beicio
           elevator: Codwr
           emergency_access_point: Pwynt Mynediad Argyfwng
           footway: Llwybr Cerdded
           ford: Rhyd

+          give_way: Arwydd "Ildiwch!"

           living_street: Stryd Byw
           milestone: Carreg Filltir
           motorway: Traffordd
           motorway_junction: Cyffordd Traffordd
           motorway_link: Ffordd Traffordd
           living_street: Stryd Byw
           milestone: Carreg Filltir
           motorway: Traffordd
           motorway_junction: Cyffordd Traffordd
           motorway_link: Ffordd Traffordd

+          passing_place: Lle Pasio

           path: Llwybr
           pedestrian: Llwybr Cerddwyr
           platform: Platfform
           path: Llwybr
           pedestrian: Llwybr Cerddwyr
           platform: Platfform


@@ -536,6 +549,7 @@ cy:
           services: Gwasanaethau Traffordd
           speed_camera: Camera Cyflymder
           steps: Grisiau
           services: Gwasanaethau Traffordd
           speed_camera: Camera Cyflymder
           steps: Grisiau

+          stop: Arwydd Stop

           street_lamp: Golau Stryd
           tertiary: Ffordd Trydyddol
           tertiary_link: Ffordd Trydyddol
           street_lamp: Golau Stryd
           tertiary: Ffordd Trydyddol
           tertiary_link: Ffordd Trydyddol


@@ -544,6 +558,7 @@ cy:
           trail: Llwybr
           trunk: Cefnffordd
           trunk_link: Cefnffordd
           trail: Llwybr
           trunk: Cefnffordd
           trunk_link: Cefnffordd

+          turning_loop: Lle Troi

           unclassified: Ffordd Diddosbarth
           "yes": Ffordd
         historic:
           unclassified: Ffordd Diddosbarth
           "yes": Ffordd
         historic:


@@ -563,6 +578,7 @@ cy:
           manor: Maenor
           memorial: Cofeb
           mine: Mwynfa
           manor: Maenor
           memorial: Cofeb
           mine: Mwynfa

+          mine_shaft: Siafft y Mwynglawdd

           monument: Cofadail
           roman_road: Ffordd Rufeinig
           ruins: Adfeilion
           monument: Cofadail
           roman_road: Ffordd Rufeinig
           ruins: Adfeilion


@@ -572,6 +588,7 @@ cy:
           wayside_cross: Croes Min Ffordd
           wayside_shrine: Cysegrfa Min Ffordd
           wreck: Llongddrylliad
           wayside_cross: Croes Min Ffordd
           wayside_shrine: Cysegrfa Min Ffordd
           wreck: Llongddrylliad

+          "yes": Safle Hanesyddol

         junction:
           "yes": Cyffordd
         landuse:
         junction:
           "yes": Cyffordd
         landuse:


@@ -611,6 +628,7 @@ cy:
           bird_hide: Cuddle Adar
           common: Tir Comin
           dog_park: Parc Cwn
           bird_hide: Cuddle Adar
           common: Tir Comin
           dog_park: Parc Cwn

+          firepit: Ardal Dân

           fishing: Man Pysgota
           fitness_centre: Canolfan Gadw'n Heini
           fitness_station: Lle Cadw'n Heini
           fishing: Man Pysgota
           fitness_centre: Canolfan Gadw'n Heini
           fitness_station: Lle Cadw'n Heini


@@ -635,15 +653,45 @@ cy:
           water_park: Parc Dŵr
           "yes": Hamdden
         man_made:
           water_park: Parc Dŵr
           "yes": Hamdden
         man_made:

+          beacon: Goleufa
+          beehive: Cwch Gwenyn
+          breakwater: Morglawdd
+          bridge: Pont
+          bunker_silo: Byncar
+          chimney: Simne
+          crane: Craen
+          dolphin: Man Angori
+          dyke: Morglawdd
+          embankment: Arglawdd
+          flagpole: Polyn Baner
+          gasometer: Tanc Nwy
+          groyne: Argor
+          kiln: Odyn

           lighthouse: Goleudy
           lighthouse: Goleudy

+          mast: Mast
+          mine: Mwynglawdd
+          mineshaft: Siafft Mwynglawdd
+          monitoring_station: Gorsaf Arsylwi
+          petroleum_well: Ffynnon Betroliwm
+          pier: Piyr

           pipeline: Pibell
           pipeline: Pibell

+          silo: Seilo
+          storage_tank: Tanc Storio
+          surveillance: Gwyliadwraeth

           tower: Tŵr
           tower: Tŵr

+          wastewater_plant: Gwaith Dŵr Budr
+          watermill: Melin Ddŵr
+          water_tower: Tŵr Dŵr
+          water_well: Ffynnon
+          water_works: Gwaith Dŵr
+          windmill: Melin Wynt

           works: Ffatri
           "yes": Wnaed gan Ddyn
         military:
           airfield: Maes Awyr Milwrol
           barracks: Barics
           bunker: Byncer
           works: Ffatri
           "yes": Wnaed gan Ddyn
         military:
           airfield: Maes Awyr Milwrol
           barracks: Barics
           bunker: Byncer

+          "yes": Safle Filwrol

         mountain_pass:
           "yes": Bwlch Mynydd
         natural:
         mountain_pass:
           "yes": Bwlch Mynydd
         natural:


@@ -689,11 +737,14 @@ cy:
           accountant: Cyfrifydd
           administrative: Gweinyddu
           architect: Pensaer
           accountant: Cyfrifydd
           administrative: Gweinyddu
           architect: Pensaer

+          association: Cymdeithas

           company: Cwmni
           company: Cwmni

+          educational_institution: Sefydliad Addysgol

           employment_agency: Asiantaeth Cyflogi
           estate_agent: Gwerthwr Tai
           government: Swyddfa Llywodraeth
           insurance: Swyddfa Yswiriant
           employment_agency: Asiantaeth Cyflogi
           estate_agent: Gwerthwr Tai
           government: Swyddfa Llywodraeth
           insurance: Swyddfa Yswiriant

+          it: Swyddfa TG

           lawyer: Cyfreithiwr
           ngo: Swyddfa'r NGO
           telecommunication: Swyddfa Telegyfathrebu
           lawyer: Cyfreithiwr
           ngo: Swyddfa'r NGO
           telecommunication: Swyddfa Telegyfathrebu


@@ -702,6 +753,7 @@ cy:
         place:
           allotments: Rhandiroedd
           city: Dinas
         place:
           allotments: Rhandiroedd
           city: Dinas

+          city_block: Bloc Dinesig

           country: Gwlad
           county: Sir
           farm: Fferm
           country: Gwlad
           county: Sir
           farm: Fferm


@@ -715,8 +767,10 @@ cy:
           municipality: Bwrdeistref
           neighbourhood: Cymdogaeth
           postcode: Cod Post
           municipality: Bwrdeistref
           neighbourhood: Cymdogaeth
           postcode: Cod Post

+          quarter: Maestref

           region: Rhanbarth
           sea: Môr
           region: Rhanbarth
           sea: Môr

+          square: Sgwâr

           state: Talaith
           subdivision: Is-adran
           suburb: Maestref
           state: Talaith
           subdivision: Is-adran
           suburb: Maestref


@@ -755,6 +809,7 @@ cy:
           beauty: Siop Harddwch
           beverages: Siop Ddiodau
           bicycle: Siop Feiciau
           beauty: Siop Harddwch
           beverages: Siop Ddiodau
           bicycle: Siop Feiciau

+          bookmaker: Llyfrwerthwr

           books: Siop Lyfrau
           boutique: Boutique
           butcher: Cigydd
           books: Siop Lyfrau
           boutique: Boutique
           butcher: Cigydd


@@ -793,11 +848,16 @@ cy:
           hairdresser: Siop Drin Gwallt
           hardware: Siop Nwyddau Metel
           hifi: Sain
           hairdresser: Siop Drin Gwallt
           hardware: Siop Nwyddau Metel
           hifi: Sain

+          houseware: Siop Offer Tŷ
+          interior_decoration: Addurniadau'r Cartref

           jewelry: Siop Gemwaith
           kiosk: Siop Fechan
           jewelry: Siop Gemwaith
           kiosk: Siop Fechan

+          kitchen: Siop Offer Cegin

           laundry: Golchdy
           laundry: Golchdy

+          lottery: Loteri

           mall: Canolfan Siopa
           market: Marchnad
           mall: Canolfan Siopa
           market: Marchnad

+          massage: Neges

           mobile_phone: Siop Ffonau Symudol
           motorcycle: Siop Beiciau Modur
           music: Siop Gerddoriaeth
           mobile_phone: Siop Ffonau Symudol
           motorcycle: Siop Beiciau Modur
           music: Siop Gerddoriaeth


@@ -805,6 +865,7 @@ cy:
           optician: Optegydd
           organic: Siop Fwyd Organig
           outdoor: Siop Awyr Agored
           optician: Optegydd
           organic: Siop Fwyd Organig
           outdoor: Siop Awyr Agored

+          paint: Siop Baent

           pet: Siop Anifeiliaid Anwes
           pharmacy: Fferyllfa
           photo: Siop Luniau
           pet: Siop Anifeiliaid Anwes
           pharmacy: Fferyllfa
           photo: Siop Luniau

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 0e360e7e75c949ee95007778258ebf0665b1d109..b63b9def1ad42349879c6d2c8822329d91002dd3 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -407,8 +407,6 @@ da:
     search:
       title:
         latlon: Resultater fra <a href="https://openstreetmap.org/">interne</a>
     search:
       title:
         latlon: Resultater fra <a href="https://openstreetmap.org/">interne</a>

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

         ca_postcode: Resultater fra <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Resultater fra <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Resultater fra <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Resultater fra <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2462,14 +2460,14 @@ da:
       instructions:
         continue_without_exit: Fortsæt ad %{name}
         slight_right_without_exit: Svagt til højre ind på %{name}
       instructions:
         continue_without_exit: Fortsæt ad %{name}
         slight_right_without_exit: Svagt til højre ind på %{name}

-        offramp_right_without_exit: Tag afkørslen til højre ud på %{name}
+        offramp_right: Tag rampen til højre
+        offramp_right_with_name: Tag afkørslen til højre ud på %{name}

         offramp_right_with_directions: Tag rampen til højre retning imod %{directions}
         offramp_right_with_directions: Tag rampen til højre retning imod %{directions}

-        offramp_right_with_name_and_directions: Tag rampen til højre på %{name}, retning
+        offramp_right_with_name_directions: Tag rampen til højre på %{name}, retning

           imod %{directions}
           imod %{directions}

-        offramp_right_without_directions: Tag rampen til højre

         onramp_right_without_exit: Hold til højre ud på %{name}
         onramp_right_with_directions: Drej mod højre ind på rampen, retning imod %{directions}
         onramp_right_without_exit: Hold til højre ud på %{name}
         onramp_right_with_directions: Drej mod højre ind på rampen, retning imod %{directions}

-        onramp_right_with_name_and_directions: Drej mod højre ind på rampen på %{name},
+        onramp_right_with_name_directions: Drej mod højre ind på rampen på %{name},

           retning imod %{directions}
         onramp_right_without_directions: Drej mod højre ind på rampen
         endofroad_right_without_exit: Ved slutningen af vejen drej til højre ud på
           retning imod %{directions}
         onramp_right_without_directions: Drej mod højre ind på rampen
         endofroad_right_without_exit: Ved slutningen af vejen drej til højre ud på


@@ -2481,15 +2479,15 @@ da:
         uturn_without_exit: U-vending langs %{name}
         sharp_left_without_exit: Skarpt til venstre ind på %{name}
         turn_left_without_exit: Drej til venstre ind på %{name}
         uturn_without_exit: U-vending langs %{name}
         sharp_left_without_exit: Skarpt til venstre ind på %{name}
         turn_left_without_exit: Drej til venstre ind på %{name}

-        offramp_left_without_exit: Tag afkørslen til venstre ud på %{name}
+        offramp_left: Tag rampen til venstre
+        offramp_left_with_name: Tag afkørslen til venstre ud på %{name}

         offramp_left_with_directions: Tag rampen til venstre, retning imod %{directions}
         offramp_left_with_directions: Tag rampen til venstre, retning imod %{directions}

-        offramp_left_with_name_and_directions: Tag rampen til venstre på %{name},
-          retning imod %{directions}
-        offramp_left_without_directions: Tag rampen til venstre
+        offramp_left_with_name_directions: Tag rampen til venstre på %{name}, retning
+          imod %{directions}

         onramp_left_without_exit: Hold til venstre ud på %{name}
         onramp_left_with_directions: Drej mod venstre ind på rampen, retning imod
           %{directions}
         onramp_left_without_exit: Hold til venstre ud på %{name}
         onramp_left_with_directions: Drej mod venstre ind på rampen, retning imod
           %{directions}

-        onramp_left_with_name_and_directions: Drej mod venstre ind på rampen på %{name},
+        onramp_left_with_name_directions: Drej mod venstre ind på rampen på %{name},

           retning imod %{directions}
         onramp_left_without_directions: Drej mod venstre ind på rampen
         endofroad_left_without_exit: Ved slutningen af vejen drej til venstre ud på
           retning imod %{directions}
         onramp_left_without_directions: Drej mod venstre ind på rampen
         endofroad_left_without_exit: Ved slutningen af vejen drej til venstre ud på

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 6fe3cb5b1d355395615aad6c8acbe499ff594b3d..f0fe87302037111c8bf06b572e373810940cca7a 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -435,8 +435,6 @@ de:
     search:
       title:
         latlon: Suchergebnisse von <a href="https://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon: Suchergebnisse von <a href="https://openstreetmap.org/">Internal</a>

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

         ca_postcode: Suchergebnisse von <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Ergebnisse von <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Suchergebnisse von <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Ergebnisse von <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2541,17 +2539,23 @@ de:
       instructions:
         continue_without_exit: Weiter auf %{name}
         slight_right_without_exit: Leicht rechts auf %{name}
       instructions:
         continue_without_exit: Weiter auf %{name}
         slight_right_without_exit: Leicht rechts auf %{name}

-        offramp_right_without_exit: Die rechte Auffahrt auf %{name} nehmen
+        offramp_right: Die rechte Auffahrt nehmen
+        offramp_right_with_exit: Rechte Ausfahrt %{exit} nehmen
+        offramp_right_with_exit_name: Rechte Ausfahrt %{exit} auf %{name} nehmen
+        offramp_right_with_exit_directions: Rechte Ausfahrt %{exit} Richtung %{directions}
+          nehmen
+        offramp_right_with_exit_name_directions: Rechte Ausfahrt %{exit} auf %{name}
+          Richtung %{directions} nehmen
+        offramp_right_with_name: Die rechte Auffahrt auf %{name} nehmen

         offramp_right_with_directions: Die rechte Auffahrt Richtung %{directions}
           nehmen
         offramp_right_with_directions: Die rechte Auffahrt Richtung %{directions}
           nehmen

-        offramp_right_with_name_and_directions: Die rechte Auffahrt auf %{name} Richtung
+        offramp_right_with_name_directions: Die rechte Auffahrt auf %{name} Richtung

           %{directions} nehmen
           %{directions} nehmen

-        offramp_right_without_directions: Die rechte Auffahrt nehmen

         onramp_right_without_exit: Bei der Auffahrt rechts abbiegen auf %{name}
         onramp_right_with_directions: Rechts auf die Auffahrt Richtung %{directions}
           abbiegen
         onramp_right_without_exit: Bei der Auffahrt rechts abbiegen auf %{name}
         onramp_right_with_directions: Rechts auf die Auffahrt Richtung %{directions}
           abbiegen

-        onramp_right_with_name_and_directions: Rechts auf die Auffahrt auf %{name}
-          Richtung %{directions} abbiegen
+        onramp_right_with_name_directions: Rechts auf die Auffahrt auf %{name} Richtung
+          %{directions} abbiegen

         onramp_right_without_directions: Rechts auf die Auffahrt abbiegen
         endofroad_right_without_exit: Am Straßenende rechts abbiegen auf %{name}
         merge_right_without_exit: Rechts einfädeln in %{name}
         onramp_right_without_directions: Rechts auf die Auffahrt abbiegen
         endofroad_right_without_exit: Am Straßenende rechts abbiegen auf %{name}
         merge_right_without_exit: Rechts einfädeln in %{name}


@@ -2561,15 +2565,21 @@ de:
         uturn_without_exit: Umkehren entlang %{name}
         sharp_left_without_exit: Scharf links auf %{name}
         turn_left_without_exit: Links abbiegen auf %{name}
         uturn_without_exit: Umkehren entlang %{name}
         sharp_left_without_exit: Scharf links auf %{name}
         turn_left_without_exit: Links abbiegen auf %{name}

-        offramp_left_without_exit: Die linke Auffahrt auf %{name} nehmen
+        offramp_left: Die linke Auffahrt nehmen
+        offramp_left_with_exit: Linke Ausfahrt %{exit} nehmen
+        offramp_left_with_exit_name: Linke Ausfahrt %{exit} auf %{name} nehmen
+        offramp_left_with_exit_directions: Linke Ausfahrt %{exit} Richtung %{directions}
+          nehmen
+        offramp_left_with_exit_name_directions: Linke Ausfahrt %{exit} auf %{name}
+          Richtung %{directions} nehmen
+        offramp_left_with_name: Die linke Auffahrt auf %{name} nehmen

         offramp_left_with_directions: Die linke Auffahrt Richtung %{directions} nehmen
         offramp_left_with_directions: Die linke Auffahrt Richtung %{directions} nehmen

-        offramp_left_with_name_and_directions: Die linke Auffahrt auf %{name} Richtung
+        offramp_left_with_name_directions: Die linke Auffahrt auf %{name} Richtung

           %{directions} nehmen
           %{directions} nehmen

-        offramp_left_without_directions: Die linke Auffahrt nehmen

         onramp_left_without_exit: Bei der Auffahrt links abbiegen auf %{name}
         onramp_left_with_directions: Links auf die Auffahrt Richtung %{directions}
           abbiegen
         onramp_left_without_exit: Bei der Auffahrt links abbiegen auf %{name}
         onramp_left_with_directions: Links auf die Auffahrt Richtung %{directions}
           abbiegen

-        onramp_left_with_name_and_directions: Links auf die Auffahrt auf %{name} Richtung
+        onramp_left_with_name_directions: Links auf die Auffahrt auf %{name} Richtung

           %{directions} abbiegen
         onramp_left_without_directions: Links auf die Auffahrt abbiegen
         endofroad_left_without_exit: Am Straßenende links abbiegen auf %{name}
           %{directions} abbiegen
         onramp_left_without_directions: Links auf die Auffahrt abbiegen
         endofroad_left_without_exit: Am Straßenende links abbiegen auf %{name}

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 8ed4ffe78de4fa1985500cea75b4a898f751c227..5c520a042fea163308e43effe282b199525573c0 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -274,7 +274,6 @@ diq:
     search:
       title:
         latlon: <a href="http://openstreetmap.org/">OSM</a> ra neticey
     search:
       title:
         latlon: <a href="http://openstreetmap.org/">OSM</a> ra neticey

-        uk_postcode: <a href="http://www.npemap.org.uk/">FreeThe Postcode</a> ra neticey

         ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a> ra neticey
         osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OSM Nominatim</a>
           ra neticey
         ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a> ra neticey
         osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OSM Nominatim</a>
           ra neticey

diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index a3eb231afbc9e201e1d0b16fc9c061f9c8fede7d..ea593f03c4c65789523afe4569cf0b9a3d66666c 100644 (file)
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -363,8 +363,6 @@ dsb:
     search:
       title:
         latlon: Wuslědki z <a href="http://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon: Wuslědki z <a href="http://openstreetmap.org/">Internal</a>

-        uk_postcode: Wuslědki z <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
-          Postcode</a>

         ca_postcode: Wuslědki z <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Wuslědki z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Wuslědki z <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Wuslědki z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

diff --git a/config/locales/el.yml b/config/locales/el.yml
index 7f8a768ebd06447d40bcfabf8355fe19f67c8483..405fb376e2de83e477bc7f4f69ec67f7f1bd4fad 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -423,8 +423,6 @@ el:
       title:
         latlon: Αποτελέσματα από την <a href="https://openstreetmap.org/">εσωτερική</a>
           βάση δεδομένων
       title:
         latlon: Αποτελέσματα από την <a href="https://openstreetmap.org/">εσωτερική</a>
           βάση δεδομένων

-        uk_postcode: Αποτελέσματα από <a href="http://www.npemap.org.uk/">NPEMap /
-          FreeThe Postcode</a>

         ca_postcode: Αποτελέσματα από <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Αποτελέσματα από το <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Αποτελέσματα από <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Αποτελέσματα από το <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -1046,7 +1044,7 @@ el:
     intro_text: Το OpenStreetMap είναι χάρτης του κόσμου, που δημιουργήθηκε από ανθρώπους
       σαν κι εσάς και είναι δωρεάν, υπό άδεια ελεύθερης χρήσης.
     intro_2_create_account: Δημιουργήστε ένα λογαριασμό χρήστη
     intro_text: Το OpenStreetMap είναι χάρτης του κόσμου, που δημιουργήθηκε από ανθρώπους
       σαν κι εσάς και είναι δωρεάν, υπό άδεια ελεύθερης χρήσης.
     intro_2_create_account: Δημιουργήστε ένα λογαριασμό χρήστη

-    partners_html: Η λειτουργία υποστηρίζεται από το %{ucl}, %{ic} και %{bytemark},
+    partners_html: Η λειτουργία υποστηρίζεται από το %{ucl}, %{bytemark} και %{ic},

       και άλλους %{συνεργάτες}.
     partners_ucl: UCL
     partners_ic: Imperial College του Λονδίνου
       και άλλους %{συνεργάτες}.
     partners_ucl: UCL
     partners_ic: Imperial College του Λονδίνου


@@ -1176,9 +1174,9 @@ el:
       trademarks_title_html: <span id="trademarks"></span>Εμπορικά σήματα
       trademarks_1_html: Το OpenStreetMap, το λογότυπο με το μεγεθυντικό φακό και
         το «State of the Map» είναι σήματα κατατεθέντα του Ιδρύματος OpenStreetMap.
       trademarks_title_html: <span id="trademarks"></span>Εμπορικά σήματα
       trademarks_1_html: Το OpenStreetMap, το λογότυπο με το μεγεθυντικό φακό και
         το «State of the Map» είναι σήματα κατατεθέντα του Ιδρύματος OpenStreetMap.

-        Î\91ν έÏ\87εÏ\84ε εÏ\81Ï\89Ï\84ήÏ\83ειÏ\82 Ï\83Ï\87εÏ\84ικά με Ï\84η Ï\87Ï\81ήÏ\83η Ï\84Ï\89ν Ï\83ημάÏ\84Ï\89ν, Ï\83Ï\84είλÏ\84ε Ï\84ιÏ\82 εÏ\81Ï\89Ï\84ήÏ\83ειÏ\82
-        Ï\83αÏ\82 Ï\83Ï\84ην <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Î\9fμάδα
-        Εργασίας Αδειών Χρήσης</a>.
+        Î\91ν έÏ\87εÏ\84ε εÏ\81Ï\89Ï\84ήÏ\83ειÏ\82 Ï\83Ï\87εÏ\84ικά με Ï\84η Ï\87Ï\81ήÏ\83η Ï\84Ï\89ν Ï\83ημάÏ\84Ï\89ν, Ï\80αÏ\81ακαλÏ\8e εÏ\80ιÏ\83κεÏ\86θείÏ\84ε
+        Ï\84ο <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">ΠολιÏ\84ική
+        Εμπορικών Σημάτων</a>.

   welcome_page:
     title: Καλώς ήρθατε!
     introduction_html: Σας καλωσορίζουμε στο OpenStreetMap, τον ελεύθερο και επεξεργάσιμο
   welcome_page:
     title: Καλώς ήρθατε!
     introduction_html: Σας καλωσορίζουμε στο OpenStreetMap, τον ελεύθερο και επεξεργάσιμο


@@ -1324,6 +1322,9 @@ el:
       Αυτός ο ιστότοπος και πολλές άλλες σχετικές υπηρεσίες λειτουργούν επίσημα από το <a href='https://osmfoundation.org/'>Ίδρυμα OpenStreetMap</a> (OSMF) εκ μέρους της κοινότητας. Η χρήση όλων των υπηρεσιών του OSMF  υπόκειται στην <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">Πολιτική Αποδεκτής Χρήσης</a> μας και στην <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Πολιτική Απορρήτου</a> μας.
       <br>
       Παρακαλούμε <a href='https://osmfoundation.org/Contact'>επικοινωνήστε με το OSMF</a> αν έχετε ερωτήματα για άδειες χρήσης, πνευματικά δικαιώματα ή άλλα νομικά θέματα.
       Αυτός ο ιστότοπος και πολλές άλλες σχετικές υπηρεσίες λειτουργούν επίσημα από το <a href='https://osmfoundation.org/'>Ίδρυμα OpenStreetMap</a> (OSMF) εκ μέρους της κοινότητας. Η χρήση όλων των υπηρεσιών του OSMF  υπόκειται στην <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">Πολιτική Αποδεκτής Χρήσης</a> μας και στην <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Πολιτική Απορρήτου</a> μας.
       <br>
       Παρακαλούμε <a href='https://osmfoundation.org/Contact'>επικοινωνήστε με το OSMF</a> αν έχετε ερωτήματα για άδειες χρήσης, πνευματικά δικαιώματα ή άλλα νομικά θέματα.

+
+      <br>
+      Το OpenStreetMap, το λογότυπο με το μεγεθυντικό φακό και το <<State of the Map>> είναι <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">κατατεθέντα σήματα του OSMF</a>.

     partners_title: Συνεργάτες
   notifier:
     diary_comment_notification:
     partners_title: Συνεργάτες
   notifier:
     diary_comment_notification:


@@ -2515,7 +2516,7 @@ el:
       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}
+        offramp_right_with_name: Πάρτε τη λωρίδα δεξιά προς %{name}

         onramp_right_without_exit: Στρίψτε δεξιά στη λωρίδα προς %{name}
         endofroad_right_without_exit: Στο τέλος του δρόμου στρίψτε δεξιά στην %{name}
         merge_right_without_exit: Ελαφριά δεξιά προς %{name}
         onramp_right_without_exit: Στρίψτε δεξιά στη λωρίδα προς %{name}
         endofroad_right_without_exit: Στο τέλος του δρόμου στρίψτε δεξιά στην %{name}
         merge_right_without_exit: Ελαφριά δεξιά προς %{name}


@@ -2525,7 +2526,7 @@ el:
         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}
+        offramp_left_with_name: Πάρτε τη λωρίδα αριστερά προς %{name}

         onramp_left_without_exit: Στρίψτε αριστερά στη λωρίδα προς %{name}
         endofroad_left_without_exit: Στο τέλος του δρόμου στρίψτε αριστερά στην %{name}
         merge_left_without_exit: Ελαφριά αριστερά προς %{name}
         onramp_left_without_exit: Στρίψτε αριστερά στη λωρίδα προς %{name}
         endofroad_left_without_exit: Στο τέλος του δρόμου στρίψτε αριστερά στην %{name}
         merge_left_without_exit: Ελαφριά αριστερά προς %{name}


@@ -2536,7 +2537,7 @@ el:
         roundabout_without_exit: Στον κυκλικό κόμβο βγείτε στο %{name}
         leave_roundabout_without_exit: Βγείτε από τον κυκλικό κόμβο - %{name}
         stay_roundabout_without_exit: Μείνετε στον κυκλικό κόμβο - %{name}
         roundabout_without_exit: Στον κυκλικό κόμβο βγείτε στο %{name}
         leave_roundabout_without_exit: Βγείτε από τον κυκλικό κόμβο - %{name}
         stay_roundabout_without_exit: Μείνετε στον κυκλικό κόμβο - %{name}

-        start_without_exit: Ξεκινήστε στο τέλος του %{name}
+        start_without_exit: Ξεκινήστε στο %{name}

         destination_without_exit: Φτάσατε στον προορισμό σας
         against_oneway_without_exit: Πηγαίνετε αντίθετα στον μονόδρομο %{name}
         end_oneway_without_exit: Τέλος του μονόδρομου %{name}
         destination_without_exit: Φτάσατε στον προορισμό σας
         against_oneway_without_exit: Πηγαίνετε αντίθετα στον μονόδρομο %{name}
         end_oneway_without_exit: Τέλος του μονόδρομου %{name}

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index ee1b21fe3afe1b0fde777b43c9579aaba87062a2..2d5fd313cc6a117d13f0b76530c1b5c64fe67043 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -400,8 +400,6 @@ en-GB:
     search:
       title:
         latlon: Results from <a href="http://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon: Results from <a href="http://openstreetmap.org/">Internal</a>

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

         ca_postcode: Results from <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Results from <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2386,14 +2384,14 @@ en-GB:
       instructions:
         continue_without_exit: Continue on %{name}
         slight_right_without_exit: Slight right onto %{name}
       instructions:
         continue_without_exit: Continue on %{name}
         slight_right_without_exit: Slight right onto %{name}

-        offramp_right_without_exit: Take the sliproad on the right onto %{name}
+        offramp_right: Take the sliproad on the right
+        offramp_right_with_name: Take the sliproad on the right onto %{name}

         offramp_right_with_directions: Take the sliproad on the right towards %{directions}
         offramp_right_with_directions: Take the sliproad on the right towards %{directions}

-        offramp_right_with_name_and_directions: Take the sliproad on the right onto
-          %{name}, towards %{directions}
-        offramp_right_without_directions: Take the sliproad on the right
+        offramp_right_with_name_directions: Take the sliproad on the right onto %{name},
+          towards %{directions}

         onramp_right_without_exit: Turn right on the sliproad onto %{name}
         onramp_right_with_directions: Turn right onto the sliproad towards %{directions}
         onramp_right_without_exit: Turn right on the sliproad onto %{name}
         onramp_right_with_directions: Turn right onto the sliproad towards %{directions}

-        onramp_right_with_name_and_directions: Turn right on the sliproad onto %{name},
+        onramp_right_with_name_directions: Turn right on the sliproad onto %{name},

           towards %{directions}
         onramp_right_without_directions: Turn right onto the sliproad
         endofroad_right_without_exit: At the end of the road turn right onto %{name}
           towards %{directions}
         onramp_right_without_directions: Turn right onto the sliproad
         endofroad_right_without_exit: At the end of the road turn right onto %{name}


@@ -2404,14 +2402,14 @@ en-GB:
         uturn_without_exit: U-turn along %{name}
         sharp_left_without_exit: Sharp left onto %{name}
         turn_left_without_exit: Turn left onto %{name}
         uturn_without_exit: U-turn along %{name}
         sharp_left_without_exit: Sharp left onto %{name}
         turn_left_without_exit: Turn left onto %{name}

-        offramp_left_without_exit: Take the sliproad on the left onto %{name}
+        offramp_left: Take the sliproad on the left
+        offramp_left_with_name: Take the sliproad on the left onto %{name}

         offramp_left_with_directions: Take the sliproad on the left towards %{directions}
         offramp_left_with_directions: Take the sliproad on the left towards %{directions}

-        offramp_left_with_name_and_directions: Take the sliproad on the left onto
-          %{name}, towards %{directions}
-        offramp_left_without_directions: Take the sliproad on the left
+        offramp_left_with_name_directions: Take the sliproad on the left onto %{name},
+          towards %{directions}

         onramp_left_without_exit: Turn left on the sliproad onto %{name}
         onramp_left_with_directions: Turn left onto the sliproad towards %{directions}
         onramp_left_without_exit: Turn left on the sliproad onto %{name}
         onramp_left_with_directions: Turn left onto the sliproad towards %{directions}

-        onramp_left_with_name_and_directions: Turn left on the sliproad onto %{name},
+        onramp_left_with_name_directions: Turn left on the sliproad onto %{name},

           towards %{directions}
         onramp_left_without_directions: Turn left onto the sliproad
         endofroad_left_without_exit: At the end of the road turn left onto %{name}
           towards %{directions}
         onramp_left_without_directions: Turn left onto the sliproad
         endofroad_left_without_exit: At the end of the road turn left onto %{name}

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 0612e148a16bb625243959f2fa1a8f731e2224a9..e64c75cab0059f6ee144a835680e2e3d9473a795 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -392,8 +392,6 @@ eo:
     search:
       title:
         latlon: Rezultoj el <a href="https://openstreetmap.org/">nia retejo</a>
     search:
       title:
         latlon: Rezultoj el <a href="https://openstreetmap.org/">nia retejo</a>

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

         ca_postcode: Rezultoj el <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Rezultoj el <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Rezultoj el <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Rezultoj el <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -1677,7 +1675,7 @@ eo:
       public_traces: Publikaj GPS-spuroj
       your_traces: Viaj GPS-spuroj
       public_traces_from: Publikaj GPS-spuroj de %{user}
       public_traces: Publikaj GPS-spuroj
       your_traces: Viaj GPS-spuroj
       public_traces_from: Publikaj GPS-spuroj de %{user}

-      description: Montri lastajn GPS-spurojn
+      description: Foliumi laste alŝutitajn GPS-spuroj

       tagged_with: etikedita kun %{tags}
       empty_html: Ankoraŭ nenio estas tie ĉi. <a href='%{upload_link}'>Alŝutu novan
         spuron</a> aŭ sciigu pli pri GPS-spurado ĉe la <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>viki-paĝo</a>.
       tagged_with: etikedita kun %{tags}
       empty_html: Ankoraŭ nenio estas tie ĉi. <a href='%{upload_link}'>Alŝutu novan
         spuron</a> aŭ sciigu pli pri GPS-spurado ĉe la <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>viki-paĝo</a>.


@@ -2403,15 +2401,22 @@ eo:
       instructions:
         continue_without_exit: Antaŭen al %{name}
         slight_right_without_exit: Ete dekstren al %{name}
       instructions:
         continue_without_exit: Antaŭen al %{name}
         slight_right_without_exit: Ete dekstren al %{name}

-        offramp_right_without_exit: Veturu la elveturejon dekstre al %{name}
+        offramp_right: Direktiĝu al enveturejo ĉe dekstre
+        offramp_right_with_exit: Direktiĝu al elveturejo %{exit} ĉe dekstre
+        offramp_right_with_exit_name: Direktiĝu al elveturejo %{exit} ĉe dekstre al
+          %{name}
+        offramp_right_with_exit_directions: Direktiĝu al elveturejo %{exit} ĉe dekstre
+          direkte al %{directions}
+        offramp_right_with_exit_name_directions: Direktiĝu al elveturejo %{exit} ĉe
+          dekstre al %{name} direkte al %{directions}
+        offramp_right_with_name: Veturu la elveturejon dekstre al %{name}

         offramp_right_with_directions: Direktiĝu al enveturejo dekstre direkte al
           %{directions}
         offramp_right_with_directions: Direktiĝu al enveturejo dekstre direkte al
           %{directions}

-        offramp_right_with_name_and_directions: Direktiĝu al enveturejo %{name}ĉe
-          dekstre direkte al %{directions}
-        offramp_right_without_directions: Direktiĝu al enveturejo ĉe dekstre
+        offramp_right_with_name_directions: Direktiĝu al enveturejo %{name}ĉe dekstre
+          direkte al %{directions}

         onramp_right_without_exit: Turniĝu dekstren al la elveturejo al %{name}
         onramp_right_with_directions: Dekstren al enveturejo direkte al %{directions}
         onramp_right_without_exit: Turniĝu dekstren al la elveturejo al %{name}
         onramp_right_with_directions: Dekstren al enveturejo direkte al %{directions}

-        onramp_right_with_name_and_directions: Dekstren al enveturejo %{name} direkte
+        onramp_right_with_name_directions: Dekstren al enveturejo %{name} direkte

           al %{directions}
         onramp_right_without_directions: Dekstren al enveturejo
         endofroad_right_without_exit: Ĉe la fino de la vojo turniĝu dekstren al %{name}
           al %{directions}
         onramp_right_without_directions: Dekstren al enveturejo
         endofroad_right_without_exit: Ĉe la fino de la vojo turniĝu dekstren al %{name}


@@ -2422,15 +2427,22 @@ eo:
         uturn_without_exit: U-forma ĝirado laŭ %{name}
         sharp_left_without_exit: Ege maldekstren al %{name}
         turn_left_without_exit: Turniĝu maldekstren al %{name}
         uturn_without_exit: U-forma ĝirado laŭ %{name}
         sharp_left_without_exit: Ege maldekstren al %{name}
         turn_left_without_exit: Turniĝu maldekstren al %{name}

-        offramp_left_without_exit: Veturu la elveturejon maldekstre al %{name}
+        offramp_left: Direktiĝu al enveturejo ĉe maldekstre
+        offramp_left_with_exit: Direktiĝu al elveturejo %{exit} ĉe maldekstre
+        offramp_left_with_exit_name: Direktiĝu al elveturejo %{exit} ĉe maldekstre
+          al %{name}
+        offramp_left_with_exit_directions: Direktiĝu al elveturejo %{exit} ĉe maldekstre
+          direkte al %{directions}
+        offramp_left_with_exit_name_directions: Direktiĝu al elveturejo %{exit} ĉe
+          maldekstre al %{name} direkte al %{directions}
+        offramp_left_with_name: Veturu la elveturejon maldekstre al %{name}

         offramp_left_with_directions: Direktiĝu al enveturejo maldekstre direkte al
           %{directions}
         offramp_left_with_directions: Direktiĝu al enveturejo maldekstre direkte al
           %{directions}

-        offramp_left_with_name_and_directions: Direktiĝu al enveturejo %{name}ĉe maldekstre
+        offramp_left_with_name_directions: Direktiĝu al enveturejo %{name}ĉe maldekstre

           direkte al %{directions}
           direkte al %{directions}

-        offramp_left_without_directions: Direktiĝu al enveturejo ĉe maldekstre

         onramp_left_without_exit: Turniĝu maldekstren al la elveturejo al %{name}
         onramp_left_with_directions: Maldekstren al enveturejo direkte al %{directions}
         onramp_left_without_exit: Turniĝu maldekstren al la elveturejo al %{name}
         onramp_left_with_directions: Maldekstren al enveturejo direkte al %{directions}

-        onramp_left_with_name_and_directions: Maldekstren al enveturejo %{name} direkte
+        onramp_left_with_name_directions: Maldekstren al enveturejo %{name} direkte

           al %{directions}
         onramp_left_without_directions: Maldekstren al enveturejo
         endofroad_left_without_exit: Ĉe la fino de la vojo turniĝu maldekstren al
           al %{directions}
         onramp_left_without_directions: Maldekstren al enveturejo
         endofroad_left_without_exit: Ĉe la fino de la vojo turniĝu maldekstren al

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 533fe886aeb2ae663d414919b7e28902b5fa7ca4..1aeb48a820727a50df0a05bd36f66ec96ce7a2a5 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -426,8 +426,6 @@ es:
     search:
       title:
         latlon: Resultados <a href="https://openstreetmap.org/">internos</a>
     search:
       title:
         latlon: Resultados <a href="https://openstreetmap.org/">internos</a>

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

         ca_postcode: Resultados de <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Resultados de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Resultados de <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Resultados de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2461,7 +2459,7 @@ es:
       instructions:
         continue_without_exit: Continuar en %{name}
         slight_right_without_exit: Gire un poco a la derecha hacia %{name}
       instructions:
         continue_without_exit: Continuar en %{name}
         slight_right_without_exit: Gire un poco a la derecha hacia %{name}

-        offramp_right_without_exit: Tome la salida a la derecha hacia %{name}
+        offramp_right_with_name: Tome la salida a la derecha hacia %{name}

         onramp_right_without_exit: Gire a la izquierda en la salida hacia %{name}
         endofroad_right_without_exit: Al final de la calle gire a la derecha hacia
           %{name}
         onramp_right_without_exit: Gire a la izquierda en la salida hacia %{name}
         endofroad_right_without_exit: Al final de la calle gire a la derecha hacia
           %{name}


@@ -2472,7 +2470,7 @@ es:
         uturn_without_exit: Vuelta en U a lo largo de %{name}
         sharp_left_without_exit: Giro brusco a la izquierda hacia %{name}
         turn_left_without_exit: Gire a la izquierda hacia %{name}
         uturn_without_exit: Vuelta en U a lo largo de %{name}
         sharp_left_without_exit: Giro brusco a la izquierda hacia %{name}
         turn_left_without_exit: Gire a la izquierda hacia %{name}

-        offramp_left_without_exit: Tome la salida a la izquierda hacia %{name}
+        offramp_left_with_name: Tome la salida a la izquierda hacia %{name}

         onramp_left_without_exit: Gire a la izquierda en la salida hacia %{name}
         endofroad_left_without_exit: Al final de la calle gire a la derecha hacia
           %{name}
         onramp_left_without_exit: Gire a la izquierda en la salida hacia %{name}
         endofroad_left_without_exit: Al final de la calle gire a la derecha hacia
           %{name}

diff --git a/config/locales/et.yml b/config/locales/et.yml
index ff015774793656f5db6f5e314f36bc100ef8a358..a4595bd2a3d00ed342760ed31ef8e956bc9908ca 100644 (file)
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -387,8 +387,6 @@ et:
     search:
       title:
         latlon: <a href="http://openstreetmap.org/">Sisemised</a> tulemused
     search:
       title:
         latlon: <a href="http://openstreetmap.org/">Sisemised</a> tulemused

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

         ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a> tulemused
         osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>i tulemused
         ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a> tulemused
         osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>i tulemused

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 339d1fd3d65f177a51ad0cd25a0e7bbf55d66354..e58a425d5dbbc8d8fc193d0e28a860666724bc48 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -397,8 +397,6 @@ eu:
     search:
       title:
         latlon: 'Emaitzak hemendik: <a href="http://openstreetmap.org/">Internal</a>'
     search:
       title:
         latlon: 'Emaitzak hemendik: <a href="http://openstreetmap.org/">Internal</a>'

-        uk_postcode: 'Emaitzak hemendik: <a href="http://www.npemap.org.uk/">NPEMap
-          / FreeThe Postcode</a>'

         ca_postcode: 'Emaitzak hemendik: <a href="http://geocoder.ca/">Geocoder.CA</a>'
         osm_nominatim: 'Emaitzak hemendik: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>'
         ca_postcode: 'Emaitzak hemendik: <a href="http://geocoder.ca/">Geocoder.CA</a>'
         osm_nominatim: 'Emaitzak hemendik: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>'


@@ -2370,7 +2368,7 @@ eu:
       instructions:
         continue_without_exit: '%{name}n jarraitu'
         slight_right_without_exit: '%{name}-ra jo eskumara pixka bat biratuz'
       instructions:
         continue_without_exit: '%{name}n jarraitu'
         slight_right_without_exit: '%{name}-ra jo eskumara pixka bat biratuz'

-        offramp_right_without_exit: Eskumako arranpala hartu %{name}-ra
+        offramp_right_with_name: Eskumako arranpala hartu %{name}-ra

         onramp_right_without_exit: Arranpalan eskumara bira egin %{name}-ra
         endofroad_right_without_exit: Errepide bukaeran eskumara bira egin %{name}-ra
         merge_right_without_exit: Eskumara batu %{name}-ra
         onramp_right_without_exit: Arranpalan eskumara bira egin %{name}-ra
         endofroad_right_without_exit: Errepide bukaeran eskumara bira egin %{name}-ra
         merge_right_without_exit: Eskumara batu %{name}-ra


@@ -2380,7 +2378,7 @@ eu:
         uturn_without_exit: '%{name}-ra U-biraketa egin'
         sharp_left_without_exit: Ezkerrera bira handia egin %{name}-ra
         turn_left_without_exit: '%{name}-ra ezkerrera bira egin'
         uturn_without_exit: '%{name}-ra U-biraketa egin'
         sharp_left_without_exit: Ezkerrera bira handia egin %{name}-ra
         turn_left_without_exit: '%{name}-ra ezkerrera bira egin'

-        offramp_left_without_exit: Ezkerreko arranpala hartu %{name}-ra
+        offramp_left_with_name: Ezkerreko arranpala hartu %{name}-ra

         onramp_left_without_exit: Arranpalan %{name}-ra bira egin ezkerrera
         endofroad_left_without_exit: Errepide bukaeran ezkerrera bira egin %{name}-ra
         merge_left_without_exit: Ezkerrera batu %{name}-ra
         onramp_left_without_exit: Arranpalan %{name}-ra bira egin ezkerrera
         endofroad_left_without_exit: Errepide bukaeran ezkerrera bira egin %{name}-ra
         merge_left_without_exit: Ezkerrera batu %{name}-ra

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 5d1dc3ec31ea18fd24780c3cd809931332956616..c8a155cb7356b17a4f27a12e497d000de19a2a9d 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -405,7 +405,6 @@ fa:
     search:
       title:
         latlon: نتایج <a href="http://openstreetmap.org/">داخلی</a>
     search:
       title:
         latlon: نتایج <a href="http://openstreetmap.org/">داخلی</a>

-        uk_postcode: نتایج <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>

         ca_postcode: نتایج <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: نتایج <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: نتایج <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: نتایج <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2335,7 +2334,7 @@ fa:
       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} را انتخاب کنید
+        offramp_right_with_name: خروجی طرف راست به %{name} را انتخاب کنید

         onramp_right_without_exit: از خروجی سمت راست به %{name} بپیچید
         endofroad_right_without_exit: در انتهای مسیر به طرف راست به %{name} بپیچید
         merge_right_without_exit: کمی به راست به %{name}
         onramp_right_without_exit: از خروجی سمت راست به %{name} بپیچید
         endofroad_right_without_exit: در انتهای مسیر به طرف راست به %{name} بپیچید
         merge_right_without_exit: کمی به راست به %{name}


@@ -2345,7 +2344,7 @@ fa:
         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} را انتخاب کنید
+        offramp_left_with_name: خروجی طرف چپ به %{name} را انتخاب کنید

         onramp_left_without_exit: از خروجی سمت چپ به %{name} بپیچید
         endofroad_left_without_exit: در انتهای مسیر به طرف چپ به %{name} بپیچید
         merge_left_without_exit: کمی به چپ به %{name}
         onramp_left_without_exit: از خروجی سمت چپ به %{name} بپیچید
         endofroad_left_without_exit: در انتهای مسیر به طرف چپ به %{name} بپیچید
         merge_left_without_exit: کمی به چپ به %{name}

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index c9026357ab905e08b005e65fe68fd0bab272c669..f7252a1fd86d9fa738978628ad4eee10c0ff404f 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -416,8 +416,6 @@ fi:
     search:
       title:
         latlon: <a href="https://openstreetmap.org/">Sisäiset</a> tulokset
     search:
       title:
         latlon: <a href="https://openstreetmap.org/">Sisäiset</a> tulokset

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

         ca_postcode: Tulokset palvelusta <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Tulokset <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatimista</a>
         ca_postcode: Tulokset palvelusta <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Tulokset <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatimista</a>


@@ -2403,7 +2401,7 @@ fi:
       instructions:
         continue_without_exit: Jatka tiellä %{name}
         slight_right_without_exit: Kaarra oikealle tielle %{name}
       instructions:
         continue_without_exit: Jatka tiellä %{name}
         slight_right_without_exit: Kaarra oikealle tielle %{name}

-        offramp_right_without_exit: Poistu oikealle liittymään tielle %{name}
+        offramp_right_with_name: Poistu oikealle liittymään tielle %{name}

         onramp_right_without_exit: Käänny oikealle liittymään tielle %{name}
         endofroad_right_without_exit: Tienpäässä käänny oikealle tielle %{name}
         merge_right_without_exit: Liity oikealle tielle %{name}
         onramp_right_without_exit: Käänny oikealle liittymään tielle %{name}
         endofroad_right_without_exit: Tienpäässä käänny oikealle tielle %{name}
         merge_right_without_exit: Liity oikealle tielle %{name}


@@ -2413,7 +2411,7 @@ fi:
         uturn_without_exit: Tee U-käännös tiellä %{name}
         sharp_left_without_exit: Käänny jyrkästi vasemmalle tielle %{name}
         turn_left_without_exit: Käänny vasemmalle tielle %{name}
         uturn_without_exit: Tee U-käännös tiellä %{name}
         sharp_left_without_exit: Käänny jyrkästi vasemmalle tielle %{name}
         turn_left_without_exit: Käänny vasemmalle tielle %{name}

-        offramp_left_without_exit: Poistu vasemmalle liittymään tielle %{name}
+        offramp_left_with_name: 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}
         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}

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 6da57c1c6b1ccb2710e28ce110d72d4de1a59eb2..3332eb33de91e7b6f55b12b77cfa8837d7f787b5 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -6,6 +6,7 @@
 # Author: Boniface
 # Author: Cquoi
 # Author: Crochet.david
 # Author: Boniface
 # Author: Cquoi
 # Author: Crochet.david

+# Author: Cybereric

 # Author: Damouns
 # Author: DavidL
 # Author: Dereckson
 # Author: Damouns
 # Author: DavidL
 # Author: Dereckson


@@ -38,6 +39,7 @@
 # Author: Mulcyber
 # Author: Nemo bis
 # Author: Nicolapps
 # Author: Mulcyber
 # Author: Nemo bis
 # Author: Nicolapps

+# Author: Niridya

 # Author: Od1n
 # Author: Olasd
 # Author: Orikrin1998
 # Author: Od1n
 # Author: Olasd
 # Author: Orikrin1998


@@ -445,8 +447,6 @@ fr:
     search:
       title:
         latlon: Résultats <a href="https://openstreetmap.org/">internes</a>
     search:
       title:
         latlon: Résultats <a href="https://openstreetmap.org/">internes</a>

-        uk_postcode: Résultats depuis <a href="http://www.npemap.org.uk/">NPEMap /
-          FreeThe Postcode</a>

         ca_postcode: Résultats depuis <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Résultats de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Résultats depuis <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Résultats de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -657,8 +657,8 @@ fr:
           bunker: Bunker
           castle: Château
           church: Église
           bunker: Bunker
           castle: Château
           church: Église

-          city_gate: Porte de la ville
-          citywalls: Remparts
+          city_gate: Porte de ville / porte de fortifications
+          citywalls: Remparts / murailles

           fort: Fort
           heritage: Site du patrimoine
           house: Maison
           fort: Fort
           heritage: Site du patrimoine
           house: Maison


@@ -667,7 +667,7 @@ fr:
           memorial: Mémorial
           mine: Mine
           mine_shaft: Puits de mine
           memorial: Mémorial
           mine: Mine
           mine_shaft: Puits de mine

-          monument: Monument
+          monument: Grand monument commémoratif

           roman_road: Voie romaine
           ruins: Ruines
           stone: Pierre
           roman_road: Voie romaine
           ruins: Ruines
           stone: Pierre


@@ -686,17 +686,17 @@ fr:
           cemetery: Cimetière
           commercial: Zone tertiaire
           conservation: Zone préservée
           cemetery: Cimetière
           commercial: Zone tertiaire
           conservation: Zone préservée

-          construction: Construction
+          construction: Zone en construction

           farm: Ferme
           farmland: Terres agricoles
           farm: Ferme
           farmland: Terres agricoles

-          farmyard: Corps de ferme
+          farmyard: Cour et corps de ferme

           forest: Forêt
           garages: Garages
           grass: Pelouse
           greenfield: Terrain vierge
           industrial: Zone industrielle
           landfill: Décharge
           forest: Forêt
           garages: Garages
           grass: Pelouse
           greenfield: Terrain vierge
           industrial: Zone industrielle
           landfill: Décharge

-          meadow: Prairie / bocage
+          meadow: Prairie

           military: Zone militaire
           mine: Mine
           orchard: Verger
           military: Zone militaire
           mine: Mine
           orchard: Verger


@@ -741,7 +741,7 @@ fr:
           water_park: Parc aquatique
           "yes": Loisirs
         man_made:
           water_park: Parc aquatique
           "yes": Loisirs
         man_made:

-          adit: Galerie d’accès
+          adit: Galerie d’accès de mine

           beacon: Phare
           beehive: Ruche
           breakwater: Brise-lames
           beacon: Phare
           beehive: Ruche
           breakwater: Brise-lames


@@ -755,7 +755,7 @@ fr:
           flagpole: Mât
           gasometer: Gazomètre
           groyne: Épi de plage
           flagpole: Mât
           gasometer: Gazomètre
           groyne: Épi de plage

-          kiln: Four à poterie
+          kiln: Four

           lighthouse: Phare
           mast: Pylône
           mine: Mine
           lighthouse: Phare
           mast: Pylône
           mine: Mine


@@ -802,13 +802,13 @@ fr:
           island: Île
           land: Terre
           marsh: Marécage
           island: Île
           land: Terre
           marsh: Marécage

-          moor: Maure
+          moor: Brande

           mud: Boue
           peak: Pic
           point: Pointe
           reef: Récif
           ridge: Crête
           mud: Boue
           peak: Pic
           point: Pointe
           reef: Récif
           ridge: Crête

-          rock: Roche
+          rock: Rocher

           saddle: Selle
           sand: Sable
           scree: Éboulis
           saddle: Selle
           sand: Sable
           scree: Éboulis


@@ -859,7 +859,7 @@ fr:
           quarter: Trimestre
           region: Région
           sea: Mer
           quarter: Trimestre
           region: Région
           sea: Mer

-          square: Square
+          square: Place

           state: État / province
           subdivision: Subdivision
           suburb: Quartier
           state: État / province
           subdivision: Subdivision
           suburb: Quartier


@@ -2537,15 +2537,22 @@ fr:
       instructions:
         continue_without_exit: Continuez sur %{name}
         slight_right_without_exit: Tournez légèrement à droite sur %{name}
       instructions:
         continue_without_exit: Continuez sur %{name}
         slight_right_without_exit: Tournez légèrement à droite sur %{name}

-        offramp_right_without_exit: Prendre la bretelle à droite sur %{name}
+        offramp_right: Prendre la bretelle à droite
+        offramp_right_with_exit: Prendre la sortie %{exit} sur la droite
+        offramp_right_with_exit_name: Prendre la sortie %{exit} sur la droite vers
+          %{name}
+        offramp_right_with_exit_directions: Prendre la sortie %{exit} sur la droite
+          en direction de %{directions}
+        offramp_right_with_exit_name_directions: Prendre la sortie %{exit}à droite
+          sur %{name}, vers %{directions}
+        offramp_right_with_name: Prendre la bretelle à droite sur %{name}

         offramp_right_with_directions: Prendre la bretelle à droite vers %{directions}
         offramp_right_with_directions: Prendre la bretelle à droite vers %{directions}

-        offramp_right_with_name_and_directions: Prendre la bretelle à droite sur %{name},
+        offramp_right_with_name_directions: Prendre la bretelle à droite sur %{name},

           vers %{directions}
           vers %{directions}

-        offramp_right_without_directions: Prendre la bretelle à droite

         onramp_right_without_exit: Tourner à droite sur la bretelle sur %{name}
         onramp_right_with_directions: Tourner à droite sur la bretelle vers %{directions}
         onramp_right_without_exit: Tourner à droite sur la bretelle sur %{name}
         onramp_right_with_directions: Tourner à droite sur la bretelle vers %{directions}

-        onramp_right_with_name_and_directions: Tourner à droite sur la bretelle sur
-          %{name}, vers %{directions}
+        onramp_right_with_name_directions: Tourner à droite sur la bretelle sur %{name},
+          vers %{directions}

         onramp_right_without_directions: Tourner à droite sur la bretelle
         endofroad_right_without_exit: À la fin de la route, tourner à droite sur %{name}
         merge_right_without_exit: Rejoindre à droite sur %{name}
         onramp_right_without_directions: Tourner à droite sur la bretelle
         endofroad_right_without_exit: À la fin de la route, tourner à droite sur %{name}
         merge_right_without_exit: Rejoindre à droite sur %{name}


@@ -2555,15 +2562,22 @@ fr:
         uturn_without_exit: Faites demi-tour sur %{name}
         sharp_left_without_exit: Tournez vivement à gauche sur %{name}
         turn_left_without_exit: Tournez à gauche sur %{name}
         uturn_without_exit: Faites demi-tour sur %{name}
         sharp_left_without_exit: Tournez vivement à gauche sur %{name}
         turn_left_without_exit: Tournez à gauche sur %{name}

-        offramp_left_without_exit: Prendre la bretelle de gauche jusque %{name}
+        offramp_left: Prendre la bretelle à gauche
+        offramp_left_with_exit: Prendre la sortie %{exit} sur la gauche
+        offramp_left_with_exit_name: Prendre la sortie %{exit} sur la gauche vers
+          %{name}
+        offramp_left_with_exit_directions: Prendre la sortie %{exit} sur la gauche
+          en direction de %{directions}
+        offramp_left_with_exit_name_directions: Prendre la sortie %{exit} sur la gauche
+          vers %{name}, en direction de %{directions}
+        offramp_left_with_name: Prendre la bretelle de gauche jusque %{name}

         offramp_left_with_directions: Prendre la bretelle à gauche vers %{directions}
         offramp_left_with_directions: Prendre la bretelle à gauche vers %{directions}

-        offramp_left_with_name_and_directions: Prendre la bretelle à gauche sur %{name},
+        offramp_left_with_name_directions: Prendre la bretelle à gauche sur %{name},

           vers %{directions}
           vers %{directions}

-        offramp_left_without_directions: Prendre la bretelle à gauche

         onramp_left_without_exit: Tourner à gauche sur la bretelle sur %{name}
         onramp_left_with_directions: Tourner à gauche sur la bretelle vers %{directions}
         onramp_left_without_exit: Tourner à gauche sur la bretelle sur %{name}
         onramp_left_with_directions: Tourner à gauche sur la bretelle vers %{directions}

-        onramp_left_with_name_and_directions: Tourner à gauche sur la bretelle sur
-          %{name}, vers %{directions}
+        onramp_left_with_name_directions: Tourner à gauche sur la bretelle sur %{name},
+          vers %{directions}

         onramp_left_without_directions: Tourner à gauche sur la bretelle
         endofroad_left_without_exit: À la fin de la route, tourner à gauche sur %{name}
         merge_left_without_exit: Rejoindre à gauche sur %{name}
         onramp_left_without_directions: Tourner à gauche sur la bretelle
         endofroad_left_without_exit: À la fin de la route, tourner à gauche sur %{name}
         merge_left_without_exit: Rejoindre à gauche sur %{name}


@@ -2571,10 +2585,10 @@ fr:
         slight_left_without_exit: Tournez légèrement à gauche sur %{name}
         via_point_without_exit: (par le point)
         follow_without_exit: Suivez %{name}
         slight_left_without_exit: Tournez légèrement à gauche sur %{name}
         via_point_without_exit: (par le point)
         follow_without_exit: Suivez %{name}

-        roundabout_without_exit: Au rond-point, prenez %{name}
+        roundabout_without_exit: Au rond-point, prendre la sortie %{name}

         leave_roundabout_without_exit: Quittez le rond-point – %{name}
         stay_roundabout_without_exit: Restez sur le rond-point – %{name}
         leave_roundabout_without_exit: Quittez le rond-point – %{name}
         stay_roundabout_without_exit: Restez sur le rond-point – %{name}

-        start_without_exit: Démarrez à l’extrémité de %{name}
+        start_without_exit: Démarrez à %{name}

         destination_without_exit: Atteignez la destination
         against_oneway_without_exit: Remontez à contre-sens sur %{name}
         end_oneway_without_exit: Fin du sens unique sur %{name}
         destination_without_exit: Atteignez la destination
         against_oneway_without_exit: Remontez à contre-sens sur %{name}
         end_oneway_without_exit: Fin du sens unique sur %{name}

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 5bd3060b123d3816bdf83a82e5369118eb3eec2d..8fe6be5aeb850a939eb0073534245f40987e4dc5 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -354,8 +354,6 @@ fur:
     search:
       title:
         latlon: Risultâts cjolts dal <a href="http://openstreetmap.org/">sît interni</a>
     search:
       title:
         latlon: Risultâts cjolts dal <a href="http://openstreetmap.org/">sît interni</a>

-        uk_postcode: Risultâts cjolts di <a href="http://www.npemap.org.uk/">NPEMap
-          / FreeThe Postcode</a>

         ca_postcode: Risultâts cjolts di <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Risultâts di <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Risultâts cjolts di <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Risultâts di <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 89d899cf8bc3129596ec15457d9eeaa156610660..7e16970ca4855e861e560fd69954172c71668827 100644 (file)
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -382,8 +382,6 @@ ga:
     search:
       title:
         latlon: Torthaí <a href="http://openstreetmap.org/">Inmheánach</a>
     search:
       title:
         latlon: Torthaí <a href="http://openstreetmap.org/">Inmheánach</a>

-        uk_postcode: Torthaí ó <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
-          Postcode</a>

         ca_postcode: Torthaí ó <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Torthaí ó <a href="http://nominatim.openstreetmap.org/">Nominatim
           OpenStreetMap</a>
         ca_postcode: Torthaí ó <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Torthaí ó <a href="http://nominatim.openstreetmap.org/">Nominatim
           OpenStreetMap</a>

diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 3b9018f32c624f2bf3a6540831792118b387d057..158da229f2daf08b89755a5e7040b54d6a10c254 100644 (file)
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -402,8 +402,6 @@ gd:
     search:
       title:
         latlon: Toraidhean on <a href="http://openstreetmap.org/">taobh a-staigh</a>
     search:
       title:
         latlon: Toraidhean on <a href="http://openstreetmap.org/">taobh a-staigh</a>

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

         ca_postcode: Toraidhean o <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Toraidhean o <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Toraidhean o <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Toraidhean o <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 501e164ecf9f9b582510c080bffde3716d97e9d7..390ac7fee4618d82b76b15f466c514af50947466 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -387,8 +387,6 @@ gl:
     search:
       title:
         latlon: Resultados <a href="https://openstreetmap.org/">internos</a>
     search:
       title:
         latlon: Resultados <a href="https://openstreetmap.org/">internos</a>

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

         ca_postcode: Resultados desde <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Resultados desde <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Resultados desde <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Resultados desde <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2427,7 +2425,7 @@ gl:
       instructions:
         continue_without_exit: Continuar en %{name}
         slight_right_without_exit: Xire un pouco cara á dereita en %{name}
       instructions:
         continue_without_exit: Continuar en %{name}
         slight_right_without_exit: Xire un pouco cara á dereita en %{name}

-        offramp_right_without_exit: Colla a rampla á dereita en %{name}
+        offramp_right_with_name: Colla a rampla á dereita en %{name}

         onramp_right_without_exit: Xire á dereita na rampla en %{name}
         endofroad_right_without_exit: Ó final da estrada xire á dereita en %{name}
         merge_right_without_exit: Únase á dereita en %{name}
         onramp_right_without_exit: Xire á dereita na rampla en %{name}
         endofroad_right_without_exit: Ó final da estrada xire á dereita en %{name}
         merge_right_without_exit: Únase á dereita en %{name}


@@ -2437,7 +2435,7 @@ gl:
         uturn_without_exit: Cambio de sentido en %{name}
         sharp_left_without_exit: Xiro brusco á esquerda en %{name}
         turn_left_without_exit: Xire á esquerda cara %{name}
         uturn_without_exit: Cambio de sentido en %{name}
         sharp_left_without_exit: Xiro brusco á esquerda en %{name}
         turn_left_without_exit: Xire á esquerda cara %{name}

-        offramp_left_without_exit: Colla a rampla á esquerda en %{name}
+        offramp_left_with_name: Colla a rampla á esquerda en %{name}

         onramp_left_without_exit: Xire á esquerda na rampla en %{name}
         endofroad_left_without_exit: Ó final da estrada xire á esquerda en %{name}
         merge_left_without_exit: Únase á esquerda en %{name}
         onramp_left_without_exit: Xire á esquerda na rampla en %{name}
         endofroad_left_without_exit: Ó final da estrada xire á esquerda en %{name}
         merge_left_without_exit: Únase á esquerda en %{name}

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 3c201d851a59d452735ec83c95a878ad5d8f10d0..05a1b86d1c7828a3365bdf8940421f66c6263b5a 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -393,8 +393,6 @@ he:
     search:
       title:
         latlon: תוצאות <a href="http://openstreetmap.org/">מתוך האתר הזה</a>
     search:
       title:
         latlon: תוצאות <a href="http://openstreetmap.org/">מתוך האתר הזה</a>

-        uk_postcode: תוצאות מאתר <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
-          Postcode</a>

         ca_postcode: תוצאות מאתר <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: תוצאות מאתר <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: תוצאות מאתר <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: תוצאות מאתר <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2331,7 +2329,7 @@ he:
       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}
+        offramp_right_with_name: לעלות ימינה אל %{name}

         onramp_right_without_exit: לפנות ימינה לעלייה אל %{name}
         endofroad_right_without_exit: בסוף הדרך לפנות ימינה אל %{name}
         merge_right_without_exit: להתמזג ימינה אל %{name}
         onramp_right_without_exit: לפנות ימינה לעלייה אל %{name}
         endofroad_right_without_exit: בסוף הדרך לפנות ימינה אל %{name}
         merge_right_without_exit: להתמזג ימינה אל %{name}


@@ -2341,7 +2339,7 @@ he:
         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}
+        offramp_left_with_name: לעלות שמאלה אל %{name}

         onramp_left_without_exit: לפנות שמאלה לעלייה אל %{name}
         endofroad_left_without_exit: בסוף הדרך לפנות שמאלה אל %{name}
         merge_left_without_exit: להתמזג שמאלה אל %{name}
         onramp_left_without_exit: לפנות שמאלה לעלייה אל %{name}
         endofroad_left_without_exit: בסוף הדרך לפנות שמאלה אל %{name}
         merge_left_without_exit: להתמזג שמאלה אל %{name}

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index d48a0ff547411358e3776e2743bf7b2c1d4a79fb..f8f1f7d5fb5ee8d52c9e5e27cbdd2b393fa47106 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -388,8 +388,6 @@ hr:
     search:
       title:
         latlon: Rezultati iz <a href="http://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon: Rezultati iz <a href="http://openstreetmap.org/">Internal</a>

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

         ca_postcode: Rezultati iz <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Rezultati sa <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Rezultati iz <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Rezultati sa <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2042,7 +2040,7 @@ hr:
       instructions:
         continue_without_exit: Nastavi na %{name}
         slight_right_without_exit: Lagano desno na %{name}
       instructions:
         continue_without_exit: Nastavi na %{name}
         slight_right_without_exit: Lagano desno na %{name}

-        offramp_right_without_exit: Siđi sa autoceste desno na %{name}
+        offramp_right_with_name: Siđi sa autoceste desno na %{name}

         onramp_right_without_exit: Skreni desno na autocestu %{name}
         endofroad_right_without_exit: Na kraju ceste skreni desno na %{name}
   redaction:
         onramp_right_without_exit: Skreni desno na autocestu %{name}
         endofroad_right_without_exit: Na kraju ceste skreni desno na %{name}
   redaction:

diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 7f09bcb83b567fc341d263dbd8786dd574ae45b0..696d007fa57aabffbc49045a6270b8c88a4ed206 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -383,8 +383,6 @@ hsb:
     search:
       title:
         latlon: Wuslědki wot <a href="http://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon: Wuslědki wot <a href="http://openstreetmap.org/">Internal</a>

-        uk_postcode: Wuslědki wot <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
-          Postcode</a>

         ca_postcode: Wuslědki wot <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Wuslědki z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Wuslědki wot <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Wuslědki z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 28d0c971a629273c4fc03d4e655bf6da96177a02..27f2ac9c00f0d9c5920150e8e482baa8d0720aa9 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -401,8 +401,6 @@ hu:
     search:
       title:
         latlon: Eredmények az <a href="https://openstreetmap.org/">Internal</a>ról
     search:
       title:
         latlon: Eredmények az <a href="https://openstreetmap.org/">Internal</a>ról

-        uk_postcode: Eredmények a <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
-          Postcode</a>-ról

         ca_postcode: Eredmények a <a href="https://geocoder.ca/">Geocoder.CA</a>-ről
         osm_nominatim: Eredmények az <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>tól
         ca_postcode: Eredmények a <a href="https://geocoder.ca/">Geocoder.CA</a>-ről
         osm_nominatim: Eredmények az <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>tól


@@ -2376,7 +2374,7 @@ hu:
       instructions:
         continue_without_exit: Folyamatosan %{name}
         slight_right_without_exit: Enyhén jobbra %{name}
       instructions:
         continue_without_exit: Folyamatosan %{name}
         slight_right_without_exit: Enyhén jobbra %{name}

-        offramp_right_without_exit: 'Forduljon jobbra erre: %{name}'
+        offramp_right_with_name: 'Forduljon jobbra erre: %{name}'

         onramp_right_without_exit: 'Forduljon jobbra, erre: %{name}'
         endofroad_right_without_exit: 'Az út végén forduljon jobbra erre: %{name}'
         merge_right_without_exit: 'Forduljon jobbra, erre: %{name}'
         onramp_right_without_exit: 'Forduljon jobbra, erre: %{name}'
         endofroad_right_without_exit: 'Az út végén forduljon jobbra erre: %{name}'
         merge_right_without_exit: 'Forduljon jobbra, erre: %{name}'


@@ -2386,7 +2384,7 @@ hu:
         uturn_without_exit: Forduljon vissza %{name}
         sharp_left_without_exit: Élesen balra %{name}
         turn_left_without_exit: Forduljon balra %{name}
         uturn_without_exit: Forduljon vissza %{name}
         sharp_left_without_exit: Élesen balra %{name}
         turn_left_without_exit: Forduljon balra %{name}

-        offramp_left_without_exit: 'Forduljon balra, erre: %{name}'
+        offramp_left_with_name: 'Forduljon balra, erre: %{name}'

         onramp_left_without_exit: 'Forduljon balra, erre: %{name}'
         endofroad_left_without_exit: 'Az út végén forduljon balre, erre: %{name}'
         merge_left_without_exit: 'Forduljon balra, erre: %{name}'
         onramp_left_without_exit: 'Forduljon balra, erre: %{name}'
         endofroad_left_without_exit: 'Az út végén forduljon balre, erre: %{name}'
         merge_left_without_exit: 'Forduljon balra, erre: %{name}'

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 93e8cae5b5f4a766a3a0eb0b50d283d8ebc48aee..2d124cf9efa3cf37d7a3c3c6fd8381f162838cc2 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -386,8 +386,6 @@ ia:
     search:
       title:
         latlon: Resultatos <a href="https://openstreetmap.org/">interne</a>
     search:
       title:
         latlon: Resultatos <a href="https://openstreetmap.org/">interne</a>

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

         ca_postcode: Resultatos de <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Resultatos de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Resultatos de <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Resultatos de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2371,7 +2369,7 @@ ia:
       instructions:
         continue_without_exit: Continuar sur %{name}
         slight_right_without_exit: Girar legiermente a dextra verso %{name}
       instructions:
         continue_without_exit: Continuar sur %{name}
         slight_right_without_exit: Girar legiermente a dextra verso %{name}

-        offramp_right_without_exit: Prende le rampa a dextra verso %{name}
+        offramp_right_with_name: Prende le rampa a dextra verso %{name}

         onramp_right_without_exit: Girar a dextra sur le rampa verso %{name}
         endofroad_right_without_exit: Al fin del strata, girar a dextra verso %{name}
         merge_right_without_exit: Junger a dextra verso %{name}
         onramp_right_without_exit: Girar a dextra sur le rampa verso %{name}
         endofroad_right_without_exit: Al fin del strata, girar a dextra verso %{name}
         merge_right_without_exit: Junger a dextra verso %{name}


@@ -2381,7 +2379,7 @@ ia:
         uturn_without_exit: Retornar preter %{name}
         sharp_left_without_exit: Curva acute a sinistra verso %{name}
         turn_left_without_exit: Girar a sinistra verso %{name}
         uturn_without_exit: Retornar preter %{name}
         sharp_left_without_exit: Curva acute a sinistra verso %{name}
         turn_left_without_exit: Girar a sinistra verso %{name}

-        offramp_left_without_exit: Prende le rampa al sinistra verso %{name}
+        offramp_left_with_name: Prende le rampa al sinistra verso %{name}

         onramp_left_without_exit: Girar a sinistra sur le rampa verso %{name}
         endofroad_left_without_exit: Al fin del strata, girar a sinistra verso %{name}
         merge_left_without_exit: Junger a sinistra verso %{name}
         onramp_left_without_exit: Girar a sinistra sur le rampa verso %{name}
         endofroad_left_without_exit: Al fin del strata, girar a sinistra verso %{name}
         merge_left_without_exit: Junger a sinistra verso %{name}

diff --git a/config/locales/id.yml b/config/locales/id.yml
index 429eff633114e72240ce64ad7f6e60445ddae5a0..c80aa664d2f4793a02284b6f874a2c2460b0d85e 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -405,8 +405,6 @@ id:
     search:
       title:
         latlon: Hasil dari <a href="http://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon: Hasil dari <a href="http://openstreetmap.org/">Internal</a>

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

         ca_postcode: Hasil dari <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Hasil dari <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Hasil dari <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Hasil dari <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2393,7 +2391,7 @@ id:
       instructions:
         continue_without_exit: Lurus ke %{name}
         slight_right_without_exit: Kanan sedikit ke %{name}
       instructions:
         continue_without_exit: Lurus ke %{name}
         slight_right_without_exit: Kanan sedikit ke %{name}

-        offramp_right_without_exit: Ambil jalur ke kanan pada %{name}
+        offramp_right_with_name: Ambil jalur ke kanan pada %{name}

         onramp_right_without_exit: Belok kanan di jalur pada %{name}
         endofroad_right_without_exit: Di ujung jalan belok kanan di %{name}
         merge_right_without_exit: Gabung ke kanan ke %{name}
         onramp_right_without_exit: Belok kanan di jalur pada %{name}
         endofroad_right_without_exit: Di ujung jalan belok kanan di %{name}
         merge_right_without_exit: Gabung ke kanan ke %{name}


@@ -2403,7 +2401,7 @@ id:
         uturn_without_exit: Putar balik ke %{name}
         sharp_left_without_exit: Kiri tajam ke %{name}
         turn_left_without_exit: Belok kiri ke %{name}
         uturn_without_exit: Putar balik ke %{name}
         sharp_left_without_exit: Kiri tajam ke %{name}
         turn_left_without_exit: Belok kiri ke %{name}

-        offramp_left_without_exit: Ambil jalur di sebelah kiri ke %{name}
+        offramp_left_with_name: Ambil jalur di sebelah kiri ke %{name}

         onramp_left_without_exit: Belok kiri di jalur ke %{name}
         endofroad_left_without_exit: Di ujung jalan belok kiri ke %{name}
         merge_left_without_exit: Gabung kiri ke %{name}
         onramp_left_without_exit: Belok kiri di jalur ke %{name}
         endofroad_left_without_exit: Di ujung jalan belok kiri ke %{name}
         merge_left_without_exit: Gabung kiri ke %{name}

diff --git a/config/locales/is.yml b/config/locales/is.yml
index cfe1cf68de911904339f341ec9688d9541f97b49..ef10e42b185ef2a015c4977c545eccbe8c50f739 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -394,8 +394,6 @@ is:
     search:
       title:
         latlon: Niðurstöður frá <a href="https://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon: Niðurstöður frá <a href="https://openstreetmap.org/">Internal</a>

-        uk_postcode: Niðurstöður frá <a href="http://www.npemap.org.uk/">NPEMap /
-          FreeThe Postcode</a>

         ca_postcode: Niðurstöður frá <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Niðurstöður frá <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Niðurstöður frá <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Niðurstöður frá <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2488,14 +2486,14 @@ is:
       instructions:
         continue_without_exit: Haltu áfram á %{name}
         slight_right_without_exit: Beygðu lítillega til hægri yfir á %{name}
       instructions:
         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: Farðu á rampinn til hægri
+        offramp_right_with_name: Farðu á rampinn til hægri yfir á %{name}

         offramp_right_with_directions: Farðu á rampinn til hægri í áttina að %{directions}
         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
+        offramp_right_with_name_directions: Farðu á rampinn til hægri á %{name}, í
+          áttina að %{directions}

         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_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},
+        onramp_right_with_name_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
           í á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


@@ -2507,14 +2505,14 @@ is:
         uturn_without_exit: U-beygja meðfram %{name}
         sharp_left_without_exit: Kröpp vinstribeygja inn á %{name}
         turn_left_without_exit: Beygðu til vinstri yfir á %{name}
         uturn_without_exit: U-beygja meðfram %{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: Farðu á rampinn til vinstri
+        offramp_left_with_name: Farðu á rampinn til vinstri yfir á %{name}

         offramp_left_with_directions: Farðu á rampinn til vinstri í áttina að %{directions}
         offramp_left_with_directions: Farðu á rampinn til vinstri í áttina að %{directions}

-        offramp_left_with_name_and_directions: Farðu á rampinn til vinstri á %{name},
+        offramp_left_with_name_directions: Farðu á rampinn til vinstri á %{name},

           í áttina að %{directions}
           í á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_with_directions: Beygðu til vinstri á rampinn í áttina að %{directions}
         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},
+        onramp_left_with_name_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
           í áttina að %{directions}
         onramp_left_without_directions: Beygðu til vinstri á rampinn
         endofroad_left_without_exit: Við enda vegarins skaltu beygja til vinstri inn

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 3f9c0832400330ab197241334e6da9db550c4244..50f69d336278891306411528b129e67b689ba6b2 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -423,8 +423,6 @@ it:
     search:
       title:
         latlon: Risultati da <a href="https://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon: Risultati da <a href="https://openstreetmap.org/">Internal</a>

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

         ca_postcode: Risultati da <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Risultati restituiti da <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Risultati da <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Risultati restituiti da <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -727,10 +725,12 @@ it:
           bunker_silo: Bunker
           chimney: Ciminiera
           crane: Gru
           bunker_silo: Bunker
           chimney: Ciminiera
           crane: Gru

+          dolphin: Briccola

           dyke: Argine
           embankment: Terrapieno
           flagpole: Asta portabandiera
           gasometer: Gasometro
           dyke: Argine
           embankment: Terrapieno
           flagpole: Asta portabandiera
           gasometer: Gasometro

+          groyne: Pennello

           kiln: Fornace
           lighthouse: Faro
           mast: Pilone
           kiln: Fornace
           lighthouse: Faro
           mast: Pilone


@@ -974,6 +974,7 @@ it:
           viewpoint: Punto panoramico
           zoo: Zoo
         tunnel:
           viewpoint: Punto panoramico
           zoo: Zoo
         tunnel:

+          building_passage: Passaggio sotto edificio

           culvert: Canale sotterraneo
           "yes": Galleria
         waterway:
           culvert: Canale sotterraneo
           "yes": Galleria
         waterway:


@@ -2490,15 +2491,15 @@ it:
       instructions:
         continue_without_exit: Prosegui su %{name}
         slight_right_without_exit: Svolta leggermente a destra in %{name}
       instructions:
         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: Prendi la rampa a destra
+        offramp_right_with_name: Prendi la rampa sulla destra in %{name}

         offramp_right_with_directions: Prendi la rampa a destra in direzione %{directions}
         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
+        offramp_right_with_name_directions: Prendi la rampa a destra su %{name}, in
+          direzione %{directions}

         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_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_with_name_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}
         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}


@@ -2508,15 +2509,15 @@ it:
         uturn_without_exit: Effettua un'inversione a U lungo %{name}
         sharp_left_without_exit: Svolta tutto a sinistra in %{name}
         turn_left_without_exit: Svolta a sinistra in %{name}
         uturn_without_exit: Effettua un'inversione a U lungo %{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: Prendi la rampa a sinistra
+        offramp_left_with_name: Prendi la rampa sulla sinistra in %{name}

         offramp_left_with_directions: Prendi la rampa  a sinistra in direzione %{directions}
         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},
+        offramp_left_with_name_directions: Prendi la rampa a sinistra su %{name},

           in direzione %{directions}
           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_with_directions: Gira a sinistra alla rampa in direzione %{directions}
         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_with_name_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}
         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}

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index bf94aeb094d6600c86a0176b9fb2c79b13e42ac6..008e5c91585c60830766eddeabee865985a3f6dc 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -396,7 +396,6 @@ ja:
     search:
       title:
         latlon: <a href="https://openstreetmap.org/">Internal</a>からの結果
     search:
       title:
         latlon: <a href="https://openstreetmap.org/">Internal</a>からの結果

-        uk_postcode: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>からの結果

         ca_postcode: <a href="https://geocoder.ca/">Geocoder.CA</a>からの結果
         osm_nominatim: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> からの結果
         ca_postcode: <a href="https://geocoder.ca/">Geocoder.CA</a>からの結果
         osm_nominatim: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> からの結果


@@ -2178,7 +2177,7 @@ ja:
       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}へ
+        offramp_right_with_name: 右のランプに進んで%{name}へ

         onramp_right_without_exit: ランプで右折して%{name}へ
         endofroad_right_without_exit: 行き止まりで右折して%{name}へ
         merge_right_without_exit: 右車線に合流して%{name}へ
         onramp_right_without_exit: ランプで右折して%{name}へ
         endofroad_right_without_exit: 行き止まりで右折して%{name}へ
         merge_right_without_exit: 右車線に合流して%{name}へ


@@ -2188,7 +2187,7 @@ ja:
         uturn_without_exit: '%{name}沿いにUターン'
         sharp_left_without_exit: 鋭角に左折して%{name}へ
         turn_left_without_exit: 左に曲がって%{name}へ
         uturn_without_exit: '%{name}沿いにUターン'
         sharp_left_without_exit: 鋭角に左折して%{name}へ
         turn_left_without_exit: 左に曲がって%{name}へ

-        offramp_left_without_exit: 左のランプに進んで%{name}へ
+        offramp_left_with_name: 左のランプに進んで%{name}へ

         onramp_left_without_exit: ランプで左折して%{name}へ
         endofroad_left_without_exit: 行き止まりで左折して%{name}へ
         merge_left_without_exit: 左車線に合流して%{name}へ
         onramp_left_without_exit: ランプで左折して%{name}へ
         endofroad_left_without_exit: 行き止まりで左折して%{name}へ
         merge_left_without_exit: 左車線に合流して%{name}へ


@@ -2196,10 +2195,10 @@ ja:
         slight_left_without_exit: 道なりに左折して%{name}へ
         via_point_without_exit: (経由)
         follow_without_exit: '%{name}を進む'
         slight_left_without_exit: 道なりに左折して%{name}へ
         via_point_without_exit: (経由)
         follow_without_exit: '%{name}を進む'

-        roundabout_without_exit: ロータリーで%{name}へ
+        roundabout_without_exit: ã\83­ã\83¼ã\82¿ã\83ªã\83¼ã\81®å\87ºå\8f£ã\81§%{name}ã\81¸

         leave_roundabout_without_exit: '%{name}でロータリーを出る'
         stay_roundabout_without_exit: ロータリーで%{name}を通過
         leave_roundabout_without_exit: '%{name}でロータリーを出る'
         stay_roundabout_without_exit: ロータリーで%{name}を通過

-        start_without_exit: '%{name}ã\81®çµ\82ã\82\8fã\82\8aã\81\8bã\82\89ã\82¹ã\82¿ã\83¼ã\83\88'
+        start_without_exit: '%{name}からスタート'

         destination_without_exit: 目的地に到着
         against_oneway_without_exit: '%{name}の一方通行を逆走'
         end_oneway_without_exit: '%{name}の一方通行の終わり'
         destination_without_exit: 目的地に到着
         against_oneway_without_exit: '%{name}の一方通行を逆走'
         end_oneway_without_exit: '%{name}の一方通行の終わり'

diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index c1f7c916c4306f7100772662a6bad34a113b2296..2cfafa194eb02f734b7062203de3a2f63048beeb 100644 (file)
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -289,8 +289,6 @@ ka:
     search:
       title:
         latlon: <a href="http://openstreetmap.org/">შიდა შედეგები</a>
     search:
       title:
         latlon: <a href="http://openstreetmap.org/">შიდა შედეგები</a>

-        uk_postcode: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>–ის
-          შედეგები

         ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a>–ს შედეგები
         osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>–ის შედეგები
         ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a>–ს შედეგები
         osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>–ის შედეგები

diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index d69178447a6e2d49acccd0952275bed4fa6e8d9b..aea9cf535fbb15e6e1b6bc493abc532235455df0 100644 (file)
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -385,8 +385,6 @@ kab:
     search:
       title:
         latlon: Igmaḍ  <a href="http://openstreetmap.org/">igensanen</a>
     search:
       title:
         latlon: Igmaḍ  <a href="http://openstreetmap.org/">igensanen</a>

-        uk_postcode: Igmaḍ si <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
-          Postcode</a>

         ca_postcode: Igmaḍ si <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Igmaḍ si <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Igmaḍ si <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Igmaḍ si <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

diff --git a/config/locales/km.yml b/config/locales/km.yml
index dc886ee44515c2470a09a3c283bc6f770676011d..fde0a7524d9a6e71540ff0a954f0cc9df345ae5c 100644 (file)
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -244,8 +244,6 @@ km:
     search:
       title:
         latlon: លទ្ធផលពី <a href="http://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon: លទ្ធផលពី <a href="http://openstreetmap.org/">Internal</a>

-        uk_postcode: លទ្ធផលពី <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
-          Postcode</a>

         ca_postcode: លទ្ធផលពី <a href="http://geocoder.ca/">Geocoder.CA</a>
         geonames: លទ្ធផលពី <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
         ca_postcode: លទ្ធផលពី <a href="http://geocoder.ca/">Geocoder.CA</a>
         geonames: លទ្ធផលពី <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 4deff2f298e8ddc892368a29c121e8910d7d18c6..e6b0b5ecf4f25e2d79219f33d303696f3b5a1cf3 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -26,6 +26,7 @@
 # Author: 고솜
 # Author: 밥풀떼기
 # Author: 아라
 # Author: 고솜
 # Author: 밥풀떼기
 # Author: 아라

+# Author: 한림

 ---
 ko:
   time:
 ---
 ko:
   time:


@@ -395,8 +396,6 @@ ko:
     search:
       title:
         latlon: <a href="https://openstreetmap.org/">내부</a> 결과
     search:
       title:
         latlon: <a href="https://openstreetmap.org/">내부</a> 결과

-        uk_postcode: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>에서의
-          결과

         ca_postcode: <a href="https://geocoder.ca/">Geocoder.CA</a>에서의 결과
         osm_nominatim: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>에서의 결과
         ca_postcode: <a href="https://geocoder.ca/">Geocoder.CA</a>에서의 결과
         osm_nominatim: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>에서의 결과


@@ -679,7 +678,10 @@ ko:
           mineshaft: 갱도
           pipeline: 파이프라인
           tower: 탑
           mineshaft: 갱도
           pipeline: 파이프라인
           tower: 탑

+          watermill: 물레방아
+          water_tower: 급수탑

           water_well: 우물
           water_well: 우물

+          water_works: 상수도

           windmill: 풍차
           works: 공장
           "yes": 인공물
           windmill: 풍차
           works: 공장
           "yes": 인공물


@@ -687,6 +689,7 @@ ko:
           airfield: 군용 비행장
           barracks: 막사
           bunker: 벙커
           airfield: 군용 비행장
           barracks: 막사
           bunker: 벙커

+          "yes": 군대

         mountain_pass:
           "yes": 산길
         natural:
         mountain_pass:
           "yes": 산길
         natural:


@@ -732,7 +735,9 @@ ko:
           accountant: 공인회계사 사무소
           administrative: 관리
           architect: 건축가
           accountant: 공인회계사 사무소
           administrative: 관리
           architect: 건축가

+          association: 협회

           company: 회사
           company: 회사

+          educational_institution: 교육 기관

           employment_agency: 직업 소개소
           estate_agent: 부동산 중개
           government: 정부 기관
           employment_agency: 직업 소개소
           estate_agent: 부동산 중개
           government: 정부 기관


@@ -746,6 +751,7 @@ ko:
         place:
           allotments: 텃밭
           city: 시
         place:
           allotments: 텃밭
           city: 시

+          city_block: 도시 구획

           country: 국가
           county: 군
           farm: 농장
           country: 국가
           county: 군
           farm: 농장


@@ -761,6 +767,7 @@ ko:
           postcode: 우편 번호
           region: 지역
           sea: 바다
           postcode: 우편 번호
           region: 지역
           sea: 바다

+          square: 광장

           state: 주
           subdivision: 구분
           suburb: 교외
           state: 주
           subdivision: 구분
           suburb: 교외


@@ -799,6 +806,7 @@ ko:
           beauty: 미용실
           beverages: 음료 가게
           bicycle: 자전거 가게
           beauty: 미용실
           beverages: 음료 가게
           bicycle: 자전거 가게

+          bookmaker: 마권업자

           books: 서점
           boutique: 부티크
           butcher: 정육점
           books: 서점
           boutique: 부티크
           butcher: 정육점


@@ -837,9 +845,11 @@ ko:
           hairdresser: 미용실
           hardware: 철물점
           hifi: 고급 오디오
           hairdresser: 미용실
           hardware: 철물점
           hifi: 고급 오디오

+          houseware: 가정용품 상점

           jewelry: 보석 상점
           kiosk: 키오스크 숍
           laundry: 세탁소
           jewelry: 보석 상점
           kiosk: 키오스크 숍
           laundry: 세탁소

+          lottery: 복권

           mall: 쇼핑몰
           market: 시장
           mobile_phone: 휴대폰 상점
           mall: 쇼핑몰
           market: 시장
           mobile_phone: 휴대폰 상점


@@ -861,8 +871,9 @@ ko:
           tailor: 양복점
           toys: 완구점
           travel_agency: 여행사
           tailor: 양복점
           toys: 완구점
           travel_agency: 여행사

+          tyres: 타이어 상점

           video: 비디오 가게
           video: 비디오 가게

-          wine: 주점
+          wine: ì\99\80ì\9d¸ ì\83\81점

           "yes": 상점
         tourism:
           alpine_hut: 산장
           "yes": 상점
         tourism:
           alpine_hut: 산장


@@ -2279,7 +2290,7 @@ ko:
       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}(으)로 진입하세요
+        offramp_right_with_name: 오른쪽에서 %{name}(으)로 진입하세요

         onramp_right_without_exit: 경사로에서 %{name}(으)로 우회전
         endofroad_right_without_exit: 길 끝쪽에서 %{name}(으)로 우회전
         merge_right_without_exit: '%{name}을(를) 따라 우회전'
         onramp_right_without_exit: 경사로에서 %{name}(으)로 우회전
         endofroad_right_without_exit: 길 끝쪽에서 %{name}(으)로 우회전
         merge_right_without_exit: '%{name}을(를) 따라 우회전'


@@ -2289,7 +2300,7 @@ ko:
         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}을(를) 향해 램프로 좌회전'
+        offramp_left_with_name: '%{name}을(를) 향해 램프로 좌회전'

         onramp_left_without_exit: 경사로에서 %{name}(으)로 좌회전
         endofroad_left_without_exit: 길 끝쪽에서 %{name}(으)로 좌회전
         merge_left_without_exit: '%{name}을(를) 따라 좌회전'
         onramp_left_without_exit: 경사로에서 %{name}(으)로 좌회전
         endofroad_left_without_exit: 길 끝쪽에서 %{name}(으)로 좌회전
         merge_left_without_exit: '%{name}을(를) 따라 좌회전'


@@ -2297,7 +2308,7 @@ ko:
         slight_left_without_exit: '%{name}을(를) 따라 왼쪽으로 완만하게 도세요'
         via_point_without_exit: (점을 통해)
         follow_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}에서 시작'

diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 2ea45ac9863789e1da6b9947545533ce139b3561..b896d78562e3799e1c9b741b1a64bcf242da8613 100644 (file)
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -394,12 +394,11 @@ ku-Latn:
       longitude: Hêlîlarː
       output: Encam
       paste_html: Vê koda HTML'yê dikarî bi ser malperra xwe ve kopî bikî
       longitude: Hêlîlarː
       output: Encam
       paste_html: Vê koda HTML'yê dikarî bi ser malperra xwe ve kopî bikî

-      export_button: Eksport bike
+      export_button: Derxîne

   geocoder:
     search:
       title:
         latlon: Encamên ji <a href="https://openstreetmap.org/"></a>
   geocoder:
     search:
       title:
         latlon: Encamên ji <a href="https://openstreetmap.org/"></a>

-        uk_postcode: Netîceyên ji <a href="http://www.npemap.org.uk/"></a>

         ca_postcode: Netîceyên ji <a href="https://geocoder.ca/"></a>
         osm_nominatim: Netîceyên ji <a href="https://nominatim.openstreetmap.org/"></a>
         geonames: Netîceyên ji <a href="http://www.geonames.org/"></a>
         ca_postcode: Netîceyên ji <a href="https://geocoder.ca/"></a>
         osm_nominatim: Netîceyên ji <a href="https://nominatim.openstreetmap.org/"></a>
         geonames: Netîceyên ji <a href="http://www.geonames.org/"></a>


@@ -1109,7 +1108,8 @@ ku-Latn:
         Resources Canada), û StatCan (Geography Division,
         Statistics Canada) dihundirrîne.
       contributors_fi_html: '<strong>Fînlenda</strong>: Daneyên ji National Land Survey
         Resources Canada), û StatCan (Geography Division,
         Statistics Canada) dihundirrîne.
       contributors_fi_html: '<strong>Fînlenda</strong>: Daneyên ji National Land Survey

-        of Finland''s Topographic Database û ji komên din ên daneyan, di bin a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">Lîsansa
+        of Finland''s Topographic Database û ji komên din ên daneyan, di bin a <a
+        href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">Lîsansa

         NLSFI</a> de daneyan dihundirrîne.'
       contributors_fr_html: '<strong>Frensa</strong>: Daneyên ji Direction Générale
         des Impôts''ê hatine bidestxistin dihundirrîne.'
         NLSFI</a> de daneyan dihundirrîne.'
       contributors_fr_html: '<strong>Frensa</strong>: Daneyên ji Direction Générale
         des Impôts''ê hatine bidestxistin dihundirrîne.'


@@ -1227,7 +1227,7 @@ ku-Latn:
       xwediyê çend çavkaniyan e.
     welcome:
       url: /welcome
       xwediyê çend çavkaniyan e.
     welcome:
       url: /welcome

-      title: Bi xêr hatî OSM'ê
+      title: Bi xêr hatî OSMê

       description: Bi vê rêbernameya kurt ê ku tê de esasên OpenStreetMapê heye dest
         pê bike.
     beginners_guide:
       description: Bi vê rêbernameya kurt ê ku tê de esasên OpenStreetMapê heye dest
         pê bike.
     beginners_guide:


@@ -1256,7 +1256,7 @@ ku-Latn:
     wiki:
       url: https://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
     wiki:
       url: https://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org

-      description: Ji bo belgeyên OSMyê yên bi berfirehî binêrin wîkî'yê.
+      description: Ji bo belgeyên OSMyê yên bi berfirehî binêrin wîkiyê.

   about_page:
     next: Pêşve
     copyright_html: <span>&copy;</span>Beşdarên<br> OpenStreetMapê
   about_page:
     next: Pêşve
     copyright_html: <span>&copy;</span>Beşdarên<br> OpenStreetMapê


@@ -1415,7 +1415,7 @@ ku-Latn:
     inbox:
       title: Qutiya hatiyan
       my_inbox: Qutiya min a hatiyan
     inbox:
       title: Qutiya hatiyan
       my_inbox: Qutiya min a hatiyan

-      outbox: qutiya çûyiyan
+      outbox: qutiya min a çûyiyan

       messages: '%{new_messages} û %{old_messages} hene.'
       new_messages:
         one: '%{count} peyama nû'
       messages: '%{new_messages} û %{old_messages} hene.'
       new_messages:
         one: '%{count} peyama nû'


@@ -1449,10 +1449,10 @@ ku-Latn:
       heading: Mesajek wek vê tine ye
       body: Li me bibore, bi vê id'yê ti peyam tine ye.
     outbox:
       heading: Mesajek wek vê tine ye
       body: Li me bibore, bi vê id'yê ti peyam tine ye.
     outbox:

-      title: Qutiya çûyiyan
+      title: Qutiya min a çûyiyan

       my_inbox: '%{inbox_link}'
       inbox: Qutiya min a hatiyan
       my_inbox: '%{inbox_link}'
       inbox: Qutiya min a hatiyan

-      outbox: Qutiya min a çûyiyan
+      outbox: qutiya min a çûyiyan

       messages:
         one: Te %{count} peyam şand
         other: Te %{count} peyaman şand
       messages:
         one: Te %{count} peyam şand
         other: Te %{count} peyaman şand


@@ -1630,32 +1630,227 @@ ku-Latn:
       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)
       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)

+      trackable: Şopbar (tenê wek anonîm têne parvekirin û bi mohrên demê yên rêzkirî
+        têne nîşankirin)
+      identifiable: Nasbar (di lîsteya şopandinê de û bi awayekî ku were naskirin,
+        wek nuqteyên rêzkirî tevî mohrên demê têne nîşandan)
+    create:
+      upload_trace: Şopê GPSê bar bike
+      trace_uploaded: Dosyeya te ya GPXê hate barkirin û ji bo ku li databasê were
+        zêdekirin li bendê ye. Ev kar pirrî caran di nîv saetê de temam dibe û gava
+        ku temam be wê ji te re e-peyamek were şandin.

     edit:
     edit:

+      title: Şopa %{name} tê guherandin
+      heading: Şopa %{name} tê guherandin
+      filename: 'Navê dosyeyê:'
+      download: daxîne
+      uploaded_at: Hate barkirinː
+      points: Hejmara nuqteyanː
+      start_coord: Koordînata destpêkêː
+      map: nexşe

       edit: biguherîne
       owner: 'Xweyî:'
       description: 'Danasîn:'
       tags: Etîketː
       edit: biguherîne
       owner: 'Xweyî:'
       description: 'Danasîn:'
       tags: Etîketː

+      tags_help: bi bêhnokê hatiye veqetandin
+      save_button: Guherandinan qeyd bike
+      visibility: Kî dikare bibîneː
+      visibility_help: Ev tê çi maneyê?

     trace_form:
     trace_form:

+      upload_gpx: Dosyeyek GPXê bar bikeː

       description: 'Danasîn:'
       description: 'Danasîn:'

+      tags: Etîketên vêː
+      tags_help: bi bêhnokê hatiye veqetandin
+      visibility: Kî dikare bibîneː

       visibility_help: Ev tê çi wateyê?
       upload_button: Bar bike
       help: Alîkarî
       visibility_help: Ev tê çi wateyê?
       upload_button: Bar bike
       help: Alîkarî

+    trace_header:
+      upload_trace: Şopek GPSê bar bike
+      see_all_traces: Hemû şopan bibîne
+      see_your_traces: Şopên xwe bibîne
+      traces_waiting:
+        one: '%{count} şopê te yê ku li hêviya barkirinê disekine heye. Ji bo ku ji
+          bikarhênerên din re nebî asteng, xêra xwe hêj ku te zêdetir şopan bar nekir,
+          li bendê bimîne ku yên berî van temam bibin.'
+        other: '%{count} şopên te yên ku li hêviya barkirinê disekinin hene. Ji bo
+          ku ji bikarhênerên din re nebî asteng, xêra xwe hêj ku te zêdetir şopan
+          bar nekir, li bendê bimînin ku yên berî van temam bibin.'
+    trace_optionals:
+      tags: Etîketên vê

     view:
     view:

+      title: Şopa %{name} tê dîtin
+      heading: Şopa %{name} tê nîşandan
+      pending: LI BENDÊ YE
+      filename: 'Navê dosyeyê:'
+      download: daxîne
+      uploaded: Hate barkirinː
+      points: Hejmara nuqteyanː
+      start_coordinates: Koordînata destpêkêː
+      map: nexşe

       edit: biguherîne
       owner: 'Xweyî:'
       description: 'Danasîn:'
       edit: biguherîne
       owner: 'Xweyî:'
       description: 'Danasîn:'

+      tags: Etîketên vêː
+      none: Tine
+      edit_track: Vê şopê biguherîne
+      delete_track: Vê şopê jê bibe
+      trace_not_found: Şop nehate dîtin!
+      visibility: Kî dikare bibîneː
+    trace_paging_nav:
+      showing_page: Rûpel %{page}
+      older: Şopên kevintir
+      newer: Şopên nûtir

     trace:
     trace:

+      pending: LI BENDÊ YE
+      count_points: '%{count} nuqte'
+      ago: '%{time_in_words_ago} berê'
+      more: dêtay
+      trace_details: Dêtayên Şopê Bibîne
+      view_map: Nexşeyê bibîne

       edit: biguherîne
       edit_map: Nexşeyê biguherîne
       edit: biguherîne
       edit_map: Nexşeyê biguherîne

+      public: GIŞTÎ
+      identifiable: DIKARE WERE NASKIRIN
+      private: XISÛSÎ
+      trackable: DIKARE WERE ŞOPANDIN
+      by: ji

       in: di
       in: di

+      map: nexşe
+    list:
+      public_traces: Şopên GPSê yên giştî (ji her kesê re vekirî)
+      your_traces: Şopên te yên GPSê
+      public_traces_from: Şopên GPSê yên giştî yên ji %{user}
+      description: Çavê xwe li nûkirinên şopên GPSê yên dawîn bigerîne
+      tagged_with: ' bi %{tags} hate etîketkirin'
+      empty_html: Li vir hêj tişt tine ye. <a href='%{upload_link}'>Şopek nû bar bike</a>
+        an jî ji ser <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>rûpela
+        wîkiyê</a> derbarê şopên GPSê de zêdetir tiştan hîn bibe.
+    delete:
+      scheduled_for_deletion: Şop ji bo jêbirinê hate plankirin
+    make_public:
+      made_public: Şop, ji her kesê re vekirî ye
+    offline_warning:
+      message: Sîstema şandinê yê dosyeyên GPXê vêga neberdest e
+    offline:
+      heading: Xizmeta depokirinê ya dosyeyên GPXê offline ye
+      message: Sîstema barkirin û depokirina dosyeyên GPXê niha neberdest e
+    georss:
+      title: Şopên GPSê yê OpenStreetMapê
+    description:
+      description_with_count:
+        one: Dosyeya GPXê yê bi %{count} nuqteyê ya ji %{user}
+        other: Dosyeya GPXê yê bi %{count} nuqteyan ya ji %{user}
+      description_without_count: Dosyeya GPXê yê ji %{user}
+  application:
+    require_cookies:
+      cookies_needed: Tê xuyan ku te kûkiyan girtiye - xêra xwe berî ku tu dewam bikî,
+        kûkiyan di geroka xwe de aktîv bike.
+    require_moderator:
+      not_a_moderator: Ji bo ku tu vê kiryarê bikî divê tu bibî moderatorek.
+    setup_user_auth:
+      blocked_zero_hour: Li ser malpera OpenStreetMapê ji te re peyamek acîl heye.
+        Berî ku tu guherandinên xwe qeyd bikî divê tu wê peyamê bixwînî.
+      blocked: Gihîna te ya APIyê hatiye astengkirin. Xêra xwe ji bo ku tu zêdetir
+        agahiyan werbigrî têkeve înterfeysa webê.
+      need_to_see_terms: Gihîna te ya APIyê ji bo demekê kurt hatiye astengkirin.
+        Xêra xwe ji bo ku Şertên Beşdaran bibînî têkeve înterfeysa webê. Hewce nake
+        ku tu van qebûl bikî, lê divê tu van bibînî.
+  oauth:
+    oauthorize:
+      title: Ji bo gihîna hesabê xwe selahiyetê bide
+      request_access: Sepana %{app_name} dixwaze bigihîje hesabê te, %{user}. Xêra
+        xwe kontrol bike ku tu dixwazî ev sepan bigihîje van taybetmendiyên li jêr.
+        Çiqas bixwazibî an jî tenê çend heb ji wan dikarî bibijêrî.
+      allow_to: 'Ji bo van tiştên li jêr, destûrê bide sepana telebkar:'
+      allow_read_prefs: xwendina hevyazên te yên bikarheneriyê.
+      allow_write_prefs: guherandina hevyazên te yên bikarheneriyê.
+      allow_write_diary: çêkirina rojnivîskan, şiroveyan û hevaltîyan.
+      allow_write_api: guherandina nexşeyê.
+      allow_read_gpx: xwendina şopên te yên GPSê ên xisûsî.
+      allow_write_gpx: barkirina şopên GPSê.
+      allow_write_notes: guherandina notan.
+      grant_access: Destûra gihîştinê bide
+    oauthorize_success:
+      title: Ji bo gihînê destûr hate dayîn
+      allowed: Tu destûr dayî sepana %{app_name} ji bo ku bigîhîje hesabê te.
+      verification: Koda teyîdkirinê %{code} ye.
+    oauthorize_failure:
+      title: Daxwaza selahiyetdarkirinê bi ser neket
+      denied: Tu destûr nedayî sepana %{app_name} ji bo ku bigîhîje hesabê te.
+      invalid: Nîşana destûrdariyê ne derbasdar e.
+    revoke:
+      flash: Te destûra ji bo %{application} betal kir
+    permissions:
+      missing: Te destûrê neda ji bo ku ev sepan bigihije vê îmkanê.

   oauth_clients:
   oauth_clients:

+    new:
+      title: Sepanekî nû qeyd bike
+      submit: Qeyd bibe

     edit:
     edit:

+      title: Sepanê xwe biguherîne

       submit: Biguherîne
       submit: Biguherîne

+    show:
+      title: Dêtayên OAuthê yê ji bo %{app_name}
+      key: 'Mifteya mişteriyê:'
+      secret: Mehremiyeta mişteriyanː
+      url: URLya ji bo xwestina destûrêː
+      access_url: URLya ji bo gihîna mifteyêː
+      authorize_url: URLya ji bo destûrdanêː
+      support_notice: Em piştgiriyê didin îmzeyên HMAC-SHA1 (tê pêşniyarkirin) û RSA-SHA1.
+      edit: Dêtayan biguherîne
+      delete: Telebkarê jê bibe
+      confirm: Tu piştrast î?
+      requests: Destûrên ku ji bikarhênerê têne xwestin ev inː
+      allow_read_prefs: xwendina hevyazên wan yên bikarheneriyê.
+      allow_write_prefs: guherandina hevyazên wan ên bikarheneriyê.
+      allow_write_diary: çêkirina rojnivîskan, şiroveyan û hevaltîyan.
+      allow_write_api: guherandina nexşeyê.
+      allow_read_gpx: xwendina şopên wan yên GPSê ên xisûsî.
+      allow_write_gpx: barkirina şopên GPSê.
+      allow_write_notes: guherandina notan.
+    index:
+      title: Dêtayên min ên OAuthê
+      my_tokens: Sepanên min ên destûrdayî
+      list_tokens: 'Ev destûrên li jêr, ji sepana bi navê te re hate dayîn:'
+      application: Navê sepanê
+      issued_at: Wextê weşanê
+      revoke: Betal bike!
+      my_apps: Sepanên min ên telebkar
+      no_apps: Gelo sepanek heye tu bixwazibî wê qeyd bikî û pê standarda %{oauth}
+        biemilînî ji bo ku digel me bi kar bînî? Berî ku tu ji OAuthê vê xizmetê bixwazibî
+        divê tu sepanê xwe yê webê bidî qeydkirin.
+      registered_apps: Van sepanên telebkar bide qeydkirinː
+      register_new: Sepanê xwe qeyd bike

     form:
       name: Nav
     form:
       name: Nav

+      required: Hewce ye
+      url: URLya sepana sereke
+      callback_url: URLya paşve lêgerînê
+      support_url: URLya piştgirîkirinê
+      requests: Destûrên ku ji bikarhênerê têne xwestin ev inː
+      allow_read_prefs: xwendina hevyazên te yên bikarheneriyê.
+      allow_write_prefs: guherandina hevyazên te yên bikarheneriyê.
+      allow_write_diary: çêkirina rojnivîskan, şiroveyan û hevaltîyan.
+      allow_write_api: guherandina nexşeyê.
+      allow_read_gpx: xwendina şopên te yên GPSê ên xisûsî.
+      allow_write_gpx: barkirina şopên GPSê.
+      allow_write_notes: guherandina notan.
+    not_found:
+      sorry: Li me bibore, me ev %{type} nedît.
+    create:
+      flash: Te agahiyan bi serkeftinî da qeydkirin.
+    update:
+      flash: Agahiyên mişteriyê bi serkeftinî hate nûkirin.
+    destroy:
+      flash: Sepana telebkar qeyda xwe ji holê rakir

   user:
     login:
   user:
     login:

+      title: Têkeve
+      heading: Têkeve
+      email or username: Adrêsa E-peyamê an jî Navê Bikarhêneriyêː

       password: 'Şîfre:'
       password: 'Şîfre:'

+      openid: '%{logo} OpenID:'

       remember: Min bi bîr bîne
       lost password link: Te şîfreya xwe winda kir?
       login_button: Têkeve
       remember: Min bi bîr bîne
       lost password link: Te şîfreya xwe winda kir?
       login_button: Têkeve


@@ -1664,6 +1859,17 @@ ku-Latn:
         bikarhêneriyê û şîfreya xwe binivîse û têkeveː
       with external: Wek alternatîv, ji bo têketinê yek ji van sepanan bi kar bîneː
       new to osm: Tu di OpenStreetMapê de nû yî?
         bikarhêneriyê û şîfreya xwe binivîse û têkeveː
       with external: Wek alternatîv, ji bo têketinê yek ji van sepanan bi kar bîneː
       new to osm: Tu di OpenStreetMapê de nû yî?

+      to make changes: Ji bo ku tu daneyên OpenStreetMapê biguherînî, divê hesabekî
+        te hebe.
+      create account minute: Hesabek çêbike. Wê ev tenê deqeyek bigire.
+      no account: Hesabekî te tine?
+      account not active: Bibore, hesabê te hêj neaktîv e.<br />Xêra xwe ji bo aktîvkirina
+        hesabê bitikîne ser lînka ku di e-peyama pejirandina hesabê de ji te re hatibû,
+        an jî <a href="%{reconfirm}">e-peyamek pejirandinê yê nû bixwaze</a>.
+      account is suspended: Bibore, hesabê te ji ber çalakiyên gumanbar hatiye rawestandin.<br
+        />Eger bixwazibî vê mijare mijûl bibî, xêra xwe bi <a href="%{webmaster}">webmasterê</a>
+        re têkiliyê deyne.
+      auth failure: Bibore, bi van dêtayan re tu têneketî.

       openid_logo_alt: Têketina bi OpenID'yê
       auth_providers:
         openid:
       openid_logo_alt: Têketina bi OpenID'yê
       auth_providers:
         openid:


@@ -1680,32 +1886,107 @@ ku-Latn:
           alt: Bi hesabê xwe yê Windows Liveê têkeve
         github:
           title: Bi GitHub'ê têkeve
           alt: Bi hesabê xwe yê Windows Liveê têkeve
         github:
           title: Bi GitHub'ê têkeve

+          alt: Bi hesabekî GitHubê têbikeve

         wikipedia:
           title: Bi Wîkîpediyayê têkeve
           alt: Bi hesabekî Wîkîpediyayê têkeve
         yahoo:
           title: Bi Yahooyê têkeve
         wikipedia:
           title: Bi Wîkîpediyayê têkeve
           alt: Bi hesabekî Wîkîpediyayê têkeve
         yahoo:
           title: Bi Yahooyê têkeve

+          alt: Bi OpenID ya Yahooyê têbikeve

         wordpress:
           title: Bi Wordpressê têkeve
         wordpress:
           title: Bi Wordpressê têkeve

+          alt: Bi OpenID ya Wordpressê têbikeve

         aol:
           title: Bi AOL'ê têkeve
         aol:
           title: Bi AOL'ê têkeve

+          alt: Bi OpenID ya AOLê têkeve

     logout:
       title: Derkeve
       heading: Ji OpenStreetMapê derkeve
       logout_button: Derkeve
     logout:
       title: Derkeve
       heading: Ji OpenStreetMapê derkeve
       logout_button: Derkeve

+    lost_password:
+      title: Şîfreya wenda
+      heading: Te şîfreya xwe ji bîr kir?
+      email address: 'Navnîşana E-peyamê:'
+      new password button: Şîfreyê nû bike
+      help_text: E-peyama ku te pê xwe qeydkiribû binivîse, em ê ji te re lînkek bişînin
+        tu yê bi wê lînkê bikaribî şîfreya xwe nû bikî.
+      notice email on way: Bibore, te wê wenda kir :-( lê belê e-peyamekî nû di rê
+        de ye. Lewma tu dikarî di nêz de wê nû bikî.
+      notice email cannot find: Bibore, ev adrêsa e-peyamê nehate dîtin.

     reset_password:
     reset_password:

+      title: Şîfreyê nû bike
+      heading: Şîfreyê nû bike ji bo %{user}

       password: 'Şîfre:'
       password: 'Şîfre:'

+      confirm password: 'Şîfreyê bipejirîne:'
+      reset: Şîfreyê nû bike

       flash changed: Şîfreya te hate guhertin.
       flash changed: Şîfreya te hate guhertin.

+      flash token bad: Eger te vê sembolê nedîtibe, belkî jî divê tu URLyê kontrol
+        bikî?

     new:
       title: Xwe Qeyd Bike
     new:
       title: Xwe Qeyd Bike

+      no_auto_account_create: Mixabin, em vêga nikarin bi otomatîkî ji bo we hesabekî
+        çêbikin.
+      contact_webmaster: Ji bo hesabê ku tu dixwazî çêbikî xêra xwe bi <a href="%{webmaster}">webmasterê</a>
+        re têkiliyê deyne - em ê hewl bidin ku daxwaza te di demekî kurt de çareser
+        bikin.
+      about:
+        header: Belaş e û dikare were sererastkirin
+        html: |-
+          <p>OpenStreetMap, ne wek nexşeyên din e. Ev xerîte, bi temamî ji aliyê însanên mîna te ve tê çêkirin û rastkirin, daxistin û bikaranîn ji her kesê re belaş e.</p>
+          <p>Ji bo ku dest bi beşdariyê bikî qeyd bibe. Ji bo pejirandina hesabê te, em ê ji te re e-peyamek bişînin.</p>
+      license_agreement: Gava ku te hesabê xwe pejirand hewce ye tu <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">şertên
+        beşdariyê</a> qebûl bikî.
+      email address: 'Navnîşana e-peyamê:'
+      confirm email address: Navnîşana e-peyamê nas bike
+      not displayed publicly: Adrêsa te ji her kesê re nayê nîşandan, ji bo zêdetir
+        agahiyan binêre <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy"
+        title="OSMF privacy policy including section on email addresses">siyaseta
+        me ya veşarîtiyê</a>.
+      display name: Navê ku tê xuyanː
+      display name description: Navê te yê ku ji her kesê re tê xuyan. Tu paşê dikarî
+        vê navê ji hevyazên xwe biguherînî.
+      external auth: 'Teyîdkirina bi aliyên sêyem:'

       password: Şîfre
       password: Şîfre

+      confirm password: 'Şîfreyê bipejirîne:'
+      use external auth: Wek alternatîv, ji bo têketinê yekî ji van bi kar bîne
+      auth no password: Eger tu bi aliyên sêyem teyîd bikî şîfre hewce nake, lê belê
+        ji bo hinek amûrên din an jî ji bo serverê dibe ku dîsa jî şîfreyek hewce
+        bike.
+      continue: Qeyd bibe
+      terms accepted: Em spasiya te dikin ji bo ku te şertên beşdariyê yê nû qebûl
+        kirǃ
+      terms declined: Em xemgîn in ji ber ku te şertên beşdariyê yê nû qebûl nekir.
+        Ji bo zêdetir agahiyan xêra xwe binêre <a href="%{url}">vê rûpela wîkiyê</a>.

     terms:
     terms:

+      title: Şertên beşdariyê
+      heading: Şertên beşdariyê
+      read and accept: Xêra xwe vê peymanê bixwîne û ji bo pejirandina şertên peymanê
+        pêl li bişkoka qebûlkirinê bike, ev peyman ji bo beşdariyên te yên niha û
+        yên ku tu yê di pêşerojê de bikî muteber e.
+      consider_pd: Tevî vê peymana li jorê, tu dikarî bibijêrî ku beşdariyên te wek
+        Malê Giştî (malê ku ne aîdî şexsekî ye) were qebûlkirin.

       consider_pd_why: Ev çi ye?
       consider_pd_why: Ev çi ye?

+      guidance: 'Li vir agahiyên alîkar yên ji bo tu van şertan fam bikî hene: <a
+        href="%{summary}">kurteyek ku dikare were xwendin</a> û çend <a href="%{translations}">tercumeyên
+        nefermî</a>'
+      agree: Qebûl bike
+      decline: Red bike
+      you need to accept or decline: Ji bo ku dewam bikî, xêra xwe şertên beşdariyê
+        bixwîne û piştre qebûl an jî red bike.
+      legale_select: Welatê ku tu lê îqamet dikîː

       legale_names:
         france: Frensa
         italy: Îtalya
       legale_names:
         france: Frensa
         italy: Îtalya

+        rest_of_world: Cihên din ên dinyayê
+    no_such_user:
+      title: Bikarhênerek wek vê tine
+      heading: Bikarhênerek bi navê %{user} tine
+      body: Bibore, bikarhênerek bi navê %{user} tine. Xêra xwe kontrol bike ka te
+        rast nivîsandiye an na. Yan jî dibe ku lînkê te tikandiye nerast be.
+      deleted: hate jêbirin

     view:
       my diary: Rojnivîska min
     view:
       my diary: Rojnivîska min

+      new diary entry: nivîsa nû yê rojane

       my edits: Guhertinên min
       my traces: Şopên min
       my notes: Notên min
       my edits: Guhertinên min
       my traces: Şopên min
       my notes: Notên min


@@ -1713,47 +1994,412 @@ ku-Latn:
       my profile: Profîla min
       my settings: Hevyazên min
       my comments: Şîroveyên min
       my profile: Profîla min
       my settings: Hevyazên min
       my comments: Şîroveyên min

+      oauth settings: mîhengên oauthê
+      blocks on me: Astengên ser min
+      blocks by me: Astengên ku ez dakirime
+      send message: Peyam bişîne
+      diary: Rojnivîsk
+      edits: Guherandin
+      traces: Şop
+      notes: Notên nexşeyê
+      remove as friend: Ji hevaltiyê derxe
+      add as friend: Bibe heval
+      mapper since: Destpêka nexşesaziyêː
+      ago: (berî %{time_in_words_ago})
+      ct status: Şertên beşdariyêː
+      ct undecided: Bêqerar
+      ct declined: Redkirî
+      ct accepted: Berî %{ago} hatiye qebûlkirin
+      latest edit: Guherandina axirkî %{ago}ː
+      email address: 'Navnîşana e-nameyê:'
+      created from: Ji van hate çêkirinː

       status: 'Rewş:'
       status: 'Rewş:'

+      spam score: Skora spamêː

       description: Danasîn
       description: Danasîn

+      user location: Cihê bikarhênerê
+      if set location: Ji bo ku bikarhênerên nêzî xwe bibînî ji ser rûpela %{settings_link}
+        cihê malê xwe bide diyarkirin.
+      settings_link_text: eyaran

       your friends: Hevalên te
       your friends: Hevalên te

+      no friends: Te hêj ji xwe re hevalek çênekiriye.
+      km away: '%{count} km dûr e'
+      m away: '%{count} m dûr e'
+      nearby users: Bikarhênerên din ên nêz
+      no nearby users: Li nêzî te bikarhênerekî din yê ku cihê xwe diyar kiribe tine
+        ye.
+      role:
+        administrator: Ev bikarhêner rêvebirek e
+        moderator: Ev bikarhêner moderatorek e
+        grant:
+          administrator: Heqê gihînê yê rêvebirê
+          moderator: Heqê gihînê yê moderatorê
+        revoke:
+          administrator: Heqê gihînê yê rêvebirê betal bike
+          moderator: Heqê gihînê yê moderatorê betal bike
+      block_history: Astengiyên aktîv
+      moderator_history: Astengiyên dayî

       comments: Şîrove
       comments: Şîrove

+      create_block: Vê bikarhênere asteng bike
+      activate_user: Vê bikarhênerê bide aktîvkirin
+      deactivate_user: Vê bikarhênerê neçalak bike
+      confirm_user: Vê bikarhênerê tesdîq bike
+      hide_user: Vê bikarhênerê biveşêre

       unhide_user: Vi bikarhênerî nîşan bide
       delete_user: Vî/ê bikarhênerî/ê jê bibe
       unhide_user: Vi bikarhênerî nîşan bide
       delete_user: Vî/ê bikarhênerî/ê jê bibe

+      confirm: Pesend bike
+      friends_changesets: desteyên guhertinan yên hevalan
+      friends_diaries: nivîsên rojane yên hevalan
+      nearby_changesets: desteyên guhertinan yên bikarhênerên nêz
+      nearby_diaries: nivîsên rojane yên bikarhênerên nêz

     popup:
       your location: Cihê te
     popup:
       your location: Cihê te

+      nearby mapper: Nexşesazên nêz

       friend: Heval
     account:
       friend: Heval
     account:

+      title: Hesabê biguherîne

       my settings: Hevyazên min
       my settings: Hevyazên min

+      current email address: 'Navnîşana e-nameyê yê niha:'
+      new email address: 'Navnîşana e-nameyê yê nû:'
+      email never displayed publicly: (ti carî nayê nîşandan)
+      external auth: Teyîdkirina xaricîː

       openid:
       openid:

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

         link text: Ev çi ye?
       public editing:
         link text: Ev çi ye?
       public editing:

+        heading: Guherandina ji her kesê re vekirîː
+        enabled: Çalak e. Ne anonîm e û dikare daneyan biguherîne.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits

         enabled link text: Ev çiye?
         enabled link text: Ev çiye?

+        disabled: Neçalak e û nikare daneyan biguherîne, hemû guherandinên berê anonîm
+          in.

         disabled link text: Ez çima nikarim biguherînim?
         disabled link text: Ez çima nikarim biguherînim?

+      public editing note:
+        heading: Guherandina ji her kesê re vekirî
+        text: Guherandinên ku tu vêga dikî anonîm in û lewma bikarhênerên din nikarin
+          ji te re peyaman bişînin an jî cihê ku tu lê yî bibînin. Ji bo ku guherandinên
+          te werin xuyan ku te çêkiriye û însanên din ji ser malperê bikaribin bi
+          te re têkiliyê deynin bitikîne ser bişkoka li jêr. <b>Ji wextê ku me derbasî
+          0.6 API'yê bû heta niha tenê bikarhênerên ji her kesê re vekirî  dikarin
+          daneyên nexşeyê biguherînin</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">hîn
+          bibe ku çima wisa ye</a>). <ul><li>Navnîşana e-nameya te wê ji her kesê
+          re vekirî nê kirin</li><li>Hûn nikarin ji vê kiryarê bizivirin û bikarhênerên
+          nû bi otomatîkî ji her kesê re vekirî têne xuyan.</li></ul>

       contributor terms:
       contributor terms:

+        heading: Şertên beşdariyêː
+        agreed: Te Şertên Beşdariyê ya nû qebûl kir
+        not yet agreed: Te hêj Şertên Beşdariyê ya nû qebûl nekiriye.
+        review link text: Gava ku tu misaîd bî, ji bo ku Şertên Beşdariyê ya nû kontrol
+          bikî û qebûl bikî xêra xwe vê lînkê taqîb bike.
+        agreed_with_pd: Herwiha te beyan kir ku tu dixwazî guherandinên te wek Malê
+          Giştî were qebûlkirin.

         link text: Ev çi ye?
         link text: Ev çi ye?

+      profile description: Danasîna profîlêː
+      preferred languages: Zimanên ku têne tercîhkirinː
+      preferred editor: Edîtora tercîhkirîː

       image: 'Wêne:'
       image: 'Wêne:'

+      gravatar:
+        gravatar: Gravatarê bi kar bîne
+        link text: ev çi ye
+        disabled: Gravatar hate neçalakkirin.
+        enabled: Gravatarê te niha dikare were xuyan.
+      new image: Wêneyek lê zêde bike
+      keep image: Rismê ku lê ye bila bimîne
+      delete image: Rismê ku lê ye rabike
+      replace image: Rismê ku lê ye biguherîne
+      image size hint: (wêneyên ku herî kêm ji 100x100 kareyan pêk werin, çêtir têne
+        xuyan)
+      home location: Cihê malê teː
+      no home location: Te cihê malê xwe diyar nekir.

       latitude: 'Hêlîpan:'
       longitude: 'Hêlîlar:'
       latitude: 'Hêlîpan:'
       longitude: 'Hêlîlar:'

+      update home location on click: Gava ku tu bitikînî ser nexşeyê bila cihê malê
+        te were rojanekirin?
+      save changes button: Guherandinan qeyd bike
+      make edits public button: Hemû guherandinên min bila ji her kesê re vekirî be
+      return to profile: Vegere profîlê
+      flash update success confirm needed: Agahiyên bikarhêner bi awayekî serkeftî
+        hate nûkirin. Ji bo pejirandina navnîşana e-nameya xwe ya nû e-nameya xwe
+        kontrol bike.
+      flash update success: Agahiya bikarhêner bi serkeftinî hate nûkirin.
+    confirm:
+      heading: E-nameya xwe kontrol bikeǃ
+      introduction_1: Me ji te re e-nameyek pejirandinê şand.
+      introduction_2: Bitikîne ser lînkê e-nameya xwe û hesabê xwe bipejirîne. Dû
+        re tu yê bikaribî dest bi nexşekirinê bikî.
+      press confirm button: Ji bo aktîvkirina hesabê xwe pêl li bişkoka pejirandinê
+        bike.
+      button: Bipejirîne
+      success: Hesabê te hate tesdîqkirin, spas ji bo qeyda teǃ
+      already active: Ev hesab jixwe pejirandî ye.
+      unknown token: Koda pejirandinê ne muteber e an jî tine.
+      reconfirm_html: Heke ji bo ku em koda pejirandinê ji te re dîsa bişînin îhtiyaciya
+        te bi me hebe <a href="%{reconfirm}">bitikîne ser vir</a>.

     confirm_resend:
     confirm_resend:

+      success: Me ji hesabê te yê %{email} re notekî teyîdê şand û gava ku te hesabê
+        xwe pejirand tu yê bikaribî dest bi çêkirina nexşeyê bikî.<br /><br />Eger
+        tu sîstemekî antî-spam bi kar bînî, ji ber ku em nikarin ji daxwazên pejirandinê
+        re cewab bidin, xêra xwe jê piştrast be ku di navbera adrêsên ku têne qebûlkirin
+        (whitelist) de %{sender} jî heye.

       failure: Bikarhêner %{name} nehate dîtin.
       failure: Bikarhêner %{name} nehate dîtin.

+    confirm_email:
+      heading: Guherandina navnîşana e-nameyê bipejirîne
+      press confirm button: Ji bo pesendkirina navnîşana e-nameya xwe ya nû pêl li
+        bişkoka li jêr bike.
+      button: Bipejirîne
+      success: Guherandina navnîşana te ya e-nameyê hate pejirandin.
+      failure: Bi vê hesabê navnîşanekî e-nameyê yê pejirandî jixwe heye.
+      unknown_token: Koda pejirandinê ne muteber e an jî tine.
+    set_home:
+      flash success: Cihê malê bi awayekî serkeftî hate rojanekirin.
+    go_public:
+      flash success: Hemû guherandinên te niha ji her kesê re vekirî ye, û destûra
+        te jî heye ji bo guherandinê.
+    make_friend:
+      heading: Bila %{user} li hevalên te were zêdekirin?
+      button: Bibe heval
+      success: '%{name} niha hevalê te yeǃ'
+      failed: Bibore, %{name} li hevalên te nehate zêdekirin.
+      already_a_friend: Tu bi %{name} re jixwe heval î.
+    remove_friend:
+      heading: Bila %{user} ji hevaltiyê were derxistin?
+      button: Ji hevaltiyê derxe
+      success: '%{name} ji hevalên te hate derxistin.'
+      not_a_friend: '%{name} ne hevalê te ye.'
+    filter:
+      not_an_administrator: Ji bo ku tu vê kiryarê bikî divê tu bibî rêvebirek.

     list:
       title: Bikarhêner
       heading: Bikarhêner
     list:
       title: Bikarhêner
       heading: Bikarhêner

+      showing:
+        one: Rûpel %{page} (%{first_item} - bi tevahî %{items})
+        other: Rûpel %{page} (%{first_item}-%{last_item} - bi tevahî %{items})
+      summary: '%{name} ji aliyê %{ip_address} ve di %{date} de hate çêkirin'
+      summary_no_ip: '%{name} di %{date} de hate çêkirin'
+      confirm: Bikarhênerên bijartî bipejirîne
+      hide: Bikarhênerên bijartî biveşêre
+      empty: Bikarhênerek ku lê were nehate dîtin
+    suspended:
+      title: Hesab hatiye rawestandin
+      heading: Hesab hatiye rawestandin
+      webmaster: rêvebirê malperê
+      body: "<p>\n  Li me bibore, hesabê te ji ber aktîvîteyên gumanbar bi otomatîkî
+        \n  hatiye rawestandin.\n</p>\n<p>\n  Wê ev qerar di demeke kurt de ji aliyê
+        rêvebirek malperê ve  \n  kontrolkirin an jî\n  eger bixwazibî vê gotûbêj
+        bikî bi %{webmaster} re dikarî \n  têkiliyê deynî.\n</p>"
+    auth_failure:
+      connection_failed: Girêdana bi peydakera teyîdkirina nasnameyê re bi ser neket
+      invalid_credentials: Ji bo teyîdkirina nasnameyê agahî nerast in
+      no_authorization_code: Koda destûrê tine
+      unknown_signature_algorithm: Algorîtmaya îmzeyê ya nenas
+      invalid_scope: Berfirehiya nemuteber
+    auth_association:
+      heading: Nasnameya te hêj bi hesabekî OpenStreetMapê ve ne girêdayî ye.
+      option_1: Eger tu di OpenStreetMapê de nû bî, xêra xwe bi vê formê li jêr, ji
+        xwe re hesabekî nû çêbike.
+      option_2: Heke jixwe hesabekî te hebe, tu dikarî navê xwe yê bikarhêneriyê û
+        şîfreyê xwe binivîsî û têkevî, û piştre jî ji mîhengên bikarhênerê nasnameya
+        (ID'ya) xwe bi hesabê xwe ve girê bidî.
+  user_role:
+    filter:
+      not_an_administrator: Tenê rêvebir dikarin rêvebirina rola bikarhênerê bi cih
+        bînin, û tu ne rêvebirek î.
+      not_a_role: '`%{role}'' ne rolek muteber e.'
+      already_has_role: Bikarhêner jixwe xwediyê rola %{role} ye.
+      doesnt_have_role: Bikahêner ne xwediyê rola %{role} ye.
+      not_revoke_admin_current_user: Rola rêvebiriyê ji vê bikarhênerê nikare were
+        rakirin.
+    grant:
+      title: Rola ku hatiye dayîn tesdîq bike
+      heading: Rola ku hatiye dayîn bipejirîne
+      are_you_sure: Tu piştrast î ku tu dixwazî rola `%{role}' bidî bikarhêner `%{name}'?
+      confirm: Pesend bike
+      fail: Rola `%{role}' ji bikarhêner `%{name}' re nekarî were dayîn. Xêra xwe
+        kontrol bike ku rol û bikarhêner muteber in an na.
+    revoke:
+      title: Rakirina rolê bipejirîne
+      heading: Rakirina rolê tesdîq bike
+      are_you_sure: Tu piştrast î ku tu dixwazî rola `%{role}' ji bikarhêner `%{name}'
+        rabikî?
+      confirm: Bipejirîne
+      fail: Rola `%{role}' ji bikarhêner `%{name}' nikare were rakirin. Xêra xwe kontrol
+        bike ka bikarhêner û rol muteber in an na.

   user_block:
   user_block:

+    model:
+      non_moderator_update: Ji bo ku astengiyek çêbikî an jî nû bikî, divê tu moderatorek
+        bibî.
+      non_moderator_revoke: Ji bo ku astengiyek rabikî divê tu moderatorek bibî.
+    not_found:
+      sorry: Bibore, astengiya bikarhêner yê bi ID'ya %{id} nehate dîtin.
+      back: Vegere îndeksê
+    new:
+      title: Li ser %{name} astengî çêbike
+      heading: Li ser %{name} astengî çêbike
+      reason: Sedema ku %{name} çima hatiye astengkirin. Der barê rewşê de, çiqas
+        bikaribî maqûl û aram be, dêtayan bide û ji bîr neke ku ev peyam dikare ji
+        aliyê kesên din ve jî were dîtin. Bi bîr bîne ku hemû bikarhêner ji jargona
+        civatê fam nakin, lewma xêra xwe gotinên ku yên nû dest pê kirine jî bikaribin
+        fam bikin bi kar bîne.
+      period: Ji niha û pê ve wê heta kengê API ji bikarhêner were astengkirin?
+      submit: Astengiyê çêbike
+      tried_contacting: Min bi bikarhênerê re têkiliyê danî û min jê xwest ku bisekine.
+      tried_waiting: Ji bo ku ji van têkiliyan re cewabê bide min jê re wextekî maqûl
+        da.
+      needs_view: Divê bikarhêner berî ku ev astengî rabe têbikeve
+      back: Hemû astengiyan bibîne
+    edit:
+      title: Astenga li ser %{name} biguherîne
+      heading: Astenga li ser %{name} biguherîne
+      reason: Sedema astengkirina %{name}. Der barê rewşê de, çiqas bikaribî maqûl
+        û aram be, dêtayan bide. Bila di bîra te de be ku hemû bikarhêner ji jargona
+        civatê fam nakin, lewma xêra xwe gotinên ku yên nû dest pê kirine jî bikaribin
+        fam bikin bi kar bîne.
+      period: Ji niha û pê ve wê heta kengê API ji bikarhêner were astengkirin?
+      submit: Astengê nû bike
+      show: Vê astengiyê bibîne
+      back: Hemû astengiyan bibîne
+      needs_view: Gelo hewce dike bikarhêner berî ku ev astengî rabe têkeve?
+    filter:
+      block_expired: Wextê astengiyê derbas bûye û nikare were guherandin.
+      block_period: Wextê astengiyê, divê yek ji nirxên vê lîsteya ku dikare were
+        vekirin be.
+    create:
+      try_contacting: Xêra xwe berî ku tu bikarhênerê asteng bikî, hewl bide ku pê
+        re têkiliyê deynî û ji bo ku karibe cewabê bide jê re wextekî maqûl bide.
+      try_waiting: Xêra xwe berî ku tu bikarhênerê asteng bikî ji bo ku karibe cewabê
+        bide jê re wextekî maqûl bide.
+      flash: Li ser bikarhêner %{name} astengiyek hate çêkirin.
+    update:
+      only_creator_can_edit: Tenê moderatorê ku vê astengiyê çêkiriye dikare vê astengiyê
+        biguherîne.
+      success: Astengî hate nûkirin.
+    index:
+      title: Astengiyên bikarhêner
+      heading: Lîsteya astengiyên bikarhêneran
+      empty: Hêj nehatiye astengkirin.
+    revoke:
+      title: Rakirina astengiyên li ser %{block_on}
+      heading: Rakirina astengiya ku ji aliyê %{block_by} ve li ser %{block_on} hatiye
+        çêkirin
+      time_future: Wê astengî di %{time} de xilas bibe.
+      past: Ev astengî berî %{time} xilas bûye û niha nikare were rakirin.
+      confirm: Tu bawer î ku tu dixwazî vî astengiyê rabikî?
+      revoke: Betal bike!
+      flash: Ev astengî hate betalkirin.
+    period:
+      one: 1 saetê
+      other: '%{count} saetan'

     partial:
     partial:

+      show: Nîşan bide

       edit: Biguherîne
       edit: Biguherîne

+      revoke: Betal bike!
+      confirm: Tu piştrast î?
+      display_name: Bikarhênerê astengkirî
+      creator_name: Çêker
+      reason: Sedema astengkirinê
+      status: Rewş
+      revoker_name: Yê ku betal kiriyeː
+      not_revoked: (ne betalkirî)

       showing_page: Rûpel %{page}
       showing_page: Rûpel %{page}

+      next: Pêşve »
+      previous: « Paşve
+    helper:
+      time_future: Di %{time} de diqede.
+      until_login: Heta ku bikarhêner têkeve aktîv e
+      time_future_and_until_login: Di %{time} de û gava ku bikarhêner têket wê biqede.
+      time_past: Berî %{time} qediya.
+    blocks_on:
+      title: Astengiyên ser %{name}
+      heading: Lîsteya astengiyên ser %{name}
+      empty: '%{name} hêj nehatiye astengkirin.'
+    blocks_by:
+      title: Yên ku ji aliyê %{name} ve hatine astengkirin
+      heading: Lîsteya astengiyên ku %{name} çêkiriye
+      empty: '%{name} hêj qet asteng nekiriye.'

     show:
     show:

+      title: '%{block_on} ji alî %{block_by} ve hate astengkirin'
+      heading: '%{block_on} ji alî %{block_by} ve hate astengkirin'
+      time_future: Di %{time} de diqede
+      time_past: Berî %{time} qediya
+      created: Hate çêkirin
+      ago: berî %{time}

       status: Rewş
       show: nîşan bide
       edit: Biguherîne
       status: Rewş
       show: nîşan bide
       edit: Biguherîne

+      revoke: Betal bike!
+      confirm: Tu piştrast î?

       reason: 'Sedema astengkirinê:'
       reason: 'Sedema astengkirinê:'

+      back: Hemû astengiyan bibîne
+      revoker: Yê ku rakiriyeː
+      needs_view: Divê bikarhêner berî ku ev astengî rabe têbikeve.

   note:
   note:

+    description:
+      opened_at_html: Berî %{when} hate çêkirin
+      opened_at_by_html: Berî %{when} ji aliyê %{user} ve hate çêkirin
+      commented_at_html: Berî %{when} hate nûkirin
+      commented_at_by_html: Berî %{when} ji aliyê %{user} ve hate rojanekirin
+      closed_at_html: Berî %{when} hatte çareserkirin
+      closed_at_by_html: Berî %{when} ji aliyê %{user} ve hate çareserkirin
+      reopened_at_html: Berî %{when} jinûve hate aktîvkirin
+      reopened_at_by_html: Berî %{when} ji aliyê %{user} ve jinûve hate aktîvkirin
+    rss:
+      title: Notên OpenStreetMapê
+      description_area: Lîsteya notên herêma te yên ku hatine raporkirin, şirovekirin
+        an jî girtin [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
+      description_item: Ji bo nota %{id} xwedîkirina rss'ê
+      opened: notê nû (nêzîkê %{place})
+      commented: şiroveyê nû (nêzîkê %{place})
+      closed: notê girtî (nêzikê %{place})
+      reopened: nota jinûve aktîvkirî (nêzî %{place})

     entry:
       comment: Şîrove
     entry:
       comment: Şîrove

+      full: Temamiya notê
+    mine:
+      title: Notên ku ji aliyê %{user} ve hatine şandin an jî şirovekirin
+      heading: Notên %{user}
+      subheading: Notên ku ji aliyê %{user} ve hatine şandin an jî şirovekirin
+      id: Id
+      creator: Çêker
+      description: Danasîn
+      created_at: Wextê çêkirinê
+      last_changed: Guherandinê dawîn
+      ago_html: berî %{when}

   javascripts:
   javascripts:

+    close: Bigre

     share:
     share:

+      title: Parve bike
+      cancel: Betal bike
+      image: Wêne

       link: Girêdan an jî HTML
       link: Girêdan an jî HTML

+      long_link: Lînk
+      short_link: Lînka kurt
+      geo_uri: Geo-URI
+      embed: HTML
+      custom_dimensions: Mezinahiyên taybet eyar bike
+      format: 'Format:'
+      scale: Pîvan (miqyas)ː
+      image_size: 'Wê rism tebeqeya standard nîşan bide li vir:'
+      download: Daxîne
+      short_url: URLya kurt
+      include_marker: Nîşanek deyne
+      center_marker: Nîşanê bike merkeza nexşeyê
+      paste_html: Ji bo ku di malperê de bi cih bikî HTMLê pê ve bike
+      view_larger_map: Nexşeya Mestir Bibîne
+      only_standard_layer: Tenê mezinahiya standard wek rismek dikare were derxistin
+    embed:
+      report_problem: Pirsgirêkek rapor bike
+    key:
+      title: Sembolên nexşeyê
+      tooltip: Sembolên nexşeyê
+      tooltip_disabled: Sembolên nexşeyê ji bo vê tebeqeyê ne berdest e
+    map:
+      zoom:
+        in: Nêzîk bike
+        out: Dûr bike
+      locate:
+        title: Cihê min nîşan bide
+      base:
+        standard: Standard
+        cycle_map: Nexşeya bisiklête

     changesets:
       show:
         comment: Şîrove
     changesets:
       show:
         comment: Şîrove

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 51055a42a3517988285eddfb6b35efba8201a441..2765bf2a9f997e43f7e550fc63be553761de7500 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -266,8 +266,6 @@ lb:
     search:
       title:
         latlon: Resultater vun <a href="https://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon: Resultater vun <a href="https://openstreetmap.org/">Internal</a>

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

         ca_postcode: Resultater vu <a href="https://geocoder.ca/">Geocoder.ca</a>
         geonames: Resultater vu <a href="http://www.geonames.org/">GeoNames</a>
         geonames_reverse: Resultater vun <a href="http://www.geonames.org/">GeoNames</a>
         ca_postcode: Resultater vu <a href="https://geocoder.ca/">Geocoder.ca</a>
         geonames: Resultater vu <a href="http://www.geonames.org/">GeoNames</a>
         geonames_reverse: Resultater vun <a href="http://www.geonames.org/">GeoNames</a>


@@ -1278,14 +1276,14 @@ lb:
       distance: Distanz
       instructions:
         continue_without_exit: Virun op %{name}
       distance: Distanz
       instructions:
         continue_without_exit: Virun op %{name}

-        offramp_right_without_exit: Déi riets Opfaart op %{name} huelen
+        offramp_right_with_name: Déi riets Opfaart op %{name} huelen

         onramp_right_without_exit: Bei der Opfaart riets ofbéien op %{name}
         endofroad_right_without_exit: Um Ënn vun der Strooss riets ofbéien op %{name}
         merge_right_without_exit: Riets areien op %{name}
         fork_right_without_exit: Um Ënn vun der Strooss riets ofbéien op %{name}
         sharp_right_without_exit: Schaarf riets op %{name}
         sharp_left_without_exit: Schaarf lénks op %{name}
         onramp_right_without_exit: Bei der Opfaart riets ofbéien op %{name}
         endofroad_right_without_exit: Um Ënn vun der Strooss riets ofbéien op %{name}
         merge_right_without_exit: Riets areien op %{name}
         fork_right_without_exit: Um Ënn vun der Strooss riets ofbéien op %{name}
         sharp_right_without_exit: Schaarf riets op %{name}
         sharp_left_without_exit: Schaarf lénks op %{name}

-        offramp_left_without_exit: Déi lénks Opfaart op %{name} huelen
+        offramp_left_with_name: Déi lénks Opfaart op %{name} huelen

         onramp_left_without_exit: Bei der Opfaart lénks ofbéien op %{name}
         endofroad_left_without_exit: Um Ënn vun der Strooss lénks ofbéien op %{name}
         merge_left_without_exit: Lénks areien op %{name}
         onramp_left_without_exit: Bei der Opfaart lénks ofbéien op %{name}
         endofroad_left_without_exit: Um Ënn vun der Strooss lénks ofbéien op %{name}
         merge_left_without_exit: Lénks areien op %{name}

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index f1f7a59911e0963d7d1623a796349dd7b446e506..b003597f70557af35f6c3ca440b85b20435c6933 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -395,8 +395,6 @@ lt:
     search:
       title:
         latlon: <a href="https://openstreetmap.org/">Vidiniai</a> rezultatai
     search:
       title:
         latlon: <a href="https://openstreetmap.org/">Vidiniai</a> rezultatai

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

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


@@ -2379,7 +2377,7 @@ lt:
       instructions:
         continue_without_exit: Tęskite kelionę %{name}
         slight_right_without_exit: Dešiniau į %{name}
       instructions:
         continue_without_exit: Tęskite kelionę %{name}
         slight_right_without_exit: Dešiniau į %{name}

-        offramp_right_without_exit: Pasirinkite rampą dešinėje į %{name}
+        offramp_right_with_name: Pasirinkite rampą dešinėje į %{name}

         onramp_right_without_exit: Sukite dešinėn ant rampos į %{name}
         endofroad_right_without_exit: Kelio pabaigoje sukite dešinėn į %{name}
         merge_right_without_exit: Įsilieti dešinėn į %{name}
         onramp_right_without_exit: Sukite dešinėn ant rampos į %{name}
         endofroad_right_without_exit: Kelio pabaigoje sukite dešinėn į %{name}
         merge_right_without_exit: Įsilieti dešinėn į %{name}


@@ -2389,7 +2387,7 @@ lt:
         uturn_without_exit: Apsisukite ties %{name}
         sharp_left_without_exit: Staigus posūkis kairėn į %{name}
         turn_left_without_exit: Sukite kairėn į %{name}
         uturn_without_exit: Apsisukite ties %{name}
         sharp_left_without_exit: Staigus posūkis kairėn į %{name}
         turn_left_without_exit: Sukite kairėn į %{name}

-        offramp_left_without_exit: Pasirinkite rampą kairėje į %{name}
+        offramp_left_with_name: Pasirinkite rampą kairėje į %{name}

         onramp_left_without_exit: Sukite kairėn ant rampos į %{name}
         endofroad_left_without_exit: Kelio pabaigoje sukite kairėn į %{name}
         merge_left_without_exit: Įsilieti kairėn į %{name}
         onramp_left_without_exit: Sukite kairėn ant rampos į %{name}
         endofroad_left_without_exit: Kelio pabaigoje sukite kairėn į %{name}
         merge_left_without_exit: Įsilieti kairėn į %{name}

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 48d7e21fa823b6c6529153016f21485a6d776b33..1e1414ef689e670dec375bad8ad7d4974c45c2e2 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -391,8 +391,6 @@ lv:
     search:
       title:
         latlon: Rezultāti no <a href="http://openstreetmap.org/">Iekšējās meklēšanas</a>
     search:
       title:
         latlon: Rezultāti no <a href="http://openstreetmap.org/">Iekšējās meklēšanas</a>

-        uk_postcode: Rezultāti no <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
-          Postcode</a>

         ca_postcode: Rezultāti no <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Rezultāti no <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Rezultāti no <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Rezultāti no <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2348,7 +2346,7 @@ lv:
       instructions:
         continue_without_exit: Turpināt uz %{name}
         slight_right_without_exit: Nedaudz pa labi uz %{name}
       instructions:
         continue_without_exit: Turpināt uz %{name}
         slight_right_without_exit: Nedaudz pa labi uz %{name}

-        offramp_right_without_exit: Izmantojiet slīpumu pa labi uz %{name}
+        offramp_right_with_name: Izmantojiet slīpumu pa labi uz %{name}

         onramp_right_without_exit: Pagriezieties pa labi uz slīpuma pie %{name}
         endofroad_right_without_exit: Ceļa beigās nogriezieties pa labi uz %{name}
         merge_right_without_exit: Izgriezieties uz %{name}
         onramp_right_without_exit: Pagriezieties pa labi uz slīpuma pie %{name}
         endofroad_right_without_exit: Ceļa beigās nogriezieties pa labi uz %{name}
         merge_right_without_exit: Izgriezieties uz %{name}


@@ -2358,7 +2356,7 @@ lv:
         uturn_without_exit: Griezieties atpakaļgaitā garām %{name}
         sharp_left_without_exit: Nogriezieties strauji pa kreisi uz %{name}
         turn_left_without_exit: Nogriezieties pa kreisi uz %{name}
         uturn_without_exit: Griezieties atpakaļgaitā garām %{name}
         sharp_left_without_exit: Nogriezieties strauji pa kreisi uz %{name}
         turn_left_without_exit: Nogriezieties pa kreisi uz %{name}

-        offramp_left_without_exit: Izmantojiet slīpumu pa kreisi uz %{name}
+        offramp_left_with_name: Izmantojiet slīpumu pa kreisi uz %{name}

         onramp_left_without_exit: Pagriezieties pa kreisi uz slīpuma pie %{name}
         endofroad_left_without_exit: Ceļa beigās nogriezieties pa kreisi uz %{name}
         merge_left_without_exit: Izgriezieties pa kreisi uz %{name}
         onramp_left_without_exit: Pagriezieties pa kreisi uz slīpuma pie %{name}
         endofroad_left_without_exit: Ceļa beigās nogriezieties pa kreisi uz %{name}
         merge_left_without_exit: Izgriezieties pa kreisi uz %{name}

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index af565387522f83ea43d6b91bae655cdfd7d61de3..b08030217549d4959b178a06d0f6ac47270eb935 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -385,8 +385,6 @@ mk:
     search:
       title:
         latlon: <a href="https://openstreetmap.org/">Внатрешни</a> исходни ставки
     search:
       title:
         latlon: <a href="https://openstreetmap.org/">Внатрешни</a> исходни ставки

-        uk_postcode: Исход од <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
-          Postcode</a>

         ca_postcode: Исход од <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Исход од <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Исход од <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Исход од <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2454,14 +2452,19 @@ mk:
       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}
+        offramp_right: Свртете на излезот десно
+        offramp_right_with_exit: Свртете на излезот %{exit} десно
+        offramp_right_with_exit_name: Свртете на излезот %{exit} десно на %{name}
+        offramp_right_with_exit_directions: Свртете на излезот %{exit} десно кон %{directions}
+        offramp_right_with_exit_name_directions: Свртете на излезот %{exit} десно
+          на %{name}, кон %{directions}
+        offramp_right_with_name: На излезот десно, исклучете се на %{name}

         offramp_right_with_directions: На излезот десно, свртете кон %{directions}
         offramp_right_with_directions: На излезот десно, свртете кон %{directions}

-        offramp_right_with_name_and_directions: На излезот десно, свртете на %{name}
-          кон %{directions}
-        offramp_right_without_directions: Свртете на излезот десно
+        offramp_right_with_name_directions: На излезот десно, свртете на %{name} кон
+          %{directions}

         onramp_right_without_exit: На влезот десно приклучете се на %{name}
         onramp_right_with_directions: Свртете на влезот десно кон %{directions}
         onramp_right_without_exit: На влезот десно приклучете се на %{name}
         onramp_right_with_directions: Свртете на влезот десно кон %{directions}

-        onramp_right_with_name_and_directions: На влезот десно приклучете се на %{name},
+        onramp_right_with_name_directions: На влезот десно приклучете се на %{name},

           кон %{directions}
         onramp_right_without_directions: Свртете во влезот десно
         endofroad_right_without_exit: На крајот од патот свртете десно на %{name}
           кон %{directions}
         onramp_right_without_directions: Свртете во влезот десно
         endofroad_right_without_exit: На крајот од патот свртете десно на %{name}


@@ -2472,14 +2475,20 @@ mk:
         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}
+        offramp_left: Свртете на излезот лево
+        offramp_left_with_exit: Свртете на излезот %{exit} лево
+        offramp_left_with_exit_name: Свртете на излезот %{exit} лево на %{name}
+        offramp_left_with_exit_directions: Свртете на излезот %{exit} лево кон на
+          %{directions}
+        offramp_left_with_exit_name_directions: Свртете на излезот %{exit} лево на
+          %{name}, кон %{directions}
+        offramp_left_with_name: На левиот исклучок, свртете на %{name}

         offramp_left_with_directions: На излезот лево, свртете кон %{directions}
         offramp_left_with_directions: На излезот лево, свртете кон %{directions}

-        offramp_left_with_name_and_directions: На излезот лево, свртете на %{name}
-          кон %{directions}
-        offramp_left_without_directions: Свртете на излезот лево
+        offramp_left_with_name_directions: На излезот лево, свртете на %{name} кон
+          %{directions}

         onramp_left_without_exit: На влезот лево приклучете се на %{name}
         onramp_left_with_directions: Свртете на влезот лево кон %{directions}
         onramp_left_without_exit: На влезот лево приклучете се на %{name}
         onramp_left_with_directions: Свртете на влезот лево кон %{directions}

-        onramp_left_with_name_and_directions: На влезот лево приклучете се на %{name},
+        onramp_left_with_name_directions: На влезот лево приклучете се на %{name},

           кон %{directions}
         onramp_left_without_directions: Свртете во влезот лево
         endofroad_left_without_exit: На крајот од патот свртете лево на %{name}
           кон %{directions}
         onramp_left_without_directions: Свртете во влезот лево
         endofroad_left_without_exit: На крајот од патот свртете лево на %{name}


@@ -2488,10 +2497,10 @@ mk:
         slight_left_without_exit: Малку налево на %{name}
         via_point_without_exit: (преку точката)
         follow_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}
         leave_roundabout_without_exit: Напуштете го кружниот тек — %{name}
         stay_roundabout_without_exit: Останете на кружниот тек — %{name}

-        start_without_exit: Почнете на крајот од %{name}
+        start_without_exit: Почнете на %{name}

         destination_without_exit: Стигнавте на одредиштето
         against_oneway_without_exit: Оди обратно во еднонасочната на %{name}
         end_oneway_without_exit: Крај на еднонасочната на %{name}
         destination_without_exit: Стигнавте на одредиштето
         against_oneway_without_exit: Оди обратно во еднонасочната на %{name}
         end_oneway_without_exit: Крај на еднонасочната на %{name}

diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index 6f0fdd4b00ee08c6c1351ab148e27854d6c12a41..84a01be4379700881e4b5b5efb0b34deb95955a1 100644 (file)
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -2,6 +2,8 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Singleton
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Singleton

+# Author: Sureshkhole
+# Author: Susheelkasab

 # Author: V.narsikar
 # Author: Vibhavari
 # Author: अभय नातू
 # Author: V.narsikar
 # Author: Vibhavari
 # Author: अभय नातू


@@ -16,8 +18,8 @@ mr:
       changeset: बदलसंच
       changeset_tag: बदलसंचाची खूणपताका
       country: देश
       changeset: बदलसंच
       changeset_tag: बदलसंचाची खूणपताका
       country: देश

-      diary_comment: à¤\85नà¥\81दिनà¥\80वरà¥\80ल अभिप्राय
-      diary_entry: à¤\85नà¥\81दिनीतील नोंद
+      diary_comment: रà¥\8bà¤\9cनिशà¥\80 अभिप्राय
+      diary_entry: रà¥\8bà¤\9cनिशीतील नोंद

       friend: मित्र
       language: भाषा
       message: संदेश
       friend: मित्र
       language: भाषा
       message: संदेश


@@ -246,11 +248,11 @@ mr:
       new: अनुदिनीत नवी नोंद
       new_title: आपल्या अनुदिनीत नवी नोंद लिहा
       no_entries: रिक्त अनुदिनी
       new: अनुदिनीत नवी नोंद
       new_title: आपल्या अनुदिनीत नवी नोंद लिहा
       no_entries: रिक्त अनुदिनी

-      recent_entries: à¤\85नà¥\81दिनीतील अलीकडील नोंदी
+      recent_entries: रà¥\8bà¤\9cनिशीतील अलीकडील नोंदी

       older_entries: जुन्या नोंदी
       newer_entries: नव्या नोंदी
     edit:
       older_entries: जुन्या नोंदी
       newer_entries: नव्या नोंदी
     edit:

-      title: à¤\85नà¥\81दिनीतील नोंद संपादा
+      title: रà¥\8bà¤\9cनिशीतील नोंद संपादा

       subject: 'विषय:'
       body: 'मायना:'
       language: 'भाषा:'
       subject: 'विषय:'
       body: 'मायना:'
       language: 'भाषा:'


@@ -259,18 +261,18 @@ mr:
       longitude: 'रेखांश:'
       use_map_link: नकाशा वापरा
       save_button: जतन करा
       longitude: 'रेखांश:'
       use_map_link: नकाशा वापरा
       save_button: जतन करा

-      marker_text: à¤\85नà¥\81दिनीतील नोंदीचे ठिकाण
+      marker_text: रà¥\8bà¤\9cनिशीतील नोंदीचे ठिकाण

     view:
     view:

-      title: '%{user}à¤\9aà¥\80 à¤\85नà¥\81दिनी | %{title}'
-      user_title: '%{user}à¤\9aà¥\80 à¤\85नà¥\81दिनी'
+      title: '%{user}à¤\9aà¥\80 रà¥\8bà¤\9cनिशी | %{title}'
+      user_title: '%{user}à¤\9aà¥\80 रà¥\8bà¤\9cनिशी'

       leave_a_comment: टिप्पणी टाका
       login_to_leave_a_comment: टिप्प्णी लिहिण्यासाठी %{login_link}
       login: सनोंद-प्रवेश करा
       save_button: जतन करा
     no_such_entry:
       leave_a_comment: टिप्पणी टाका
       login_to_leave_a_comment: टिप्प्णी लिहिण्यासाठी %{login_link}
       login: सनोंद-प्रवेश करा
       save_button: जतन करा
     no_such_entry:

-      title: à¤\85नà¥\81दिनीत अशी नोंद नाही
+      title: रà¥\8bà¤\9cनिशीत अशी नोंद नाही

       heading: '%{id} क्रमांकाची नोंद अस्तित्वात नाही'
       heading: '%{id} क्रमांकाची नोंद अस्तित्वात नाही'

-      body: à¤\95à¥\8dषमा à¤\85सावà¥\80, %{id} à¤\95à¥\8dरमाà¤\82à¤\95ाà¤\9aà¥\80 à¤\85नà¥\81दिनीतील नोंद किंवा अभिप्राय अस्तित्वात
+      body: à¤\95à¥\8dषमा à¤\85सावà¥\80, %{id} à¤\95à¥\8dरमाà¤\82à¤\95ाà¤\9aà¥\80 रà¥\8bà¤\9cनिशीतील नोंद किंवा अभिप्राय अस्तित्वात

         नाही. कृपया आपले वर्णलेखन तपासा, किंवा कदाचित आपण चुकीच्या दुव्यावर टिचकी
         दिली असेल.
     diary_entry:
         नाही. कृपया आपले वर्णलेखन तपासा, किंवा कदाचित आपण चुकीच्या दुव्यावर टिचकी
         दिली असेल.
     diary_entry:


@@ -294,8 +296,8 @@ mr:
       edit: संपादन करा
     feed:
       user:
       edit: संपादन करा
     feed:
       user:

-        title: '%{user}à¤\95डà¥\82न à¤\93पनसà¥\8dà¤\9fà¥\8dरà¥\80à¤\9fमà¥\85प à¤\85नà¥\81दिनी-नोंदी'
-        description: '%{user}à¤\95डà¥\82न à¤\85लà¥\80à¤\95डà¥\80ल à¤\93पनसà¥\8dà¤\9fà¥\8dरà¥\80à¤\9fमà¥\85प à¤\85नà¥\81दिनी-नोंदी'
+        title: '%{user}à¤\95डà¥\82न à¤\93पनसà¥\8dà¤\9fà¥\8dरà¥\80à¤\9fमà¥\85प रà¥\8bà¤\9cनिशी-नोंदी'
+        description: '%{user}à¤\95डà¥\82न à¤\85लà¥\80à¤\95डà¥\80ल à¤\93पनसà¥\8dà¤\9fà¥\8dरà¥\80à¤\9fमà¥\85प रà¥\8bà¤\9cनिशी-नोंदी'

       language:
         title: '%{language_name} भाषेतील ओपनस्ट्रीटमॅप अनुदिनीतील नोंदी'
         description: ओपनस्ट्रीटमॅप सदस्यांकडून %{language_name} भाषेतील अलीकडील अनुदिनी-नोंदी
       language:
         title: '%{language_name} भाषेतील ओपनस्ट्रीटमॅप अनुदिनीतील नोंदी'
         description: ओपनस्ट्रीटमॅप सदस्यांकडून %{language_name} भाषेतील अलीकडील अनुदिनी-नोंदी


@@ -360,7 +362,6 @@ mr:
     search:
       title:
         latlon: निकाल <a href="https://openstreetmap.org/"">अंतर्गत</a>
     search:
       title:
         latlon: निकाल <a href="https://openstreetmap.org/"">अंतर्गत</a>

-        uk_postcode: निकाल<a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>

         ca_postcode: निकाल <a href="http://geocoder.ca/">जिओकोडर.सीए</a>
         osm_nominatim: निकाल <a href="https://nominatim.openstreetmap.org/">ओपनस्ट्रीटमॅप
           नॉमिनॅटिम</a>
         ca_postcode: निकाल <a href="http://geocoder.ca/">जिओकोडर.सीए</a>
         osm_nominatim: निकाल <a href="https://nominatim.openstreetmap.org/">ओपनस्ट्रीटमॅप
           नॉमिनॅटिम</a>


@@ -1415,6 +1416,20 @@ mr:
         add: टीप जोडा
       show:
         resolve: निराकरण करा
         add: टीप जोडा
       show:
         resolve: निराकरण करा

+    directions:
+      instructions:
+        offramp_right_with_exit: उजवीकडील %{exit}ने बाहेर पडा
+        offramp_right_with_exit_name: '%{name}वर उजवीकडे %{exit} कडून बाहेर पडा'
+        offramp_right_with_exit_directions: '%{directions}कडे जाता उजवीकडून %{exit}वर
+          बाहेर पडा.'
+        offramp_right_with_exit_name_directions: '%{directions}कडे जाताना %{name}वर
+          %{exit}ने बाहेर पडा'
+        offramp_left_with_exit: उजवीकडील %{exit}ने बाहेर पडा
+        offramp_left_with_exit_name: '%{name}वर उजवीकडे %{exit} कडून बाहेर पडा'
+        offramp_left_with_exit_directions: '%{directions}कडे जाताना %{exit}ने बाहेर
+          पडा'
+        offramp_left_with_exit_name_directions: '%{directions}कडे जाताना %{name}वर
+          %{exit}ने बाहेर पडा'

   redaction:
     new:
       description: वर्णन
   redaction:
     new:
       description: वर्णन

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index a81254008e47d037af8c490b72dba9a59905ef0e..6eab345f94619c704e9ce406087d40e2d3b04f05 100644 (file)
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -380,8 +380,6 @@ ms:
     search:
       title:
         latlon: Hasil carian <a href="http://openstreetmap.org/">dalaman</a>
     search:
       title:
         latlon: Hasil carian <a href="http://openstreetmap.org/">dalaman</a>

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

         ca_postcode: Hasil carian <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Hasil Carian <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Hasil carian <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Hasil Carian <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index f5978b69eae1ae662ffe8776b8b5d5ed2635305a..2e540ebb34d760ca963a88d1f334dda0ff676f50 100644 (file)
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -396,8 +396,6 @@ nb:
     search:
       title:
         latlon: Resultat fra <a href="http://openstreetmap.org/">Internt</a>
     search:
       title:
         latlon: Resultat fra <a href="http://openstreetmap.org/">Internt</a>

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

         ca_postcode: Resultat fra <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Resultat fra <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Resultat fra <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Resultat fra <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2348,7 +2346,7 @@ nb:
       instructions:
         continue_without_exit: Fortsett på %{name}
         slight_right_without_exit: Slak høyre inn på %{name}
       instructions:
         continue_without_exit: Fortsett på %{name}
         slight_right_without_exit: Slak høyre inn på %{name}

-        offramp_right_without_exit: Ta rampen til høyre til %{name}
+        offramp_right_with_name: Ta rampen til høyre til %{name}

         onramp_right_without_exit: Ta til høyre til rampen til %{name}
         endofroad_right_without_exit: Ved slutten av veien, ta til høyre inn på %{name}
         merge_right_without_exit: Flett til høyre til %{name}
         onramp_right_without_exit: Ta til høyre til rampen til %{name}
         endofroad_right_without_exit: Ved slutten av veien, ta til høyre inn på %{name}
         merge_right_without_exit: Flett til høyre til %{name}


@@ -2358,7 +2356,7 @@ nb:
         uturn_without_exit: Helomvending på %{name}
         sharp_left_without_exit: Skarp venstresving inn på %{name}
         turn_left_without_exit: Ta til venstre inn på %{name}
         uturn_without_exit: Helomvending på %{name}
         sharp_left_without_exit: Skarp venstresving inn på %{name}
         turn_left_without_exit: Ta til venstre inn på %{name}

-        offramp_left_without_exit: Ta rampen til venstre til %{name}
+        offramp_left_with_name: Ta rampen til venstre til %{name}

         onramp_left_without_exit: Ta til venstre til rampen til %{name}
         endofroad_left_without_exit: Ved slutten av veien, ta til venstre inn på %{name}
         merge_left_without_exit: Flett til venstre til %{name}
         onramp_left_without_exit: Ta til venstre til rampen til %{name}
         endofroad_left_without_exit: Ved slutten av veien, ta til venstre inn på %{name}
         merge_left_without_exit: Flett til venstre til %{name}

diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 1a6f0f6c216e19713ae7553fae145c963532273d..c30c6632815de628be813ea5f5db0d78f8ee1c2e 100644 (file)
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -398,8 +398,6 @@ ne:
     search:
       title:
         latlon: <a href="http://openstreetmap.org/">आन्तरिक</a> बाट नतिजाहरू
     search:
       title:
         latlon: <a href="http://openstreetmap.org/">आन्तरिक</a> बाट नतिजाहरू

-        uk_postcode: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>बाट
-          नतिजाहरू

         ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</aबाट नतिजाहरू
         osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>बाट नतिजाहरू
         ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</aबाट नतिजाहरू
         osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>बाट नतिजाहरू

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index a7b2af2ca2f897783ded3445e019a8eddc289027..4afc5aad0b1eed6a5e01146c850842fe5da5a725 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -423,8 +423,6 @@ nl:
     search:
       title:
         latlon: Resultaten van <a href="https://openstreetmap.org/">intern</a>
     search:
       title:
         latlon: Resultaten van <a href="https://openstreetmap.org/">intern</a>

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

         ca_postcode: Resultaten van <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Resultaten van <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Resultaten van <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Resultaten van <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2421,7 +2419,7 @@ nl:
       instructions:
         continue_without_exit: Verder op %{name}
         slight_right_without_exit: Flauwe bocht naar rechts naar %{name}
       instructions:
         continue_without_exit: Verder op %{name}
         slight_right_without_exit: Flauwe bocht naar rechts naar %{name}

-        offramp_right_without_exit: Neem de oprit aan de rechterkant naar %{name}
+        offramp_right_with_name: Neem de oprit aan de rechterkant naar %{name}

         onramp_right_without_exit: Sla rechtsaf op de oprit naar %{name}
         endofroad_right_without_exit: Sla rechtsaf aan het einde van de weg naar %{name}
         merge_right_without_exit: Voeg rechts in naar %{name}
         onramp_right_without_exit: Sla rechtsaf op de oprit naar %{name}
         endofroad_right_without_exit: Sla rechtsaf aan het einde van de weg naar %{name}
         merge_right_without_exit: Voeg rechts in naar %{name}


@@ -2431,7 +2429,7 @@ nl:
         uturn_without_exit: U-bocht langs %{name}
         sharp_left_without_exit: Scherp linksaf naar %{name}
         turn_left_without_exit: Sla linksaf naar %{name}
         uturn_without_exit: U-bocht langs %{name}
         sharp_left_without_exit: Scherp linksaf naar %{name}
         turn_left_without_exit: Sla linksaf naar %{name}

-        offramp_left_without_exit: Neem de oprit aan de linkerkant naar %{name}
+        offramp_left_with_name: Neem de oprit aan de linkerkant naar %{name}

         onramp_left_without_exit: Sla linksaf op de oprit naar %{name}
         endofroad_left_without_exit: Sla linksaf bij het einde van de weg naar %{name}
         merge_left_without_exit: Voeg links in naar %{name}
         onramp_left_without_exit: Sla linksaf op de oprit naar %{name}
         endofroad_left_without_exit: Sla linksaf bij het einde van de weg naar %{name}
         merge_left_without_exit: Voeg links in naar %{name}

diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index ff7b1100a44fbc05f8fdb74be66a0de13c2acc0e..ee9ec4fcb1ed6ee6cb98d768186b47e87ea05da0 100644 (file)
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -358,8 +358,6 @@ nn:
     search:
       title:
         latlon: Resultat frå <a href="http://openstreetmap.org/">Internt</a>
     search:
       title:
         latlon: Resultat frå <a href="http://openstreetmap.org/">Internt</a>

-        uk_postcode: Resultat frå <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
-          Postcode</a>

         ca_postcode: Resultat frå <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Resultat frå <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Resultat frå <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Resultat frå <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2144,7 +2142,7 @@ nn:
       instructions:
         continue_without_exit: Fortset på %{name}
         slight_right_without_exit: Svak høgresving inn på %{name}
       instructions:
         continue_without_exit: Fortset på %{name}
         slight_right_without_exit: Svak høgresving inn på %{name}

-        offramp_right_without_exit: Ta avkøyrselen til høgre ut på %{name}
+        offramp_right_with_name: Ta avkøyrselen til høgre ut på %{name}

         onramp_right_without_exit: Ta til høgre ut på %{name}
         endofroad_right_without_exit: Ved slutten av vegen, sving til høgre inn på
           %{name}
         onramp_right_without_exit: Ta til høgre ut på %{name}
         endofroad_right_without_exit: Ved slutten av vegen, sving til høgre inn på
           %{name}


@@ -2155,7 +2153,7 @@ nn:
         uturn_without_exit: U-sving langs %{name}
         sharp_left_without_exit: Skarp venstresving inn på %{name}
         turn_left_without_exit: Ta til venstre inn på %{name}
         uturn_without_exit: U-sving langs %{name}
         sharp_left_without_exit: Skarp venstresving inn på %{name}
         turn_left_without_exit: Ta til venstre inn på %{name}

-        offramp_left_without_exit: Ta rampen til venstre til %{name}
+        offramp_left_with_name: Ta rampen til venstre til %{name}

         onramp_left_without_exit: Sving til venstre på rampen inn til %{name}
         endofroad_left_without_exit: Ved slutten av vegen, sving til venstre inn på
           %{name}
         onramp_left_without_exit: Sving til venstre på rampen inn til %{name}
         endofroad_left_without_exit: Ved slutten av vegen, sving til venstre inn på
           %{name}

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 7e9566021be92fdf6d0e4582ac626dc57b0bca9f..cdebe0ca50e0292277dc9c569ffd148000c3b7bf 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -382,8 +382,6 @@ oc:
     search:
       title:
         latlon: Resultats <a href="https://openstreetmap.org/">intèrnes</a>
     search:
       title:
         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>

         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>
         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>


@@ -2157,16 +2155,16 @@ oc:
       instructions:
         continue_without_exit: Contunhar sus %{name}
         slight_right_without_exit: Viratz leugièrament a dreita sus %{name}
       instructions:
         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: Prene la via de racòrdament a dreita
+        offramp_right_with_name: 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_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
+        offramp_right_with_name_directions: Prene la via de racòrdament a dreita sus
+          %{name}, cap a %{directions}

         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_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
+        onramp_right_with_name_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}
           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}


@@ -2177,16 +2175,16 @@ oc:
         uturn_without_exit: Fasètz mièg torn sus %{name}
         sharp_left_without_exit: Viratz vivament a esquèrra sus %{name}
         turn_left_without_exit: Viratz a esquèrra cap a %{name}
         uturn_without_exit: Fasètz mièg torn sus %{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: Prene la via de racòrdament a esquèrra
+        offramp_left_with_name: 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_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
+        offramp_left_with_name_directions: Prene la via de racòrdament a esquèrra

           sus %{name}, cap a %{directions}
           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_with_directions: Virar a esquèrra sus la via de racòrdament cap
           a %{directions}
         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
+        onramp_left_with_name_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}
           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}

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 362f6c530bbf4889992815c64231b4b371b748f9..d23755a9b9c087b63df8b318810593a4cea54702 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -431,8 +431,6 @@ pl:
     search:
       title:
         latlon: Wyniki z <a href="https://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon: Wyniki z <a href="https://openstreetmap.org/">Internal</a>

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

         ca_postcode: Wyniki z <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Wyniki z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Wyniki z <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Wyniki z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -454,6 +452,7 @@ pl:
           aerodrome: Lotnisko
           apron: Płyta postojowa
           gate: Bramka
           aerodrome: Lotnisko
           apron: Płyta postojowa
           gate: Bramka

+          hangar: Hangar

           helipad: Helipad
           runway: Pas startowy
           taxiway: Droga kołowania
           helipad: Helipad
           runway: Pas startowy
           taxiway: Droga kołowania


@@ -500,6 +499,7 @@ pl:
           fuel: Stacja paliw
           gambling: Hazard
           grave_yard: Cmentarz przykościelny
           fuel: Stacja paliw
           gambling: Hazard
           grave_yard: Cmentarz przykościelny

+          grit_bin: Pojemnik na piasek

           hospital: Szpital
           hunting_stand: Ambona myśliwska
           ice_cream: Lodziarnia
           hospital: Szpital
           hunting_stand: Ambona myśliwska
           ice_cream: Lodziarnia


@@ -576,6 +576,7 @@ pl:
           "yes": Warsztat
         emergency:
           ambulance_station: Stacja pogotowia ratunkowego
           "yes": Warsztat
         emergency:
           ambulance_station: Stacja pogotowia ratunkowego

+          assembly_point: Miejsce zbiórki do ewakuacji

           defibrillator: Defibrylator
           landing_site: Miejsce awaryjnego lądowania
           phone: Telefon alarmowy
           defibrillator: Defibrylator
           landing_site: Miejsce awaryjnego lądowania
           phone: Telefon alarmowy


@@ -597,6 +598,7 @@ pl:
           motorway: Autostrada
           motorway_junction: Węzeł autostradowy
           motorway_link: Autostrada - dojazd
           motorway: Autostrada
           motorway_junction: Węzeł autostradowy
           motorway_link: Autostrada - dojazd

+          passing_place: Mijanka

           path: Ścieżka
           pedestrian: Droga dla pieszych
           platform: Miejsce oczekiwania dla pasażerów
           path: Ścieżka
           pedestrian: Droga dla pieszych
           platform: Miejsce oczekiwania dla pasażerów


@@ -622,6 +624,7 @@ pl:
           trail: Szlak
           trunk: Droga główna/ekspresowa
           trunk_link: Droga główna/ekspresowa – dojazd
           trail: Szlak
           trunk: Droga główna/ekspresowa
           trunk_link: Droga główna/ekspresowa – dojazd

+          turning_loop: Pętla do zawracania

           unclassified: Droga czwartorzędna
           "yes": Droga
         historic:
           unclassified: Droga czwartorzędna
           "yes": Droga
         historic:


@@ -720,16 +723,28 @@ pl:
           chimney: Komin
           crane: Żuraw (dźwig)
           dyke: Grobla
           chimney: Komin
           crane: Żuraw (dźwig)
           dyke: Grobla

+          embankment: Nasyp
+          flagpole: Maszt flagowy
+          groyne: Ostroga brzegowa
+          kiln: Piec przemysłowy

           lighthouse: Latarnia morska
           lighthouse: Latarnia morska

+          mast: Maszt

           mine: Kopalnia
           mine: Kopalnia

+          mineshaft: Szyb górniczy
+          monitoring_station: Stacja pomiarowa
+          petroleum_well: Szyb naftowy

           pier: Molo/pomost
           pipeline: Rurociąg
           pier: Molo/pomost
           pipeline: Rurociąg

+          silo: Silos
+          storage_tank: Zbiornik
+          surveillance: Punkt monitoringu

           tower: Wieża
           wastewater_plant: Oczyszczalnia ścieków
           watermill: Młyn wodny
           water_tower: Wieża ciśnień
           water_well: Studnia
           water_works: Wodociągi
           tower: Wieża
           wastewater_plant: Oczyszczalnia ścieków
           watermill: Młyn wodny
           water_tower: Wieża ciśnień
           water_well: Studnia
           water_works: Wodociągi

+          windmill: Młyn wiatrowy

           works: Fabryka
           "yes": Sztuczny
         military:
           works: Fabryka
           "yes": Sztuczny
         military:


@@ -781,11 +796,14 @@ pl:
           accountant: Księgowy
           administrative: Administracja
           architect: Architekt
           accountant: Księgowy
           administrative: Administracja
           architect: Architekt

+          association: Stowarzyszenie

           company: Przedsiębiorstwo
           company: Przedsiębiorstwo

+          educational_institution: Instytucja edukacyjna

           employment_agency: Urząd pracy
           estate_agent: Biuro nieruchomości
           government: Biuro rządowe/samorządowe
           insurance: Biuro ubezpieczeń
           employment_agency: Urząd pracy
           estate_agent: Biuro nieruchomości
           government: Biuro rządowe/samorządowe
           insurance: Biuro ubezpieczeń

+          it: Biuro firmy informatycznej

           lawyer: Prawnik
           ngo: Biuro organizacji pozarządowych
           telecommunication: Urząd telekomunikacji
           lawyer: Prawnik
           ngo: Biuro organizacji pozarządowych
           telecommunication: Urząd telekomunikacji


@@ -848,6 +866,7 @@ pl:
           beauty: Salon kosmetyczny
           beverages: Sklep z napojami
           bicycle: Sklep rowerowy
           beauty: Salon kosmetyczny
           beverages: Sklep z napojami
           bicycle: Sklep rowerowy

+          bookmaker: Bukmacher

           books: Księgarnia
           boutique: Butik
           butcher: Sklep mięsny
           books: Księgarnia
           boutique: Butik
           butcher: Sklep mięsny


@@ -886,11 +905,16 @@ pl:
           hairdresser: Fryzjernia
           hardware: Sklep ze sprzętem
           hifi: Hi-Fi
           hairdresser: Fryzjernia
           hardware: Sklep ze sprzętem
           hifi: Hi-Fi

+          houseware: Sklep z artykułami gospodarstwa domowego
+          interior_decoration: Sklep z dekoracją wnętrz

           jewelry: Sklep z biżuterią
           kiosk: Kiosk
           jewelry: Sklep z biżuterią
           kiosk: Kiosk

+          kitchen: Sklep z meblami kuchennymi

           laundry: Pralnia
           laundry: Pralnia

+          lottery: Kolektura

           mall: Centrum handlowe
           market: Targowisko
           mall: Centrum handlowe
           market: Targowisko

+          massage: Salon masażu

           mobile_phone: Sklep z telefonami komórkowymi
           motorcycle: Sklep z motocyklami
           music: Sklep muzyczny
           mobile_phone: Sklep z telefonami komórkowymi
           motorcycle: Sklep z motocyklami
           music: Sklep muzyczny


@@ -898,6 +922,7 @@ pl:
           optician: Optyk
           organic: Sklep z produktami organicznymi
           outdoor: Sklep turystyczny
           optician: Optyk
           organic: Sklep z produktami organicznymi
           outdoor: Sklep turystyczny

+          paint: Sklep z farbami

           pawnbroker: Lombard
           pet: Sklep ze zwierzętami
           pharmacy: Apteka
           pawnbroker: Lombard
           pet: Sklep ze zwierzętami
           pharmacy: Apteka


@@ -909,9 +934,13 @@ pl:
           stationery: Sklep papierniczy
           supermarket: Supermarket
           tailor: Krawiec
           stationery: Sklep papierniczy
           supermarket: Supermarket
           tailor: Krawiec

+          ticket: Kasa biletowa
+          tobacco: Sklep z artykułami tytoniowymi

           toys: Sklep z zabawkami
           travel_agency: Biuro podróży
           toys: Sklep z zabawkami
           travel_agency: Biuro podróży

+          tyres: Sklep z oponami

           vacant: Sklep zamknięty
           vacant: Sklep zamknięty

+          variety_store: Mały sklep wielobranżowy

           video: Sklep filmowy
           wine: Sklep z winami
           "yes": Sklep
           video: Sklep filmowy
           wine: Sklep z winami
           "yes": Sklep


@@ -937,6 +966,7 @@ pl:
           viewpoint: Punkt widokowy
           zoo: Zoo
         tunnel:
           viewpoint: Punkt widokowy
           zoo: Zoo
         tunnel:

+          building_passage: Przejazd przez budynek

           culvert: Rura kanalizacyjna
           "yes": Tunel
         waterway:
           culvert: Rura kanalizacyjna
           "yes": Tunel
         waterway:


@@ -1051,18 +1081,18 @@ pl:
         i dostosowywać nasze dane, pod warunkiem podania OpenStreetMap i jego autorów
         jako źródło. Jeśli zmienisz, przekształcisz lub wykorzystasz nasze dane, wynik
         swojej pracy możesz rozpowszechniać tylko na podstawie tej samej licencji.
         i dostosowywać nasze dane, pod warunkiem podania OpenStreetMap i jego autorów
         jako źródło. Jeśli zmienisz, przekształcisz lub wykorzystasz nasze dane, wynik
         swojej pracy możesz rozpowszechniać tylko na podstawie tej samej licencji.

-        <a href="http://opendatacommons.org/licenses/odbl/1.0/">Pełen tekst licencji</a>
+        <a href="https://opendatacommons.org/licenses/odbl/1.0/">Pełen tekst licencji</a>

         dokładnie opisuje Twoje prawa i obowiązki.
       intro_3_html: Mapy w postaci graficznej, a także dokumentacja rozpowszechniane
         dokładnie opisuje Twoje prawa i obowiązki.
       intro_3_html: Mapy w postaci graficznej, a także dokumentacja rozpowszechniane

-        na warunkach licencji <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.pl">Uznanie
-        autorstwa na tych samych warunkach 2.0</a> (CC-BY-SA 2.0).
+        na warunkach licencji <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.pl">Uznanie
+        autorstwa na tych samych warunkach 2.0</a> (CC BY-SA 2.0).

       credit_title_html: Jak podać źródło
       credit_1_html: Wymagamy podania źródła w postaci &ldquo;&copy; autorzy OpenStreetMap&rdquo;.
       credit_2_html: Musisz także jasno zaznaczyć, że dane dostępne są na licencji
       credit_title_html: Jak podać źródło
       credit_1_html: Wymagamy podania źródła w postaci &ldquo;&copy; autorzy OpenStreetMap&rdquo;.
       credit_2_html: Musisz także jasno zaznaczyć, że dane dostępne są na licencji

-        Open Database License, a w przypadku kafelków - CC-BY-SA. Możesz to zrobić
-        przez podlinkowanie <a href="http://www.openstreetmap.org/copyright">tej strony
-        licencyjnej</a>. W przypadku rozpowszechniania OSM w formie danych, możesz
-        podać nazwy licencji i umieścić do nich bezpośredni link. Jeśli niemożliwe
+        Open Database License, a w przypadku kafelków - CC BY-SA. Możesz to zrobić
+        przez podlinkowanie <a href="https://www.openstreetmap.org/copyright">tej
+        strony licencyjnej</a>. W przypadku rozpowszechniania OSM w formie danych,
+        możesz podać nazwy licencji i umieścić do nich bezpośredni link. Jeśli niemożliwe

         jest umieszczenie linków (np. mapy papierowe), sugerujemy pokierowanie czytelników
         na stronę openstreetmap.org (lub OpenStreetMap.org), opendatacommons.org i,
         jeśli odpowiednie, creativecommons.org.
         jest umieszczenie linków (np. mapy papierowe), sugerujemy pokierowanie czytelników
         na stronę openstreetmap.org (lub OpenStreetMap.org), opendatacommons.org i,
         jeśli odpowiednie, creativecommons.org.


@@ -1074,7 +1104,7 @@ pl:
       more_title_html: Dowiedz się więcej
       more_1_html: |-
         Dowiedz się więcej o korzystaniu z naszych danych i o tym, jak określić nas jako źródło, z którego pochodzą dane na <a
       more_title_html: Dowiedz się więcej
       more_1_html: |-
         Dowiedz się więcej o korzystaniu z naszych danych i o tym, jak określić nas jako źródło, z którego pochodzą dane na <a

-        href="http://osmfoundation.org/License">stronie OSMF License</a>.
+        href="https://osmfoundation.org/License">stronie OSMF License</a>.

       more_2_html: Chociaż dane OpenStreetMap są otwarte, nie jesteśmy w stanie zapewnić
         nieograniczonego dostępu do naszego API wszystkim chętnym. Zapoznaj się z
         naszą <a href="https://operations.osmfoundation.org/policies/api/">Polityką
       more_2_html: Chociaż dane OpenStreetMap są otwarte, nie jesteśmy w stanie zapewnić
         nieograniczonego dostępu do naszego API wszystkim chętnym. Zapoznaj się z
         naszą <a href="https://operations.osmfoundation.org/policies/api/">Polityką


@@ -1086,22 +1116,22 @@ pl:
         dane na otwartej zasadzie z krajowych agencji kartograficznych i innych źródeł,
         wśród nich:'
       contributors_at_html: |-
         dane na otwartej zasadzie z krajowych agencji kartograficznych i innych źródeł,
         wśród nich:'
       contributors_at_html: |-

-        <strong>Austria</strong>: Zawiera dane <a href="http://data.wien.gv.at/">miasta Wiednia</a> (na licencji <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-        <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> oraz
-        Land Tyrol (na licencji <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT z późniejszymi zmianami</a>).
+        <strong>Austria</strong>: Zawiera dane <a href="https://data.wien.gv.at/">miasta Wiednia</a> (na licencji <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
+        <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> oraz
+        Land Tyrol (na licencji <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT z późniejszymi zmianami</a>).

       contributors_ca_html: '<strong>Kanada</strong>: Zawiera dane z GeoBase&reg;,
         GeoGratis (&copy; ''Department of Natural Resources Canada''), CanVec (&copy;
         ''Department of Natural Resources Canada'') i StatCan (''Geography Division,
         Statistics Canada'').'
       contributors_fi_html: '<strong>Finlandia</strong>: Zawiera dane z National Land
         Survey of Finland''s Topographic Database i innych zbiorów danych, pod <a
       contributors_ca_html: '<strong>Kanada</strong>: Zawiera dane z GeoBase&reg;,
         GeoGratis (&copy; ''Department of Natural Resources Canada''), CanVec (&copy;
         ''Department of Natural Resources Canada'') i StatCan (''Geography Division,
         Statistics Canada'').'
       contributors_fi_html: '<strong>Finlandia</strong>: Zawiera dane z National Land
         Survey of Finland''s Topographic Database i innych zbiorów danych, pod <a

-        href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">licencją
-        NLSFI</a>.'
+        href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">NLSFI
+        License</a>.'

       contributors_fr_html: '<strong>Francja</strong>: Zawiera dane uzyskane z ''Direction
         Générale des Impôts''.</li>'
       contributors_nl_html: |-
         <strong>Holandia</strong>: Zawiera dane &copy; AND, 2007
       contributors_fr_html: '<strong>Francja</strong>: Zawiera dane uzyskane z ''Direction
         Générale des Impôts''.</li>'
       contributors_nl_html: |-
         <strong>Holandia</strong>: Zawiera dane &copy; AND, 2007

-        (<a href="http://www.and.com">www.and.com</a>)
+        (<a href="https://www.and.com">www.and.com</a>)

       contributors_nz_html: '<strong>Nowa Zelandia</strong>: Zawiera dane uzyskane
         z ''Land Information New Zealand''. Crown Copyright reserved.'
       contributors_si_html: |-
       contributors_nz_html: '<strong>Nowa Zelandia</strong>: Zawiera dane uzyskane
         z ''Land Information New Zealand''. Crown Copyright reserved.'
       contributors_si_html: |-


@@ -1118,7 +1148,7 @@ pl:
       contributors_footer_1_html: |-
         Szczegóły tych i innych źródeł, które zostały wykorzystane,
         aby udoskonalić OpenStreetMap, są dostępne na stronie
       contributors_footer_1_html: |-
         Szczegóły tych i innych źródeł, które zostały wykorzystane,
         aby udoskonalić OpenStreetMap, są dostępne na stronie

-        <a href="http://wiki.openstreetmap.org/wiki/Contributors">Contributors (en)</a>.
+        <a href="https://wiki.openstreetmap.org/wiki/Contributors">Contributors (en)</a>.

       contributors_footer_2_html: Włączenie danych do OpenStreetMap nie musi oznaczać,
         że udostępniający je podmiot popiera OpenStreetMap, udziela jakiejkolwiek
         gwarancji lub ponosi jakąkolwiek odpowiedzialność.
       contributors_footer_2_html: Włączenie danych do OpenStreetMap nie musi oznaczać,
         że udostępniający je podmiot popiera OpenStreetMap, udziela jakiejkolwiek
         gwarancji lub ponosi jakąkolwiek odpowiedzialność.


@@ -1128,13 +1158,13 @@ pl:
         np. Google Maps i&nbsp;większość map drukowanych) bez wyraźnego pozwolenia
         właściciela praw autorskich.
       infringement_2_html: Jeśli uważasz, że materiał chroniony prawem autorskim został
         np. Google Maps i&nbsp;większość map drukowanych) bez wyraźnego pozwolenia
         właściciela praw autorskich.
       infringement_2_html: Jeśli uważasz, że materiał chroniony prawem autorskim został

-        niewłaściwie dodany do bazy OpenStreetMap, zajrzyj pod adres naszej <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procedury
+        niewłaściwie dodany do bazy OpenStreetMap, zajrzyj pod adres naszej <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">procedury

         usuwania danych</a> lub <a href="http://dmca.openstreetmap.org/">wypełnij
         formularz on-line</a>.
       trademarks_title_html: <span id="trademarks"></span>Znaki towarowe
       trademarks_1_html: OpenStreetMap, logo i nazwa State of the Map są zastrzeżonymi
         znakami towarowymi Fundacji OpenStreetMap. Jeśli masz pytania dotyczące ich
         usuwania danych</a> lub <a href="http://dmca.openstreetmap.org/">wypełnij
         formularz on-line</a>.
       trademarks_title_html: <span id="trademarks"></span>Znaki towarowe
       trademarks_1_html: OpenStreetMap, logo i nazwa State of the Map są zastrzeżonymi
         znakami towarowymi Fundacji OpenStreetMap. Jeśli masz pytania dotyczące ich

-        używania, prześlij swoje pytania do <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">grupy
+        używania, prześlij swoje pytania do <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">grupy

         roboczej ds. licencji</a>.
   welcome_page:
     title: Witamy!
         roboczej ds. licencji</a>.
   welcome_page:
     title: Witamy!


@@ -1165,8 +1195,8 @@ pl:
       paragraph_1_html: W OpenStreetMap jest kilka formalnych zasad, ale oczekujemy,
         że wszyscy uczestnicy będą współpracować i komunikować się ze społecznością.
         Jeśli planujesz jakieś działania inne niż same edycje manualne, proszę przeczytaj
       paragraph_1_html: W OpenStreetMap jest kilka formalnych zasad, ale oczekujemy,
         że wszyscy uczestnicy będą współpracować i komunikować się ze społecznością.
         Jeśli planujesz jakieś działania inne niż same edycje manualne, proszę przeczytaj

-        i dostosuj się do zaleceń dotyczących <a href="http://wiki.openstreetmap.org/wiki/Import/Guidelines">importów</a>
-        oraz <a href="http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct">zautomatyzowanych
+        i dostosuj się do zaleceń dotyczących <a href="https://wiki.openstreetmap.org/wiki/Import/Guidelines">importów</a>
+        oraz <a href="https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct">zautomatyzowanych

         edycji</a>.
     questions:
       title: Czy masz jakieś pytania?
         edycji</a>.
     questions:
       title: Czy masz jakieś pytania?


@@ -1194,15 +1224,15 @@ pl:
           dołączenie do społeczności OpenStreetMap i dokonanie edycji lub naprawy
           własnoręcznie.
       add_a_note:
           dołączenie do społeczności OpenStreetMap i dokonanie edycji lub naprawy
           własnoręcznie.
       add_a_note:

-        instructions_html: Wystarczy, że klikniesz na <a class='icon note'></a> lub
-          taką samą ikonkę na mapie. Pojawi się wtedy pinezka, którą możesz przesunąć
-          przeciągając. Wpisz wiadomość, kliknij Zapisz, a inni mapujący zajmą się
-          opisanym problemem.
+        instructions_html: 'Wystarczy, że klikniesz tutaj: <a class=''icon note''></a>
+          lub na taką samą ikonkę przeglądając mapę na głównej stronie. Pojawi się
+          wtedy pinezka, którą możesz przesunąć przeciągając. Wpisz wiadomość, kliknij
+          Zapisz, a inni mapujący zajmą się opisanym problemem.'

     other_concerns:
       title: Inne kwestie
       explanation_html: "Jeśli masz obawy o jak nasze dane są używane lub zawartość
         proszę zapoznać się ze\n<a href='/copyright'>stroną o prawach autorskich</a>
     other_concerns:
       title: Inne kwestie
       explanation_html: "Jeśli masz obawy o jak nasze dane są używane lub zawartość
         proszę zapoznać się ze\n<a href='/copyright'>stroną o prawach autorskich</a>

-        po więcej informacji prawnych lub skontaktować się z \n<a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>grupą
+        po więcej informacji prawnych lub skontaktować się z \n<a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>grupą

         roboczą OSMF</a>."
   help_page:
     title: Uzyskiwanie pomocy
         roboczą OSMF</a>."
   help_page:
     title: Uzyskiwanie pomocy


@@ -1214,7 +1244,7 @@ pl:
       title: Witamy w OSM
       description: Zacznij od tego krótkiego przewodnika, obejmującego podstawy OpenStreetMap.
     beginners_guide:
       title: Witamy w OSM
       description: Zacznij od tego krótkiego przewodnika, obejmującego podstawy OpenStreetMap.
     beginners_guide:

-      url: http://wiki.openstreetmap.org/wiki/Pl:Beginners%27_guide
+      url: https://wiki.openstreetmap.org/wiki/Pl:Beginners%27_guide

       title: Podręcznik dla początkujących
       description: Podręcznik dla początkujących tworzony przez społeczność.
     help:
       title: Podręcznik dla początkujących
       description: Podręcznik dla początkujących tworzony przez społeczność.
     help:


@@ -1267,8 +1297,10 @@ pl:
       autorskie i licencja</a> by zobaczyć szczegóły.'
     legal_title: Pytania prawne
     legal_html: |-
       autorskie i licencja</a> by zobaczyć szczegóły.'
     legal_title: Pytania prawne
     legal_html: |-

-      Ta strona internetowa i inne usługi z tym związane prowadzone są oficjalnie przez <a href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF) w imieniu społeczności. Korzystanie z wszystkich usług OSMF jest regulowane przez <a href="http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
-      Politykę użytkowania</a> i naszą <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy">Politykę prywatności</a>.<br>Proszę, <a href="http://osmfoundation.org/Contact">skontaktuj się z OSMF</a>, jeśli masz pytania odnośnie licencji, praw autorskich lub innych prawnych zagadnień i problemów.
+      Ta strona internetowa i inne powiązane usługi prowadzone są oficjalnie przez <a href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF) w imieniu społeczności. Korzystanie z wszystkich usług OSMF jest regulowane przez <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
+      Politykę użytkowania</a> i naszą <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Politykę prywatności</a>.<br>Proszę, <a href="https://osmfoundation.org/Contact">skontaktuj się z OSMF</a>, jeśli masz pytania odnośnie licencji, praw autorskich lub innych prawnych zagadnień i problemów.
+      <br>
+      OpenStreetMap, logo oraz State of the Map są <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">zarejestrowanymi znakami towarowymi OSMF</a>.

     partners_title: Partnerzy
   notifier:
     diary_comment_notification:
     partners_title: Partnerzy
   notifier:
     diary_comment_notification:


@@ -1483,15 +1515,15 @@ pl:
       user_page_link: stronie użytkownika
       anon_edits: (%{link})
       anon_edits_link_text: Tu dowiesz się dlaczego.
       user_page_link: stronie użytkownika
       anon_edits: (%{link})
       anon_edits_link_text: Tu dowiesz się dlaczego.

-      flash_player_required: Aby korzystać z Potlacza, edytora OpenStreetMap, niezbędna
-        jest wtyczka Flash. Możesz <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">ściągnąć
-        odtwarzacz Flash</a> z Adobe.com.  Możesz również skorzystać z <a href="http://wiki.openstreetmap.org/wiki/Editing">innych
+      flash_player_required: Aby korzystać z Potlatcha, edytora OpenStreetMap, niezbędna
+        jest wtyczka Flash. Możesz <a href="https://get.adobe.com/flashplayer/">ściągnąć
+        odtwarzacz Flash</a> z Adobe.com.  Możesz również skorzystać z <a href="https://wiki.openstreetmap.org/wiki/Editing">innych

         dostępnych edytorów</a>, aby edytować OpenStreetMap.
       potlatch_unsaved_changes: Masz niezapisane zmiany. (Aby zapisać zmiany w Potlatchu,
         kliknij przycisk „Zapisz”, bądź też, jeśli edytujesz w trybie „na żywo”, odznacz
         aktualnie zaznaczony obiekt.)
       potlatch2_not_configured: Potlatch 2 nie został skonfigurowany – aby uzyskać
         dostępnych edytorów</a>, aby edytować OpenStreetMap.
       potlatch_unsaved_changes: Masz niezapisane zmiany. (Aby zapisać zmiany w Potlatchu,
         kliknij przycisk „Zapisz”, bądź też, jeśli edytujesz w trybie „na żywo”, odznacz
         aktualnie zaznaczony obiekt.)
       potlatch2_not_configured: Potlatch 2 nie został skonfigurowany – aby uzyskać

-        więcej informacji, zobacz http://wiki.openstreetmap.org/wiki/The_Rails_Port
+        więcej informacji, zobacz https://wiki.openstreetmap.org/wiki/The_Rails_Port

       potlatch2_unsaved_changes: Nie zapisałeś zmian. (Jeśli chcesz zapisać zmiany
         w Potlatch 2 powinieneś kliknąć przycisk „zapisz”.)
       id_not_configured: iD nie został skonfigurowany
       potlatch2_unsaved_changes: Nie zapisałeś zmian. (Jeśli chcesz zapisać zmiany
         w Potlatch 2 powinieneś kliknąć przycisk „zapisz”.)
       id_not_configured: iD nie został skonfigurowany


@@ -1583,7 +1615,7 @@ pl:
       edit: Edytuj
       preview: Podgląd
     markdown_help:
       edit: Edytuj
       preview: Podgląd
     markdown_help:

-      title_html: Składnia <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+      title_html: Składnia <a href="https://daringfireball.net/projects/markdown/">Markdown</a>

       headings: Nagłówki
       heading: Nagłówek
       subheading: Podtytuł
       headings: Nagłówki
       heading: Nagłówek
       subheading: Podtytuł


@@ -1697,7 +1729,7 @@ pl:
       description: Przeglądanie ostatnio dodanych śladów GPS
       tagged_with: ' otagowane %{tags}'
       empty_html: Nic tu jeszcze nie ma. <a href='%{upload_link}'>Prześlij nowy ślad</a>
       description: Przeglądanie ostatnio dodanych śladów GPS
       tagged_with: ' otagowane %{tags}'
       empty_html: Nic tu jeszcze nie ma. <a href='%{upload_link}'>Prześlij nowy ślad</a>

-        lub dowiedz się więcej o śledzeniu GPS na <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>stronie
+        lub dowiedz się więcej o śledzeniu GPS na <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>stronie

         wiki</a>.
     delete:
       scheduled_for_deletion: Ślad oczekuje na usunięcie
         wiki</a>.
     delete:
       scheduled_for_deletion: Ślad oczekuje na usunięcie


@@ -1911,7 +1943,7 @@ pl:
       email address: 'Adres e-mail:'
       confirm email address: 'Potwierdzenie adresu e-mail:'
       not displayed publicly: Twój adres nie będzie wyświetlany publicznie, zobacz
       email address: 'Adres e-mail:'
       confirm email address: 'Potwierdzenie adresu e-mail:'
       not displayed publicly: Twój adres nie będzie wyświetlany publicznie, zobacz

-        naszą <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy" title="polityka
+        naszą <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="polityka

         prywatności OSMF zawierająca sekcję o adresach el-pocztowych">politykę prywatności</a>
         aby uzyskać więcej informacji.
       display name: 'Przyjazna nazwa:'
         prywatności OSMF zawierająca sekcję o adresach el-pocztowych">politykę prywatności</a>
         aby uzyskać więcej informacji.
       display name: 'Przyjazna nazwa:'


@@ -2052,7 +2084,7 @@ pl:
           wiadomości lub zobaczyć twojej lokalizacji. Aby pokazać, co edytowałeś i
           umożliwić ludziom kontakt z Tobą za pośrednictwem strony internetowej, kliknij
           przycisk poniżej. <b>W międzyczasie API 0.6 zmienił się, jedynie publiczni
           wiadomości lub zobaczyć twojej lokalizacji. Aby pokazać, co edytowałeś i
           umożliwić ludziom kontakt z Tobą za pośrednictwem strony internetowej, kliknij
           przycisk poniżej. <b>W międzyczasie API 0.6 zmienił się, jedynie publiczni

-          użytkownicy mogą edytować dane mapy. </b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">dowiedz
+          użytkownicy mogą edytować dane mapy. </b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">dowiedz

           się dlaczego</a>).<ul><li>Twój adres e-mail nie zostanie ujawniony przez
           stawanie się publicznym. Tej akcji nie można cofnąć i wszyscy nowi użytkownicy
           są już domyślnie publiczni.</ul></li>
           się dlaczego</a>).<ul><li>Twój adres e-mail nie zostanie ujawniony przez
           stawanie się publicznym. Tej akcji nie można cofnąć i wszyscy nowi użytkownicy
           są już domyślnie publiczni.</ul></li>


@@ -2437,7 +2469,7 @@ pl:
       instructions:
         continue_without_exit: Kontynuuj na %{name}
         slight_right_without_exit: Lekko w prawo w %{name}
       instructions:
         continue_without_exit: Kontynuuj na %{name}
         slight_right_without_exit: Lekko w prawo w %{name}

-        offramp_right_without_exit: Jedź zjazdem w prawo do %{name}.
+        offramp_right_with_name: Jedź zjazdem w prawo do %{name}.

         onramp_right_without_exit: Skręć w prawo do podjazdu do %{name}.
         endofroad_right_without_exit: Na końcu tej drogi skręć w prawo w kierunku
           %{name}.
         onramp_right_without_exit: Skręć w prawo do podjazdu do %{name}.
         endofroad_right_without_exit: Na końcu tej drogi skręć w prawo w kierunku
           %{name}.


@@ -2448,7 +2480,7 @@ pl:
         uturn_without_exit: Zawróć wzdłuż %{name}
         sharp_left_without_exit: Ostro w lewo w %{name}
         turn_left_without_exit: Skręć w lewo w %{name}
         uturn_without_exit: Zawróć wzdłuż %{name}
         sharp_left_without_exit: Ostro w lewo w %{name}
         turn_left_without_exit: Skręć w lewo w %{name}

-        offramp_left_without_exit: Jedź zjazdem w lewo do %{name}.
+        offramp_left_with_name: Jedź zjazdem w lewo do %{name}.

         onramp_left_without_exit: Skręć w lewo do podjazdu do %{name}.
         endofroad_left_without_exit: Na końcu tej drogi skręć w lewo w kierunku %{name}.
         merge_left_without_exit: Skręć w lewo w kierunku %{name}.
         onramp_left_without_exit: Skręć w lewo do podjazdu do %{name}.
         endofroad_left_without_exit: Na końcu tej drogi skręć w lewo w kierunku %{name}.
         merge_left_without_exit: Skręć w lewo w kierunku %{name}.


@@ -2456,7 +2488,7 @@ pl:
         slight_left_without_exit: Lekko w lewo w %{name}
         via_point_without_exit: (przez punkt)
         follow_without_exit: Jedź wzdłuż %{name}
         slight_left_without_exit: Lekko w lewo w %{name}
         via_point_without_exit: (przez punkt)
         follow_without_exit: Jedź wzdłuż %{name}

-        roundabout_without_exit: Na rondzie, wybierz %{name}
+        roundabout_without_exit: Na rondzie, zjedź na %{name}

         leave_roundabout_without_exit: Opuść rondo - %{name}
         stay_roundabout_without_exit: Zostań na rondzie - %{name}
         start_without_exit: Zacznij na końcu %{name}
         leave_roundabout_without_exit: Opuść rondo - %{name}
         stay_roundabout_without_exit: Zostań na rondzie - %{name}
         start_without_exit: Zacznij na końcu %{name}

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 13c550acaef63295b74b47b6923d1827a543f8d9..fb54b7092980b91b6401931799a589ef0abd58d3 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -422,8 +422,6 @@ pt-BR:
     search:
       title:
         latlon: Resultados <a href="https://openstreetmap.org/">internos</a>
     search:
       title:
         latlon: Resultados <a href="https://openstreetmap.org/">internos</a>

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

         ca_postcode: Resultados de <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Resultados de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Resultados de <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Resultados de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -1749,7 +1747,7 @@ pt-BR:
       public_traces: Trilhas Públicas de GPS
       your_traces: Suas Trilhas de GPS
       public_traces_from: Trilhas de GPS públicas de %{user}
       public_traces: Trilhas Públicas de GPS
       your_traces: Suas Trilhas de GPS
       public_traces_from: Trilhas de GPS públicas de %{user}

-      description: Consultar últimos carregamentos de trilhas de GPS
+      description: Procurar recentes carregamentos de rastreamento de GPS

       tagged_with: ' etiquetadas com %{tags}'
       empty_html: Ainda não enviou nenhum trilho GPS. <a href='%{upload_link}'>Envie
         um novo trilho GPS</a> ou saiba mais sobre trilhos GPS na <a href='https://wiki.openstreetmap.org/wiki/Pt:Beginners_Guide_1.2'>página
       tagged_with: ' etiquetadas com %{tags}'
       empty_html: Ainda não enviou nenhum trilho GPS. <a href='%{upload_link}'>Envie
         um novo trilho GPS</a> ou saiba mais sobre trilhos GPS na <a href='https://wiki.openstreetmap.org/wiki/Pt:Beginners_Guide_1.2'>página


@@ -2492,16 +2490,21 @@ pt-BR:
       instructions:
         continue_without_exit: Continuar em %{name}
         slight_right_without_exit: Curva suave à direita para %{name}
       instructions:
         continue_without_exit: Continuar em %{name}
         slight_right_without_exit: Curva suave à direita para %{name}

-        offramp_right_without_exit: Pegue a via de acesso à direita na %{name}
+        offramp_right: Conduza até a rampa do lado direito
+        offramp_right_with_exit: Pegue a saída %{exit} a direita
+        offramp_right_with_exit_name: Pegue a saída %{exit} à direita na %{name}
+        offramp_right_with_exit_directions: Pegue a saída %{exit} à direita para %{directions}
+        offramp_right_with_exit_name_directions: Pegue a saída %{exit} à direita na
+          %{name}, em direção %{directions}
+        offramp_right_with_name: Pegue a via de acesso à direita na %{name}

         offramp_right_with_directions: Conduza até a rampa do lado direito em direção
           a %{directions}
         offramp_right_with_directions: Conduza até a rampa do lado direito em direção
           a %{directions}

-        offramp_right_with_name_and_directions: Conduza até a rampa do lado direito
-          para %{name}, em direção a %{directions}
-        offramp_right_without_directions: Conduza até a rampa do lado direito
+        offramp_right_with_name_directions: Conduza até a rampa do lado direito para
+          %{name}, em direção a %{directions}

         onramp_right_without_exit: Vire à direita, na via de acesso, na %{name}
         onramp_right_with_directions: Vire à direita na rampa em direção a %{directions}
         onramp_right_without_exit: Vire à direita, na via de acesso, na %{name}
         onramp_right_with_directions: Vire à direita na rampa em direção a %{directions}

-        onramp_right_with_name_and_directions: Vire à direita na rampa para %{name},
-          em direção a %{directions}
+        onramp_right_with_name_directions: Vire à direita na rampa para %{name}, em
+          direção a %{directions}

         onramp_right_without_directions: Vire à direita na rampa
         endofroad_right_without_exit: No fim da estrada, vire à direita na %{name}
         merge_right_without_exit: Entre à direita na %{name}
         onramp_right_without_directions: Vire à direita na rampa
         endofroad_right_without_exit: No fim da estrada, vire à direita na %{name}
         merge_right_without_exit: Entre à direita na %{name}


@@ -2511,16 +2514,21 @@ pt-BR:
         uturn_without_exit: Retorno em %{name}
         sharp_left_without_exit: Curva acentuada à esquerda para %{name}
         turn_left_without_exit: Vire à esquerda para %{name}
         uturn_without_exit: Retorno em %{name}
         sharp_left_without_exit: Curva acentuada à esquerda para %{name}
         turn_left_without_exit: Vire à esquerda para %{name}

-        offramp_left_without_exit: Pegue a via de acesso à esquerda na %{name}
+        offramp_left: Conduza até a rampa do lado esquerdo
+        offramp_left_with_exit: Pegue a saída %{exit} à esquerda
+        offramp_left_with_exit_name: Pegue a saída %{exit} à esquerda na %{name}
+        offramp_left_with_exit_directions: Pegue a saída %{exit} à esquerda para %{directions}
+        offramp_left_with_exit_name_directions: Pegue a saída %{exit} à esquerda na
+          %{name}, em direção %{directions}
+        offramp_left_with_name: Pegue a via de acesso à esquerda na %{name}

         offramp_left_with_directions: Conduza até a rampa do lado esquerdo em direção
           a %{directions}
         offramp_left_with_directions: Conduza até a rampa do lado esquerdo em direção
           a %{directions}

-        offramp_left_with_name_and_directions: Conduza até a tampa do lado esquerdo
-          para %{name}, em direção a %{directions}
-        offramp_left_without_directions: Conduza até a rampa do lado esquerdo
+        offramp_left_with_name_directions: Conduza até a tampa do lado esquerdo para
+          %{name}, em direção a %{directions}

         onramp_left_without_exit: Vire à esquerda, na via de acesso, na %{name}
         onramp_left_with_directions: Vire à esquerda na rampa em direção a %{directions}
         onramp_left_without_exit: Vire à esquerda, na via de acesso, na %{name}
         onramp_left_with_directions: Vire à esquerda na rampa em direção a %{directions}

-        onramp_left_with_name_and_directions: Vire à esquerda na rampa para %{name},
-          em direção a %{directions}
+        onramp_left_with_name_directions: Vire à esquerda na rampa para %{name}, em
+          direção a %{directions}

         onramp_left_without_directions: Vire à esquerda na rampa
         endofroad_left_without_exit: No fim da estrada, vire à esquerda na %{name}
         merge_left_without_exit: Entre à esquerda na %{name}
         onramp_left_without_directions: Vire à esquerda na rampa
         endofroad_left_without_exit: No fim da estrada, vire à esquerda na %{name}
         merge_left_without_exit: Entre à esquerda na %{name}

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 810ad220a6fc1ceb3af156e2f9a50acc108f12b2..3f0bd1bd76e535eb46687b62fd2ac5de03bed41d 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -409,8 +409,6 @@ pt-PT:
     search:
       title:
         latlon: Resultados <a href="https://openstreetmap.org/">internos</a>
     search:
       title:
         latlon: Resultados <a href="https://openstreetmap.org/">internos</a>

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

         ca_postcode: Resultados de <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Resultados de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Resultados de <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Resultados de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2478,16 +2476,22 @@ pt-PT:
       instructions:
         continue_without_exit: Continuar em %{name}
         slight_right_without_exit: Virar ligeiramente à direita para %{name}
       instructions:
         continue_without_exit: Continuar em %{name}
         slight_right_without_exit: Virar ligeiramente à direita para %{name}

-        offramp_right_without_exit: Seguir a via de acesso à direita para %{name}
+        offramp_right: Conduza até a rampa do lado direito
+        offramp_right_with_exit: Tome a saída %{exit} à direita
+        offramp_right_with_exit_name: Tome a saída %{exit} à direita em %{name}
+        offramp_right_with_exit_directions: Tome a saída %{exit} à direita, em direção
+          a %{directions}
+        offramp_right_with_exit_name_directions: Tome a saída %{exit} à direita na
+          %{name}, em direção a %{directions}
+        offramp_right_with_name: Seguir a via de acesso à direita para %{name}

         offramp_right_with_directions: Conduza até a rampa do lado direito em direção
           a %{directions}
         offramp_right_with_directions: Conduza até a rampa do lado direito em direção
           a %{directions}

-        offramp_right_with_name_and_directions: Conduza até a rampa do lado direito
-          para %{name}, em direção a %{directions}
-        offramp_right_without_directions: Conduza até a rampa do lado direito
+        offramp_right_with_name_directions: Conduza até a rampa do lado direito para
+          %{name}, em direção a %{directions}

         onramp_right_without_exit: Virar à direita na via de acesso para %{name}
         onramp_right_with_directions: Vire à direita na rampa em direção a %{directions}
         onramp_right_without_exit: Virar à direita na via de acesso para %{name}
         onramp_right_with_directions: Vire à direita na rampa em direção a %{directions}

-        onramp_right_with_name_and_directions: Vire à direita na rampa para %{name},
-          em direção a %{directions}
+        onramp_right_with_name_directions: Vire à direita na rampa para %{name}, em
+          direção a %{directions}

         onramp_right_without_directions: Vire à direita na rampa
         endofroad_right_without_exit: No fim da estrada, virar à direita para %{name}
         merge_right_without_exit: Encostar à via da direita para %{name}
         onramp_right_without_directions: Vire à direita na rampa
         endofroad_right_without_exit: No fim da estrada, virar à direita para %{name}
         merge_right_without_exit: Encostar à via da direita para %{name}


@@ -2497,16 +2501,22 @@ pt-PT:
         uturn_without_exit: Inversão de marcha em %{name}
         sharp_left_without_exit: Curva acentuada à esquerda para %{name}
         turn_left_without_exit: Virar à esquerda para %{name}
         uturn_without_exit: Inversão de marcha em %{name}
         sharp_left_without_exit: Curva acentuada à esquerda para %{name}
         turn_left_without_exit: Virar à esquerda para %{name}

-        offramp_left_without_exit: Seguir a via de acesso à esquerda para %{name}
+        offramp_left: Conduza até a rampa do lado esquerdo
+        offramp_left_with_exit: Tome a saída %{exit} à esquerda
+        offramp_left_with_exit_name: Tome a saída %{exit} à esquerda na %{name}
+        offramp_left_with_exit_directions: Tome a saída %{exit} à esquerda, em direção
+          a %{directions}
+        offramp_left_with_exit_name_directions: Tome a saída %{exit} à esquerda em
+          %{name}, em direção a %{directions}
+        offramp_left_with_name: Seguir a via de acesso à esquerda para %{name}

         offramp_left_with_directions: Conduza até a rampa do lado esquerdo em direção
           a %{directions}
         offramp_left_with_directions: Conduza até a rampa do lado esquerdo em direção
           a %{directions}

-        offramp_left_with_name_and_directions: Conduza até a tampa do lado esquerdo
-          para %{name}, em direção a %{directions}
-        offramp_left_without_directions: Conduza até a rampa do lado esquerdo
+        offramp_left_with_name_directions: Conduza até a tampa do lado esquerdo para
+          %{name}, em direção a %{directions}

         onramp_left_without_exit: Virar à esquerda na via de acesso para %{name}
         onramp_left_with_directions: Vire à esquerda na rampa em direção a %{directions}
         onramp_left_without_exit: Virar à esquerda na via de acesso para %{name}
         onramp_left_with_directions: Vire à esquerda na rampa em direção a %{directions}

-        onramp_left_with_name_and_directions: Vire à esquerda na rampa para %{name},
-          em direção a %{directions}
+        onramp_left_with_name_directions: Vire à esquerda na rampa para %{name}, em
+          direção a %{directions}

         onramp_left_without_directions: Vire à esquerda na rampa
         endofroad_left_without_exit: No fim da estrada virar à esquerda para %{name}
         merge_left_without_exit: Encostar à via da esquerda para %{name}
         onramp_left_without_directions: Vire à esquerda na rampa
         endofroad_left_without_exit: No fim da estrada virar à esquerda para %{name}
         merge_left_without_exit: Encostar à via da esquerda para %{name}


@@ -2514,10 +2524,10 @@ pt-PT:
         slight_left_without_exit: Virar ligeiramente à esquerda para %{name}
         via_point_without_exit: (ponto de passagem)
         follow_without_exit: Seguir %{name}
         slight_left_without_exit: Virar ligeiramente à esquerda para %{name}
         via_point_without_exit: (ponto de passagem)
         follow_without_exit: Seguir %{name}

-        roundabout_without_exit: Na rotunda seguir %{name}
+        roundabout_without_exit: Na rotunda, tome a saída para %{name}

         leave_roundabout_without_exit: Saia da rotunda - %{name}
         stay_roundabout_without_exit: Mantenha-se na rotunda - %{name}
         leave_roundabout_without_exit: Saia da rotunda - %{name}
         stay_roundabout_without_exit: Mantenha-se na rotunda - %{name}

-        start_without_exit: Começar no final de %{name}
+        start_without_exit: Começar em %{name}

         destination_without_exit: Chegada ao destino
         against_oneway_without_exit: Ir em contra-mão em %{name}
         end_oneway_without_exit: Fim do sentido único em %{name}
         destination_without_exit: Chegada ao destino
         against_oneway_without_exit: Ir em contra-mão em %{name}
         end_oneway_without_exit: Fim do sentido único em %{name}

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 1d26d55a27f07ef611f20798eeaf9373650e1b34..1f9544d272ab028af3e06178533cc93067b932fd 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -367,8 +367,6 @@ ro:
     search:
       title:
         latlon: Rezultate <a href="http://openstreetmap.org/">interne</a>
     search:
       title:
         latlon: Rezultate <a href="http://openstreetmap.org/">interne</a>

-        uk_postcode: Rezultate de la <a href="http://www.npemap.org.uk/">NPEMap /
-          FreeThe Postcode</a>

         ca_postcode: Rezultate de la <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Rezultate de la <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Rezultate de la <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Rezultate de la <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 361cbcf4c7617ae34eec9dbaf27f0b8fbb863d33..56a8e15af1f2c9d8042211e1a578a0c3eff855fc 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -451,8 +451,6 @@ ru:
     search:
       title:
         latlon: <a href="https://openstreetmap.org/">Внутренние результаты</a>
     search:
       title:
         latlon: <a href="https://openstreetmap.org/">Внутренние результаты</a>

-        uk_postcode: Результаты от <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
-          Postcode</a>

         ca_postcode: Результаты от <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Результаты от <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Результаты от <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Результаты от <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -1768,7 +1766,7 @@ ru:
       public_traces: Общедоступные GPS-треки
       your_traces: Ваши GPS-треки
       public_traces_from: Общедоступные треки пользователя %{user}
       public_traces: Общедоступные GPS-треки
       your_traces: Ваши GPS-треки
       public_traces_from: Общедоступные треки пользователя %{user}

-      description: Обзор последних загруженных маршрутов GPS
+      description: Обзор последний загруженный след GPS

       tagged_with: 'с тегами: %{tags}'
       empty_html: Пока здесь ничего нет. <a href='%{upload_link}'>Загрузите новый
         трек</a> или почитайте про GPS-треки на <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>вики-странице</a>.
       tagged_with: 'с тегами: %{tags}'
       empty_html: Пока здесь ничего нет. <a href='%{upload_link}'>Загрузите новый
         трек</a> или почитайте про GPS-треки на <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>вики-странице</a>.


@@ -2522,15 +2520,15 @@ 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}
+        offramp_right: Сверните на правый съезд
+        offramp_right_with_name: Сверните на правый съезд на %{name}

         offramp_right_with_directions: Сверните на правый съезд в направлении %{directions}
         offramp_right_with_directions: Сверните на правый съезд в направлении %{directions}

-        offramp_right_with_name_and_directions: Сверните на правый съезд на %{name}
-          в направлении %{directions}
-        offramp_right_without_directions: Сверните на правый съезд
+        offramp_right_with_name_directions: Сверните на правый съезд на %{name} в
+          направлении %{directions}

         onramp_right_without_exit: Сверните на правый въезд на %{name}
         onramp_right_with_directions: Сверните на правый въезд в направлении %{directions}
         onramp_right_without_exit: Сверните на правый въезд на %{name}
         onramp_right_with_directions: Сверните на правый въезд в направлении %{directions}

-        onramp_right_with_name_and_directions: Сверните на правый въезд на %{name}
-          в направлении %{directions}
+        onramp_right_with_name_directions: Сверните на правый въезд на %{name} в направлении
+          %{directions}

         onramp_right_without_directions: Сверните на правый въезд
         endofroad_right_without_exit: В конце дороги поверните направо на %{name}
         merge_right_without_exit: Перестройтесь правее на %{name}
         onramp_right_without_directions: Сверните на правый въезд
         endofroad_right_without_exit: В конце дороги поверните направо на %{name}
         merge_right_without_exit: Перестройтесь правее на %{name}


@@ -2540,15 +2538,15 @@ 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}
+        offramp_left: Сверните на левый съезд
+        offramp_left_with_name: Сверните на левый съезд на %{name}

         offramp_left_with_directions: Сверните на левый съезд в направлении %{directions}
         offramp_left_with_directions: Сверните на левый съезд в направлении %{directions}

-        offramp_left_with_name_and_directions: Сверните на левый съезд на %{name}
-          в направлении %{directions}
-        offramp_left_without_directions: Сверните на левый съезд
+        offramp_left_with_name_directions: Сверните на левый съезд на %{name} в направлении
+          %{directions}

         onramp_left_without_exit: Сверните на левый въезд на %{name}
         onramp_left_with_directions: Сверните на левый въезд в направлении %{directions}
         onramp_left_without_exit: Сверните на левый въезд на %{name}
         onramp_left_with_directions: Сверните на левый въезд в направлении %{directions}

-        onramp_left_with_name_and_directions: Сверните на левый въезд на %{name} в
-          направлении %{directions}
+        onramp_left_with_name_directions: Сверните на левый въезд на %{name} в направлении
+          %{directions}

         onramp_left_without_directions: Сверните на левый въезд
         endofroad_left_without_exit: В конце дороги поверните налево на %{name}
         merge_left_without_exit: Перестройтесь левее на %{name}
         onramp_left_without_directions: Сверните на левый въезд
         endofroad_left_without_exit: В конце дороги поверните налево на %{name}
         merge_left_without_exit: Перестройтесь левее на %{name}

diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index 61dee2f1c7927dcae0e5d4dd8566abfb1024929f..8d912283df74c3f7c2ea72ed776a410be9962f60 100644 (file)
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -382,8 +382,6 @@ scn:
     search:
       title:
         latlon: Risurtati di <a href="http://openstreetmap.org/">Nternu</a>
     search:
       title:
         latlon: Risurtati di <a href="http://openstreetmap.org/">Nternu</a>

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

         ca_postcode: Risurtati di <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Risurtati di <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Risurtati di <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Risurtati di <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 809ae90031f2118bc00ea214954d926067fac207..85532940a77dfc5ae104868917d6b715c5841780 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -364,8 +364,6 @@ sco:
     search:
       title:
         latlon: Results frae <a href="http://openstreetmap.org/">Internal</a>
     search:
       title:
         latlon: Results frae <a href="http://openstreetmap.org/">Internal</a>

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

         ca_postcode: Results frae <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Results frae <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Results frae <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Results frae <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -1122,7 +1120,7 @@ sco:
       instructions:
         continue_without_exit: Conteena on %{name}
         slight_right_without_exit: Slicht richt ontae %{name}
       instructions:
         continue_without_exit: Conteena on %{name}
         slight_right_without_exit: Slicht richt ontae %{name}

-        offramp_right_without_exit: Tak the ramp on the richt ontae %{name}
+        offramp_right_with_name: Tak the ramp on the richt ontae %{name}

         onramp_right_without_exit: Turn richt on the ramp ontae %{name}
         endofroad_right_without_exit: At the end o the road turn richt ontae %{name}
         merge_right_without_exit: Merge richt ontae %{name}
         onramp_right_without_exit: Turn richt on the ramp ontae %{name}
         endofroad_right_without_exit: At the end o the road turn richt ontae %{name}
         merge_right_without_exit: Merge richt ontae %{name}


@@ -1132,7 +1130,7 @@ sco:
         uturn_without_exit: U-turn alang %{name}
         sharp_left_without_exit: Shairp left ontae %{name}
         turn_left_without_exit: Turn left ontae %{name}
         uturn_without_exit: U-turn alang %{name}
         sharp_left_without_exit: Shairp left ontae %{name}
         turn_left_without_exit: Turn left ontae %{name}

-        offramp_left_without_exit: Tak the ramp on the left ontae %{name}
+        offramp_left_with_name: Tak the ramp on the left ontae %{name}

         onramp_left_without_exit: Turn left on the ramp ontae %{name}
         endofroad_left_without_exit: At the end o the road turn left ontae %{name}
         merge_left_without_exit: Merge left ontae %{name}
         onramp_left_without_exit: Turn left on the ramp ontae %{name}
         endofroad_left_without_exit: At the end o the road turn left ontae %{name}
         merge_left_without_exit: Merge left ontae %{name}

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index c1846ab00b3068952ea19b44ac06272b82f58a82..bca249cb1ff97ffe95f2e6d2da7ce6cc580387b8 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -372,8 +372,6 @@ sk:
     search:
       title:
         latlon: Výsledky z <a href="http://openstreetmap.org/">internej databázy</a>
     search:
       title:
         latlon: Výsledky z <a href="http://openstreetmap.org/">internej databázy</a>

-        uk_postcode: Výsledky z <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
-          Postcode</a>

         ca_postcode: Výsledky z <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Výsledky z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Výsledky z <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Výsledky z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index aa203d026784128ebc6858301b0f6f0fb36823b7..d50cf5c378c56af6001bbdffc1d333013be8a40f 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -389,8 +389,6 @@ sl:
     search:
       title:
         latlon: <a href="https://openstreetmap.org/">Interni</a> zadetki
     search:
       title:
         latlon: <a href="https://openstreetmap.org/">Interni</a> zadetki

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

         ca_postcode: Zadetki iz <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Zadetki iz <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Zadetki iz <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Zadetki iz <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2209,7 +2207,7 @@ sl:
       instructions:
         continue_without_exit: Nadaljujte po %{name}
         slight_right_without_exit: Rahlo desno na %{name}
       instructions:
         continue_without_exit: Nadaljujte po %{name}
         slight_right_without_exit: Rahlo desno na %{name}

-        offramp_right_without_exit: Zapeljite na priključek na desni in nato na %{name}
+        offramp_right_with_name: Zapeljite na priključek na desni in nato na %{name}

         onramp_right_without_exit: Na priključku zavijte desno na %{name}
         endofroad_right_without_exit: Na koncu ceste zavijte desno na %{name}
         merge_right_without_exit: Zapeljite rahlo desno na %{name}
         onramp_right_without_exit: Na priključku zavijte desno na %{name}
         endofroad_right_without_exit: Na koncu ceste zavijte desno na %{name}
         merge_right_without_exit: Zapeljite rahlo desno na %{name}


@@ -2219,7 +2217,7 @@ sl:
         uturn_without_exit: Polkrožno obrnite po %{name}
         sharp_left_without_exit: Ostro levo na %{name}
         turn_left_without_exit: Zavijte levo na %{name}
         uturn_without_exit: Polkrožno obrnite po %{name}
         sharp_left_without_exit: Ostro levo na %{name}
         turn_left_without_exit: Zavijte levo na %{name}

-        offramp_left_without_exit: Zapeljite na priključek na levi in nato na %{name}
+        offramp_left_with_name: Zapeljite na priključek na levi in nato na %{name}

         onramp_left_without_exit: Na priključku zavijte levo na %{name}
         endofroad_left_without_exit: Na koncu ceste zavijete levo na %{name}
         merge_left_without_exit: Zapeljite rahlo levo na %{name}
         onramp_left_without_exit: Na priključku zavijte levo na %{name}
         endofroad_left_without_exit: Na koncu ceste zavijete levo na %{name}
         merge_left_without_exit: Zapeljite rahlo levo na %{name}

diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 4838615fb9522da7a1f6f9498dda26883d74b30c..71a12a21b931bb54c8e99bcb0f7b56ae5e082d4f 100644 (file)
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -400,8 +400,6 @@ sq:
     search:
       title:
         latlon: Rezultatet e brendshme nga <a href="https://openstreetmap.org/"></a>
     search:
       title:
         latlon: Rezultatet e brendshme nga <a href="https://openstreetmap.org/"></a>

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

         ca_postcode: Rezultatet nga <a href="https://geocoder.ca/">Geocoder.ca</a>
         osm_nominatim: Rezultatet nga <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Rezultatet nga <a href="https://geocoder.ca/">Geocoder.ca</a>
         osm_nominatim: Rezultatet nga <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>

diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index f5ca8e9d4df8631d1cf18cb8151402b4a3d08929..dc418f62239e2798e0e20ad06461c8d37e806d0a 100644 (file)
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -270,7 +270,6 @@ sr-Latn:
     search:
       title:
         latlon: Rezultati iz <a href="http://openstreetmap.org/">Internala</a>
     search:
       title:
         latlon: Rezultati iz <a href="http://openstreetmap.org/">Internala</a>

-        uk_postcode: Rezultati iz <a href="http://www.npemap.org.uk/">NPEMap-a</a>

         ca_postcode: Rezultati iz <a href="http://geocoder.ca/">Geokodera</a>
         osm_nominatim: Rezultati iz <a href="http://nominatim.openstreetmap.org/">Nominatima</a>
         geonames: Rezultati iz <a href="http://www.geonames.org/">Geografskih imena</a>
         ca_postcode: Rezultati iz <a href="http://geocoder.ca/">Geokodera</a>
         osm_nominatim: Rezultati iz <a href="http://nominatim.openstreetmap.org/">Nominatima</a>
         geonames: Rezultati iz <a href="http://www.geonames.org/">Geografskih imena</a>

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 6210ad645d41eb16a586438574b3f16cf28df5b7..bd7f28097bd89e9d53e218273205085050b6cd6a 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -388,8 +388,6 @@ sr:
     search:
       title:
         latlon: <a href="http://openstreetmap.org/">Унутрашњи резултати</a>
     search:
       title:
         latlon: <a href="http://openstreetmap.org/">Унутрашњи резултати</a>

-        uk_postcode: Резултати са сајта <a href="http://www.npemap.org.uk/">NPEMap/FreeThe
-          Postcode</a>

         ca_postcode: Резултати са сајта <a href="https://geocoder.ca/">Geocoder.ca</a>
         osm_nominatim: Резултати са сајта <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Резултати са сајта <a href="https://geocoder.ca/">Geocoder.ca</a>
         osm_nominatim: Резултати са сајта <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -1894,7 +1892,7 @@ sr:
       confirm password: 'Потврдите лозинку:'
       use external auth: Алтернативно, користите трећу страну за пријаву
       auth no password: Са аутентификацијом треће стране, лозинка није потребна —
       confirm password: 'Потврдите лозинку:'
       use external auth: Алтернативно, користите трећу страну за пријаву
       auth no password: Са аутентификацијом треће стране, лозинка није потребна —

-        али неки додаÑ\82ни алаÑ\82и или сервер можда је ипак буду захтевали.
+        али неке додаÑ\82не алаÑ\82ке или сервер можда је ипак буду захтевали.

       continue: Отвори налог
       terms accepted: Хвала вам што прихватате нове услове уређивања.
       terms declined: Жао нам је што сте одлучили да не прихватите нове услове уређивања.
       continue: Отвори налог
       terms accepted: Хвала вам што прихватате нове услове уређивања.
       terms declined: Жао нам је што сте одлучили да не прихватите нове услове уређивања.


@@ -2393,7 +2391,7 @@ sr:
       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}
+        offramp_right_with_name: Идите на рампу десно, на %{name}

         onramp_right_without_exit: Скрените десно на рампи, на %{name}
         endofroad_right_without_exit: На крају цесте скрените десно, на %{name}
         merge_right_without_exit: Укључите се десно, на %{name}
         onramp_right_without_exit: Скрените десно на рампи, на %{name}
         endofroad_right_without_exit: На крају цесте скрените десно, на %{name}
         merge_right_without_exit: Укључите се десно, на %{name}


@@ -2403,7 +2401,7 @@ sr:
         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}
+        offramp_left_with_name: Идите на рампу лево, на %{name}

         onramp_left_without_exit: Скрените лево на рампи, на %{name}
         endofroad_left_without_exit: На крају цесте скрените лево, на %{name}
         merge_left_without_exit: Укључите се лево, на %{name}
         onramp_left_without_exit: Скрените лево на рампи, на %{name}
         endofroad_left_without_exit: На крају цесте скрените лево, на %{name}
         merge_left_without_exit: Укључите се лево, на %{name}

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index d4782c70cbc5a843737b2840bb748e4afd13dab0..65e962a82ecc48e21e79ae62df37631961b5b18f 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -421,8 +421,6 @@ sv:
     search:
       title:
         latlon: Resultat från <a href="https://openstreetmap.org/">OpenStreetMap</a>
     search:
       title:
         latlon: Resultat från <a href="https://openstreetmap.org/">OpenStreetMap</a>

-        uk_postcode: Resultat från <a href="http://www.npemap.org.uk/">NPEMap / Free
-          The Postcode</a>

         ca_postcode: Resultat från <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Resultat från <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Resultat från <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Resultat från <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2474,7 +2472,7 @@ sv:
       instructions:
         continue_without_exit: Fortsätt på %{name}
         slight_right_without_exit: Svag högersväng in på %{name}
       instructions:
         continue_without_exit: Fortsätt på %{name}
         slight_right_without_exit: Svag högersväng in på %{name}

-        offramp_right_without_exit: Ta rampen till höger in på %{name}
+        offramp_right_with_name: Ta rampen till höger in på %{name}

         onramp_right_without_exit: Sväng vänster på rampen till %{name}
         endofroad_right_without_exit: Vid slutet av vägen, sväng höger in på %{name}
         merge_right_without_exit: Sväng rakt in på %{name}
         onramp_right_without_exit: Sväng vänster på rampen till %{name}
         endofroad_right_without_exit: Vid slutet av vägen, sväng höger in på %{name}
         merge_right_without_exit: Sväng rakt in på %{name}


@@ -2484,7 +2482,7 @@ sv:
         uturn_without_exit: U-sväng längs %{name}
         sharp_left_without_exit: Skarp vänstersväng in på %{name}
         turn_left_without_exit: Vänstersväng in på %{name}
         uturn_without_exit: U-sväng längs %{name}
         sharp_left_without_exit: Skarp vänstersväng in på %{name}
         turn_left_without_exit: Vänstersväng in på %{name}

-        offramp_left_without_exit: Ta rampen till vänster in på %{name}
+        offramp_left_with_name: Ta rampen till vänster in på %{name}

         onramp_left_without_exit: Sväng vänster på rampen in till %{name}
         endofroad_left_without_exit: Vid slutet av vägen, sväng vänster in på %{name}
         merge_left_without_exit: Sväng vänster in på %{name}
         onramp_left_without_exit: Sväng vänster på rampen in till %{name}
         endofroad_left_without_exit: Vid slutet av vägen, sväng vänster in på %{name}
         merge_left_without_exit: Sväng vänster in på %{name}

diff --git a/config/locales/th.yml b/config/locales/th.yml
index 26bb9b38075edd09efa1dd47158fbc50668d3dc0..e23d2087bbf659d7228c1b6af59d8c18bfdbbc38 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -370,8 +370,6 @@ th:
     search:
       title:
         latlon: ผลการค้นหาจาก <a href="https://openstreetmap.org/">เว็บไซต์นี้</a>
     search:
       title:
         latlon: ผลการค้นหาจาก <a href="https://openstreetmap.org/">เว็บไซต์นี้</a>

-        uk_postcode: ผลการค้นหาจาก <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
-          Postcode</a>

         ca_postcode: ผลการค้นหาจาก <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: ผลการค้นหาจาก <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: ผลการค้นหาจาก <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: ผลการค้นหาจาก <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -479,7 +477,7 @@ th:
           swimming_pool: สระว่ายน้ำ
           taxi: รถแท็กซี่
           telephone: โทรศัพท์สาธารณะ
           swimming_pool: สระว่ายน้ำ
           taxi: รถแท็กซี่
           telephone: โทรศัพท์สาธารณะ

-          theatre: à¹\82รà¸\87ภาà¸\9eยà¸\99à¸\95รà¹\8c
+          theatre: à¹\82รà¸\87ละà¸\84ร

           toilets: ห้องน้ำสาธารณะ
           townhall: ศาลาว่าการเมือง
           university: มหาวิทยาลัย
           toilets: ห้องน้ำสาธารณะ
           townhall: ศาลาว่าการเมือง
           university: มหาวิทยาลัย


@@ -1629,10 +1627,11 @@ th:
       remember: จดจำฉันไว้ในระบบ
       lost password link: ลืมรหัสผ่านหรือ?
       login_button: ลงชื่อเข้าใช้
       remember: จดจำฉันไว้ในระบบ
       lost password link: ลืมรหัสผ่านหรือ?
       login_button: ลงชื่อเข้าใช้

-      register now: ลà¸\87à¸\97ะà¹\80à¸\9aียà¸\99à¹\80à¸\94ีà¹\8bยวà¸\99ีà¹\89
+      register now: ลà¸\87à¸\97ะà¹\80à¸\9aียà¸\99à¸\81à¹\88อà¸\99à¹\80ลย

       with username: มีบัญชี OpenStreetMap แล้วหรือยัง? ถ้ามีโปรดเข้าระบบด้วยชื่อผู้ใช้และรหัสผ่านที่ท่านมี
       with external: นอกจากนี้ ท่านสามารถใช้บัญชีผู้ใช้จากเว็บอื่นในการเข้าใช้งานได้
       new to osm: เพิ่งเริ่มใช้ OpenStreetMap หรือ?
       with username: มีบัญชี OpenStreetMap แล้วหรือยัง? ถ้ามีโปรดเข้าระบบด้วยชื่อผู้ใช้และรหัสผ่านที่ท่านมี
       with external: นอกจากนี้ ท่านสามารถใช้บัญชีผู้ใช้จากเว็บอื่นในการเข้าใช้งานได้
       new to osm: เพิ่งเริ่มใช้ OpenStreetMap หรือ?

+      no account: ยังไม่ได้เป็นสมาชิก?

       openid_logo_alt: เข้าใช้งานด้วย OpenID
       auth_providers:
         openid:
       openid_logo_alt: เข้าใช้งานด้วย OpenID
       auth_providers:
         openid:


@@ -2022,7 +2021,7 @@ th:
       distance: ระยะทาง
       instructions:
         continue_without_exit: เคลื่อนต่อไปทางถนน %{name}
       distance: ระยะทาง
       instructions:
         continue_without_exit: เคลื่อนต่อไปทางถนน %{name}

-        offramp_right_without_exit: ใช้ทางลาดด้านขวาไปที่ถนน %{name}
+        offramp_right_with_name: ใช้ทางลาดด้านขวาไปที่ถนน %{name}

         onramp_right_without_exit: เลี่ยวขวาที่ทางลาดไปที่ถนน %{name}
         endofroad_right_without_exit: เมื่อถึงสุดถนนเลี้ยวขวาไปที่ถนน %{name}
         merge_right_without_exit: เลี้ยวขวาเข้าสู่ถนน %{name} ซึ่งเป็นทางเอก
         onramp_right_without_exit: เลี่ยวขวาที่ทางลาดไปที่ถนน %{name}
         endofroad_right_without_exit: เมื่อถึงสุดถนนเลี้ยวขวาไปที่ถนน %{name}
         merge_right_without_exit: เลี้ยวขวาเข้าสู่ถนน %{name} ซึ่งเป็นทางเอก


@@ -2030,7 +2029,7 @@ th:
         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}
+        offramp_left_with_name: ใช้ทางลาดด้านซ้ายไปที่ %{name}

         onramp_left_without_exit: เลี้ยวซ้ายบนทางลาดไปที่ถนน %{name}
         endofroad_left_without_exit: เมื่อถึงสุดถนนเลี้ยวซ้ายไปที่ถนน %{name}
         merge_left_without_exit: เลี้ยวซ้ายเข้าสู่ถนน %{name} ซึ่งเป็นทางเอก
         onramp_left_without_exit: เลี้ยวซ้ายบนทางลาดไปที่ถนน %{name}
         endofroad_left_without_exit: เมื่อถึงสุดถนนเลี้ยวซ้ายไปที่ถนน %{name}
         merge_left_without_exit: เลี้ยวซ้ายเข้าสู่ถนน %{name} ซึ่งเป็นทางเอก

diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 2da4f6726d1e22a490ec1db883190704f2299719..886319cb56954d374485ccff70e8d5693300dc1b 100644 (file)
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -351,8 +351,6 @@ tl:
     search:
       title:
         latlon: Mga kinalabasan mula sa <a href="http://openstreetmap.org/">Panloob</a>
     search:
       title:
         latlon: Mga kinalabasan mula sa <a href="http://openstreetmap.org/">Panloob</a>

-        uk_postcode: Mga kinalabasan mula sa  <a href="http://www.npemap.org.uk/">NPEMap
-          / FreeThe Postcode</a>

         ca_postcode: Mga kinalabasan mula sa <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Mga kinalabasan mula sa <a href="http://nominatim.openstreetmap.org/">Nominatim
           ng OpenStreetMap</a>
         ca_postcode: Mga kinalabasan mula sa <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Mga kinalabasan mula sa <a href="http://nominatim.openstreetmap.org/">Nominatim
           ng OpenStreetMap</a>


@@ -2025,6 +2023,20 @@ tl:
       directions: Mga Direksyon
       distance: Layo
       instructions:
       directions: Mga Direksyon
       distance: Layo
       instructions:

+        offramp_right_with_exit: Kunin ang nakasaad na EXIT %{exit} sa kanang bahagi
+        offramp_right_with_exit_name: Kunin ang nakasaad na EXIT %{exit} sa kanang
+          bahagi papuntang %{name}
+        offramp_right_with_exit_directions: Kunin ang nakasaad na EXIT %{exit} sa
+          kanang bahagi papuntang biyaheng %{directions}
+        offramp_right_with_exit_name_directions: Kunin ang nakasaad na EXIT %{exit}
+          sa kanang bahagi papuntang %{name}, padaang %{directions}
+        offramp_left_with_exit: Kunin ang nakasaad na EXIT %{exit} sa kaliwang bahagi
+        offramp_left_with_exit_name: Kunin ang nakasaad na EXIT %{exit} sa kaliwang
+          bahagi papuntang %{name}
+        offramp_left_with_exit_directions: Kunin ang nakasaad na EXIT %{exit} sa kaliwang
+          bahagi biyaheng %{directions}
+        offramp_left_with_exit_name_directions: Kunin ang nakasaad na EXIT %{exit}
+          sa kaliwang bahagi papuntang %{name}, biyaheng %{directions}

         follow_without_exit: Sundan %{name}
         start_without_exit: Magsimula sa dulo ng %{name}
         destination_without_exit: Abutin ang patutunguhan
         follow_without_exit: Sundan %{name}
         start_without_exit: Magsimula sa dulo ng %{name}
         destination_without_exit: Abutin ang patutunguhan

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 052f61446f56ac3a9b11efc7e62d2f49758603f8..971a0dfeab1fe8a06392b96098cfcf08aa6875b1 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -423,8 +423,6 @@ tr:
     search:
       title:
         latlon: <a href="https://openstreetmap.org/">OSM</a>'in sonuçları
     search:
       title:
         latlon: <a href="https://openstreetmap.org/">OSM</a>'in sonuçları

-        uk_postcode: <a href="http://www.npemap.org.uk/">FreeThe Postcode</a> sonuçları
-          (İngiltere)

         ca_postcode: <a href="https://geocoder.ca/">Geocoder.CA</a>'dan sonuçları
         osm_nominatim: <a href="https://nominatim.openstreetmap.org/">OSM Nominatim</a>
           sonuçları
         ca_postcode: <a href="https://geocoder.ca/">Geocoder.CA</a>'dan sonuçları
         osm_nominatim: <a href="https://nominatim.openstreetmap.org/">OSM Nominatim</a>
           sonuçları


@@ -1868,8 +1866,8 @@ tr:
       new password button: Parolayı sıfırla
       help_text: Kaydolmak için kullandığınız e-posta adresini girin, şifrenizi sıfırlamak
         için kullanabileceğiniz bir bağlantı yollayacağız.
       new password button: Parolayı sıfırla
       help_text: Kaydolmak için kullandığınız e-posta adresini girin, şifrenizi sıfırlamak
         için kullanabileceğiniz bir bağlantı yollayacağız.

-      notice email on way: Maalesef onu kaybettiniz :-( Ancak yeni bir e-posta yolda.
-        Dolayısıyla yakında sıfırlayabilirsiniz.
+      notice email on way: Maalesef şifrenizi kaybettiniz :-( Ancak yeni bir e-posta
+        yolda böylece şifreniziyakında sıfırlayabilirsiniz.

       notice email cannot find: 'Üzgünüz: bu e-posta adresi bulunamadı.'
     reset_password:
       title: Parolayı sıfırla
       notice email cannot find: 'Üzgünüz: bu e-posta adresi bulunamadı.'
     reset_password:
       title: Parolayı sıfırla


@@ -2414,7 +2412,7 @@ tr:
       instructions:
         continue_without_exit: '%{name} üzerinde devam edin.'
         slight_right_without_exit: '%{name} üstünden hafif sağa'
       instructions:
         continue_without_exit: '%{name} üzerinde devam edin.'
         slight_right_without_exit: '%{name} üstünden hafif sağa'

-        offramp_right_without_exit: Sağdaki rampayı kullanarak %{name} girin
+        offramp_right_with_name: Sağdaki rampayı kullanarak %{name} girin

         onramp_right_without_exit: Rampadan sağa dönerek %{name} girin
         endofroad_right_without_exit: Yolun sonunda sağa %{name} yönünde dönün
         merge_right_without_exit: '%{name} üzerine sağdan birleşin'
         onramp_right_without_exit: Rampadan sağa dönerek %{name} girin
         endofroad_right_without_exit: Yolun sonunda sağa %{name} yönünde dönün
         merge_right_without_exit: '%{name} üzerine sağdan birleşin'


@@ -2424,7 +2422,7 @@ tr:
         uturn_without_exit: '%{name} boyunca U dönüşü'
         sharp_left_without_exit: '%{name} üstünden sola keskin dönüş'
         turn_left_without_exit: '%{name} üstünden sola dönün'
         uturn_without_exit: '%{name} boyunca U dönüşü'
         sharp_left_without_exit: '%{name} üstünden sola keskin dönüş'
         turn_left_without_exit: '%{name} üstünden sola dönün'

-        offramp_left_without_exit: Soldaki rampayı kullanarak %{name} girin
+        offramp_left_with_name: Soldaki rampayı kullanarak %{name} girin

         onramp_left_without_exit: Rampadan sola dönerek %{name} girin
         endofroad_left_without_exit: Yolun sonunda sola %{name} yönünde dönün
         merge_left_without_exit: '%{name} üzerine soldan birleşin'
         onramp_left_without_exit: Rampadan sola dönerek %{name} girin
         endofroad_left_without_exit: Yolun sonunda sola %{name} yönünde dönün
         merge_left_without_exit: '%{name} üzerine soldan birleşin'


@@ -2437,6 +2435,7 @@ tr:
         stay_roundabout_without_exit: Kavşakta kal - %{name}
         start_without_exit: '%{name} bitişinden başlayın'
         destination_without_exit: Hedefe ulaş
         stay_roundabout_without_exit: Kavşakta kal - %{name}
         start_without_exit: '%{name} bitişinden başlayın'
         destination_without_exit: Hedefe ulaş

+        end_oneway_without_exit: '%{name} için tek yönün sonu'

         roundabout_with_exit: Dönel kavşakta %{exit}. çıkışı kullanarak %{name} üzerine
         slight_left_with_exit: Dönel kavşakta %{name} üzerine hafif sola
         slight_right_with_exit: Dönel kavşakta %{name} üzerine hafif sağa
         roundabout_with_exit: Dönel kavşakta %{exit}. çıkışı kullanarak %{name} üzerine
         slight_left_with_exit: Dönel kavşakta %{name} üzerine hafif sola
         slight_right_with_exit: Dönel kavşakta %{name} üzerine hafif sağa

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index f17f2d5adeecff8ef71c99348a07336d9b43a2fa..01a510be802c5f151cffb7e95e010d7139ca43b2 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -415,8 +415,6 @@ uk:
     search:
       title:
         latlon: Результати від <a href="http://openstreetmap.org/">OpenStreetMap</a>
     search:
       title:
         latlon: Результати від <a href="http://openstreetmap.org/">OpenStreetMap</a>

-        uk_postcode: Результати від <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
-          Postcode</a>

         ca_postcode: Результати від <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Результати від <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Результати від <a href="http://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Результати від <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2392,7 +2390,7 @@ uk:
       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}
+        offramp_right_with_name: Прямуйте праворуч на зʼїзд в напрямку %{name}

         onramp_right_without_exit: Поверніть праворуч на зʼїзд в напрямку %{name}
         endofroad_right_without_exit: В кінці дороги поверніть праворуч на %{name}
         merge_right_without_exit: Приєднайтесь до руху праворуч на %{name}
         onramp_right_without_exit: Поверніть праворуч на зʼїзд в напрямку %{name}
         endofroad_right_without_exit: В кінці дороги поверніть праворуч на %{name}
         merge_right_without_exit: Приєднайтесь до руху праворуч на %{name}


@@ -2402,7 +2400,7 @@ uk:
         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}
+        offramp_left_with_name: Прямуйте ліворуч на зʼїзд в напрямку %{name}

         onramp_left_without_exit: Поверніть ліворуч на зʼїзд в напрямку %{name}
         endofroad_left_without_exit: В кінці дороги поверніть ліворуч на %{name}
         merge_left_without_exit: Приєднайтесь до руху ліворуч на %{name}
         onramp_left_without_exit: Поверніть ліворуч на зʼїзд в напрямку %{name}
         endofroad_left_without_exit: В кінці дороги поверніть ліворуч на %{name}
         merge_left_without_exit: Приєднайтесь до руху ліворуч на %{name}

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 72eb9f6bf645517d7933b459907aa1ba70661718..d905c904a315715b7f4e21809ec5977c3237d6ed 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -384,8 +384,6 @@ vi:
     search:
       title:
         latlon: Kết quả <a href="https://www.openstreetmap.org/">nội bộ</a>
     search:
       title:
         latlon: Kết quả <a href="https://www.openstreetmap.org/">nội bộ</a>

-        uk_postcode: Kết quả <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
-          Postcode</a>

         ca_postcode: Kết quả <a href="https://www.geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Kết quả <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         ca_postcode: Kết quả <a href="https://www.geocoder.ca/">Geocoder.CA</a>
         osm_nominatim: Kết quả <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>


@@ -2335,15 +2333,14 @@ vi:
       instructions:
         continue_without_exit: Chạy tiếp trên %{name}
         slight_right_without_exit: Nghiêng về bên phải vào %{name}
       instructions:
         continue_without_exit: Chạy tiếp trên %{name}
         slight_right_without_exit: Nghiêng về bên phải vào %{name}

-        offramp_right_without_exit: Đi vào lối ra bên phải vào %{name}
+        offramp_right: Đi đường nhánh bên phải
+        offramp_right_with_name: Đi đường nhánh bên phải vào %{name}

         offramp_right_with_directions: Đi đường nhánh bên phải về %{directions}
         offramp_right_with_directions: Đi đường nhánh bên phải về %{directions}

-        offramp_right_with_name_and_directions: Đi đường nhánh bên phải vào %{name}
-          về %{directions}
-        offramp_right_without_directions: Đi đường nhánh bên phải
+        offramp_right_with_name_directions: Đi đường nhánh bên phải vào %{name} về
+          %{directions}

         onramp_right_without_exit: Quẹo phải vào lối bên phải vào %{name}
         onramp_right_with_directions: Quẹo phải vào đường nhánh về %{directions}
         onramp_right_without_exit: Quẹo phải vào lối bên phải vào %{name}
         onramp_right_with_directions: Quẹo phải vào đường nhánh về %{directions}

-        onramp_right_with_name_and_directions: Quẹo phải vào đường nhánh %{name} về
-          %{directions}
+        onramp_right_with_name_directions: Quẹo phải vào đường nhánh %{name} về %{directions}

         onramp_right_without_directions: Quẹo phải vào đường nhánh
         endofroad_right_without_exit: Tới cuối đường quẹo phải vào %{name}
         merge_right_without_exit: Nhập sang phải vào %{name}
         onramp_right_without_directions: Quẹo phải vào đường nhánh
         endofroad_right_without_exit: Tới cuối đường quẹo phải vào %{name}
         merge_right_without_exit: Nhập sang phải vào %{name}


@@ -2353,15 +2350,14 @@ vi:
         uturn_without_exit: Quay trở lại vào %{name}
         sharp_left_without_exit: Quẹo gắt bên trái vào %{name}
         turn_left_without_exit: Quẹo trái vào %{name}
         uturn_without_exit: Quay trở lại vào %{name}
         sharp_left_without_exit: Quẹo gắt bên trái vào %{name}
         turn_left_without_exit: Quẹo trái vào %{name}

-        offramp_left_without_exit: Đi vào lối ra bên trái vào %{name}
+        offramp_left: Đi đường nhánh bên trái
+        offramp_left_with_name: Đi đường nhánh bên trái vào %{name}

         offramp_left_with_directions: Đi đường nhánh bên trái về %{directions}
         offramp_left_with_directions: Đi đường nhánh bên trái về %{directions}

-        offramp_left_with_name_and_directions: Đi đường nhánh bên trái vào %{name}
-          về %{directions}
-        offramp_left_without_directions: Đi đường nhánh bên trái
+        offramp_left_with_name_directions: Đi đường nhánh bên trái vào %{name} về
+          %{directions}

         onramp_left_without_exit: Quẹo phải vào lối bên trái vào %{name}
         onramp_left_with_directions: Quẹo trái vào đường nhánh về %{directions}
         onramp_left_without_exit: Quẹo phải vào lối bên trái vào %{name}
         onramp_left_with_directions: Quẹo trái vào đường nhánh về %{directions}

-        onramp_left_with_name_and_directions: Quẹo trái vào đường nhánh %{name} về
-          %{directions}
+        onramp_left_with_name_directions: Quẹo trái vào đường nhánh %{name} về %{directions}

         onramp_left_without_directions: Quẹo trái vào đường nhánh
         endofroad_left_without_exit: Tới cuối đường quẹo trái vào %{name}
         merge_left_without_exit: Nhập sang trái vào %{name}
         onramp_left_without_directions: Quẹo trái vào đường nhánh
         endofroad_left_without_exit: Tới cuối đường quẹo trái vào %{name}
         merge_left_without_exit: Nhập sang trái vào %{name}

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 90f5cea92daf8a86ef85440dbdf8031cc1a877ba..1068395097bfda941563aa501c332eeca8bcb49d 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -25,6 +25,7 @@
 # Author: RyRubyy
 # Author: Shizhao
 # Author: StephDC
 # Author: RyRubyy
 # Author: Shizhao
 # Author: StephDC

+# Author: WQL

 # Author: Xiaomingyan
 # Author: Yfdyh000
 # Author: 乌拉跨氪
 # Author: Xiaomingyan
 # Author: Yfdyh000
 # Author: 乌拉跨氪


@@ -397,8 +398,6 @@ zh-CN:
     search:
       title:
         latlon: 来自<a href="https://openstreetmap.org/">内部</a>的结果
     search:
       title:
         latlon: 来自<a href="https://openstreetmap.org/">内部</a>的结果

-        uk_postcode: 来自 <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
-          的结果

         ca_postcode: 来自 <a href="https://geocoder.ca/">Geocoder.CA</a> 的结果
         osm_nominatim: 来自 <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> 的结果
         ca_postcode: 来自 <a href="https://geocoder.ca/">Geocoder.CA</a> 的结果
         osm_nominatim: 来自 <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> 的结果


@@ -415,9 +414,9 @@ zh-CN:
           drag_lift: 上山牵引机
           gondola: 索道
           platter: 拼盘电梯
           drag_lift: 上山牵引机
           gondola: 索道
           platter: 拼盘电梯

-          pylon: 电缆塔
+          pylon: 桥塔

           station: 索道站
           station: 索道站

-          t-bar: T字形滑雪输送机
+          t-bar: T字形电梯

         aeroway:
           aerodrome: 小型飞机场
           airstrip: 飞机跑道
         aeroway:
           aerodrome: 小型飞机场
           airstrip: 飞机跑道


@@ -425,7 +424,7 @@ zh-CN:
           gate: 登机口
           hangar: 飞机库
           helipad: 直升机停机坪
           gate: 登机口
           hangar: 飞机库
           helipad: 直升机停机坪

-          holding_position: ç»\93æ\9d\9f位置
+          holding_position: ç­\89车位置

           parking_position: 停车位置
           runway: 跑道
           taxiway: 滑行道
           parking_position: 停车位置
           runway: 跑道
           taxiway: 滑行道


@@ -529,7 +528,7 @@ zh-CN:
           protected_area: 保护区
         bridge:
           aqueduct: 沟渠
           protected_area: 保护区
         bridge:
           aqueduct: 沟渠

-          boardwalk: 木板人行道
+          boardwalk: 木板路

           suspension: 悬索桥
           swing: 平旋桥
           viaduct: 高架桥
           suspension: 悬索桥
           swing: 平旋桥
           viaduct: 高架桥


@@ -549,11 +548,11 @@ zh-CN:
           "yes": 工艺品店
         emergency:
           ambulance_station: 救护站
           "yes": 工艺品店
         emergency:
           ambulance_station: 救护站

-          assembly_point: 集合点
+          assembly_point: 集合地点

           defibrillator: 除颤仪
           landing_site: 紧急着陆地点
           phone: 紧急电话
           defibrillator: 除颤仪
           landing_site: 紧急着陆地点
           phone: 紧急电话

-          water_tank: 急救水箱
+          water_tank: 紧急水箱

           "yes": 紧急
         highway:
           abandoned: 弃用公路
           "yes": 紧急
         highway:
           abandoned: 弃用公路


@@ -567,13 +566,13 @@ zh-CN:
           emergency_access_point: 紧急求救点
           footway: 人行道
           ford: 浅滩
           emergency_access_point: 紧急求救点
           footway: 人行道
           ford: 浅滩

-          give_way: 让车标志
+          give_way: 让路标志

           living_street: 生活街
           milestone: 里程碑
           motorway: 高速公路
           motorway_junction: 高速公路连接线
           motorway_link: 高速公路
           living_street: 生活街
           milestone: 里程碑
           motorway: 高速公路
           motorway_junction: 高速公路连接线
           motorway_link: 高速公路

-          passing_place: 会车带
+          passing_place: 避车道

           path: 小径
           pedestrian: 步行街
           platform: 车站
           path: 小径
           pedestrian: 步行街
           platform: 车站


@@ -599,7 +598,7 @@ zh-CN:
           trail: 小路
           trunk: 主干道路
           trunk_link: 干道
           trail: 小路
           trunk: 主干道路
           trunk_link: 干道

-          turning_loop: 转弯循环
+          turning_loop: 环形回车道

           unclassified: 无等级道路
           "yes": 道路
         historic:
           unclassified: 无等级道路
           "yes": 道路
         historic:


@@ -629,7 +628,7 @@ zh-CN:
           wayside_cross: 路旁十字架
           wayside_shrine: 路旁神龛
           wreck: 残骸
           wayside_cross: 路旁十字架
           wayside_shrine: 路旁神龛
           wreck: 残骸

-          "yes": å\8e\86å\8f²é\81\97迹
+          "yes": å\8f¤迹

         junction:
           "yes": 交叉点
         landuse:
         junction:
           "yes": 交叉点
         landuse:


@@ -694,16 +693,16 @@ zh-CN:
           water_park: 水上公园
           "yes": 闲暇
         man_made:
           water_park: 水上公园
           "yes": 闲暇
         man_made:

-          adit: å\9d\91é\81\93
+          adit: å¹³å\9d\91

           beacon: 信号浮标
           beehive: 蜂箱
           breakwater: 防波堤
           bridge: 桥
           beacon: 信号浮标
           beehive: 蜂箱
           breakwater: 防波堤
           bridge: 桥

-          bunker_silo: 掩体
+          bunker_silo: 地堡

           chimney: 烟囱
           chimney: 烟囱

-          crane: 起重机
+          crane: 吊车

           dolphin: 系船柱
           dolphin: 系船柱

-          dyke: 堤坝
+          dyke: 堤

           embankment: 路堤
           flagpole: 旗杆
           gasometer: 贮气器
           embankment: 路堤
           flagpole: 旗杆
           gasometer: 贮气器


@@ -715,7 +714,7 @@ zh-CN:
           mineshaft: 矿井
           monitoring_station: 监测电台
           petroleum_well: 石油井
           mineshaft: 矿井
           monitoring_station: 监测电台
           petroleum_well: 石油井

-          pier: 桥墩
+          pier: 码头

           pipeline: 管道
           silo: 地下贮藏库
           storage_tank: 储油罐
           pipeline: 管道
           silo: 地下贮藏库
           storage_tank: 储油罐


@@ -724,7 +723,7 @@ zh-CN:
           wastewater_plant: 污水处理厂
           watermill: 水磨
           water_tower: 水塔
           wastewater_plant: 污水处理厂
           watermill: 水磨
           water_tower: 水塔

-          water_well: 卖
+          water_well: 井

           water_works: 自来水厂
           windmill: 风力机
           works: 工厂
           water_works: 自来水厂
           windmill: 风力机
           works: 工厂


@@ -733,7 +732,7 @@ zh-CN:
           airfield: 军用机场
           barracks: 营房
           bunker: 掩体
           airfield: 军用机场
           barracks: 营房
           bunker: 掩体

-          "yes": 军事
+          "yes": 军队

         mountain_pass:
           "yes": 山口
         natural:
         mountain_pass:
           "yes": 山口
         natural:


@@ -809,10 +808,10 @@ zh-CN:
           municipality: 直辖市
           neighbourhood: 居住区
           postcode: 邮政编码
           municipality: 直辖市
           neighbourhood: 居住区
           postcode: 邮政编码

-          quarter: 宿舍
+          quarter: 街角

           region: 地区
           sea: 海
           region: 地区
           sea: 海

-          square: 方块
+          square: 广场

           state: 洲
           subdivision: 细分
           suburb: 郊区
           state: 洲
           subdivision: 细分
           suburb: 郊区


@@ -894,7 +893,7 @@ zh-CN:
           interior_decoration: 内部装饰物
           jewelry: 珠宝店
           kiosk: 售货亭
           interior_decoration: 内部装饰物
           jewelry: 珠宝店
           kiosk: 售货亭

-          kitchen: 厨房店
+          kitchen: å\8e¨æ\88¿å\95\86åº\97

           laundry: 洗衣店
           lottery: 彩票
           mall: 购物中心
           laundry: 洗衣店
           lottery: 彩票
           mall: 购物中心


@@ -912,20 +911,20 @@ zh-CN:
           pet: 宠物店
           pharmacy: 药店
           photo: 照相馆
           pet: 宠物店
           pharmacy: 药店
           photo: 照相馆

-          seafood: 海产食物
+          seafood: 海鲜

           second_hand: 二手商品商店
           shoes: 鞋店
           sports: 体育用品店
           stationery: 文具店
           supermarket: 超市
           tailor: 裁缝店
           second_hand: 二手商品商店
           shoes: 鞋店
           sports: 体育用品店
           stationery: 文具店
           supermarket: 超市
           tailor: 裁缝店

-          ticket: 售票店
+          ticket: 门票商店

           tobacco: 烟草店
           toys: 玩具店
           travel_agency: 旅行社
           tyres: 轮胎店
           tobacco: 烟草店
           toys: 玩具店
           travel_agency: 旅行社
           tyres: 轮胎店

-          vacant: 空置的店
-          variety_store: 杂货铺
+          vacant: 空店
+          variety_store: 杂货店

           video: 音像店
           wine: 葡萄酒店
           "yes": 商店
           video: 音像店
           wine: 葡萄酒店
           "yes": 商店


@@ -951,7 +950,7 @@ zh-CN:
           viewpoint: 观景点
           zoo: 动物园
         tunnel:
           viewpoint: 观景点
           zoo: 动物园
         tunnel:

-          building_passage: 建筑物通道
+          building_passage: 建筑通道

           culvert: 排水管
           "yes": 隧道
         waterway:
           culvert: 排水管
           "yes": 隧道
         waterway:


@@ -1575,7 +1574,7 @@ zh-CN:
       public_traces: 公开 GPS 轨迹
       your_traces: 您的 GPS 轨迹
       public_traces_from: 来自 %{user} 的公开 GPS 轨迹
       public_traces: 公开 GPS 轨迹
       your_traces: 您的 GPS 轨迹
       public_traces_from: 来自 %{user} 的公开 GPS 轨迹

-      description: 浏览最近上传的 GPS 轨迹
+      description: 浏览最近的GPS踪迹上传

       tagged_with: 以 %{tags} 标记
       empty_html: 尚无轨迹。<a href='%{upload_link}'>上传新轨迹</a>或在<a href='https://wiki.openstreetmap.org/wiki/Zh-hans:Beginners_Guide_1.2'>wiki页面</a>上了解
         GPS 轨迹。
       tagged_with: 以 %{tags} 标记
       empty_html: 尚无轨迹。<a href='%{upload_link}'>上传新轨迹</a>或在<a href='https://wiki.openstreetmap.org/wiki/Zh-hans:Beginners_Guide_1.2'>wiki页面</a>上了解
         GPS 轨迹。


@@ -2240,13 +2239,17 @@ zh-CN:
       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}
+        offramp_right: 上右侧斜坡
+        offramp_right_with_exit: 在右侧沿%{exit}出口驶离
+        offramp_right_with_exit_name: 在右侧沿%{exit}出口至%{name}
+        offramp_right_with_exit_directions: 在右侧沿%{exit}出口驶往%{directions}方向
+        offramp_right_with_exit_name_directions: 在右侧沿%{exit}出口至%{name}，往%{directions}方向
+        offramp_right_with_name: 在右侧上坡前往%{name}

         offramp_right_with_directions: 上右侧斜坡，往%{directions}方向
         offramp_right_with_directions: 上右侧斜坡，往%{directions}方向

-        offramp_right_with_name_and_directions: 上坡右转至%{name}，往%{directions}方向
-        offramp_right_without_directions: 上右侧斜坡
+        offramp_right_with_name_directions: 上坡右转至%{name}，往%{directions}方向

         onramp_right_without_exit: 右转上坡至%{name}
         onramp_right_with_directions: 向右侧斜坡拐去，往%{directions}方向
         onramp_right_without_exit: 右转上坡至%{name}
         onramp_right_with_directions: 向右侧斜坡拐去，往%{directions}方向

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

         onramp_right_without_directions: 右转至坡道上
         endofroad_right_without_exit: 在道路尽头右转至%{name}
         merge_right_without_exit: 向右并线至%{name}
         onramp_right_without_directions: 右转至坡道上
         endofroad_right_without_exit: 在道路尽头右转至%{name}
         merge_right_without_exit: 向右并线至%{name}


@@ -2256,13 +2259,17 @@ zh-CN:
         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}
+        offramp_left: 上左侧斜坡
+        offramp_left_with_exit: 在左侧沿%{exit}出口驶离
+        offramp_left_with_exit_name: 在左侧沿%{exit}出口至%{name}
+        offramp_left_with_exit_directions: 在左侧沿%{exit}出口驶往%{directions}方向
+        offramp_left_with_exit_name_directions: 在左侧沿%{exit}出口至%{name}，往%{directions}方向
+        offramp_left_with_name: 在左侧上坡前往%{name}

         offramp_left_with_directions: 上左侧斜坡，往%{directions}方向
         offramp_left_with_directions: 上左侧斜坡，往%{directions}方向

-        offramp_left_with_name_and_directions: 上坡左转至%{name}，往%{directions}方向
-        offramp_left_without_directions: 上左侧斜坡
+        offramp_left_with_name_directions: 上坡左转至%{name}，往%{directions}方向

         onramp_left_without_exit: 左转上坡至%{name}
         onramp_left_with_directions: 向左侧斜坡拐去，往%{directions}方向
         onramp_left_without_exit: 左转上坡至%{name}
         onramp_left_with_directions: 向左侧斜坡拐去，往%{directions}方向

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

         onramp_left_without_directions: 左转至坡道上
         endofroad_left_without_exit: 在道路尽头左转至%{name}
         merge_left_without_exit: 向左并线至%{name}
         onramp_left_without_directions: 左转至坡道上
         endofroad_left_without_exit: 在道路尽头左转至%{name}
         merge_left_without_exit: 向左并线至%{name}

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index f2800fdcbe38940c31df693be3159d955dd7d920..388aacf89d9eb2c15706656fc82f1830494ce8e2 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -393,7 +393,6 @@ zh-TW:
     search:
       title:
         latlon: 來自<a href="https://openstreetmap.org/">內部</a>的結果
     search:
       title:
         latlon: 來自<a href="https://openstreetmap.org/">內部</a>的結果

-        uk_postcode: 來自<a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>的結果

         ca_postcode: 來自 <a href="https://geocoder.ca/">Geocoder.CA</a> 的結果
         osm_nominatim: 來自 <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> 的結果
         ca_postcode: 來自 <a href="https://geocoder.ca/">Geocoder.CA</a> 的結果
         osm_nominatim: 來自 <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> 的結果


@@ -593,7 +592,7 @@ zh-TW:
           trail: 步徑
           trunk: 快速道路
           trunk_link: 主要幹道連接路
           trail: 步徑
           trunk: 快速道路
           trunk_link: 主要幹道連接路

-          turning_loop: 交流道
+          turning_loop: 環形迴車道

           unclassified: 無分級道路
           "yes": 道路
         historic:
           unclassified: 無分級道路
           "yes": 道路
         historic:


@@ -2248,13 +2247,17 @@ zh-TW:
       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}
+        offramp_right: 往右側上坡
+        offramp_right_with_exit: 在右側往出口 %{exit}
+        offramp_right_with_exit_name: 在右側沿著出口 %{exit} 前往 %{name}
+        offramp_right_with_exit_directions: 在右側沿著出口 %{exit} 朝 %{directions}
+        offramp_right_with_exit_name_directions: 在右側沿著出口 %{exit} 前往 %{name} 朝 %{directions}
+        offramp_right_with_name: 在右側上坡前往%{name}

         offramp_right_with_directions: 在右側上坡朝%{directions}
         offramp_right_with_directions: 在右側上坡朝%{directions}

-        offramp_right_with_name_and_directions: 在右側往%{name}的上坡朝%{directions}
-        offramp_right_without_directions: 往右側上坡
+        offramp_right_with_name_directions: 在右側往%{name}的上坡朝%{directions}

         onramp_right_without_exit: 右轉上坡至%{name}
         onramp_right_with_directions: 右轉前往上坡朝%{directions}
         onramp_right_without_exit: 右轉上坡至%{name}
         onramp_right_with_directions: 右轉前往上坡朝%{directions}

-        onramp_right_with_name_and_directions: 在往%{name}的上坡右轉朝%{directions}
+        onramp_right_with_name_directions: 在往%{name}的上坡右轉朝%{directions}

         onramp_right_without_directions: 右轉前往上坡
         endofroad_right_without_exit: 在道路盡頭右轉至%{name}
         merge_right_without_exit: 向右併線至%{name}
         onramp_right_without_directions: 右轉前往上坡
         endofroad_right_without_exit: 在道路盡頭右轉至%{name}
         merge_right_without_exit: 向右併線至%{name}


@@ -2264,13 +2267,17 @@ zh-TW:
         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}
+        offramp_left: 往左側上坡
+        offramp_left_with_exit: 在左側往出口 %{exit}
+        offramp_left_with_exit_name: 在左側沿著出口 %{exit} 前往 %{name}
+        offramp_left_with_exit_directions: 在左側沿著出口 %{exit} 朝 %{directions}
+        offramp_left_with_exit_name_directions: 在左側沿著出口 %{exit} 前往 %{name} 朝 %{directions}
+        offramp_left_with_name: 在左側上坡前往%{name}

         offramp_left_with_directions: 在左側上坡朝%{directions}
         offramp_left_with_directions: 在左側上坡朝%{directions}

-        offramp_left_with_name_and_directions: 在左側往%{name}的上坡朝%{directions}
-        offramp_left_without_directions: 往左側上坡
+        offramp_left_with_name_directions: 在左側往%{name}的上坡朝%{directions}

         onramp_left_without_exit: 左轉上坡至%{name}
         onramp_left_with_directions: 左轉前往上坡朝%{directions}
         onramp_left_without_exit: 左轉上坡至%{name}
         onramp_left_with_directions: 左轉前往上坡朝%{directions}

-        onramp_left_with_name_and_directions: 在往%{name}的上坡左轉朝%{directions}
+        onramp_left_with_name_directions: 在往%{name}的上坡左轉朝%{directions}

         onramp_left_without_directions: 左轉前往上坡
         endofroad_left_without_exit: 在道路盡頭左轉至%{name}
         merge_left_without_exit: 向左併線至%{name}
         onramp_left_without_directions: 左轉前往上坡
         endofroad_left_without_exit: 在道路盡頭左轉至%{name}
         merge_left_without_exit: 向左併線至%{name}