X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fa77b55bd5efdb38ddfaad0911d871df5a226dd6..0571802b31a6a218472763f6b58cb6898cbdc56e:/config/locales/nqo.yml?ds=inline

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 13681c412..5b4e0e9eb 100644
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -18,7 +18,7 @@ nqo:
       prompt: ßßßßß® ßßß¥ßß²ßßß
     submit:
       diary_comment:
-        create: ßß¬ ßßßßß²ß¬ßßß¬
+        create: ß¡ßßß£ßß²
       diary_entry:
         create: ßßß¬ß¥ßß²ß¬ßßß¬ßß
         update: ßßß²ßßß¦ßßß
@@ -29,7 +29,7 @@ nqo:
       client_application:
         create: ßßß¯ßßßßß
         update: ßßß²ßßß¦ßßß
-      doorkeeper_application:
+      oauth2_application:
         create: ßßß¯ßßßßß
         update: ßßß²ßßß¦ßßß
       redaction:
@@ -100,9 +100,10 @@ nqo:
       diary_entry:
         user: ßßß¬ßßß°ßßß¬ßß
         title: ßßß¡ß
+        body: ßßß¬ßß
         latitude: ß¦ßß ßßßßßß¯ß¦ßß«
         longitude: ßßß°ßßß¬ßßß²ß¬ß¦ß
-        language: ßßß²
+        language_code: ßßß²
       doorkeeper/application:
         name: ßßß®
         redirect_uri: URLs ßßßßß²ß¬ßßß²ß¬ß ßß²
@@ -155,6 +156,8 @@ nqo:
           ßßß²ß¬ßß ßßß¬ ßßß« ß¡ßß¬ßßß« ßßß²ß¬ßß ßßß« (ßßßßß²ßßßßß² ßß¥ßß¬ßßß¬ßßß² ßßßß ßßß¬ ß£ßß« ßßßßß«
           ßßß²ß¬ßßßßß² ßß¥ßß¬ßßß¬ßßß² ß ßß¬ ßßß« ßßß²ß¬ßßß¬ßßß« ßßß«)
         redirect_uri: ßßß¬ßßß¬ßßß¬ ßßßßß²ß« ß ßßßß¯ßßß« URL ß¡ßß¬
+      trace:
+        tagstring: ßßßß¡ßß ß¡ßß² ß ßß¬ ßßßßßß£ßß²ß« ß¦ßß« ß¦ßßßßß ßßß«
       user_block:
         needs_view: ßß¬ ßßß« ßßß¬ßßß°ßßß¬ßß ß¡ßß¬ßß ß¦ßß« ßßß²ß¬ßßß²ß¬ß ßß² ß ßß« ßßß¬ßßß¬ßß ß£ßß²ß¬ ßß
           ßßßß£ßß²ß§ß ßßß« ßßß¬Ø
@@ -236,27 +239,25 @@ nqo:
       current email address: ßßß²ß­ßßß²ß­ ß¢ßß¡ßßßß²ß« ßßß²ßß
       external auth: ßßßßß²ß ß ßßß¬ß¡ßß¬ß¢ßß²ß°ß¦ßß¬ßß
       openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
         link text: ß¡ßß²ß¬ ß¦ßß« ß£ßß²ß¬ ßßß«Ø
       public editing:
         heading: ßßß¬ß¡ß ßßß« ß¡ßß¬ß¦ßßß¬ß¡ßß²ß¬ß ßß²
         enabled: ßßßß« ßßß¬ßß´ßß¬ ßßß«. ßß¬ ßßß« ßßß¬ ßßß« ßßß¯ßßßß² ßßß« ßßß« ßßß« ßßß²ßß ß¡ßß¦ßßß¬ß¡ßß²ß«
           ß ßß«.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: ß£ßß²ß¬ ß¦ßß« ß¡ßß²ß¬ ßßß«Ø
         disabled: ßß¬ ßßßß« ßß´ßß¬ ßßß« ßß¬ ßßß²ß¬ ßßß« ßßß« ßßß²ßß ß¡ßß¦ßßß¬ß¡ßß²ß« ß ßß«ß¸ ß¡ßß¬ß¦ßßß¬ß¡ßß²ß¬ß ßß²
           ßßß¯-ß-ßßß« ßßß²ß¬ß£ßß²ß« ß¦ßß« ß¢ß ßßß«ß¸ ßß¬ ßßß¯ ß¦ßß« ßßß¯ßßßß² ß ßß¬ ßßß«.
         disabled link text: ß¡ßß²ß¬ß ßß« ßß ß ßßß« ßßß« ßßß« ß¡ßß¬ß¦ßßß¬ß¡ßß²ß¬ß ßß²ß« ßßß« ßßß«Ø
-      public editing note:
-        heading: ßßß¬ß¡ß ßßß« ß¡ßß¬ß¦ßßß¬ß¡ßß²ß¬ß ßß²
       contributor terms:
         heading: ßßßßßßßß¢ßß²ß¯ßßß² ßßßßß ßßß¬
         agreed: ß ßßßß« ßßß¬ß¢ßß« ßßßßßßßß¢ßß²ß¯ßßß²ß ßß« ßßßß ßßßßß ßßß¬ ß¡ßß¬.
         not yet agreed: ß ß¡ßß« ßßß¬ß¢ßß¬ ßßßßßßßß¢ßß²ß¯ßßß²ß ßß« ßßßß ßßßßß ßßß¬ ß¡ßß¬ ß¡ßß£ßß²ß¬.
         link text: ß¡ßß²ß¬ ß¦ßß« ß£ßß²ß¬ ßßß«Ø
       save changes button: ß¡ßß¬ß¦ßßß¬ß¡ßß²ß¬ß ßß² ß ßß¬ ß ßßßß²ß¬ßßß¬
-      make edits public button: ßß¬ ßßß¯ ßßß« ß ß ßß« ßß¡ßß¬ßßß¬ ß¡ßß¦ßßß¡ßß²ß ßß² ßßß«
       delete_account: ßßß¬ßßß¬ßß ßßß°ßßß¬ßß...
+    go_public:
+      heading: ßßß¬ß¡ß ßßß« ß¡ßß¬ß¦ßßß¬ß¡ßß²ß¬ß ßß²
+      make_edits_public_button: ßß¬ ßßß¯ ßßß« ß ß ßß« ßß¡ßß¬ßßß¬ ß¡ßß¦ßßß¡ßß²ß ßß² ßßß«
     update:
       success_confirm_needed: ßßß¬ßßß°ßßß¬ßß ßßß¬ßßß¬ßßß¬ß¦ß ßßßß« ßßßßßß¦ßß« ßßßßßßßßß«. ß ßßß«
         ß¢ßß¡ßßßß²ßßß²ßß ß¡ßßßßß« ß¦ßßß£ßß« ßß ßßß« ßßµß ßßß« ß¢ßß¡ßßßß²ßßß²ßß ßßßßßß¦ßß«.
@@ -343,6 +344,9 @@ nqo:
         changeset: ßßß¬ßßß²ß¬ß ßß² ß¡ßß¬ßßß¬ßßß²ß¬ß ßß²
         note: ßßß¬ßßßß
     redacted:
+      redaction: ß¥ß£ßß¬ßßß¬ß£ßß² %{id}
+      message_html: ß¦ßßß¡ß %{version} ß£ßß²ß¬ %{type} ßßß« ßßß²ß¬ ß¦ßß¬ßßß¬ ßßß« ßßßß¬ ßß¬ ß¥ß£ßß¬ßßß¬ß£ßß²ß«
+        ß ßß¬. %{redaction_link} ß¦ßß« ßßß°ß£ßß²ß« ßßßßß²ßßß¯ßßß« ßß ßßß«.
       type:
         node: ß¥ßßßß²ßßß²
         way: ßßßß
@@ -360,27 +364,7 @@ nqo:
       wikimedia_commons_link: '%{page} ßß£ßßß ß¥ßßß¡ßßßß¦ßß« ßßß¡ßß² ßßß²ß¬'
       telephone_link: ßßßßß %{phone_number}
       colour_preview: ßßß¬ßß %{colour_value} ß¢ßßß
-    note:
-      title: 'ß¦ßßß£ß: %{id}'
-      new_note: ß¦ßßß£ßß« ßßßßß«
-      description: ßßß¯ßßßßß
-      open_title: ß¦ßßß£ßß« ß¢ßßßßßßß %{note_name}
-      closed_title: ß¦ßßß£ßß« ß¢ßßßß£ßß² %{note_name}
-      hidden_title: ß¦ßßß£ßß« ß¢ß¡ßßßß²ß°ß£ßß² %{note_name}
-      opened_by_html: ßß¬ ßßß²ßßß£ßß²ß« ß¦ßß« %{user}<abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
-        ßßß¬ ßßßß«
-      opened_by_anonymous_html: ßß¬ ßßß²ßßß£ßß²ß« ß¦ßß« ßßß¯ßßßß² ß ßß¬ ßßß« ßßßß« <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: ß¡ßßß£ßß² ßßß¬ ßßßß« %{user} <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
-      commented_by_anonymous_html: ß¡ßßß£ßß² ßßß¬ ßßßß« ßßß¯ßßßß² <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
-        ßßß«
-      closed_by_html: ßß¬ ß¢ßßßß£ßß²ß« ß¦ßß« %{user} <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
-        ßßßß«
-      closed_by_anonymous_html: ßß¬ ß¢ßßßß£ßß²ß« ß¦ßß« ßßß¯ßßßß² <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
-        ßßß¬ ßßßß«
-      reopened_by_html: ßß¬ ßßßßß£ßß²ß£ßß²ß« ßßß²ß¯ %{user} ßßß¬ ßßßß« <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
-      reopened_by_anonymous_html: ßß¬ ßßßßß£ßß²ß£ßß²ß« ß¦ßß« ßßß¯ßßßß² ß ßß¬ ßßßß« <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
-      hidden_by_html: ßß¬ ß¢ß¡ßßßß²ß°ß£ßß²ß¬ ß¦ßß« %{user} ßßß¬ ßßßß« <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
-      report: ßßßßß ß£ßß²ß¬ ß ßßßßßß«
+      email_link: ß¢:ßßß²ßß %{email}
     query:
       title: ßßß¬ßßß°ßßß¬ßß ßßß¬ ß¡ßß¢ßß¬ß£ßß²ß¬ßßß«
       introduction: ß¡ßß ßßß²ß¬ßßß²ß« ßßß¬ ß ß¡ßßßßß¬ß§ßß¬ ßßßßß¯ßßßß ßßß« ß¢ßß£ßß²ß«.
@@ -404,6 +388,7 @@ nqo:
     index:
       title: ßßß¬ßßß²ß¬ß ßß² ß ßß¬ ß¡ßßßß¬ßßß²ß«
       title_user: '%{user} ßßßß« ßßß¬ßßß²ß¬ß ßß² ß¡ßßßß¬ßßß²ß«'
+      title_user_link_html: ß¡ßß¬ß¦ßßß¬ß¡ßß²ß¬ß ßß²ß« ßßß %{user_link} ßßßß«
       title_friend: ß ßßßß ßßßß« ßßß¬ßßß²ß¬ß ßß² ß¡ßßßß¬ßßß²ß«
       title_nearby: ß¡ßß¬ß¦ßßß¬ß¡ßß²ß¬ß ßß² ß¡ßß² ßßßßß²ß¬ß£ßß²ß« ßßß¬ß¢ßß²ß° ßßß¬ßßß°ßßß¬ßß ßßß¬ ßßßß«
       empty: ßßß¬ßßß²ß¬ß ßß²ß¬ ß¡ßß¬ßßß¬ßßß²ß¬ß ßß²ß¬ ß¡ßß« ßßß¬ßßß²ß«
@@ -419,6 +404,8 @@ nqo:
   changeset_comments:
     comment:
       commented_at_by_html: ßß¬ ßßßßßß¦ßß£ßß²ß« ß¦ßß« %{when} ßß¬ ß£ßß« %{user} ßßßß«
+    index:
+      title_all: ßßßß²ßßßßßßßß¡ßß ß¡ßß¬ß¦ßßß¬ß¡ßß²ß¬ß ßß²ß« ßßß ßßßßßßß¥ß
   dashboards:
     contact:
       km away: ßßßß %{count} ßßß¬ß£ßß² ß ßß«
@@ -515,6 +502,15 @@ nqo:
       applications:
         create:
           notice: ßß¥ßß¬ßßß¬ßß ßßßß« ßßßßß²ß¬ßßß«
+  errors:
+    contact:
+      contact: ßßß²ß¬ßßß¬ßßß®
+    forbidden:
+      title: ßßßßß²ß£ßß²ß«
+    internal_server_error:
+      title: ßß¥ßß¬ßßß¬ßß ßßß¬ßßß²ß¬ßß
+    not_found:
+      title: ßßßßß® ß¡ßß¬ ßßß¬ßßß²ß¬
   friendships:
     make_friend:
       heading: ' ßßß¬ %{user} ßßß« ß ßßßß ßßß«Ø'
@@ -533,36 +529,43 @@ nqo:
     search:
       title:
         latlon_html: ßßßßß ßßß¬ ßßßß« <a href="https://openstreetmap.org/">ßß£ßßß</a>
-        ca_postcode_html: ßßßßß ßßß¬ ßßß¬ ßßßß« <a href="https://geocoder.ca/">ßßß±ßßßßß²</a>
         osm_nominatim_html: ßßßßß ßßß¬ ßßßß« <a href="https://nominatim.openstreetmap.org/">ßßßß²ßßßßßßßß¡ßß</a>
           ßßß«
-        geonames_html: ßßßßß ßßß¬ ßßßß« <a href="http://www.geonames.org/">ßßß±ßßß®</a>
-          ßßß«
         osm_nominatim_reverse_html: ßßßßß ßßß¬ ßßßß« <a href="https://nominatim.openstreetmap.org/">ßßß¯ß¦ßßß</a>
           ßßß«
-        geonames_reverse_html: ßßßßß ßßß¬ ßßßß« <a href="http://www.geonames.org/">ßßß±ßßß®</a>
     search_osm_nominatim:
       prefix:
         aerialway:
           cable_car: ßßß²ßßßßß²
           chair_lift: ß¥ßßßßßß¯ßßß²
+          drag_lift: ßß£ßß¬ß£ßß¬ß¡ßßß¡ßß
+          gondola: ßßßß¬ßßßßß²
+          magic_carpet: ßßß°ßßß²ß¬ ßßßßßßßß
+          platter: ßßß¬ß¢ßß²ßßßßß²
+          pylon: ßßß²
+          station: ßßß²ßßßßß² ßßß¬ßßß®
+          "yes": ßßß²ß¡ßß« ßßßß (ßßß²ßßßßß²)
         aeroway:
-          gate: ßßß²ß¬ßß
+          aerodrome: ßßß²ß¡ßßßßßß²ß« ßßß
+          airstrip: ßßß°ßßß¬ ßßß (ßßß²ß¡ßßßßßß²)
+          gate: ßßß²ß¡ßßßß² ßßß²ß¬ßß
           hangar: ßßß
           helipad: ßßß²ß¡ßßßß²
           holding_position: ßßß²ß¡ßßßß²ß« ß¦ßß
-          navigationaid: ßßß²ß¡ßßßß² ßßß¯ßßßß ßßß¬ß¡ßß²ß¬ß ßß² ß ßß¬
+          navigationaid: ßßß²ß¡ßßßßßß² ßßß²ßßß²ß ßß² ßßß¬ß¡ßß²ß¬ß ßß² ß ßß¬
           parking_position: ßßß¬ßß ßßß²ß¬ßßßß
           runway: ßßß¬ßßß¬ ßßßß
           taxilane: ßßßßß« ß¡ßß¡ßß¬ßßß¬ß£ßß² ß ßß¬ ßßß²ß°ßß ßßßß¬ßß ß¦ßß«
           taxiway: ß¥ßßßß¥ßßßß« ßßßß
-          terminal: ßßß¬ßßß²
+          terminal: ßßß²ß¡ßßßß² ßßß²ß¬ßßß®
         amenity:
           animal_boarding: ßßß¦ßß²ß« ß ßß¦ßßß« ß¦ßßß
+          animal_shelter: ßßß¦ßß² ß ßß¬ ß¥ßß¬ß£ßßß
           arts_centre: ßßß¬ßßß²ß¬ß§ß ßßß²ßßß²
           bank: ßßßßß²
           bar: ß¡ßß²ß¬ßßß²
           bbq: BBQ
+          bench: ßßß°ßßß²
           bicycle_parking: ß£ßß°ßßß¬ ßßß
           bicycle_rental: ß£ßß°ßßß¬ ßßßßß
           bicycle_repair_station: ß£ßß°ßßß¬ ßßß¬ßßß²ß¬ ß¦ßßß
@@ -573,6 +576,7 @@ nqo:
           bus_station: ßßßßß²ßßß²ß« ßßß« ß¦ßß
           cafe: ßßßß
           car_rental: ßßß²ß¬ßßß¬ ßßß¬ßßßß¬ ß¦ßß
+          car_sharing: ßßß¬ßß¬ß¡ßß¬ßßß²ßß
           car_wash: ßßß²ß¬ßßß¬ ßßß¬ ß¦ßßß
           casino: ßßßßß£ß
           childcare: ßßß²ß£ßß²ß« ß ßß¡ßßß« ß¦ßßß
@@ -585,12 +589,15 @@ nqo:
           drinking_water: ßßß« ß¡ßß²ß¬ßß
           driving_school: ßßß²ß¬ßßß¬ ßßßßß²ßß
           embassy: ßßß¬ßßß°ßß
+          fast_food: ßßß¬ß¡ßß²ß¬ ßßßßß²
+          ferry_terminal: ßßß°ßß ßßß²ß¬ß¦ßß
           fire_station: ßßß« ßßßßß ßßß¬
           fountain: ßßß²ß¬ßß
-          fuel: ßßß¬ß£ßß²ß¬ßß
+          fuel: ßßß¬ß£ßß²ß¬ßß ßßßß
           gambling: ß£ßß²ß¬ßßß¬ß¡ßß²ß¬ß£ßß²ßßß¡ßß²
           grave_yard: ßßßßßßß
           hospital: ßßß²ßßßß
+          hunting_stand: ßßß¬ ßßß¬ ßßß²
           ice_cream: ß£ßß£ßßßß
           internet_cafe: ßßßßßß« ßßßß
           kindergarten: ßß¡ßßßßß« ßßßßß²ßß
@@ -628,6 +635,7 @@ nqo:
           toilets: ß¢ßß²ß®
           townhall: ßßßßß¯ßß
           university: ßßß¯ßßß
+          vending_machine: ßßß°ßßß¬ßßß¬ ßßßßß
           veterinary: ßßß¦ßß²ßßß²ßßß ßßß¬ßßßß¬ßß
           village_hall: ßßß¯ßß ßßßßß¯ßßß«
           waste_basket: ß¢ß¡ßß¬ßßß¬ßßß²
@@ -637,6 +645,7 @@ nqo:
           weighbridge: ßßßßß²ßßß« ßßß²
         boundary:
           administrative: ßßßßß²ß« ßßß²ß¬ß ßß¬ßßß°ßßß¬ßß
+          political: ßßß¥ßß²ßßß ßßßßß²
           protected_area: ß¦ßßß« ßßßßß²ßßß£ßß²
           "yes": ßßßßß²
         bridge:
@@ -648,18 +657,28 @@ nqo:
           commercial: ßßß¬ßß¦ß ßßß²
           construction: ßßß² ß¡ßß² ß¦ßß« ßßß¬ßß ßßßßßß«
           farm: ßß£ßß¬ßßß¬ ßß
+          garage: ßßß¬ßßß²ß¬ßß
+          garages: ßßß¬ßßß²ß¬ßß
+          greenhouse: ß¥ßßßßßß¡ß
           hangar: ßßß
           hospital: ßßß²ßßßß ßßß²
           hotel: ßßß¬ß¦ßß¬ßßß²
           house: ßß
+          houseboat: ßßß²ßßß²
+          hut: ßßß­ (ßßß²ß¬ßß\ßßß®)
           industrial: ßßß²ßßß² ßßß²
           kindergarten: ßßß£ßß²ß« ßßßßßßß« ßßßßß²ßß
           manufacture: ßßß²ßßß²
           office: ßßßßßß« ßßß²
           public: ßßßß¬ßßß¬ ßßß²
           residential: ß¡ßß¬ßßß¬ß¦ßßß¬ ßßß²
+          retail: ß£ßß°ßßßß ß¡ß£ßß¬ßßß²
+          roof: ßßßß
+          ruins: ßßß²ß« ßßß
           school: ßßß¬ßßß²ß¬ßß
+          train_station: ßßß¬ßßß¬ßßßßß² ßßß¬ßßß¬ßßß« ßßß²
           university: ßßß¯ßßß ßßß²
+          warehouse: ß¡ß£ßß¬ßßß²
         craft:
           electrician: ß¢ßß¡ßß¦ßß
           electronics_repair: ß¢ßß¡ßß« ßßßßß²ß« ß¦ßß
@@ -679,7 +698,9 @@ nqo:
           construction: ßßß²ß¬ßß ß¡ßß² ßß ß¦ß´ß ßßß«
           living_street: ßßßß£ßß« ßßßß
           motorway: ßßß²ß¬ßß
+          passing_place: ßßß¬ß¡ßß²ß¬ ß¦ßßß
           path: ßßßß
+          pedestrian: ßßß²ß¬ß¡ßß¬ ßßßß
           primary: ßßßß ßßßßßßß
           primary_link: ßßßß ßßß²ß¬ßßß
           proposed: ßßßßß« ßßßßßßß£ßß²
@@ -692,7 +713,10 @@ nqo:
           service: ßßßßß« ßßßß
           speed_camera: ßßßßß¦ß ßßß¬ßßß²ß¬ßßß²
           steps: ßßß²ß¬ßßß¬ßßß²ßß
+          stop: ßßß¬ßßß¬ ßßß
           street_lamp: ßßß²ß¬ßßß¬ßßß²ß¬ ß¡ßßßßß
+          traffic_signals: ßßßß ßßß°ß£ßß¬ß¦ßßß« ßßß¯ßßß¦ß
+          trailhead: ß¥ßßß¬ ß¦ßß
           unclassified: ßßßßß« ßßßßßß°ßßßß
           "yes": ßßßß
         historic:
@@ -704,10 +728,13 @@ nqo:
           building: ßßß²ß« ßßßßßß
           castle: ßßß²ß¬ßßß²
           church: ßßß¬ßßß¬ßßß²
+          heritage: ßßß¦ßß \ ßßßß¬ßßß¬ßßß®
           house: ßß
           mine: ßßß¬ß¡ßß²
           monument: ßßßßß
           railway: ß£ßß°ßßßß ßßßß¬ß¡ß
+          ruins: ßßß²ßßß²
+          rune_stone: ßßß²ßßß²ß« ßßß
           stone: ßßß
           tomb: ßßß¬ßß
           tower: ßßß²ßßß²
@@ -716,7 +743,14 @@ nqo:
           "yes": ßßß²ß¬ßß
         landuse:
           cemetery: ßßß¬ßßß¬ßß
+          commercial: ßßß¬ß¥ß ßßß²ß¬ßßßß
+          conservation: ß¦ßßß« ßßßßß£ßß² \ ßßß¡ßßß¬ß£ßß²
+          construction: ßßß¬ßßß¬ ßßßßß²
+          farmland: ßß£ßß¬ßßß¬ ßßßßß² \ ßßß¬ßß
+          farmyard: ßßß¬ßß \ ßßß \ ß¥ßß«ßß
           forest: ßß
+          garages: ßßß¬ßßß²ß¬ßß
+          grass: ßßß² \ ßßß¥ßßß
           industrial: ßßß²ß°ß¦ßß¬ßß ßßß²ß¬ßßßßß²
           military: ß£ßß²ß¬ßßß° ßßß²ßßßßß²
           mine: ßßß¬ß¡ßß²
@@ -764,7 +798,10 @@ nqo:
           peninsula: ßßß²ß¡ßß£ßß²
           point: ßßß²ßß
           sand: ßßß¬ß¢ß
+          stone: ßßß
+          strait: ßßß
           tree: ß¦ßßßß
+          tree_row: ß¦ßßß« ßßß
           valley: ßßß²ßßß²
           volcano: ßßßßß
           water: ßß
@@ -811,8 +848,11 @@ nqo:
           construction: ß£ßß°ßßßß ß¡ßß² ß¦ßß« ßßß²ß« ßßß¬ß£ßß² ß ßß¬ ßßßß«
           halt: ßßß¬ßßß¬ßßßßß² ßßß¬ß¦ßß
           junction: ß£ßß°ßßßß ßßß²ß¬ßß
+          light_rail: ß£ßß°ßßß¬ßßß« ß¡ßß²ßßß²
+          miniature: ß£ßß°ßßß¬ßßß« ß¡ßßßß²
           preserved: ß£ßß°ßßß¬ßßß¬ ßßßßß²ßßß£ßß²
           proposed: ß£ßß°ßßßß ßßß¬ßßß¬ßßß¬ßßß°ß£ßß²
+          rail: ß£ßß°ßßßß
           spur: ßßß¬ßßß¬ßßßßß² ßßß¬ß¦ßß
           station: ß£ßß°ßßßß ßßß¬ßßß®
           stop: ßßß¬ßßß¬ßßßßß² ßßß¬ß¦ßß
@@ -867,6 +907,7 @@ nqo:
           music: ßßß²ß¬ßßß ßßß²ßßß²
           musical_instrument: ßßß²ß¬ßßßß¬ßßß¬ ß¡ßßßß² ß ßß¬
           nutrition_supplements: ßßß¬ß¡ßß²ß¬ ß¡ßß¬ßßß¬ßß ßßß«
+          paint: ßßßßß²ßßß« ßßß²ßßß²
           pet: ßßß¦ßß² ß ßß¬ ßßß« ßßß²ßßß²
           pet_grooming: ßßßß£ßß« ßßß¦ßß² ß ßß¬ ßßß²ßßß« ß¦ßßß
           photo: ßßß¬ß¦ßß¬ßßßßß² ßßß²ßßß²
@@ -1069,7 +1110,6 @@ nqo:
     gpx_failure:
       hi: '%{to_user} ß£ßß« ßßß¬ß¡ßß¬'
       failed_to_import: 'ßßß¬ßß£ßß¬ßßß¬ ßßßßß²ß£ßß². ßßß¬ßßß²ß¬ßß ß¦ßß« ß¦ßß²ß¬:'
-      import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures
       subject: '[ßßßß²ßßßßßßßß¡ßß] GPX ßßßß£ßßß ßßßß« ßßßßß²ß«'
     gpx_success:
       hi: ß ß£ßß« ßßß¬ß¡ßß« %{to_user}
@@ -1432,11 +1472,9 @@ nqo:
         url: /welcome
         title: ß ß£ßß« ßß£ßß« ßßßß²ß« ßßßßßß ß¡ßß ßßß²ß¬ß¹
       beginners_guide:
-        url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
         title: ßßß¡ßß£ßßßßß ßßß¬ ß¢ßß¡ßßß
         description: ßßß¬ßß ß¦ßß« ß¢ßß¡ßßß ßßß« ßßßßß²ß¬ ß ßß« ßßß¡ßß£ßßßßß ßßß¬ ß¦ßß«.
       help:
-        url: https://help.openstreetmap.org/
         title: ßßß¬ß¡ßß²ß¬ß ßß² ßßß¯ßßßß
         description: ß¢ßß¬ß£ßß²ß¬ßßß¬ßß ßßß« ßßß« ß¤ßß¡ßß²ßßß« ßßß¬ ßßß¬ßß ßßß« ßßß« ß¡ßßßßß« ßßßß²ßßßßßßßß¡ßß
           ß¢ßß¬ß£ßß²ß¬ßßß¬ßß-ß£ß´ßß¬-ßßß¬ßß ßßß¦ßß ßßß²ß¬.
@@ -1445,12 +1483,12 @@ nqo:
       forums:
         title: ßßß¯ßßßß
       welcomemat:
-        url: https://welcome.openstreetmap.org/
         title: ßßß²ß¬ßßß²ß¬ßß ß¢ßß«
       wiki:
-        url: https://wiki.openstreetmap.org/
         title: ßßßß²ßßßßßßßß¡ßß ß¥ßß
         description: ß¥ßß ßßß²ß¯ßßß« ßßßß²ßßßßßßßß¡ßß ßßß¬ßßßß¬ß¦ßß¬ßßß¬ ßßßßß²ß°ß§ßß¬ß£ßß²ß¬ ßßß« ßßß«
+    any_questions:
+      title: ß¢ßß¬ß£ßß²ß¬ßßß¬ßßß¬ ßßß«Ø
     sidebar:
       search_results: ßßßßß ßßß¬ ß¢ßß£ßß²ß«
       close: ßß¬ ßßßßß²ß¯
@@ -1506,8 +1544,6 @@ nqo:
       title: ßßßß« ß£ßß« ßß£ßß«ß¹
       whats_on_the_map:
         title: ß¡ßß²ß¬ ß ßß¬ ß¦ßß« ß¡ßß ßßß²ß¬
-      questions:
-        title: ß¢ßß¬ß£ßß²ß¬ßßß¬ßßß¬ ßßß«Ø
       start_mapping: ßßß¬ßßßß¬ß¦ßß¬ßß ßßß¡ßß¬ß£ßß«
       add_a_note:
         title: ß¡ßß¬ß¦ßßß¬ß¡ßß²ß¬ß ßß² ßßß¬ß¡ßß¬ ßß´ß¦ßß²ß¬Ø ß¦ßßß£ß ßßß« ßßßß¬ß¹
@@ -1515,7 +1551,6 @@ nqo:
     new:
       upload_trace: GPS ßßß¬ßß ßßßßßß¦ßß«
       visibility_help: ß£ßß²ß¬ ßßß ß¦ßß« ß¡ßß²ß¬ ßßß«Ø
-      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: ßßß¬ß¡ßß²ß¬ß ßß²
       help_url: https://wiki.openstreetmap.org/ß¥ßß/ßßß¬ß¦ßßß¬ßß
     create:
@@ -1566,13 +1601,10 @@ nqo:
       in: ßßß«
     index:
       public_traces: ßßßßß« GPS ßßß¬ßß ßßß¬
-      my_traces: ß ßßß²ß¬ßßß² ß ßß¬
       public_traces_from: ßßßßß« ßßß ßßß¬ ßßß¬ ßßßß« %{user} ßßß«
-      empty_html: ßßß¦ßß¬ ßßß« ß¦ßß²ß¬ ß¡ßß£ßß²ß¬. <a href='%{upload_link}'>ßßßß¬ ßßßßß« ßßß¦ßßß¬</a>ß¥ßßß«
-        ßßß« ßßßß« ßßß« ßßßßß¬ßßß² ßßß¬ ßßß²ß¬ GPS ßßßß¬ßßß¬ßß ß¡ßß¬ <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>ß¥ßßß«
-        ßßßß</a> ßßß²ß¬.
       upload_trace: ßßß¬ßß ßßß« ßßß¦ßßß¬
       all_traces: ßßß¬ßß ßßß¬ ßßß¯
+      my_traces: ß ßßß²ß¬ßßß² ß ßß¬
       traces_from: ßßßßß« ßßß ßßß¬ ßßß¬ ßßßß« %{user} ßßß«
     destroy:
       scheduled_for_deletion: ßßß¬ßß ßßß¯ßßßß ßßß°ßßß¬ ßßß²ß¡ßß¬
@@ -1728,7 +1760,6 @@ nqo:
         ßßß« ßßßß« ßßßßß¬ßßß²ß¬ßß</a> ß£ßß« <a href="%{translations}">ßßß²ß¬ß ßß¬ßßß£ßß² ßßßß¡ßßßßß</a>
         ßßß« ßßß«'
       continue: ßß¬ ßßßßß²ß«
-      declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
       legale_select: 'ß ßßß°ß£ßß²ß¬ ß¦ßß« ßß¡ßß¬ß£ß ß¡ßß² ßßß«:'
       legale_names:
         france: ßßß¬ßßß²ß¬ßßß«
@@ -1739,7 +1770,6 @@ nqo:
         ßßßß ßßßßß ßßß¡ßß¬ß£ßß« ßßß«. ßß´ß ßßß« ßßß²ß¬ß ßß¬ßßß¬ß£ßß²ß« ßßß¦ßß¡ßß²ß« ßß ßßß«ß¸ %{terms_declined_link}
         ßßßßß« ßßß°ß£ßß²ß«.
       terms_declined_link: ß¥ßßß« ßßßß ß£ßß²ß¬
-      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
     no_such_user:
       title: ßßß¬ßßß°ßßß¬ßßß« ßßß® ßß¬ ßßß« ß¦ßß²ß¬
       heading: ßßß¬ßßß°ßßß¬ßß %{user} ßßß« ß¦ßß²ß¬
@@ -1797,6 +1827,11 @@ nqo:
       support: ßßß¬ß¡ßß²ß¬ß ßß²
     auth_failure:
       unknown_error: ßßß¬ß¡ßß¬ß¢ßß²ß°ß¦ß ßßßß« ßßßßß²ß«
+  user_role:
+    grant:
+      confirm: ßß¬ ßßßßßß¦ßß«
+    revoke:
+      confirm: ßß¬ ßßßßßß¦ßß«
   user_blocks:
     helper:
       time_future_html: ßßß« ßßß²ß« %{time} ßßß«.
@@ -1825,6 +1860,32 @@ nqo:
       description: ßßß²ß¬ßßßßß
       created_at: ßßß²ßßß£ßß²ß« ß¦ßß«
       last_changed: ßßß¯ßßß« ß¡ßß¦ßßß¡ßß²ß ßß²
+    show:
+      title: 'ß¦ßßß£ß: %{id}'
+      description: ßßß¯ßßßßß
+      open_title: ß¦ßßß£ßß« ß¢ßßßßßßß %{note_name}
+      closed_title: ß¦ßßß£ßß« ß¢ßßßß£ßß² %{note_name}
+      hidden_title: ß¦ßßß£ßß« ß¢ß¡ßßßß²ß°ß£ßß² %{note_name}
+      opened_by_html: ßß¬ ßßß²ßßß£ßß²ß« ß¦ßß« %{user}<abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
+        ßßß¬ ßßßß«
+      opened_by_anonymous_html: ßß¬ ßßß²ßßß£ßß²ß« ß¦ßß« ßßß¯ßßßß² ß ßß¬ ßßß« ßßßß« <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: ß¡ßßß£ßß² ßßß¬ ßßßß« %{user} <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
+      commented_by_anonymous_html: ß¡ßßß£ßß² ßßß¬ ßßßß« ßßß¯ßßßß² <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
+        ßßß«
+      closed_by_html: ßß¬ ß¢ßßßß£ßß²ß« ß¦ßß« %{user} <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
+        ßßßß«
+      closed_by_anonymous_html: ßß¬ ß¢ßßßß£ßß²ß« ß¦ßß« ßßß¯ßßßß² <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
+        ßßß¬ ßßßß«
+      reopened_by_html: ßß¬ ßßßßß£ßß²ß£ßß²ß« ßßß²ß¯ %{user} ßßß¬ ßßßß« <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
+      reopened_by_anonymous_html: ßß¬ ßßßßß£ßß²ß£ßß²ß« ß¦ßß« ßßß¯ßßßß² ß ßß¬ ßßßß« <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
+      hidden_by_html: ßß¬ ß¢ß¡ßßßß²ß°ß£ßß²ß¬ ß¦ßß« %{user} ßßß¬ ßßßß« <abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
+      report: ß¦ßßß£ß ß£ßß²ß¬ ß ßßßßßß«
+      hide: ßß¬ ß¢ß¡ßßßß²ß°
+      resolve: ßß¬ ß¢ßßßß«
+      reactivate: ßß¬ ßßßßß£ßß²ß«
+    new:
+      title: ß¦ßßß£ßß« ßßßßß«
+      add: ß¦ßßß£ß ßßßß¬
   javascripts:
     close: ßß¬ ßßßßß²ß¯
     share:
@@ -1834,12 +1895,22 @@ nqo:
       link: ßßßß¬ßßß² ß¥ßßß« HTML
       long_link: ßßßß¬ßßß²
       short_link: ßßßß¬ßßß²ß« ßßßßß²
+      geo_uri: ßßß°ß¡ URL
+      embed: HTML
+      format: 'ßßßß¡ßß²:'
+      download: ßßß¬ßßß°ßß¬ßßß²ß¬ß ßß²
+      short_url: URL ßßßßß²
+      center_marker: ßßß¬ßßß ßßß²ßßß²ßßß« ß£ßß¬ß£ßß¬ßßß² ß ßß«
+      view_larger_map: ßßß¬ßßßß¬ ßßß¥ßßß¬ß£ßß² ß¦ßß«
     map:
       zoom:
         in: ßßµßß¬ ß¡ßßßß¬ß¡ßß²ß«
         out: ßß¬ ß¡ßßßß«
       locate:
         title: ß ßßß²ß¬ßßßß ß¦ßß¬ßßß¬
+      base:
+        standard: ßßß¡ßß²ßßß²ßß
+        transport_map: ß¡ßß¬ßßß¬ß£ßß²ß¬ß ßß² ßßß¬ßßß
       layers:
         notes: ß¡ßß ß¦ßßß£ß ßßß¬
         data: ßßß¬ßßß ßßß²ßß
@@ -1861,6 +1932,13 @@ nqo:
         hide_comment: ßß¬ ß¢ß¡ßßßß²ß°
         unhide_comment: ßß¬ ßßß²ßß£ßß¡ß¦ßß«
     directions:
+      engines:
+        fossgis_osrm_bike: ß£ßß°ßß (OSRM)
+        fossgis_osrm_car: ßßß²ß¬ßß (OSRM)
+        fossgis_osrm_foot: ßßß²ß¬ß¡ßß¬ßß (OSRM)
+        graphhopper_bicycle: ß£ßß°ßß (GraphHopper)
+        graphhopper_car: ßßß²ß¬ßß (GraphHopper)
+        graphhopper_foot: ßßß²ß¬ß¡ßß¬ßß (GraphHopper)
       directions: ßßß²ß¬ßßßßß²
       distance: ßßß¬ß£ßß²
       errors:
@@ -1874,8 +1952,10 @@ nqo:
         uturn_without_exit: ß ß¡ßßßß²ßßß« ßßµß ßßßßß¬ß¦ßß« %{name} ß¡ßß¬
         sharp_left_without_exit: ßß¬ ßßßß¡ßß²ß« ß£ßß¡ßß² ßßß¬ %{name} ßßß«
         turn_left_without_exit: ßß¬ ßßßß¡ßß²ß« ß£ßß¡ßß² ßßß¬ %{name} ßßß«
+        follow_without_exit: '%{name} ßßßßß¬ßßß¬'
         start_without_exit: ßß¬ ßßß¡ßß¬ß£ßß¬ %{name} ß¡ßß¬
         destination_without_exit: ßßß¯ß¦ßß ßßßßß¬ßßß²ß¬
+        unnamed: ßßßßß« ßßß¯ßßßß²
         exit_counts:
           first: ßß­
           second: ßß²