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

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

diff --git a/config/locales/ps.yml b/config/locales/ps.yml
index 82ca9bd504cd6ebb4b128bddf9531272e30ec479..db445f17e2a9c0ab5c6644b6c21b4903144b9827 100644 (file)
--- a/config/locales/ps.yml
+++ b/config/locales/ps.yml
@@ -96,6 +96,9 @@ ps:
       user: کارن
       comment: تبصره
       area: سيمه
+  dashboards:
+    popup:
+      friend: ملگری
   diary_entries:
     form:
       location: 'ځای:'
@@ -304,6 +307,10 @@ ps:
     lost_password:
       heading: آيا پټنوم مو هېر شوی؟
       email address: 'برېښليک پته:'
+  profiles:
+    edit:
+      image: 'انځور:'
+      new image: يو انځور ورگډول
   sessions:
     new:
       title: ننوتل
@@ -398,7 +405,6 @@ ps:
       add as friend: ملگری ورگډول
       email address: 'برېښليک پته:'
       status: 'دريځ:'
-      settings_link_text: امستنې
       block_history: فعاله بنديزونه
       moderator_history: لگېدلي بنديزونه
       comments: تبصرې
@@ -410,8 +416,6 @@ ps:
       unhide_user: دا کارن ښکاره کول
       delete_user: دا کارن ړنگول
       confirm: تاييد
-    popup:
-      friend: ملگری
     account:
       my settings: زما امستنې
       openid:
@@ -420,8 +424,6 @@ ps:
         enabled link text: دا څه دی؟
       contributor terms:
         link text: دا څه دی؟
-      image: 'انځور:'
-      new image: يو انځور ورگډول
       save changes button: بدلونونه خوندي کول
     index:
       title: کارنان