Remove accidental commit

[rails.git] / config / locales / nqo.yml

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index cbb72bc97659a1c06b18ad93d21138f5aa77b18f..5b4e0e9ebc62e099f5dcd4fdc81c80ad43852142 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -18,7 +18,7 @@ nqo:
       prompt: ߞߐߕߐ߮ ߛߎߥߊ߲ߘߟߌ
     submit:
       diary_comment:
-        create: ß\8a߬ ß\9fß\8aß\9eß\8e߲߬ß\98ß\8e߬
+        create: ß¡ß\99ß\8cߣß\8aß²
       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 ߟߊߞߎ߲߬ߛߌ߲߬ߠߌ߲
@@ -238,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: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߞߌ߬ߓߊ߬ߙߏ߬ߦߊ ߓߘߊ߫ ߟߊߞߎߘߦߊ߫ ߞߏߟߌߞߏߟߌ߫. ߌ ߟߊ߫
         ߢߎߡߍߙߋ߲ߞߏ߲ߘߏ ߡߊߝߟߍ߫ ߦߟߌߣߐ߫ ߞߏ ߘߐ߫ ߞߵߌ ߟߊ߫ ߢߎߡߍߙߋ߲ߞߏ߲ߘߏ ߟߊߛߙߋߦߊ߫.
@@ -345,6 +344,9 @@ nqo:
         changeset: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲
         note: ߘߐ߬ߞߌߛߍ
     redacted:
+      redaction: ߥߣߊ߬ߙߌ߬ߣߍ߲ %{id}
+      message_html: ߦߌߟߡߊ %{version} ߣߌ߲߬ %{type} ߕߍ߫ ߛߐ߲߬ ߦߌ߬ߘߊ߬ ߟߊ߫ ߓߊߏ߬ ߊ߬ ߥߣߊ߬ߙߌ߬ߣߍ߲߫
+        ߠߋ߬. %{redaction_link} ߦߋ߫ ߖߊ߰ߣߌ߲߫ ߝߊߙߊ߲ߝߊ߯ߛߌ߫ ߞߏ ߘߐ߫.
       type:
         node: ߥߎߙߋ߲ߛߋ߲
         way: ߛߌߟߊ
@@ -362,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: ߡߊߔ ߛߐ߲߬ߞߌ߲߫ ߞߊ߬ ߌ ߡߊߛߘߎ߬ߧߊ߬ ߟߊߓߊ߯ߙߊߟߌ ߟߎ߫ ߢߌߣߌ߲߫.
@@ -406,6 +388,7 @@ nqo:
     index:
       title: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߠߎ߬ ߡߊߝߊ߬ߟߋ߲߫
       title_user: '%{user} ߓߘߊ߫ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫'
+      title_user_link_html: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߫ ߞߙߎ %{user_link} ߓߟߏ߫
       title_friend: ߒ ߕߋߙߌ ߓߘߊ߫ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
       title_nearby: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߡߍ߲ ߟߊߘߏ߲߬ߣߍ߲߫ ߛߌ߬ߢߐ߲߰ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߎ߬ ߓߟߏ߫
       empty: ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲߬ ߡߊ߫ ߛߐ߬ߘߐ߲߫
@@ -519,6 +502,15 @@ nqo:
       applications:
         create:
           notice: ߟߥߊ߬ߟߌ߬ߟߌ ߓߘߊ߫ ߟߊߞߎ߲߬ߘߎ߫
+  errors:
+    contact:
+      contact: ߛߊ߲߬ߓߊ߬ߕߐ߮
+    forbidden:
+      title: ߟߊߕߐ߲ߣߍ߲߫
+    internal_server_error:
+      title: ߟߥߊ߬ߟߌ߬ߟߌ ߝߎ߬ߕߎ߲߬ߕߌ
+    not_found:
+      title: ߞߐߕߐ߮ ߡߊ߬ ߛߐ߬ߘߐ߲߬
   friendships:
     make_friend:
       heading: ' ߞߊ߬ %{user} ߞߍ߫ ߌ ߕߋߙߌ ߘߌ߫؟'
@@ -537,14 +529,10 @@ 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:
@@ -554,12 +542,13 @@ nqo:
           gondola: ߖߟߎ߬ߞߎߟߎ߲
           magic_carpet: ߘߎ߰ߓߍ߲߬ ߞߘߎߞߘߎߟߊ
           platter: ߕߊ߬ߢߍ߲ߞߍߘߍ߲
+          pylon: ߟߐ߲
           station: ߘߎ߲ߞߎߟߎ߲ ߟߐ߬ߘߊ߮
           "yes": ߛߊ߲ߡߊ߫ ߛߌߟߊ (ߘߎ߲ߞߎߟߎ߲)
         aeroway:
           aerodrome: ߛߊ߲ߡߊߞߎߟߎ߲߫ ߜߘߋ
           airstrip: ߖߌ߰ߟߌ߬ ߜߘߋ (ߛߊ߲ߡߊߞߎߟߎ߲)
-          gate: ߘߏ߲߬ߘߊ
+          gate: ß\9bß\8a߲ߡß\8aß\98ß\8aß² ß\98ß\8f߲߬ß\98ß\8a
           hangar: ߜߕߊ
           helipad: ߛߊ߲ߡߊߘߊ߲
           holding_position: ߛߊ߲ߡߊߘߊ߲߫ ߦߙߐ
@@ -600,6 +589,7 @@ nqo:
           drinking_water: ߖߌ߫ ߡߌ߲߬ߕߊ
           driving_school: ߞߐ߲߬ߛߏ߬ ߞߊߙߊ߲ߕߊ
           embassy: ߟߊ߬ߛߌ߰ߘߊ
+          fast_food: ߛߎ߬ߡߊ߲߬ ߞߊߟߌ߲
           ferry_terminal: ߝߋ߰ߙߌ ߘߊ߲߬ߦߙߐ
           fire_station: ߕߊ߫ ߟߊߛߟߊ ߟߎ߬
           fountain: ߕߋ߲߬ߞߋ
@@ -607,6 +597,7 @@ nqo:
           gambling: ߣߊ߲߬ߞߊ߬ߡߎ߲߬ߣߊ߲ߞߊߡߎ߲
           grave_yard: ߞߊߓߙߎߟߏ
           hospital: ߘߊ߲ߘߊߛߏ
+          hunting_stand: ߟߐ߬ ߞߊ߬ ߓߏ߲
           ice_cream: ߣߍߣߍߞߓߊ
           internet_cafe: ߓߟߐߟߐ߫ ߞߊߝߋ
           kindergarten: ߘߡߊߞߟߏ߫ ߞߊߙߊ߲ߕߊ
@@ -654,6 +645,7 @@ nqo:
           weighbridge: ߖߌߘߊ߲ߕߊ߫ ߛߍ߲
         boundary:
           administrative: ߓߐߕߏ߲߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ߬ߞߊ
+          political: ߛߎߥߊ߲ߘߟߌ ߓߐߕߏ߲
           protected_area: ߦߙߐ߫ ߟߊߞߊ߲ߘߊߣߍ߲
           "yes": ߓߐߕߏ߲
         bridge:
@@ -684,7 +676,9 @@ nqo:
           roof: ߕߌߓߊ
           ruins: ߓߏ߲߫ ߜߘߊ
           school: ߞߊ߬ߙߊ߲߬ߕߊ
+          train_station: ߛߌ߬ߛߌ߬ߞߎߟߎ߲ ߟߐ߬ߘߊ߬ߟߊ߫ ߓߏ߲
           university: ߖߊ߯ߓߘߊ ߓߏ߲
+          warehouse: ߡߣߐ߬ߓߏ߲
         craft:
           electrician: ߢߎߡߍߦߟߊ
           electronics_repair: ߢߎߡߍ߫ ߘߐߓߍ߲߫ ߦߙߐ
@@ -704,7 +698,9 @@ nqo:
           construction: ߝߏ߲߬ߘߏ ߡߍ߲ ߓߐ ߦߴߌ ߘߐ߫
           living_street: ߛߏߞߣߐ߫ ߛߌߟߊ
           motorway: ߝߏ߲߬ߘߏ
+          passing_place: ߕߊ߬ߡߌ߲߬ ߦߌߟߊ
           path: ߛߌߟߊ
+          pedestrian: ߛߋ߲߬ߡߊ߬ ߛߌߟߊ
           primary: ߛߌߟߊ ߓߊߖߎߟߞߊ
           primary_link: ߛߌߟߊ ߞߎ߲߬ߝߟߐ
           proposed: ߛߌߟߊ߫ ߟߊߞߏߝߐߣߍ߲
@@ -717,7 +713,10 @@ nqo:
           service: ߗߋߘߊ߫ ߛߌߟߊ
           speed_camera: ߞߊߟߌߦߊ ߖߊ߬ߛߏ߲߬ߟߊ߲
           steps: ߛߊ߲߬ߞߊ߬ߛߊ߲ߞߊ
+          stop: ߟߐ߬ߟߌ߬ ߛߙߋ
           street_lamp: ߝߏ߲߬ߘߏ߬ߞߊ߲߬ ߡߟߍߞߘߍ
+          traffic_signals: ߛߌߟߊ ߖߌ߰ߣߌ߬ߦߟߍ߫ ߞߐ߯ߙߍߦߊ
+          trailhead: ߥߟߌ߬ ߦߙߐ
           unclassified: ߛߌߟߊ߫ ߛߙߊߛߌ߰ߓߊߟߌ
           "yes": ߛߌߟߊ
         historic:
@@ -729,10 +728,13 @@ nqo:
           building: ߓߏ߲߫ ߞߘߐߞߘߐ
           castle: ߖߌ߲߬ߓߏ߲
           church: ߓߊ߬ߕߏ߬ߓߏ߲
