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

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

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 71db56f7cc8488a24d2f78c31156e439d543c24b..396c7ca0e630aee6139bdb48c7780289e7718948 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: ߕߐ߮ ߟߊߓߊ߯ߙߊ߫
@@ -278,12 +277,6 @@ nqo:
     destroy:
       success: ߖߊ߬ߕߋ߬ߘߊ ߓߘߊ߫ ߖߏ߰ߛߌ߫.
   browse:
-    created: ߛߌ߲ߘߌߣߍ߲
-    closed: ߘߊߕߎ߲߯ߣߍ߲
-    created_ago_html: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{time_ago}
-    closed_ago_html: ߘߊߕߎ߯ߣߍ߲߫ ߦߋ߫ %{time_ago}
-    created_ago_by_html: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{time_ago} %{user} ߓߟߏ߫
-    closed_ago_by_html: ߘߊߕߎ߲߯ߣߍ߲߫ ߦߋ߫ %{time_ago} ߟߊ߫ %{user} ߓߟߏ߫
     deleted_ago_by_html: ߖߏ߰ߛߌ߬ߣߍ߲߬ ߦߋ߫ %{time_ago} ߟߋ߬ ߟߊ߫ %{user} ߓߟߏ߫
     edited_ago_by_html: ߡߊߙߟߍ߬ߡߊ߲߬ߣߍ߲߬ ߦߋ߫ %{time_ago} ߟߋ߬ ߟߊ߫ %{user} ߓߟߏ߫
     version: ߦߌߟߡߊ
@@ -295,27 +288,6 @@ nqo:
     view_history: ߘߐ߬ߝߐ ߘߐߜߍ߫
     view_details: ߝߊߙߊ߲ߝߊ߯ߛߟߌ ߘߐߜߍ߫
     location: ߘߌ߲߬ߞߌߙߊ
-    changeset:
-      title: 'ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲: %{id}'
-      belongs_to: ߛߓߍߦߟߊ
-      node: ߥߎߙߋ߲ߛߋ߲ %{count}
-      node_paginated: ߥߎߙߋ߲ߛߋ߲ %{x}-%{y} ߦߋ߫ %{count}
-      way: ߛߌߟߊ (%{count})
-      way_paginated: ߛߌߟߊ (%{x}-%{y} ߦߋ߫ %{count})
-      relation: ߕߍߓߊ߯ߦߊ (%{count})
-      relation_paginated: ߕߍߓߊ߯ߦߊ (%{x}-%{y} %{count})
-      comment: ߡߙߌߣߊ߲ (%{count})
-      hidden_comment_by_html: ߞߊ߲߬ߞߎߡߊ ߥߣߊ߬ߙߌ߬ߣߍ߲߬ ߦߋ߫ %{user} ߡߊ߬ %{time_ago} ߟߊ߫
-      comment_by_html: ߞߊ߲߬ߞߎߡߊ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫ %{time_ago} ߡߊ߬
-      changesetxml: XML ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
-      osmchangexml: ߏ.ߛ.ߡ ߡߝߊ߬ߟߋ߲߬ߠߌ߲ XML
-      feed:
-        title: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ %{id}
-        title_comment: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ %{id} - %{comment}
-      join_discussion: ߌ ߜߊ߲߬ߞߎ߲߫ ߞߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߦߌߘߊ ߘߐ߫
-      discussion: ߘߊߘߐߖߊߥߏ
-      still_open: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߟߊߞߊ߬ߣߍ߲߫ ߦߋ߫ ߡߎߣߎ߲߬ - ߘߊߘߐߖߊߥߏ
-        ߘߌ߫ ߘߊߦߟߍ߬ ߣߌ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߕߎ߯ ߘߊ߫ ߕߎ߬ߡߊ ߡߍ߲ ߠߊ߫.
     node:
       title_html: 'ߥߎߙߋ߲ߛߋ߲: %{name}'
       history_title_html: 'ߥߎߙߋ߲ߛߋ߲ ߘߐ߬ߝߐ: %{name}'
@@ -410,6 +382,33 @@ nqo:
       no_more_area: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߜߘߍ߫ ߕߍ߫ ߕߌ߲߬ߞߎߘߎ߲ ߣߌ߲߬ ߘߐ߫.
       no_more_user: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߟߊߘߏ߲߬ߣߍ߲߬ ߜߘߍ߫ ߕߍ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߓߟߏ߫
       load_more: ߘߏߜߘߍ߫ ߟߎ߫ ߟߊߢߎ߲߫
+      feed:
+        title: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ %{id}
+        title_comment: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ %{id} - %{comment}
+        created: ߛߌ߲ߘߌߣߍ߲
+        closed: ߘߊߕߎ߲߯ߣߍ߲
+        belongs_to: ߛߓߍߦߟߊ
+    show:
+      title: 'ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲: %{id}'
+      created_ago_html: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{time_ago}
+      closed_ago_html: ߘߊߕߎ߯ߣߍ߲߫ ߦߋ߫ %{time_ago}
+      created_ago_by_html: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{time_ago} %{user} ߓߟߏ߫
+      closed_ago_by_html: ߘߊߕߎ߲߯ߣߍ߲߫ ߦߋ߫ %{time_ago} ߟߊ߫ %{user} ߓߟߏ߫
+      discussion: ߘߊߘߐߖߊߥߏ
+      join_discussion: ߌ ߜߊ߲߬ߞߎ߲߫ ߞߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߦߌߘߊ ߘߐ߫
+      still_open: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߟߊߞߊ߬ߣߍ߲߫ ߦߋ߫ ߡߎߣߎ߲߬ - ߘߊߘߐߖߊߥߏ
+        ߘߌ߫ ߘߊߦߟߍ߬ ߣߌ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߕߎ߯ ߘߊ߫ ߕߎ߬ߡߊ ߡߍ߲ ߠߊ߫.
+      comment_by_html: ߞߊ߲߬ߞߎߡߊ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫ %{time_ago} ߡߊ߬
+      hidden_comment_by_html: ߞߊ߲߬ߞߎߡߊ ߥߣߊ߬ߙߌ߬ߣߍ߲߬ ߦߋ߫ %{user} ߡߊ߬ %{time_ago} ߟߊ߫
+      changesetxml: XML ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
+      osmchangexml: ߏ.ߛ.ߡ ߡߝߊ߬ߟߋ߲߬ߠߌ߲ XML
+    paging_nav:
+      nodes: ߥߎߙߋ߲ߛߋ߲ %{count}
+      nodes_paginated: ߥߎߙߋ߲ߛߋ߲ %{x}-%{y} ߦߋ߫ %{count}
+      ways: ߛߌߟߊ (%{count})
+      ways_paginated: ߛߌߟߊ (%{x}-%{y} ߦߋ߫ %{count})
+      relations: ߕߍߓߊ߯ߦߊ (%{count})
+      relations_paginated: ߕߍߓߊ߯ߦߊ (%{x}-%{y} %{count})
     timeout:
       sorry: ߤߊߞߍ߬ߕߏ߫߸ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߛߙߍߘߍ ߡߍ߲ ߡߊߢߌߣߌ߲ ߦߴߌ ߘߐ߫ ߌ ߓߟߏ߫߸
         ߊ߬ ߓߘߊ߫ ߥߛߎ߬ ߖߊ߲߬ߓߊ ߟߋ߬ ߕߵߊ߬ ߡߊߛߐ߬ߘߐ߲ ߘߐ߫.
@@ -1021,9 +1020,9 @@ nqo:
         resolved: ߊ߬ ߓߘߊ߫ ߢߊߓߐ߫
     show:
       title: '%{status} ߝߌ߬ߛߌ #%{issue_id}'
-      report_created_at: ߞߏߝߐߟߌ߫ ߝߟߐ ߞߍ߫ ߘߊ߫ %{datetime}
-      last_resolved_at: ߢߊߓߐߟߌ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ %{datetime}
-      last_updated_at: ߊ߬ ߟߊߛߋ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ ߘߊߞߎ߲ ߘߐ߫ %{datetime} ߊ߬ ߣߌ߫ %{displayname}
+      report_created_at_html: ߞߏߝߐߟߌ߫ ߝߟߐ ߞߍ߫ ߘߊ߫ %{datetime}
+      last_resolved_at_html: ߢߊߓߐߟߌ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ %{datetime}
+      last_updated_at_html: ߊ߬ ߟߊߛߋ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ ߘߊߞߎ߲ ߘߐ߫ %{datetime} ߊ߬ ߣߌ߫ %{displayname}
         ߓߟߏ߫
       resolve: ߊ߬ ߢߊߓߐ߫
       ignore: ߊ߬ ߡߋߓߌ߬ߟߊ߫
@@ -1092,7 +1091,6 @@ nqo:
     intro_text: ߏߔߌ߲߫ ߛߕߑߙߌߕ ߡߊߔ ߦߋ߫ ߘߎߢߊ߫ ߔߊ߬ߔߘߊ ߟߋ߬ ߘߌ߫߸ ߡߍ߲ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ ߡߐ߱ ߟߎ߬
       ߓߟߏ߫ ߦߏ߫ ߌߟߋ߸ ߊ߬ ߟߊߓߊ߯ߙߊ ߦߋ߫ ߛߙߊ߬ߓߊߟߌ ߟߋ߬ ߘߌ߫ ߟߊ߬ߘߤߊ߬ߟߌ߫ ߘߊߦߟߍ߬ߣߍ߲ ߞߘߐ߫.
     intro_2_create_account: ߖߊ߬ߕߋ߬ߘߊ ߘߏ߫ ߘߊߦߟߍ߬
-    partners_ucl: UCL
     partners_fastly: ߝߊߛߕߑߟߋ߫
     partners_partners: ߞߊ߬ߝߏ߬ߢߐ߲߮ ߠߎ߬
     tou: ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߛߙߊߕߌ
@@ -1297,10 +1295,6 @@ nqo:
       new password button: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߬
       help_text: ߢ:ߞߏ߲ߘߏ ߟߊߘߏ߲߬ ߌ ߞߊ߬ ߡߍ߲ ߠߊߓߊ߯ߙߊ߫ ߞߵߌ ߜߊ߲߬ߞߎ߲߫߸ ߊ߲ ߘߌ߫ ߛߘߌ߬ߜߋ߲ ߗߴߌ
         ߡߵߊ߬ ߟߊ߫ ߌ ߘߴߏ߬ ߟߊߓߊ߯ߙߊ߫ ߞߵߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߫.
-    create:
-      notice email on way: ߤߊߞߍ߬ߕߏ߫ ߌ ߓߘߊ߫ ߓߐߣߵߊ߬ ߘߐ߫:-(ߒ߬ߞߊ߬ ߗߋߛߓߍ ߘߏ߫ ߦߴߊ߬ ߞߣߐ߫
-        ߏ߬ ߘߐ߫ ߌ ߘߌ߫ ߛߴߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫ ߠߊ߫ ߖߏߣߊ߫.
-      notice email cannot find: ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߏ߬ ߕߴߛߋ߫ ߢߌߣߌ߲߫ ߠߊ߫߸ ߤߊߞߍ߬ߕߏ߫.
     edit:
       title: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߬
       heading: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߫ %{user} ߦߋ߫
@@ -1348,42 +1342,14 @@ nqo:
   sessions:
     new:
       title: ߌ ߜߊ߲߬ߞߎ߲߫
-      heading: ߌ ߜߊ߲߬ߞߎ߲߫
+      tab_title: ߌ ߜߊ߲߬ߞߎ߲߫
       email or username: 'ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߥߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ߬ ߕߐ߮:'
       password: 'ߕߊ߬ߡߌ߲߬ߞߊ߲:'
-      openid_html: '%{logo} ߘߊߦߟߍߟߌ߫ ID:'
       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: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߊ߫
@@ -1448,11 +1414,7 @@ nqo:
       id_not_configured: ID ߡߊ߫ ߘߊߘߐߓߍ߲߬ ߡߎߣߎ߲߬
     export:
       title: ߟߊ߬ߝߏ߬ߦߌ߬ߟߌ
-      area_to_export: ߟߊ߬ߝߏ߬ߦߌ߬ߟߌ ߞߍ߫ ߦߙߐ
       manually_select: ߦߙߐ߫ ߓߐߣߍ߲ߢߐ߲߰ߡߊ ߟߎ߬ ߓߊߕߐ߬ߡߐ߲߬ ߓߟߏߟߕߊߦߊ ߘߐ߫
-      format_to_export: ߖߙߎߡߎ߲߫ ߛߏ߲߯ߓߕߊ
-      osm_xml_data: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ XML ߟߐ߲ߕߊ
-      map_image: ߡߊߔ ߖߌ߬ߦߊ߬ߓߍ (ߓߊߖߎ ߟߊߟߊߟߌ ߦߌ߬ߘߊ߬ߟߌ)
       too_large:
         planet:
           title: ߖߊ߯ߓߊߟߌ OSM
@@ -1460,11 +1422,6 @@ nqo:
           title: ߛߎ߲߫ ߜߘߍ ߟߎ߬
           description: ߊ߬ ߛߎ߲߫ ߞߏ ߡߞߊ߬ߝߏ߬ߟߌ߬ ߜߘߍ߫ ߟߎ߫ ߛߙߍߘߍ ߦߋ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߥߞߌ
             ߞߊ߲߬
-      options: ߢߣߊߕߊߟߌ
-      format: ߖߙߎߡߎ߲
-      image_size: ߖߌ߬ߦߊ߬ߓߍ ߢߊ߲ߞߊ߲
-      zoom: ߡߛߊ߬ߡߊ߲߬ߠߌ߲
-      add_marker: ߣߐ߬ߣߐ߬ߟߊ߲ ߓߌ߬ߟߊ߬ ߡߊߔ ߟߊ߫
       export_button: ߟߊ߬ߝߏ߬ߦߌ߬ߟߌ
     fixthemap:
       title: ߝߙߋߞߋ ߘߏ߫ ߟߊߞߏߝߐ߫\ߔߊ߬ߔߘߊ ߘߐߓߍ߲߬
@@ -1485,10 +1442,6 @@ nqo:
       beginners_guide:
         title: ߘߊߡߌߣߊߟߌߟߊ ߟߎ߬ ߢߍߡߌߘߊ
         description: ߘߍ߬ߘߊ ߦߋ߫ ߢߍߡߌߘߊ ߘߏ߫ ߘߐߓߍ߲߬ ߠߊ߫ ߘߊߡߌߣߊߟߌߟߊ ߟߎ߬ ߦߋ߫.
-      help:
-        title: ߘߍ߬ߡߍ߲߬ߠߌ߲ ߟߐ߯ߓߊߟߐ
-        description: ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ ߘߏ߫ ߞߍ߫ ߤߊߡߊ߲ߕߍ߫ ߞߊ߬ ߖߋ߬ߓߌ ߘߏ߫ ߟߎ߫ ߡߊߝߟߍ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ
-          ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ-ߣߴߊ߬-ߖߋ߬ߓߌ ߞߍߦߙߐ ߞߊ߲߬.
       mailing_lists:
         title: ߢߎߡߍߙߋ߲ߦߊߟߌ ߛߙߍߘߍ ߟߎ߬
       welcomemat:
@@ -1521,23 +1474,23 @@ nqo:
           rail: ߣߍ߰ߛߌߟߊ
           subway: ߘߎ߰ߞߘߐ߬ߛߌߟߊ
           cable_car: ߘߎ߲ߞߎߟߎ߲
-          runway_only: ߛߊ߲ߡߊߘߊ߲ ߓߏ߬ߙߌ߬ ߛߌߟߊ
+          runway: ߛߊ߲ߡߊߘߊ߲ ߓߏ߬ߙߌ߬ ߛߌߟߊ
           taxiway: ߥߊߟߌߥߊߟߌ ߫ ߛߌߟߊ
           admin: ߓߐߕߏ߲߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ߬ߞߊ
-          forest_only: ߕߎ
+          forest: ߕߎ
           wood: ߦߙߌ
-          common_only: ߘߍ߬ߒ߬ߡߊ߬ ߞߣߍ
+          common: ߘߍ߬ߒ߬ߡߊ߬ ߞߣߍ
           resident: ߡߐ߰ߘߐ߬ ߛߌߟߊ
           retail: ߖߎ߬ߟߦߊ߬ ߞߣߍ
           industrial: ߘߍ߲߰ߦߊ߬ߟߌ ߕߌ߲߬ߞߎߘߎ߲
           commercial: ߖߊ߬ߥߏ ߘߌ߲߬ߞߌߙߊ
-          lake_only: ߞߐ߰ߖߌ߬ߘߟߊ
+          lake: ߞߐ߰ߖߌ߬ߘߟߊ
           farm: ߝߏ߬ߘߏ
           cemetery: ߞߊߓߙߎߟߏ
           centre: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ ߕߊ߲ߓߊ߲
           reserve: ߛߎ߲ߞߎ߲ ߦߙߐ߫ ߟߊߕߏߣߍ߲
           military: ߣߊ߲߬ߕߌ߰ ߕߌ߲ߞߎߘߎ߲
-          school_only: ߞߊ߬ߙߊ߲߬ߕߊ
+          school: ߞߊ߬ߙߊ߲߬ߕߊ
           university: ߖߊ߯ߓߘߊ
           station: ߣߍ߰ߛߌߟߊ ߟߐ߬ߘߊ߮
           construction: ߛߌߟߊ ߡߍ߲ ߟߊ ߦߴߌ ߘߐ߫
@@ -1600,8 +1553,6 @@ nqo:
       identifiable: ߡߊ߬ߟߐ߲߬ߕߊ
       private: ߘߎ߲߬ߘߎ߬ߡߊ
       trackable: ߜߙߋ߬ߓߐ߬ߕߊ
-      by: ߞߊ߬ ߝߘߊ߫
-      in: ߘߐ߫
     index:
       public_traces: ߜߍߘߐ߫ GPS ߜߋ߬ߙߋ ߟߎ߬
       public_traces_from: ߜߍߘߐ߫ ߜߙߋ ߟߎ߬ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫
@@ -1643,6 +1594,32 @@ nqo:
       oauth1_settings: 0Auth 1 ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߦߊ߬ߘߊ
       oauth2_applications: 0Auth 2 ߟߥߊ߬ߟߌ߬ߟߌ ߟߎ߬
       oauth2_authorizations: 0Auth 2 ߖߡߊ߬ߙߌ߬ߦߊ߬ߟߌ
+    auth_providers:
+      openid_logo_alt: ߌ ߜߊ߲߬ߞߎ߲߬ ߏߔߌ߲ ID ߟߊ߫
+      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 ߟߊ߫
   oauth:
     authorize:
       title: ߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߟߊߛߐ߬ߘߐ߲ ߠߊߘߌ߬ߢߍ߬
@@ -1843,9 +1820,6 @@ nqo:
     blocks:
       creator_name: ߛߌ߲ߘߌߟߊ߲
       reason: ߓߊ߬ߟߊ߲߬ߠߌ߲ ߞߎ߲߭
-      showing_page: ߞߐߜߍ %{page}
-      next: ߟߊ߬ߕߎ߲߰ߠߊ »
-      previous: ߕߊ߬ߡߌ߲߬ߣߍ߲
   notes:
     index:
       no_notes: ߦߟߌߣߐ߫ ߛߌ߫ ߕߴߦߋ߲߬