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

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

diff --git a/config/locales/ps.yml b/config/locales/ps.yml
index 985180fe1937a513c516be6b92d85f686e4b6be6..23d53f006918386f55a364037a5b812736dde695 100644 (file)
--- a/config/locales/ps.yml
+++ b/config/locales/ps.yml
@@ -81,12 +81,9 @@ ps:
     id:
       name: iD
   accounts:
-    edit:
-      my settings: زما امستنې
+    show:
       openid:
         link text: دا څه دی؟
-      public editing:
-        enabled link text: دا څه دی؟
       contributor terms:
         link text: دا څه دی؟
       save changes button: بدلونونه خوندي کول
@@ -114,9 +111,6 @@ ps:
       feed:
         created: جوړ شو
         closed: تړل شوی
-  dashboards:
-    popup:
-      friend: ملگری
   diary_entries:
     form:
       location: 'ځای:'
@@ -132,13 +126,6 @@ ps:
       confirm: تاييد
     location:
       location: 'ځای:'
-  diary_comments:
-    page:
-      when: کله
-      comment: تبصره
-  friendships:
-    make_friend:
-      button: د ملگري په توگه ورگډول
   geocoder:
     search_osm_nominatim:
       prefix:
@@ -313,7 +300,7 @@ ps:
   passwords:
     new:
       heading: آيا پټنوم مو هېر شوی؟
-      email address: 'برېښليک پته:'
+      email address: برېښليک‌پته
   profiles:
     edit:
       image: 'انځور:'
@@ -335,7 +322,7 @@ ps:
       legal_babble:
         credit_1_html: موږ غواړو چې تاسو کریډیټ وکاروي لپاره “© د اوفن
           سټریټ ميپ مرسته کوونکی”.
-    edit:
+    not_public_flash:
       user_page_link: د کارن مخ
     export:
       licence: منښتليک
@@ -387,8 +374,7 @@ ps:
       my messages: زما پيغامونه
       send message: پيغام لېږل
       edits: سمونونه
-      add as friend: ملگری ورگډول
-      email address: 'برېښليک پته:'
+      email address: 'برېښليک‌پته:'
       status: 'دريځ:'
       block_history: فعاله بنديزونه
       moderator_history: لگېدلي بنديزونه
@@ -404,6 +390,10 @@ ps:
       show:
         title: کارنان
         heading: کارنان
+    changeset_comments:
+      page:
+        when: کله
+        comment: تبصره
   user_blocks:
     show:
       created: جوړ شو