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

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

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 3422dd68ef1256ec94b708179c9a116f78637572..d131f4021e8de49644cbc6ac0c885e1ada3f1d8e 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -138,7 +138,6 @@ nqo:
         auth_provider: ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ ߡߊߛߐߟߊ߲
         auth_uid: ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ UID
         email: ߢ:ߞߏ߲ߘߏ
-        email_confirmation: ߢ:ߞߏ߲ߘߏ ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ
         new_email: ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ߫ ߞߎߘߊ
         active: ߞߎ߲߬ߞߊߟߌ߲
         display_name: ߕߐ߮ ߟߊߓߊ߯ߙߊ߫
@@ -355,6 +354,22 @@ nqo:
       introduction: ߡߊߔ ߛߐ߲߬ߞߌ߲߫ ߞߊ߬ ߌ ߡߊߛߘߎ߬ߧߊ߬ ߟߊߓߊ߯ߙߊߟߌ ߟߎ߫ ߢߌߣߌ߲߫.
       nearby: ߕߙߐ߬ߝߍ߬ ߟߊߓߊ߯ߙߊߟߌ
       enclosing: ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ߫ ߡߊߛߎ߬ߘߎ߲߬ߧߊ߬ߣߍ߲ ߠߎ߬
+  changeset_comments:
+    feeds:
+      comment:
+        comment: ߞߊ߲߬ߞߎ߬ߡߊ߬ ߞߎߘߊ߫ ߦߋ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ %{changeset_id}
+          %{author} ߓߟߏ߫
+        commented_at_by_html: ߊ߬ ߟߊߘߎߘߦߊߣߍ߲߫ ߦߋ߫ %{when} ߊ߬ ߣߌ߫ %{user} ߓߟߏ߫
+      comments:
+        comment: ߞߊ߲߬ߞߎ߬ߡߊ߬ ߞߎߘߊ߫ ߦߋ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ %{changeset_id}
+          ߠߊ߫ %{author} ߓߟߏ߫
+      show:
+        title_all: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߫ ߞߙߎ ߘߊߘߐߖߊߥߏ
+        title_particular: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ %{changeset_id}
+          ߘߊߘߐߖߊߥߏ
+      timeout:
+        sorry: ߤߊߞߍ߬ߕߏ߫߸ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߞߊ߲߬ߞߎߡߊ ߛߙߍߘߍ ߡߍ߲ ߡߊߢߌߣߌ߲ ߦߴߌ
+          ߘߐ߫ ߌ ߓߟߏ߫߸ ߊ߬ ߓߘߊ߫ ߥߛߎ߬ ߖߊ߲߬ߓߊ ߟߋ߬ ߞߵߊ߬ ߡߊߛߐ߬ߘߐ߲ ߘߐ߫.
   changesets:
     changeset_paging_nav:
       showing_page: ߞߐߜߍ %{page}
@@ -399,8 +414,13 @@ nqo:
       join_discussion: ߌ ߜߊ߲߬ߞߎ߲߫ ߞߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߦߌߘߊ ߘߐ߫
       still_open: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߟߊߞߊ߬ߣߍ߲߫ ߦߋ߫ ߡߎߣߎ߲߬ - ߘߊߘߐߖߊߥߏ
         ߘߌ߫ ߘߊߦߟߍ߬ ߣߌ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߕߎ߯ ߘߊ߫ ߕߎ߬ߡߊ ߡߍ߲ ߠߊ߫.
+      subscribe: ߊ߬ ߡߊߝߘߎ߫
+      unsubscribe: ߊ߬ ߡߊߝߘߎߣߍ߲ ߓߐ߫
       comment_by_html: ߞߊ߲߬ߞߎߡߊ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫ %{time_ago} ߡߊ߬
       hidden_comment_by_html: ߞߊ߲߬ߞߎߡߊ ߥߣߊ߬ߙߌ߬ߣߍ߲߬ ߦߋ߫ %{user} ߡߊ߬ %{time_ago} ߟߊ߫
+      hide_comment: ߊ߬ ߢߡߊߘߏ߲߰
+      unhide_comment: ߊ߬ ߟߊ߲ߞߣߍߡߦߊ߫
+      comment: ߡߙߌߣߊ߲
       changesetxml: XML ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
       osmchangexml: ߏ.ߛ.ߡ ߡߝߊ߬ߟߋ߲߬ߠߌ߲ XML
     paging_nav:
@@ -413,21 +433,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} ߝߏ߬ߣߊ߲ ߠߊ߫
@@ -462,6 +467,7 @@ nqo:
       new_title: ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߞߎߘߊ߫ ߛߏ߯ߙߏ߫ ߒ ߕߋ߬ߟߋ߲ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߘߐ߫
       my_diary: ߒ ߕߋ߬ߟߋ߲
       no_entries: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ߣߐ߬ ߟߎ߬ ߕߴߦߋ߲߬
+    page:
       recent_entries: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ߣߐ ߞߐߟߕߊ ߟߎ߬
       older_entries: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߞߘߐ߬ߡߊ߲ ߠߎ߬
       newer_entries: ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߞߎߘߊߟߡߊ ߟߎ߬
@@ -510,11 +516,13 @@ nqo:
       all:
         title: ߏߔߌ߲ߛߕߑߙߌߕߑߡߊߔ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߠߎ߬
         description: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߊ߫ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߏߔߌ߲ߛߕߑߙߌߕߑߡߊߔ ߞߊ߲߬
-    comments:
+  diary_comments:
+    index:
       title: ߕߋ߬ߟߋ߲ ߡߙߌߣߊ߲߲߫ ߝߙߊ߬ߣߍ߲ %{user} ߓߟߏ߫
       heading: '%{user} ߟߊ߫ ߕߋ߬ߟߋ߲ ߡߙߌߣߊ߲߲ ߠߎ߬'
       subheading_html: ߕߋ߬ߟߋ߲ ߡߙߌߣߊ߲߲ ߝߙߊ߬ߣߍ߲ %{user} ߓߟߏ߫
       no_comments: ߕߋ߬ߟߋ߲ ߡߙߌߣߊ߲߲߫ ߕߴߦߋ߲߬
+    page:
       post: ߗߋߓߏ߲
       when: ߕߎ߬ߡߊ߫ ߖߐ߲߬
       comment: ߡߙߌߣߊ߲ߦߌߘߊ
@@ -1009,16 +1017,17 @@ nqo:
       not_updated: ߊ߬ ߡߊ߫ ߟߏ߲ߘߐߦߊ߫
       search: ߢߌߣߌ߲ߠߌ߲
       search_guidance: ߓߐ߲ߘߊ ߘߏ߫ ߢߌߣߌ߲߫
-      user_not_found: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߏ߬ ߕߴߦߋ߲߬
-      issues_not_found: ߒ߬ߒ߫ ߓߐ߲ߘߊ߫ ߛߎ߮ ߏ߬ ߡߊ߫ ߛߐ߬ߘߐ߲߫
-      status: ߡߊ߬ߘߎ߮
-      last_updated: ߟߏ߲ߘߐߦߊߟߌ ߞߐ߯ߟߕߊ
       link_to_reports: ߞߏߝߐߟߌ߫ ߟߎ߬ ߘߐߜߍ߫
-      reported_item: ߝߛߌ߬ ߟߊߞߏߝߐߣߍ߲
       states:
         ignored: ߊ߬ ߡߊߓߌ߬ߟߊ߬ߣߍ߲߫
         open: ߊ߬ ߟߊߞߊ߬
         resolved: ߊ߬ ߓߘߊ߫ ߢߊߓߐ߫
+    page:
+      user_not_found: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߏ߬ ߕߴߦߋ߲߬
+      issues_not_found: ߒ߬ߒ߫ ߓߐ߲ߘߊ߫ ߛߎ߮ ߏ߬ ߡߊ߫ ߛߐ߬ߘߐ߲߫
+      status: ߡߊ߬ߘߎ߮
+      last_updated: ߟߏ߲ߘߐߦߊߟߌ ߞߐ߯ߟߕߊ
+      reported_item: ߝߛߌ߬ ߟߊߞߏߝߐߣߍ߲
     show:
       title: '%{status} ߝߌ߬ߛߌ #%{issue_id}'
       report_created_at_html: ߞߏߝߐߟߌ߫ ߝߟߐ ߞߍ߫ ߘߊ߫ %{datetime}
@@ -1085,7 +1094,6 @@ nqo:
     gps_traces: GPS ߣߐ߬ߣߐ߬ߟߌ
     gps_traces_tooltip: GPS ߜߙߋ߬ߓߐ߬ߟߌ ߘߊߘߐߓߍ߲߬
     user_diaries: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߕߋߟߋ߲ ߠߎ߬
-    user_diaries_tooltip: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߕߋ߬ߟߋ߲ ߦߋ߫
     edit_with: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫ %{editor} ߘߌ߫
     tag_line: ߥߞߌ ߛߙߊ߬ߓߊߟߌ ߘߎߢߊ߫ ߔߊ߬ߔߘߊ
     intro_header: ߌ ߣߌ߫ ߛߣߍ߫ ߏߔߌ߲߫ ߛߕߑߙߌߕ ߡߊߔ ߞߊ߲߬߹
