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

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

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 395cbcf0b5488d769973f624f3aaeb9ab4779503..396c7ca0e630aee6139bdb48c7780289e7718948 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -138,7 +138,6 @@ nqo:
         auth_provider: ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ ߡߊߛߐߟߊ߲
         auth_uid: ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ UID
         email: ߢ:ߞߏ߲ߘߏ
         auth_provider: ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ ߡߊߛߐߟߊ߲
         auth_uid: ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ UID
         email: ߢ:ߞߏ߲ߘߏ

-        email_confirmation: ߢ:ߞߏ߲ߘߏ ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ

         new_email: ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ߫ ߞߎߘߊ
         active: ߞߎ߲߬ߞߊߟߌ߲
         display_name: ߕߐ߮ ߟߊߓߊ߯ߙߊ߫
         new_email: ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ߫ ߞߎߘߊ
         active: ߞߎ߲߬ߞߊߟߌ߲
         display_name: ߕߐ߮ ߟߊߓߊ߯ߙߊ߫


@@ -1343,41 +1342,14 @@ nqo:
   sessions:
     new:
       title: ߌ ߜߊ߲߬ߞߎ߲߫
   sessions:
     new:
       title: ߌ ߜߊ߲߬ߞߎ߲߫

-      heading: ߌ ߜߊ߲߬ߞߎ߲߫
+      tab_title: ߌ ߜߊ߲߬ߞߎ߲߫

       email or username: 'ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߥߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ߬ ߕߐ߮:'
       password: 'ߕߊ߬ߡߌ߲߬ߞߊ߲:'
       remember: ߒ ߖߊ߲߭ߓߌ߬ߟߊ߬
       lost password link: ߌ ߓߘߊ߫ ߢߌ߬ߣߊ߬ ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߠߊ߫؟
       login_button: ߌ ߜߊ߲߬ߞߎ߲߫
       register now: ߌ ߕߐ߮ ߛߓߍ߫ ߡߎ߬ߕߎ߲߫
       email or username: 'ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߥߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ߬ ߕߐ߮:'
       password: 'ߕߊ߬ߡߌ߲߬ߞߊ߲:'
       remember: ߒ ߖߊ߲߭ߓߌ߬ߟߊ߬
       lost password link: ߌ ߓߘߊ߫ ߢߌ߬ߣߊ߬ ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߠߊ߫؟
       login_button: ߌ ߜߊ߲߬ߞߎ߲߫
       register now: ߌ ߕߐ߮ ߛߓߍ߫ ߡߎ߬ߕߎ߲߫

-      no account: ߖߊ߬ߕߋ߬ߘߊ߬ ߕߴߌ ߓߟߏ߫ ߓߊ߬؟

       auth failure: ߤߊߞߍ߬ߕߏ߫߸ ߌ ߕߴߛߋ߫ ߌ ߜߊ߲߬ߞߎ߲߬ ߠߊ߫ ߝߊߙߊ߲ߝߊ߯ߛߌ ߏ߬ ߟߐ߬ߟߊ߫.
       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: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߊ߫
     destroy:
       title: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫
       heading: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߊ߫


@@ -1581,8 +1553,6 @@ nqo:
       identifiable: ߡߊ߬ߟߐ߲߬ߕߊ
       private: ߘߎ߲߬ߘߎ߬ߡߊ
       trackable: ߜߙߋ߬ߓߐ߬ߕߊ
       identifiable: ߡߊ߬ߟߐ߲߬ߕߊ
       private: ߘߎ߲߬ߘߎ߬ߡߊ
       trackable: ߜߙߋ߬ߓߐ߬ߕߊ

-      by: ߞߊ߬ ߝߘߊ߫
-      in: ߘߐ߫

     index:
       public_traces: ߜߍߘߐ߫ GPS ߜߋ߬ߙߋ ߟߎ߬
       public_traces_from: ߜߍߘߐ߫ ߜߙߋ ߟߎ߬ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫
     index:
       public_traces: ߜߍߘߐ߫ GPS ߜߋ߬ߙߋ ߟߎ߬
       public_traces_from: ߜߍߘߐ߫ ߜߙߋ ߟߎ߬ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫


@@ -1624,6 +1594,32 @@ nqo:
       oauth1_settings: 0Auth 1 ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߦߊ߬ߘߊ
       oauth2_applications: 0Auth 2 ߟߥߊ߬ߟߌ߬ߟߌ ߟߎ߬
       oauth2_authorizations: 0Auth 2 ߖߡߊ߬ߙߌ߬ߦߊ߬ߟߌ
       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: ߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߟߊߛߐ߬ߘߐ߲ ߠߊߘߌ߬ߢߍ߬
   oauth:
     authorize:
       title: ߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߟߊߛߐ߬ߘߐ߲ ߠߊߘߌ߬ߢߍ߬


@@ -1824,9 +1820,6 @@ nqo:
     blocks:
       creator_name: ߛߌ߲ߘߌߟߊ߲
       reason: ߓߊ߬ߟߊ߲߬ߠߌ߲ ߞߎ߲߭
     blocks:
       creator_name: ߛߌ߲ߘߌߟߊ߲
       reason: ߓߊ߬ߟߊ߲߬ߠߌ߲ ߞߎ߲߭

-      showing_page: ߞߐߜߍ %{page}
-      next: ߟߊ߬ߕߎ߲߰ߠߊ »
-      previous: ߕߊ߬ߡߌ߲߬ߣߍ߲

   notes:
     index:
       no_notes: ߦߟߌߣߐ߫ ߛߌ߫ ߕߴߦߋ߲߬
   notes:
     index:
       no_notes: ߦߟߌߣߐ߫ ߛߌ߫ ߕߴߦߋ߲߬