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

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

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index dd6eeae294de7dd0ba072cd8ba9b89794a72b86d..4edadf16d7c6efacf40d3d9c7e1e4aa9cb7f7384 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -558,6 +558,7 @@ nqo:
           nature_reserve: ߛߎ߲ߞߎ߲ ߦߙߐ߫ ߟߊߕߏߣߍ߲
           park: ߖߛߊ ߥߟߊ߫ ߥߍ߬ߙߍ
           sports_centre: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ ߕߊ߲ߓߊ߲
+          stadium: ߞߊߡߊ߲
           swimming_pool: ߣߊߥߎߠߌ߲߫ ߘߟߊ
         man_made:
           bridge: ߛߍ߲
@@ -1045,9 +1046,6 @@ nqo:
         wikipedia:
           title: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߞߌߔߋߘߌߦߊ ߟߊ߫
           alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߞߌߔߋߘߌߦߊ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫
-        yahoo:
-          title: ߌ ߜ߭ߊ߲߬ߞߎ߲߫ ߦߊ߬ߤߎ ߟߊ߫
-          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߦߊ߬ߤߎ ߏߔߌ߲ ID ߟߊ߫
         wordpress:
           title: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߐߘߑߔߙߍߛ ߟߊ߫
           alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߐߘߑߔߙߍߛ ߏߔߌ߲ ID ߟߊ߫
@@ -1253,4 +1251,16 @@ nqo:
       showing_page: ߞߐߜߍ %{page}
       older: ߜߋ߬ߙߋ ߞߘߐ߬ߡߊ߲ ߠߎ߬
       newer: ߜߋ߬ߙߋ ߞߎߘߡߊ ߟߎ߬
+  oauth_clients:
+    show:
+      edit: ߝߊߙߊ߲ߝߊ߯ߛߟߌ ߟߎ߬ ߡߊߦߟߍ߬ߡߊ߲߫
+      delete: ߛߊ߲߬ߠߌ߲߬ߢߐ߲߮ ߖߏ߬ߛߌ߫
+      confirm: ߌ ߟߊߣߴߏ߬ ߟߊ߫؟
+  users:
+    new:
+      email address: 'ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮:'
+      confirm email address: 'ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ ߟߊߛߙߋߦߊ߫:'
+      display name: 'ߟߊ߬ߓߊ߰ߙߊ߬ ߕߐ߮:'
+      display name description: ߌ ߓߘߊ߫ ߕߐ߮ ߟߊߓߊ߯ߙߕߊ ߟߊߓߊ߯ߙߊ߫ ߖߊ߬ߡߊ ߢߊߞߘߐ߫.ߌ ߘߌ߫ ߛߴߏ߬
+        ߡߊߝߊ߬ߟߋ߲߬ ߠߊ߫ ߦߟߌߡߊߛߙߋ ߞߣߐ߫ ߞߐߝߍ߬.
 ...