+          heritage: ߞߍߦߙߐ \ ߝߘߏ߬ߓߊ߬ߗߍ߮
           house: ߟߎ
           mine: ߘߊ߬ߡߊ߲
           monument: ߝߙߎߕߎ
           railway: ߣߍ߰ߛߌߟߊ ߘߝߐ߬ߡߊ
+          ruins: ߕߏ߲ߓߏ߲
+          rune_stone: ߕߏ߲ߓߏ߲߫ ߞߓߊ
           stone: ߞߓߊ
           tomb: ߛߊ߬ߙߌ
           tower: ߛߊ߲ߓߏ߲
@@ -741,7 +743,14 @@ nqo:
           "yes": ߓߍ߲߬ߕߍ
         landuse:
           cemetery: ߛߊ߬ߙߌ߬ߟߏ
+          commercial: ߖߊ߬ߥߏ ߘߌ߲߬ߞߌߙߊ
+          conservation: ߦߙߐ߫ ߟߊߕߏߣߍ߲ \ ߟߊߡߙߊ߬ߣߍ߲
+          construction: ߟߐ߬ߟߌ߬ ߘߊߞߎ߲
+          farmland: ߛߣߍ߬ߞߍ߬ ߘߊߞߎ߲ \ ߝߏ߬ߘߏ
+          farmyard: ߝߏ߬ߘߏ \ ߖߛߊ \ ߥߍ߫ߙߍ
           forest: ߕߎ
+          garages: ߘߐ߬ߓߍ߲߬ߘߊ
+          grass: ߓߌ߲ \ ߖߍߥߎߟߍ
           industrial: ߘߍ߲߰ߦߊ߬ߟߌ ߕߌ߲߬ߞߎߘߎ߲
           military: ߣߊ߲߬ߕߌ߰ ߕߌ߲ߞߎߘߎ߲
           mine: ߘߊ߬ߡߊ߲
@@ -1101,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}
@@ -1464,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: ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ ߘߏ߫ ߞߍ߫ ߤߊߡߊ߲ߕߍ߫ ߞߊ߬ ߖߋ߬ߓߌ ߘߏ߫ ߟߎ߫ ߡߊߝߟߍ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ
           ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ-ߣߴߊ߬-ߖߋ߬ߓߌ ߞߍߦߙߐ ߞߊ߲߬.
@@ -1477,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: ߊ߬ ߘߊߕߎ߲߯
@@ -1538,8 +1544,6 @@ nqo:
       title: ߊߟߎ߫ ߣߌ߫ ߛߣߍ߫߹
       whats_on_the_map:
         title: ߡߎ߲߬ ߠߋ߬ ߦߋ߫ ߡߊߔ ߞߊ߲߬
-      questions:
-        title: ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ߬ ߛߌ߫؟
       start_mapping: ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߌ ߘߊߡߌ߬ߣߊ߫
       add_a_note:
         title: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߕߎ߬ߡߊ߬ ߕߴߦߋ߲߬؟ ߦߟߌߣߐ ߘߏ߫ ߝߙߊ߬߹
@@ -1547,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:
@@ -1599,9 +1602,6 @@ nqo:
     index:
       public_traces: ߜߍߘߐ߫ GPS ߜߋ߬ߙߋ ߟߎ߬
       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: ߒ ߝߏ߲߬ߝߏ߲ ߠߎ߬
@@ -1760,7 +1760,6 @@ nqo:
         ߟߊ߫ ߛߟߊ߫ ߘߐߞߊ߬ߙߊ߲߬ߕߊ</a> ߣߌ߫ <a href="%{translations}">ߞߎ߲߬ߠߊ߬ߝߏߣߌ߲ ߘߟߊߡߌߘߊߟߌ</a>
         ߘߏ߫ ߟߎ߫'
       continue: ߊ߬ ߘߊߓߊ߲߫
-      declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
       legale_select: 'ߌ ߛߌ߰ߣߍ߲߬ ߦߋ߫ ߖߡߊ߬ߣߊ ߡߍ߲ ߘߐ߫:'
       legale_names:
         france: ߝߊ߬ߙߊ߲߬ߛߌ߫
@@ -1771,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} ߕߍ߫ ߦߋ߲߬
@@ -1862,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:
@@ -1907,13 +1931,6 @@ nqo:
         unsubscribe: ߊ߬ ߡߊߝߘߎߣߍ߲ ߓߐ߫
         hide_comment: ߊ߬ ߢߡߊߘߏ߲߰
         unhide_comment: ߊ߬ ߟߊ߲ߞߣߍߡߦߊ߫
-    notes:
-      new:
-        add: ߦߟߌߣߐ ߝߙߊ߬
-      show:
-        hide: ߊ߬ ߢߡߊߘߏ߲߰
-        resolve: ߊ߬ ߢߊߓߐ߫
-        reactivate: ߊ߬ ߟߊߞߎߣߎ߲߫
     directions:
       engines:
         fossgis_osrm_bike: ߣߍ߰ߛߏ (OSRM)