@@ -1099,9 +1107,6 @@ nqo:
     about: ߞߊ߬ ߓߍ߲߬
     copyright: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ
     community: ߘߍ߬ߘߊ
-    make_a_donation:
-      title: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߞߐߡߊߓߌ߲ߓߌ߲߫ ߥߏߘߌ ߣߌ߬ߟߌ ߟߊ߫
-      text: ߣߌ߬ߟߌ ߘߏ߫ ߞߍ߫
     learn_more: ߘߏߜߘߍ߫ ߟߎ߫ ߘߐߞߊ߬ߙߊ߲߬
     more: ߡߊ߬ߞߊ߬ߝߏ߬ ߜߘߍ ߟߎ߬
   user_mailer:
@@ -1343,41 +1348,14 @@ nqo:
   sessions:
     new:
       title: ߌ ߜߊ߲߬ߞߎ߲߫
-      heading: ߌ ߜߊ߲߬ߞߎ߲߫
+      tab_title: ߌ ߜߊ߲߬ߞߎ߲߫
       email or username: 'ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߥߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ߬ ߕߐ߮:'
       password: 'ߕߊ߬ߡߌ߲߬ߞߊ߲:'
       remember: ߒ ߖߊ߲߭ߓߌ߬ߟߊ߬
       lost password link: ߌ ߓߘߊ߫ ߢߌ߬ߣߊ߬ ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߠߊ߫؟
       login_button: ߌ ߜߊ߲߬ߞߎ߲߫
       register now: ߌ ߕߐ߮ ߛߓߍ߫ ߡߎ߬ߕߎ߲߫
-      no account: ߖߊ߬ߕߋ߬ߘߊ߬ ߕߴߌ ߓߟߏ߫ ߓߊ߬؟
       auth failure: ߤߊߞߍ߬ߕߏ߫߸ ߌ ߕߴߛߋ߫ ߌ ߜߊ߲߬ߞߎ߲߬ ߠߊ߫ ߝߊߙߊ߲ߝߊ߯ߛߌ ߏ߬ ߟߐ߬ߟߊ߫.
-      openid_logo_alt: ߌ ߜߊ߲߬ߞߎ߲߬ ߏߔߌ߲ ID ߟߊ߫
-      auth_providers:
-        openid:
-          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߏߔߌ߲ ID ߘߌ߫
-          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߏߔߌ߲ ID URL ߟߊ߫
-        google:
-          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߎߜ߭ߏߟ ߟߊ߫
-          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߎߜ߭ߏߟ ߏߔߌ߲ ID ߟߊ߫
-        facebook:
-          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߝߋߛߑߓߎߞ ߟߊ߫
-          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߝߋߛߑߓߎߞ ߖߊ߬ߕߋ߬ߘߊ ߘߏ߫ ߟߊ߫
-        microsoft:
-          title: ߌ ߜ߭ߊ߲߬ߞߎ߲߫ ߥߌ߲ߘߏߥߛ ߟߊߌߝ߭ ߟߊ߫
-          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߌ߲ߘߏߥߛ ߟߊߌߝ߭ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫
-        github:
-          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߌߕߑߤߐߓ ߟߊ߫
-          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߌߕߑߤߐߓ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫
-        wikipedia:
-          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߞߌߔߋߘߌߦߊ ߟߊ߫
-          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߞߌߔߋߘߌߦߊ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫
-        wordpress:
-          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߐߘߑߔߙߍߛ ߟߊ߫
-          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߐߘߑߔߙߍߛ ߏߔߌ߲ ID ߟߊ߫
-        aol:
-          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߊߏߍߟ ߟߊ߫
-          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߊߏߍߟ ߏߔߌ߲ ID ߟߊ߫
     destroy:
       title: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫
       heading: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߊ߫
@@ -1412,6 +1390,7 @@ nqo:
       open_data_title: ߓߟߏߡߟߊ߫ ߘߊߦߟߍ߬ߣߍ߲
       partners_title: ߞߊ߬ߝߏ߬ߢߐ߲߮ ߠߎ߬
     copyright:
+      title: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ ߣߌ߫ ߕߌ߰ߦߊ
       foreign:
         title: ߞߊ߬ ߓߍ߲߬ ߘߟߊߡߌߘߊߟߌ ߣߌ߲߬ ߡߊ߬
         english_link: ߊ߲߬ߜ߭ߌߟߋ ߓߊߖߎߡߊ
@@ -1420,14 +1399,10 @@ nqo:
         native_link: ߒߞߏ_ߕߐ߮_ߦߋ߫_ߦߊ߲߬ ߟߦߍ߬ߡߊ߲߬ߠߌ߲
         mapping_link: ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߌ ߘߊߡߌ߬ߣߊ߫
       legal_babble:
-        title_html: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ ߣߌ߫ ߕߌ߰ߦߊ
         credit_title_html: ߟߊߒߣߦߊ ߦߋ߫ ߛߐ߬ߘߐ߲߬ ߠߊ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߊ߫ ߘߌ߬
         more_title_html: ߛߌߦߊߡߊ߲߫ ߜߘߍ߫ ߟߎ߫ ߢߌߣߌ߲ ߦߴߌ ߘߐ߫
         contributors_title_html: ߊ߲ ߠߊ߫ ߓߟߏߡߊߜߍ߲ ߠߎ߬
     index:
-      permalink: ߛߘߌ߬ߜߋ߲߬ ߓߟߏߕߍ߰ߓߊߟߌ
-      shortlink: ߛߘߌ߬ߜߋ߲߬ ߛߎߘߎ߲
-      createnote: ߦߟߌߣߐ ߘߏ߫ ߝߙߊ߬
       license:
         copyright: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߣߌ߫ ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ߠߊ ߟߎ߬߸ ߕߦߊ߫ ߘߊߦߟߍ߬ߣߍ߲
           ߞߘߐ߫
@@ -1569,9 +1544,6 @@ nqo:
       trace_not_found: ߜߋ߬ߙߋ ߡߊ߫ ߛߐ߬ߘߐ߲߫߹
       visibility: 'ߦߋߟߌ:'
       confirm_delete: ߞߊ߬ ߜߋ߬ߙߋ ߣߌ߲߬ ߖߏ߰ߛߌ߫؟
-    trace_paging_nav:
-      older: ߜߋ߬ߙߋ ߞߘߐ߬ߡߊ߲ ߠߎ߬
-      newer: ߜߋ߬ߙߋ ߞߎߘߡߊ ߟߎ߬
     trace:
       pending: ߡߊ߬ߞߐ߬ߣߐ߲߬ߠߌ߲ ߘߐ߫
       more: ߡߊ߬ߞߊ߬ߝߏ߬ ߜߘߍ ߟߎ߬
@@ -1588,6 +1560,9 @@ nqo:
       all_traces: ߜߋ߬ߙߋ ߟߎ߬ ߓߍ߯
       my_traces: ߒ ߝߏ߲߬ߝߏ߲ ߠߎ߬
       traces_from: ߜߍߘߐ߫ ߜߙߋ ߟߎ߬ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫
+    page:
+      older: ߜߋ߬ߙߋ ߞߘߐ߬ߡߊ߲ ߠߎ߬
+      newer: ߜߋ߬ߙߋ ߞߎߘߡߊ ߟߎ߬
     destroy:
       scheduled_for_deletion: ߜߋ߬ߙߋ ߟߐ߯ߟߊߟߌ ߖߏ߰ߛߌ߬ ߞߊ߲ߡߊ߬
     make_public:
@@ -1606,8 +1581,6 @@ nqo:
     require_cookies:
       cookies_needed: ߌ ߞߎ߲߬ߓߐߣߍ߲߫ ߠߋ߬ ߦߏ߫ ߞߎߞߌߦߋ ߓߐߣߴߊ߬ ߟߴߌ ߓߟߏ߫ - ߞߎߞߌߦߋ ߓߌ߬ߟߵߊ߬
         ߟߴߌ ߟߊ߫ ߛߏ߲߯ߓߊߟߊ߲ ߠߊ߫ ߦߊ߬ߣߴߌ ߦߋ߫ ߛߌߟߊ ߘߊߓߊ߲߫.
-    require_admin:
-      not_an_admin: ߌ ߞߊߡߊ߲߫ ߞߊ߬ ߞߍ߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ ߘߌ߫ ߦߊ߬ߣߴߌ ߦߋ߫ ߞߴߏ߬ ߓߟߏߦߊ߫.
     setup_user_auth:
       blocked_zero_hour: ' ߌ ߓߘߊ߫ ߜߍ߬ߘߍ߲߬ߘߐ߬ ߗߋߛߓߍ ߘߏ߫ ߛߐ߬ߘߐ߲߬ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߓߟߐߟߐ߫
         ߞߍߦߙߐ ߟߊ߫. ߌ ߞߊߞߊ߲߫ ߞߵߏ߬ ߞߊ߬ߙߊ߲߬ ߡߎߣߎ߲߬ ߏ߬ ߓߊ߯ ߞߴߌ ߘߌ߫ ߛߋ߫ ߞߵߌ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲
@@ -1619,33 +1592,28 @@ nqo:
         ߡߊ߬߸ ߞߏ߬ߣߌ߲߬ ߌ ߦߴߊ߬ߟߎ߬ ߦߋ߫ ߕߎ߲߫.
     settings_menu:
       account_settings: ߖߊ߬ߕߋ߬ߘߊ ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߦߊ߬ߘߊ ߟߎ߫
-      oauth1_settings: 0Auth 1 ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߦߊ߬ߘߊ
       oauth2_applications: 0Auth 2 ߟߥߊ߬ߟߌ߬ߟߌ ߟߎ߬
       oauth2_authorizations: 0Auth 2 ߖߡߊ߬ߙߌ߬ߦߊ߬ߟߌ
+    auth_providers:
+      openid:
+        title: ߌ ߜߊ߲߬ߞߎ߲߫ ߏߔߌ߲ ID ߘߌ߫
+        alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߏߔߌ߲ ID URL ߟߊ߫
+      google:
+        title: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߎߜ߭ߏߟ ߟߊ߫
+        alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߎߜ߭ߏߟ ߏߔߌ߲ ID ߟߊ߫
+      facebook:
+        title: ߌ ߜߊ߲߬ߞߎ߲߫ ߝߋߛߑߓߎߞ ߟߊ߫
+        alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߝߋߛߑߓߎߞ ߖߊ߬ߕߋ߬ߘߊ ߘߏ߫ ߟߊ߫
+      microsoft:
+        title: ߌ ߜ߭ߊ߲߬ߞߎ߲߫ ߥߌ߲ߘߏߥߛ ߟߊߌߝ߭ ߟߊ߫
+        alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߌ߲ߘߏߥߛ ߟߊߌߝ߭ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫
+      github:
+        title: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߌߕߑߤߐߓ ߟߊ߫
+        alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߌߕߑߤߐߓ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫
+      wikipedia:
+        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: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߊ߫ ߦߟߌߡߊߛߙߋ ߟߎ߬ ߡߊߦߟߍ߬ߡߊ߲߫
@@ -1654,30 +1622,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: ߒ ߛߊ߲߬ߠߌ߲߬ߢߐ߲߰ ߟߥߊߟߌߟߊ߲ ߠߎ߬
@@ -1791,9 +1735,10 @@ nqo:
       heading: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߎ߬
       summary_html: '%{name} ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{ip_address} ߟߋ߬ ߡߊ߬ %{date} ߟߊ߫'
       summary_no_ip_html: '%{name} ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{date} ߟߋ߬ ߟߊ߫'
+      empty: ߕߙߏ߬ߞߏ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߡߊ߫ ߛߐ߬ߘߐ߲߫
+    page:
       confirm: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߓߊߕߐ߬ߡߐ߲߬ߣߍ߲ ߠߎ߬ ߟߊߛߙߋߦߊ߫
       hide: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߓߊߕߐ߬ߡߐ߲߬ߣߍ߲ ߠߎ߬ ߢߡߊߘߏ߲߰
-      empty: ߕߙߏ߬ߞߏ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߡߊ߫ ߛߐ߬ߘߐ߲߫
     suspended:
       title: ߖߊ߬ߕߋ߬ߘߊ߬ ߟߊߘߎ߲ߣߍ߲
       heading: ߖߊ߬ߕߋ߬ߘߊ߬ ߟߊߘߎ߲ߣߍ߲
@@ -1881,13 +1826,6 @@ nqo:
       map_data_zoom_in_tooltip: ߊ߬ ߡߊߛߊ߬ߡߊ߲߫ ߞߊ߬ ߔߊ߬ߔߘߊ ߟߐ߲ߕߊ ߦߋ߫
       queryfeature_tooltip: ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߟߎ߬ ߡߊߢߌ߬ߣߌ߲߬ߞߊ߫
       queryfeature_disabled_tooltip: ߊ߬ ߡߊߛߊ߬ߡߊ߲߫ ߞߊ߬ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߘߏ߫ ߟߎ߫ ߡߊߢߌ߬ߣߌ߲߬ߞߊ߫
-    changesets:
-      show:
-        comment: ߡߙߌߣߊ߲
-        subscribe: ߊ߬ ߡߊߝߘߎ߫
-        unsubscribe: ߊ߬ ߡߊߝߘߎߣߍ߲ ߓߐ߫
-        hide_comment: ߊ߬ ߢߡߊߘߏ߲߰
-        unhide_comment: ߊ߬ ߟߊ߲ߞߣߍߡߦߊ߫
     directions:
       engines:
         fossgis_osrm_bike: ߣߍ߰ߛߏ (OSRM)