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

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

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index da05996ffd7f3488a319269bd8bbb7b213c2e1a7..2b0d6f182ebf3cd9742569f4a9aa9b5fc86def65 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: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
@@ -360,9 +356,6 @@ nqo:
         comment: ߞߊ߲߬ߞߎ߬ߡߊ߬ ߞߎߘߊ߫ ߦߋ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ %{changeset_id}
           %{author} ߓߟߏ߫
         commented_at_by_html: ߊ߬ ߟߊߘߎߘߦߊߣߍ߲߫ ߦߋ߫ %{when} ߊ߬ ߣߌ߫ %{user} ߓߟߏ߫
-      comments:
-        comment: ߞߊ߲߬ߞߎ߬ߡߊ߬ ߞߎߘߊ߫ ߦߋ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ %{changeset_id}
-          ߠߊ߫ %{author} ߓߟߏ߫
       show:
         title_all: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߫ ߞߙߎ ߘߊߘߐߖߊߥߏ
         title_particular: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ %{changeset_id}
@@ -371,12 +364,7 @@ nqo:
         sorry: ߤߊߞߍ߬ߕߏ߫߸ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߞߊ߲߬ߞߎߡߊ ߛߙߍߘߍ ߡߍ߲ ߡߊߢߌߣߌ߲ ߦߴߌ
           ߘߐ߫ ߌ ߓߟߏ߫߸ ߊ߬ ߓߘߊ߫ ߥߛߎ߬ ߖߊ߲߬ߓߊ ߟߋ߬ ߞߵߊ߬ ߡߊߛߐ߬ߘߐ߲ ߘߐ߫.
   changesets:
-    changeset_paging_nav:
-      showing_page: ߞߐߜߍ %{page}
-      next: ߟߊ߬ߕߎ߲߰ߠߊ»
-      previous: ߟߊ߬ߕߎ߲߰ߠߊ ߟߎ߬
     changeset:
-      anonymous: ߕߐ߯ߒߕߊ߲
       no_edits: (ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߕߴߦߋ߲߬)
       view_changeset_details: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲ ߝߊߙߊ߲ߝߊ߯ߛߟߌ ߘߐߜߍ߫
     index:
@@ -463,8 +451,6 @@ nqo:
       no_entries: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ߣߐ߬ ߟߎ߬ ߕߴߦߋ߲߬
     page:
       recent_entries: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ߣߐ ߞߐߟߕߊ ߟߎ߬
-      older_entries: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߞߘߐ߬ߡߊ߲ ߠߎ߬
-      newer_entries: ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߞߎߘߊߟߡߊ ߟߎ߬
     edit:
       title: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߦߟߍ߬ߡߊ߲߫
       marker_text: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߘߌ߲߬ߞߌߙߊ ߟߎ߬
@@ -497,8 +483,6 @@ nqo:
       report: ߡߙߌߣߊ߲ ߣߌ߲߬ ߠߊߞߏߝߐ߫
     location:
       location: 'ߘߌ߲߬ߞߌߙߊ:'
-      view: ߦߌ߬ߘߊ߬ߟߌ
-      edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫
     feed:
       user:
         title: ߏߔߌ߲ߛߕߑߙߌߕߑߡߊߔ %{user} ߟߊ߫ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߠߎ߬
@@ -520,8 +504,6 @@ nqo:
       post: ߗߋߓߏ߲
       when: ߕߎ߬ߡߊ߫ ߖߐ߲߬
       comment: ߡߙߌߣߊ߲ߦߌߘߊ
-      newer_comments: ߡߙߌߣߊ߲ߦߌߘߊ ߞߎߘߊ ߟߎ߬
-      older_comments: ߡߙߌߣߊ߲ߦߌߘߊ ߞߘߐ߬ߡߊ߲ ߠߎ߬
   doorkeeper:
     flash:
       applications:
@@ -995,9 +977,6 @@ nqo:
         level8: ߛߏ ߓߐߕߏ߲
         level9: ߕߏߘߊ ߓߐߕߏ߲
         level11: ߛߌ߰ߢߐ߲߰ߦߊ߬ ߦߙߐ ߓߐߕߏ߲
-      types:
-        towns: ߛߏ
-        places: ߘߌ߲߬ߞߌߙߊ
     results:
       no_results: ߞߐߝߟߌ߫ ߡߊ߫ ߛߐ߬ߘߐ߲߬
       more_results: ߞߐߝߟߌ߫ ߜߘߍ ߟߎ߬
@@ -1010,7 +989,6 @@ nqo:
       not_updated: ߊ߬ ߡߊ߫ ߟߏ߲ߘߐߦߊ߫
       search: ߢߌߣߌ߲ߠߌ߲
       search_guidance: ߓߐ߲ߘߊ ߘߏ߫ ߢߌߣߌ߲߫
-      link_to_reports: ߞߏߝߐߟߌ߫ ߟߎ߬ ߘߐߜߍ߫
       states:
         ignored: ߊ߬ ߡߊߓߌ߬ߟߊ߬ߣߍ߲߫
         open: ߊ߬ ߟߊߞߊ߬
@@ -1198,7 +1176,6 @@ nqo:
         ߘߐ߫.
     changeset_comment_notification:
       hi: ߌ ߣߌ߫ ߕߎ߬ߡߊ߫ %{to_user}
-      greeting: ߌ ߣߌ߫ ߕߎ߬ߡߊ߬߸
       commented:
         partial_changeset_with_comment: ߡߙߌߣߊ߲ ߘߌ߫ %{changeset_comment}ߴ
         partial_changeset_without_comment: ߞߵߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߕߍ߫
@@ -1333,14 +1310,12 @@ nqo:
       failure: ߢߊߞߙߍ ߕߍ߫ ߛߐ߲߬ ߟߏ߲ߘߐߦߊ߫ ߟߊ߫.
   sessions:
     new:
-      title: ߌ ߜߊ߲߬ߞߎ߲߫
       tab_title: ߌ ߜߊ߲߬ߞߎ߲߫
       email or username: 'ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߥߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ߬ ߕߐ߮:'
       password: 'ߕߊ߬ߡߌ߲߬ߞߊ߲:'
       remember: ߒ ߖߊ߲߭ߓߌ߬ߟߊ߬
       lost password link: ߌ ߓߘߊ߫ ߢߌ߬ߣߊ߬ ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߠߊ߫؟
       login_button: ߌ ߜߊ߲߬ߞߎ߲߫
-      register now: ߌ ߕߐ߮ ߛߓߍ߫ ߡߎ߬ߕߎ߲߫
       auth failure: ߤߊߞߍ߬ߕߏ߫߸ ߌ ߕߴߛߋ߫ ߌ ߜߊ߲߬ߞߎ߲߬ ߠߊ߫ ߝߊߙߊ߲ߝߊ߯ߛߌ ߏ߬ ߟߐ߬ߟߊ߫.
     destroy:
       title: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫
@@ -1362,6 +1337,16 @@ nqo:
     richtext_field:
       edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫
       preview: ߟߊ߬ߕߎ߲߰ߠߊ
+    pagination:
+      diary_comments:
+        older: ߡߙߌߣߊ߲ߦߌߘߊ ߞߘߐ߬ߡߊ߲ ߠߎ߬
+        newer: ߡߙߌߣߊ߲ߦߌߘߊ ߞߎߘߊ ߟߎ߬
+      diary_entries:
+        older: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߞߘߐ߬ߡߊ߲ ߠߎ߬
+        newer: ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߞߎߘߊߟߡߊ ߟߎ߬
+      traces:
+        older: ߜߋ߬ߙߋ ߞߘߐ߬ߡߊ߲ ߠߎ߬
+        newer: ߜߋ߬ߙߋ ߞߎߘߡߊ ߟߎ߬
   site:
     about:
       used_by_html: '%{name} ߓߘߊ߫ ߡߊߔ ߘߕߊ ߡߊߛߐ߫ ߓߟߐߟߐ߫ ߞߍߦߙߐ ߥߊ߯ ߦߙߌߞߊ ߟߊ߫. ߜߋߟߋ߲ߜߋߟߋ߲
@@ -1441,7 +1426,6 @@ nqo:
       title: ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ߬ ߛߌ߫؟
     sidebar:
       search_results: ߞߐߝߟߌ ߟߎ߬ ߢߌߣߌ߲߫
-      close: ߊ߬ ߘߊߕߎ߲߯
     search:
       search: ߢߌߣߌ߲ߣߌ߲
       get_directions_title: ߞߎ߲߬ߕߋߟߋ߲ ߢߌߣߌ߲߫ ߘߊߞߎ߲߫ ߝߌ߬ߟߊ߬ ߟߎ߫ ߕߍ߫
@@ -1506,8 +1490,6 @@ nqo:
       visibility_help: ߣߌ߲߬ ߞߘߐ ߦߋ߫ ߡߎ߲߬ ߘߌ߫؟
     update:
       updated: ߜߋ߬ߙߋ ߓߘߊ߫ ߟߊߞߎߘߦߊ߫
-    trace_optionals:
-      tags: ߘߎ߲ߛߓߍ ߟߎ߬
     show:
       title: ߜߋ߬ߙߋ ߦߋߟߌ %{name}
       heading: ߜߋ߬ߙߋ ߦߋߟߌ %{name}
@@ -1544,13 +1526,8 @@ nqo:
       all_traces: ߜߋ߬ߙߋ ߟߎ߬ ߓߍ߯
       my_traces: ߒ ߝߏ߲߬ߝߏ߲ ߠߎ߬
       traces_from: ߜߍߘߐ߫ ߜߙߋ ߟߎ߬ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫
-    page:
-      older: ߜߋ߬ߙߋ ߞߘߐ߬ߡߊ߲ ߠߎ߬
-      newer: ߜߋ߬ߙߋ ߞߎߘߡߊ ߟߎ߬
     destroy:
       scheduled_for_deletion: ߜߋ߬ߙߋ ߟߐ߯ߟߊߟߌ ߖߏ߰ߛߌ߬ ߞߊ߲ߡߊ߬
-    make_public:
-      made_public: ߜߋ߬ߙߋ ߡߍ߲ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ ߖߊ߬ߡߊ ߓߟߏ߫
     offline_warning:
       message: GPX ߞߐߕߐ߮ ߟߊߦߟߍ߬ ߞߊ߲ߞߋ ߕߴߊ߬ ߟߊ߫ ߕߍ߯ߣߍ߲ ߣߌ߲߬ ߘߐ߫ ߕߊ߲߬
     offline:
@@ -1729,11 +1706,6 @@ nqo:
       support: ߘߍ߬ߡߍ߲߬ߠߌ߲
     auth_failure:
       unknown_error: ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ ߓߘߊ߫ ߗߌߙߏ߲߫
-  user_role:
-    grant:
-      confirm: ߊ߬ ߟߊߛߙߋߦߊ߫
-    revoke:
-      confirm: ߊ߬ ߟߊߛߙߋߦߊ߫
   user_blocks:
     helper:
       time_future_html: ߘߌ߫ ߓߊ߲߫ %{time} ߟߊ߫.
@@ -1741,14 +1713,12 @@ nqo:
       created: 'ߛߌ߲ߘߌߣߍ߲:'
       duration: 'ߘߎ߲ߡߊߟߌ:'
       status: 'ߡߊ߬ߘߎ߮:'
-      show: ߦߌ߬ߘߊ߬ߟߌ
       edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫
-      confirm: ߌ ߟߊߣߴߏ߬ ߟߊ߫؟
       reason: 'ߓߊ߬ߟߊ߲߬ߠߌ߲ ߞߎ߲߭:'
     block:
       show: ߊ߬ ߦߌ߬ߘߊ߬
       edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫
-    blocks:
+    page:
       creator_name: ߛߌ߲ߘߌߟߊ߲
       reason: ߓߊ߬ߟߊ߲߬ߠߌ߲ ߞߎ߲߭
   notes:
@@ -1772,6 +1742,8 @@ nqo:
     new:
       title: ߦߟߌߣߐ߫ ߞߎߘߊ߫
       add: ߦߟߌߣߐ ߝߙߊ߬
+    notes_paging_nav:
+      showing_page: ߞߐߜߍ %{page}
   javascripts:
     close: ߊ߬ ߘߊߕߎ߲߯
     share: