Merge branch 'master' into feature/add-communities-page

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

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 9359b68f865d5b59602a2c52faaacb391784d868..6a40da417d648bc1489c3e47156f3eb606a9b3b0 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -5,6 +5,7 @@
 # Author: Ajeje Brazorf
 # Author: Lancine.kounfantoh.fofana
 # Author: Youssoufkadialy
+# Author: ߛߊ߲߬ߛߊ߲߬ߘߐ߬ ߊߡߙߊ߫
 ---
 nqo:
   html:
@@ -105,6 +106,7 @@ nqo:
       doorkeeper/application:
         name: ߕߐ߮
         redirect_uri: URLs ߟߊߞߎ߲߬ߛߌ߲߬ߠߌ߲
+        confidential: ' ߜߎ߲߬ߘߎ߬ߘߐ߫ ߟߊߥߊߟߌߟߌ߫؟'
         scopes: ߘߌ߬ߢߍ߬ߟߊ߬ߢߌ߬ߣߌ߲߬
       friend:
         user: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ
@@ -140,8 +142,11 @@ nqo:
         new_email: ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ߫ ߞߎߘߊ
         active: ߞߎ߲߬ߞߊߟߌ߲
         display_name: ߕߐ߮ ߟߊߓߊ߯ߙߊ߫
-        description: ߕߐ߯ߛߓߍߟߌ
+        description: ߦߊߞߙߍ ߛߎ߯ߦߌߘߊ
+        home_lat: ߘߟߊߕߍ߮
+        home_lon: ߕߍߟߍ߲
         languages: ߞߊ߲߫ ߝߌ߬ߛߊ߬ߡߊ߲߬ߕߋ ߟߎ߬
+        preferred_editor: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߊ ߝߌ߬ߛߊ߬ߡߊ߲߬ߕߋ
         pass_crypt: ߕߊ߬ߡߌ߲߬ߞߊ߲
         pass_crypt_confirmation: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߠߊߛߙߋߦߊ߫
     help:
@@ -694,6 +699,7 @@ nqo:
           erotic: ߋߙߏߕߌߞ ߝߎ߲ߞߎ߲
           farm: ߛߣߍ߬ߞߍ߬ߝߋ߲߬ ߝߎ߲ߞߎ߲
           fashion: ߘߐ߬ߓߍ߲߬ߠߌ߲߬ ߖߐ߯ߙߊ߲ ߝߎ߲ߞߎ߲
+          fishing: ߖߍ߯ ߡߌߘߊ߫ ߖߐ߯ߙߊ߲ ߝߎ߲ߞߎ߲
           food: ߛߎ߬ߡߊ߲߬ ߝߎ߲ߞߎ߲
           gas: ߥߊߦߌ߲߫ ߝߎ߲ߞߎ߲
           hairdresser: ߞߎ߲߬ ߘߐ߬ߓߍ߲߬ ߦߌߟߊ
@@ -1180,6 +1186,7 @@ nqo:
         english_link: ߊ߲߬ߜ߭ߌߟߋ ߓߊߖߎߡߊ
       native:
         title: ߞߊ߬ ߓߍ߲߬ ߞߐߜߍ ߣߌ߲߬ ߡߊ߬
+        native_link: ߒߞߏ_ߕߐ߮_ߦߋ߫_ߦߊ߲߬ ߟߦߍ߬ߡߊ߲߬ߠߌ߲
         mapping_link: ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߌ ߘߊߡߌ߬ߣߊ߫
       legal_babble:
         title_html: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ ߣߌ߫ ߕߌ߰ߦߊ
@@ -1542,7 +1549,7 @@ nqo:
       my settings: ߒ ߠߊ߫ ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߦߊ߬ߘߊ ߟߎ߬
       my comments: ߒ ߠߊ߫ ߡߙߌߣߊ߲ ߠߎ߬
       my_preferences: ߒ ߠߊ߫ ߝߌ߬ߛߊ߬ߡߊ߲߬ߕߋ ߟߎ߬
-      blocks on me: ß\92 ß ß\8aß« ß\93ß\8a߬ß\9fß\8a߲߬ߣß\8dß² ß ß\8e߬
+      blocks on me: ß\93ß\8a߬ß\9fß\8aß²ß¬ß ß\8cß² ß¡ß\8dß² ߦß\8bß« ß\92 ß\9eß\8aß²߬
       blocks by me: ߡߍ߲ ߠߎ߬ ߓߊ߬ߟߊ߲߬ߣߍ߲߫ ߦߋ߫ ߒߠߋ ߓߟߏ߫
       send message: ߗߋߛߓߍ߫ ߗߋߣߍ߲
       diary: ߕߋ߬ߟߋ߲
@@ -1552,6 +1559,8 @@ nqo:
       remove as friend: ߕߋߙߌߦߊ ߝߘߊ߫
       add as friend: ߕߋߙߌ ߝߙߊ߬
       mapper since: 'ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߊ ߘߌ߫ ߞߊ߬ߦߌ߯:'
+      email address: 'ߢߎߡߍߙߋ߲߫ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮:'
+      created from: 'ߊ߬ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ ߞߊ߬ ߝߘߊ߫:'
       description: ߞߊ߲߬ߛߓߍߟߌ
       user location: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߘߌ߲߬ߞߌߙߊ
       role: