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

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

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 7e906c597f3d6fc9f2d4c1619a2733c7dbc50f8e..7d7e099005da80a7cc561df415127999d67b363b 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -42,10 +42,6 @@ nqo:
         create: ߘߏߙߊ ߘߏ߫ ߛߌ߲ߘߌ߫
         update: ߘߏߙߊ ߘߏ߫ ߟߊߦߟߍ߬
   activerecord:
-    errors:
-      messages:
-        invalid_email_address: ߊ߬ ߡߊ߫ ߓߐ߫ ߦߏ߫ ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߓߍ߲߬ߣߍ߲ ߠߋ߬
-        email_address_not_routable: ߊ߬ ߕߍ߫ ߛߙߊ߬ߕߊ߫ ߘߌ߫
     models:
       acl: ߞߣߐ߬ߜߍ߲߬ ߛߙߍߘߍ ߟߊߛߐ߬ߘߐ߲߫
       changeset: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
@@ -306,7 +302,6 @@ nqo:
         way: ߛߌߟߊ
         relation: ߕߍߓߊ߯ߦߊ
     containing_relation:
-      entry_html: ߕߍߓߊ߯ߦߊ %{relation_name}
       entry_role_html: ߕߍߓߊ߯ߦߊ %{relation_role} %{relation_name} ߘߌ߫
     not_found:
       title: ߡߊ߫ ߛߐ߬ߘߐ߲߫
@@ -354,21 +349,23 @@ nqo:
       introduction: ߡߊߔ ߛߐ߲߬ߞߌ߲߫ ߞߊ߬ ߌ ߡߊߛߘߎ߬ߧߊ߬ ߟߊߓߊ߯ߙߊߟߌ ߟߎ߫ ߢߌߣߌ߲߫.
       nearby: ߕߙߐ߬ߝߍ߬ ߟߊߓߊ߯ߙߊߟߌ
       enclosing: ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ߫ ߡߊߛߎ߬ߘߎ߲߬ߧߊ߬ߣߍ߲ ߠߎ߬
+  changeset_comments:
+    feeds:
+      comment:
+        comment: ߞߊ߲߬ߞߎ߬ߡߊ߬ ߞߎߘߊ߫ ߦߋ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ %{changeset_id}
+          %{author} ߓߟߏ߫
+        commented_at_by_html: ߊ߬ ߟߊߘߎߘߦߊߣߍ߲߫ ߦߋ߫ %{when} ߊ߬ ߣߌ߫ %{user} ߓߟߏ߫
+      show:
+        title_all: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߫ ߞߙߎ ߘߊߘߐߖߊߥߏ
+        title_particular: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ %{changeset_id}
+          ߘߊߘߐߖߊߥߏ
+      timeout:
+        sorry: ߤߊߞߍ߬ߕߏ߫߸ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߞߊ߲߬ߞߎߡߊ ߛߙߍߘߍ ߡߍ߲ ߡߊߢߌߣߌ߲ ߦߴߌ
+          ߘߐ߫ ߌ ߓߟߏ߫߸ ߊ߬ ߓߘߊ߫ ߥߛߎ߬ ߖߊ߲߬ߓߊ ߟߋ߬ ߞߵߊ߬ ߡߊߛߐ߬ߘߐ߲ ߘߐ߫.
   changesets:
-    changeset_paging_nav:
-      showing_page: ߞߐߜߍ %{page}
-      next: ߟߊ߬ߕߎ߲߰ߠߊ»
-      previous: ߟߊ߬ߕߎ߲߰ߠߊ ߟߎ߬
     changeset:
-      anonymous: ߕߐ߯ߒߕߊ߲
       no_edits: (ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߕߴߦߋ߲߬)
       view_changeset_details: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲ ߝߊߙߊ߲ߝߊ߯ߛߟߌ ߘߐߜߍ߫
-    changesets:
-      id: ID
-      saved_at: ߊ߬ ߓߘߊ߫ ߟߊߞߎ߲߬ߘߎ߫
-      user: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ
-      comment: ߡߙߌߣߊ߲
-      area: ߦߙߐ
     index:
       title: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߠߎ߬ ߡߊߝߊ߬ߟߋ߲߫
       title_user: '%{user} ߓߘߊ߫ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫'
@@ -417,21 +414,6 @@ nqo:
     timeout:
       sorry: ߤߊߞߍ߬ߕߏ߫߸ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߛߙߍߘߍ ߡߍ߲ ߡߊߢߌߣߌ߲ ߦߴߌ ߘߐ߫ ߌ ߓߟߏ߫߸
         ߊ߬ ߓߘߊ߫ ߥߛߎ߬ ߖߊ߲߬ߓߊ ߟߋ߬ ߕߵߊ߬ ߡߊߛߐ߬ߘߐ߲ ߘߐ߫.
-  changeset_comments:
-    comment:
-      comment: ߞߊ߲߬ߞߎ߬ߡߊ߬ ߞߎߘߊ߫ ߦߋ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ %{changeset_id} %{author}
-        ߓߟߏ߫
-      commented_at_by_html: ߊ߬ ߟߊߘߎߘߦߊߣߍ߲߫ ߦߋ߫ %{when} ߊ߬ ߣߌ߫ %{user} ߓߟߏ߫
-    comments:
-      comment: ߞߊ߲߬ߞߎ߬ߡߊ߬ ߞߎߘߊ߫ ߦߋ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ %{changeset_id} ߠߊ߫
-        %{author} ߓߟߏ߫
-    index:
-      title_all: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߫ ߞߙߎ ߘߊߘߐߖߊߥߏ
-      title_particular: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ %{changeset_id}
-        ߘߊߘߐߖߊߥߏ
-    timeout:
-      sorry: ߤߊߞߍ߬ߕߏ߫߸ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߞߊ߲߬ߞߎߡߊ ߛߙߍߘߍ ߡߍ߲ ߡߊߢߌߣߌ߲ ߦߴߌ
-        ߘߐ߫ ߌ ߓߟߏ߫߸ ߊ߬ ߓߘߊ߫ ߥߛߎ߬ ߖߊ߲߬ߓߊ ߟߋ߬ ߞߵߊ߬ ߡߊߛߐ߬ߘߐ߲ ߘߐ߫.
   dashboards:
     contact:
       km away: ߞߎߘߍ %{count} ߝߏ߬ߣߊ߲ ߠߊ߫
@@ -468,8 +450,6 @@ nqo:
       no_entries: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ߣߐ߬ ߟߎ߬ ߕߴߦߋ߲߬
     page:
       recent_entries: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ߣߐ ߞߐߟߕߊ ߟߎ߬
-      older_entries: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߞߘߐ߬ߡߊ߲ ߠߎ߬
-      newer_entries: ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߞߎߘߊߟߡߊ ߟߎ߬
     edit:
       title: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߦߟߍ߬ߡߊ߲߫
       marker_text: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߘߌ߲߬ߞߌߙߊ ߟߎ߬
@@ -502,8 +482,6 @@ nqo:
       report: ߡߙߌߣߊ߲ ߣߌ߲߬ ߠߊߞߏߝߐ߫
     location:
       location: 'ߘߌ߲߬ߞߌߙߊ:'
-      view: ߦߌ߬ߘߊ߬ߟߌ
-      edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫
     feed:
       user:
         title: ߏߔߌ߲ߛߕߑߙߌߕߑߡߊߔ %{user} ߟߊ߫ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߠߎ߬
@@ -525,8 +503,6 @@ nqo:
       post: ߗߋߓߏ߲
       when: ߕߎ߬ߡߊ߫ ߖߐ߲߬
       comment: ߡߙߌߣߊ߲ߦߌߘߊ
-      newer_comments: ߡߙߌߣߊ߲ߦߌߘߊ ߞߎߘߊ ߟߎ߬
-      older_comments: ߡߙߌߣߊ߲ߦߌߘߊ ߞߘߐ߬ߡߊ߲ ߠߎ߬
   doorkeeper:
     flash:
       applications:
@@ -558,7 +534,6 @@ nqo:
   geocoder:
     search:
       title:
-        results_from_html: ߞߐߝߟߌ ߝߘߊߣߍ߲߫ ߦߋ߫ %{results_link} ߟߋ߬ ߟߊ߫
         latlon: ߞߣߐߟߊ
     search_osm_nominatim:
       prefix:
@@ -1001,9 +976,6 @@ nqo:
         level8: ߛߏ ߓߐߕߏ߲
         level9: ߕߏߘߊ ߓߐߕߏ߲
         level11: ߛߌ߰ߢߐ߲߰ߦߊ߬ ߦߙߐ ߓߐߕߏ߲
-      types:
-        towns: ߛߏ
-        places: ߘߌ߲߬ߞߌߙߊ
     results:
       no_results: ߞߐߝߟߌ߫ ߡߊ߫ ߛߐ߬ߘߐ߲߬
       more_results: ߞߐߝߟߌ߫ ߜߘߍ ߟߎ߬
@@ -1016,18 +988,17 @@ nqo:
       not_updated: ߊ߬ ߡߊ߫ ߟߏ߲ߘߐߦߊ߫
       search: ߢߌߣߌ߲ߠߌ߲
       search_guidance: ߓߐ߲ߘߊ ߘߏ߫ ߢߌߣߌ߲߫
+      states:
+        ignored: ߊ߬ ߡߊߓߌ߬ߟߊ߬ߣߍ߲߫
+        open: ߊ߬ ߟߊߞߊ߬
+        resolved: ߊ߬ ߓߘߊ߫ ߢߊߓߐ߫
+    page:
       user_not_found: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߏ߬ ߕߴߦߋ߲߬
       issues_not_found: ߒ߬ߒ߫ ߓߐ߲ߘߊ߫ ߛߎ߮ ߏ߬ ߡߊ߫ ߛߐ߬ߘߐ߲߫
       status: ߡߊ߬ߘߎ߮
       last_updated: ߟߏ߲ߘߐߦߊߟߌ ߞߐ߯ߟߕߊ
-      link_to_reports: ߞߏߝߐߟߌ߫ ߟߎ߬ ߘߐߜߍ߫
       reported_item: ߝߛߌ߬ ߟߊߞߏߝߐߣߍ߲
-      states:
-        ignored: ߊ߬ ߡߊߓߌ߬ߟߊ߬ߣߍ߲߫
-        open: ߊ߬ ߟߊߞߊ߬
-        resolved: ߊ߬ ߓߘߊ߫ ߢߊߓߐ߫
     show:
-      title: '%{status} ߝߌ߬ߛߌ #%{issue_id}'
       report_created_at_html: ߞߏߝߐߟߌ߫ ߝߟߐ ߞߍ߫ ߘߊ߫ %{datetime}
       last_resolved_at_html: ߢߊߓߐߟߌ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ %{datetime}
       last_updated_at_html: ߊ߬ ߟߊߛߋ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ ߘߊߞߎ߲ ߘߐ߫ %{datetime} ߊ߬ ߣߌ߫ %{displayname}
@@ -1087,28 +1058,18 @@ nqo:
     history: ߘߐ߬ߝߐ
     export: ߟߊ߬ߝߏ߬ߦߌ߬ߟߌ
     issues: ߓߐ߲ߘߊ ߟߎ߫
-    data: ߓߟߏߡߟߊ
-    export_data: ߓߟߏߡߟߊ ߟߊߝߏ߬ߦߌ߬
     gps_traces: GPS ߣߐ߬ߣߐ߬ߟߌ
-    gps_traces_tooltip: GPS ߜߙߋ߬ߓߐ߬ߟߌ ߘߊߘߐߓߍ߲߬
     user_diaries: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߕߋߟߋ߲ ߠߎ߬
-    user_diaries_tooltip: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߕߋ߬ߟߋ߲ ߦߋ߫
     edit_with: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫ %{editor} ߘߌ߫
-    tag_line: ߥߞߌ ߛߙߊ߬ߓߊߟߌ ߘߎߢߊ߫ ߔߊ߬ߔߘߊ
     intro_header: ߌ ߣߌ߫ ߛߣߍ߫ ߏߔߌ߲߫ ߛߕߑߙߌߕ ߡߊߔ ߞߊ߲߬߹
     intro_text: ߏߔߌ߲߫ ߛߕߑߙߌߕ ߡߊߔ ߦߋ߫ ߘߎߢߊ߫ ߔߊ߬ߔߘߊ ߟߋ߬ ߘߌ߫߸ ߡߍ߲ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ ߡߐ߱ ߟߎ߬
       ߓߟߏ߫ ߦߏ߫ ߌߟߋ߸ ߊ߬ ߟߊߓߊ߯ߙߊ ߦߋ߫ ߛߙߊ߬ߓߊߟߌ ߟߋ߬ ߘߌ߫ ߟߊ߬ߘߤߊ߬ߟߌ߫ ߘߊߦߟߍ߬ߣߍ߲ ߞߘߐ߫.
-    intro_2_create_account: ߖߊ߬ߕߋ߬ߘߊ ߘߏ߫ ߘߊߦߟߍ߬
     partners_fastly: ߝߊߛߕߑߟߋ߫
     partners_partners: ߞߊ߬ߝߏ߬ߢߐ߲߮ ߠߎ߬
     tou: ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߛߙߊߕߌ
     help: ߘߍ߬ߡߍ߲߬ߠߌ߲
     about: ߞߊ߬ ߓߍ߲߬
     copyright: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ
-    community: ߘߍ߬ߘߊ
-    make_a_donation:
-      title: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߞߐߡߊߓߌ߲ߓߌ߲߫ ߥߏߘߌ ߣߌ߬ߟߌ ߟߊ߫
-      text: ߣߌ߬ߟߌ ߘߏ߫ ߞߍ߫
     learn_more: ߘߏߜߘߍ߫ ߟߎ߫ ߘߐߞߊ߬ߙߊ߲߬
     more: ߡߊ߬ߞߊ߬ߝߏ߬ ߜߘߍ ߟߎ߬
   user_mailer:
@@ -1213,7 +1174,6 @@ nqo:
         ߘߐ߫.
     changeset_comment_notification:
       hi: ߌ ߣߌ߫ ߕߎ߬ߡߊ߫ %{to_user}
-      greeting: ߌ ߣߌ߫ ߕߎ߬ߡߊ߬߸
       commented:
         partial_changeset_with_comment: ߡߙߌߣߊ߲ ߘߌ߫ %{changeset_comment}ߴ
         partial_changeset_without_comment: ߞߵߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߕߍ߫
@@ -1253,7 +1213,6 @@ nqo:
     message_summary:
       unread_button: ߊ߬ ߞߍ߫ ߞߊ߬ߙߊ߲߬ߓߊߟߌ ߘߌ߫
       read_button: ߊ߬ ߣߐ߬ߣߐ߫ ߘߐ߬ߞߊ߬ߙߊ߲߬ߣߍ߲ ߘߌ߫
-      reply_button: ߊ߬ ߞߐߖߋ߬ߓߌ߬
       destroy_button: ߊ߬ ߖߏ߬ߛߌ߬
     new:
       title: ߗߋߛߓߍ ߗߋ߫
@@ -1349,14 +1308,12 @@ nqo:
       failure: ߢߊߞߙߍ ߕߍ߫ ߛߐ߲߬ ߟߏ߲ߘߐߦߊ߫ ߟߊ߫.
   sessions:
     new:
-      title: ߌ ߜߊ߲߬ߞߎ߲߫
       tab_title: ߌ ߜߊ߲߬ߞߎ߲߫
       email or username: 'ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߥߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ߬ ߕߐ߮:'
       password: 'ߕߊ߬ߡߌ߲߬ߞߊ߲:'
       remember: ߒ ߖߊ߲߭ߓߌ߬ߟߊ߬
       lost password link: ߌ ߓߘߊ߫ ߢߌ߬ߣߊ߬ ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߠߊ߫؟
       login_button: ߌ ߜߊ߲߬ߞߎ߲߫
-      register now: ߌ ߕߐ߮ ߛߓߍ߫ ߡߎ߬ߕߎ߲߫
       auth failure: ߤߊߞߍ߬ߕߏ߫߸ ߌ ߕߴߛߋ߫ ߌ ߜߊ߲߬ߞߎ߲߬ ߠߊ߫ ߝߊߙߊ߲ߝߊ߯ߛߌ ߏ߬ ߟߐ߬ߟߊ߫.
     destroy:
       title: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫
@@ -1378,9 +1335,18 @@ nqo:
     richtext_field:
       edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫
       preview: ߟߊ߬ߕߎ߲߰ߠߊ
+    pagination:
+      diary_comments:
+        older: ߡߙߌߣߊ߲ߦߌߘߊ ߞߘߐ߬ߡߊ߲ ߠߎ߬
+        newer: ߡߙߌߣߊ߲ߦߌߘߊ ߞߎߘߊ ߟߎ߬
+      diary_entries:
+        older: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߞߘߐ߬ߡߊ߲ ߠߎ߬
+        newer: ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߞߎߘߊߟߡߊ ߟߎ߬
+      traces:
+        older: ߜߋ߬ߙߋ ߞߘߐ߬ߡߊ߲ ߠߎ߬
+        newer: ߜߋ߬ߙߋ ߞߎߘߡߊ ߟߎ߬
   site:
     about:
-      next: ߢߍߕߊ
       used_by_html: '%{name} ߓߘߊ߫ ߡߊߔ ߘߕߊ ߡߊߛߐ߫ ߓߟߐߟߐ߫ ߞߍߦߙߐ ߥߊ߯ ߦߙߌߞߊ ߟߊ߫. ߜߋߟߋ߲ߜߋߟߋ߲
         ߟߥߊ߬ߟߌ߬ߟߊ߲ ߣߌ߫ ߞߍߟߊ߲߫ ߛߎ߲ߝߘߍߡߊ ߟߎ߬'
       lede_text: "ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߊߘߊ߲ߣߍ߲߫ ߦߋ߫ ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߊ ߘߍ߬ߘߊ ߟߎ߬ ߟߋ߬ ߓߟߏ߫ ߡߍ߲
@@ -1458,10 +1424,8 @@ nqo:
       title: ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ߬ ߛߌ߫؟
     sidebar:
       search_results: ߞߐߝߟߌ ߟߎ߬ ߢߌߣߌ߲߫
-      close: ߊ߬ ߘߊߕߎ߲߯
     search:
       search: ߢߌߣߌ߲ߣߌ߲
-      get_directions: ߞߎ߲߬ߕߋߟߋ߲ ߠߎ߬ ߡߊߛߐ߬ߘߐ߲߬
       get_directions_title: ߞߎ߲߬ߕߋߟߋ߲ ߢߌߣߌ߲߫ ߘߊߞߎ߲߫ ߝߌ߬ߟߊ߬ ߟߎ߫ ߕߍ߫
       from: ߞߊ߬ ߝߘߊ߫
       to: ߞߊ߬ ߕߊ߯
@@ -1524,8 +1488,6 @@ nqo:
       visibility_help: ߣߌ߲߬ ߞߘߐ ߦߋ߫ ߡߎ߲߬ ߘߌ߫؟
     update:
       updated: ߜߋ߬ߙߋ ߓߘߊ߫ ߟߊߞߎߘߦߊ߫
-    trace_optionals:
-      tags: ߘߎ߲ߛߓߍ ߟߎ߬
     show:
       title: ߜߋ߬ߙߋ ߦߋߟߌ %{name}
       heading: ߜߋ߬ߙߋ ߦߋߟߌ %{name}
@@ -1561,14 +1523,9 @@ nqo:
       upload_trace: ߜߋ߬ߙߋ ߘߏ߫ ߟߊߦߟߍ߬
       all_traces: ߜߋ߬ߙߋ ߟߎ߬ ߓߍ߯
       my_traces: ߒ ߝߏ߲߬ߝߏ߲ ߠߎ߬
-      traces_from: ߜߍߘߐ߫ ߜߙߋ ߟߎ߬ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫
-    page:
-      older: ߜߋ߬ߙߋ ߞߘߐ߬ߡߊ߲ ߠߎ߬
-      newer: ߜߋ߬ߙߋ ߞߎߘߡߊ ߟߎ߬
+      traces_from_html: ߜߍߘߐ߫ ߜߙߋ ߟߎ߬ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫
     destroy:
       scheduled_for_deletion: ߜߋ߬ߙߋ ߟߐ߯ߟߊߟߌ ߖߏ߰ߛߌ߬ ߞߊ߲ߡߊ߬
-    make_public:
-      made_public: ߜߋ߬ߙߋ ߡߍ߲ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ ߖߊ߬ߡߊ ߓߟߏ߫
     offline_warning:
       message: GPX ߞߐߕߐ߮ ߟߊߦߟߍ߬ ߞߊ߲ߞߋ ߕߴߊ߬ ߟߊ߫ ߕߍ߯ߣߍ߲ ߣߌ߲߬ ߘߐ߫ ߕߊ߲߬
     offline:
@@ -1583,8 +1540,6 @@ nqo:
     require_cookies:
       cookies_needed: ߌ ߞߎ߲߬ߓߐߣߍ߲߫ ߠߋ߬ ߦߏ߫ ߞߎߞߌߦߋ ߓߐߣߴߊ߬ ߟߴߌ ߓߟߏ߫ - ߞߎߞߌߦߋ ߓߌ߬ߟߵߊ߬
         ߟߴߌ ߟߊ߫ ߛߏ߲߯ߓߊߟߊ߲ ߠߊ߫ ߦߊ߬ߣߴߌ ߦߋ߫ ߛߌߟߊ ߘߊߓߊ߲߫.
-    require_admin:
-      not_an_admin: ߌ ߞߊߡߊ߲߫ ߞߊ߬ ߞߍ߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ ߘߌ߫ ߦߊ߬ߣߴߌ ߦߋ߫ ߞߴߏ߬ ߓߟߏߦߊ߫.
     setup_user_auth:
       blocked_zero_hour: ' ߌ ߓߘߊ߫ ߜߍ߬ߘߍ߲߬ߘߐ߬ ߗߋߛߓߍ ߘߏ߫ ߛߐ߬ߘߐ߲߬ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߓߟߐߟߐ߫
         ߞߍߦߙߐ ߟߊ߫. ߌ ߞߊߞߊ߲߫ ߞߵߏ߬ ߞߊ߬ߙߊ߲߬ ߡߎߣߎ߲߬ ߏ߬ ߓߊ߯ ߞߴߌ ߘߌ߫ ߛߋ߫ ߞߵߌ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲
@@ -1596,7 +1551,6 @@ nqo:
         ߡߊ߬߸ ߞߏ߬ߣߌ߲߬ ߌ ߦߴߊ߬ߟߎ߬ ߦߋ߫ ߕߎ߲߫.
     settings_menu:
       account_settings: ߖߊ߬ߕߋ߬ߘߊ ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߦߊ߬ߘߊ ߟߎ߫
-      oauth1_settings: 0Auth 1 ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߦߊ߬ߘߊ
       oauth2_applications: 0Auth 2 ߟߥߊ߬ߟߌ߬ߟߌ ߟߎ߬
       oauth2_authorizations: 0Auth 2 ߖߡߊ߬ߙߌ߬ߦߊ߬ߟߌ
     auth_providers:
@@ -1619,29 +1573,6 @@ nqo:
         title: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߞߌߔߋߘߌߦߊ ߟߊ߫
         alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߞߌߔߋߘߌߦߊ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫
   oauth:
-    authorize:
-      title: ߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߟߊߛߐ߬ߘߐ߲ ߠߊߘߌ߬ߢߍ߬
-      request_access_html: ߟߥߊ߬ߟߌ߬ߟߊ߲ %{app_name} ߦߴߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߟߊߛߐ߬ߘߐ߲߬ ߞߏ ߡߊߢߌߣߌ߲߫
-        ߠߊ߫߸ %{user} ߊ߬ ߡߊߝߟߍ߫ ߡߎߣߎ߲߬ ߖߊ߰ߣߌ߲߫ ߣߌ߫ ߟߥߊ߬ߟߌ߬ߟߊ߲ ߠߊ߫ ߛߋߞߏߦߊ ߏ߬ ߟߎ߬ ߟߊߛߐ߬ߘߐ߲
-        ߞߊߘߴߌ ߦߋ߫. ߌ ߘߌ߫ ߛߋ߫ ߛߌߦߊߡߊ߲߫ ߛߎߥߊ߲ߘߌ߫ ߟߴߊ߬ߟߎ߬ ߘߐ߫ ߥߟߊ߫ ߞߋߟߋ߲߫߸ ߡߍ߲ ߓߊ߯ ߘߌߦߊ߫
-        ߌ ߦߋ߫ ߕߎ߲߫.
-      allow_to: 'ߛߊ߲߬ߠߌ߲߬ߢߐ߲߰ ߟߥߊߟߌߟߊ߲ ߠߊߘߌ߬ߢߍ߫ ߞߊ߬:'
-      allow_read_prefs: ߌ ߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߦߟߌߡߊߛߙߋ ߟߎ߬ ߞߊ߬ߙߊ߲߫.
-      allow_write_prefs: ߌ ߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߦߟߌߡߊߛߙߋ ߟߎ߬ ߡߊߦߟߍ߬ߡߊ߲߫.
-      allow_write_diary: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߛߌ߲ߘߌ߫߸ ߡߙߌߣߊ߲ ߊ߬ ߣߌ߫ ߞߊ߬ ߕߋߙߌ ߟߎ߬ ߟߊߘߊ߲߫.
-      allow_write_api: ߔߊ߬ߔߘߊ ߡߊߦߟߍ߬ߡߊ߲߫
-      allow_read_gpx: ߌ ߘߎ߲߬ߘߎ߬ߡߊ߬ GPS ߝߏ߲߬ߝߏ߲ ߠߎ߬ ߘߐߞߊ߬ߙߊ߲߬
-      allow_write_gpx: GPS ߝߏ߲߬ߝߏ߲ ߠߊߞߎߘߦߊ߫.
-      allow_write_notes: ߦߟߌߡߊߛߙߋ ߟߎ߬ ߡߊߦߟߍ߬ߡߊ߲߫
-      grant_access: ߟߊ߬ߛߐ߬ߘߐ߲߬ߠߌ߲ ߠߊߡߌ߬ߘߊ߬
-    authorize_success:
-      title: ߟߊ߬ߘߌ߬ߢߍ߬ߟߌ ߡߊ߬ߢߌ߬ߣߌ߲߬ߠߌ߲ ߓߘߊ߫ ߟߊߘߤߊ߬
-      allowed_html: ߌ ߓߘߊ߫ ߘߌ߬ߢߍ߫ ߟߥߊ߬ߟߌ߬ߟߊ߲ %{app_name} ߡߊ߬ ߛߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߟߊߛߐ߬ߘߐ߲
-        ߠߊ߫.
-      verification: ߝߛߍ߬ߝߛߍ߬ߟߌ ߘߏߞߊ߲ ߦߋ߫ %{code} ߟߋ߬ ߘߌ߫
-    authorize_failure:
-      title: ߟߊ߬ߘߌ߬ߢߍ߬ߟߌ ߡߊ߬ߢߌ߬ߣߌ߲߬ߠߌ߲ ߓߘߊ߫ ߗߌߙߏ߲߫
-      invalid: ߟߊ߬ߘߌ߬ߢߍ߬ߟߌ ߖߐߟߐ߲ߞߐ ߓߍ߲߬ߣߍ߲߫ ߕߍ߫
     scopes:
       read_prefs: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߊ߫ ߦߟߌߡߊߛߙߋ ߟߎ߬ ߘߐߞߊ߬ߙߊ߲߬
       write_prefs: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߊ߫ ߦߟߌߡߊߛߙߋ ߟߎ߬ ߡߊߦߟߍ߬ߡߊ߲߫
@@ -1650,30 +1581,6 @@ nqo:
       write_gpx: GPS ߝߏ߲߬ߝߏ߲ ߠߊߦߟߍ߬
       write_notes: ߦߟߌߣߐ ߟߎ߬ ߡߊߦߟߍ߬ߡߊ߲߫
       read_email: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߊ߫ ߢߎߡߍߙߋ߲ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߞߊ߬ߙߊ߲߬
-  oauth_clients:
-    new:
-      title: ߟߥߊ߬ߟߌ߬ߟߌ߬ ߞߎߘߊ߫ ߟߊߞߎ߲߬ߘߎ߫
-    edit:
-      title: ߌ ߟߊ߫ ߟߥߊ߬ߟߌ߬ߟߊ߲ ߡߊߦߟߍ߬ߡߊ߲߫
-    show:
-      title: OAuthn %{app_name} ߝߊߙߊ߲ߝߊ߯ߛߟߌ
-      url: 'ߖߐߟߐ߲ߞߐ ߡߊ߬ߢߌ߬ߣߌ߲߬ߠߌ߲ URL:'
-      access_url: 'ߟߊ߬ߛߐ߬ߘߐ߲߬ߠߌ߲ ߖߐߟߐ߲ߞߐ URL:'
-      edit: ߝߊߙߊ߲ߝߊ߯ߛߟߌ ߟߎ߬ ߡߊߦߟߍ߬ߡߊ߲߫
-      delete: ߛߊ߲߬ߠߌ߲߬ߢߐ߲߮ ߖߏ߬ߛߌ߫
-      confirm: ߌ ߟߊߣߴߏ߬ ߟߊ߫؟
-    index:
-      title: ߒ ߠߊ߫ 0Auth ߝߊߙߊ߲ߝߊ߯ߛߌ
-      my_tokens: ߒ ߠߊ߫ ߟߥߊ߬ߟߌ߬ߟߊ߲߫ ߖߡߊ߬ߙߌ߬ߦߊ߬ߣߍ߲ ߠߎ߬
-      oauth: OAuth
-    not_found:
-      sorry: ߤߊߞߍ߬ߕߏ߫߸ %{type} ߕߍߣߊ߬ ߛߐ߬ߘߐ߲߬ ߠߊ߫.
-    create:
-      flash: ߞߌ߬ߓߊ߬ߙߏ߬ߦߊ ߟߊߞߎ߲߬ߘߎ߬ߟߌ ߓߘߊ߫ ߛߎߘߊ߲߫ ߞߏߟߌߞߏߟߌ߫
-    update:
-      flash: ߛߊ߲߬ߣߌ߲߬ߢߐ߲߮ ߞߎ߲߬ߠߊ߬ߝߏߣߌ߲ ߓߘߊ߫ ߟߊߞߎߘߦߊ߫ ߞߏߟߌߞߏߟߌ߫.
-    destroy:
-      flash: ߛߊ߲߬ߠߌ߲߬ߢߐ߲߰ ߟߥߊߟߌߟߊ߲ ߕߐ߯ߛߓߍߟߌ ߓߘߊ߫ ߘߐߕߌߢߍ߫ ߔߛߐߞߐ߫.
   oauth2_applications:
     index:
       title: ߒ ߛߊ߲߬ߠߌ߲߬ߢߐ߲߰ ߟߥߊߟߌߟߊ߲ ߠߎ߬
@@ -1730,7 +1637,6 @@ nqo:
       consider_pd: ߛߊ߲ߝߍߟߊ ߏ߬ ߡߊߞߊ߬ߝߏ߬ߟߌ ߘߐ߫ ߌ ߞߐ߫߸ ߒ ߧߋ߫ ߒ ߠߊ߫ ߓߟߏߡߊߜߍ߲ ߖߊ߬ߕߋ߬ ߟߴߊ߬
         ߞߍ ߘߐ߫ ߖߊ߬ߡߊ ߘߍ߬ߒ߬ߡߊ߬ߝߋ߲ ߘߌ߫
       consider_pd_why: ߣߌ߲߬ ߦߋ߫ ߡߎ߲߬ ߘߌ߫؟
-      consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
       continue: ߊ߬ ߘߊߓߊ߲߫
       legale_select: 'ߌ ߛߌ߰ߣߍ߲߬ ߦߋ߫ ߖߡߊ߬ߣߊ ߡߍ߲ ߘߐ߫:'
       legale_names:
@@ -1797,11 +1703,6 @@ nqo:
       support: ߘߍ߬ߡߍ߲߬ߠߌ߲
     auth_failure:
       unknown_error: ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ ߓߘߊ߫ ߗߌߙߏ߲߫
-  user_role:
-    grant:
-      confirm: ߊ߬ ߟߊߛߙߋߦߊ߫
-    revoke:
-      confirm: ߊ߬ ߟߊߛߙߋߦߊ߫
   user_blocks:
     helper:
       time_future_html: ߘߌ߫ ߓߊ߲߫ %{time} ߟߊ߫.
@@ -1809,14 +1710,12 @@ nqo:
       created: 'ߛߌ߲ߘߌߣߍ߲:'
       duration: 'ߘߎ߲ߡߊߟߌ:'
       status: 'ߡߊ߬ߘߎ߮:'
-      show: ߦߌ߬ߘߊ߬ߟߌ
       edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫
-      confirm: ߌ ߟߊߣߴߏ߬ ߟߊ߫؟
       reason: 'ߓߊ߬ߟߊ߲߬ߠߌ߲ ߞߎ߲߭:'
     block:
       show: ߊ߬ ߦߌ߬ߘߊ߬
       edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫
-    blocks:
+    page:
       creator_name: ߛߌ߲ߘߌߟߊ߲
       reason: ߓߊ߬ߟߊ߲߬ߠߌ߲ ߞߎ߲߭
   notes:
@@ -1840,6 +1739,8 @@ nqo:
     new:
       title: ߦߟߌߣߐ߫ ߞߎߘߊ߫
       add: ߦߟߌߣߐ ߝߙߊ߬
+    notes_paging_nav:
+      showing_page: ߞߐߜߍ %{page}
   javascripts:
     close: ߊ߬ ߘߊߕߎ߲߯
     share: