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

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

diff --git a/config/locales/ps.yml b/config/locales/ps.yml
index c5efeea4c52d62a8f22b49fdfa3c7fde87b02567..23d53f006918386f55a364037a5b812736dde695 100644 (file)
--- a/config/locales/ps.yml
+++ b/config/locales/ps.yml
@@ -81,8 +81,7 @@ ps:
     id:
       name: iD
   accounts:
-    edit:
-      my settings: زما امستنې
+    show:
       openid:
         link text: دا څه دی؟
       contributor terms:
@@ -301,7 +300,7 @@ ps:
   passwords:
     new:
       heading: آيا پټنوم مو هېر شوی؟
-      email address: 'برېښليک پته:'
+      email address: برېښليک‌پته
   profiles:
     edit:
       image: 'انځور:'
@@ -323,7 +322,7 @@ ps:
       legal_babble:
         credit_1_html: موږ غواړو چې تاسو کریډیټ وکاروي لپاره “© د اوفن
           سټریټ ميپ مرسته کوونکی”.
-    edit:
+    not_public_flash:
       user_page_link: د کارن مخ
     export:
       licence: منښتليک
@@ -375,7 +374,7 @@ ps:
       my messages: زما پيغامونه
       send message: پيغام لېږل
       edits: سمونونه
-      email address: 'برېښليک پته:'
+      email address: 'برېښليک‌پته:'
       status: 'دريځ:'
       block_history: فعاله بنديزونه
       moderator_history: لگېدلي بنديزونه