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

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

diff --git a/config/locales/ps.yml b/config/locales/ps.yml
index 2796408464d5693dc5b3b1ec48fc4f50035c180b..3b3d2be5196f05933c7b79d4e39e7ac42d4ab4e9 100644 (file)
--- a/config/locales/ps.yml
+++ b/config/locales/ps.yml
@@ -113,11 +113,6 @@ ps:
   changesets:
     changeset:
       anonymous: ورکنومی
   changesets:
     changeset:
       anonymous: ورکنومی

-    changesets:
-      id: پېژند
-      user: کارن
-      comment: تبصره
-      area: سيمه

     index:
       feed:
         created: جوړ شو
     index:
       feed:
         created: جوړ شو


@@ -142,7 +137,8 @@ ps:
       location: 'ځای:'
       view: کتل
       edit: سمول
       location: 'ځای:'
       view: کتل
       edit: سمول

-    comments:
+  diary_comments:
+    page:

       when: کله
       comment: تبصره
   friendships:
       when: کله
       comment: تبصره
   friendships:


@@ -294,8 +290,6 @@ ps:
     edit: سمول
     history: پېښليک
     help: لارښود
     edit: سمول
     history: پېښليک
     help: لارښود

-    make_a_donation:
-      text: بسپنه ورکول

     learn_more: نور مالومات
   user_mailer:
     diary_comment_notification:
     learn_more: نور مالومات
   user_mailer:
     diary_comment_notification:


@@ -335,13 +329,9 @@ ps:
   sessions:
     new:
       title: ننوتل
   sessions:
     new:
       title: ننوتل

-      heading: ننوتل
+      tab_title: ننوتل

       password: 'پټنوم:'
       login_button: ننوتل
       password: 'پټنوم:'
       login_button: ننوتل

-      auth_providers:
-        github:
-          title: د گېټ هب له لارې ننوتل
-          alt: د يو گېټ هب گڼون له لارې ننوتل

     destroy:
       title: وتل
       logout_button: وتل
     destroy:
       title: وتل
       logout_button: وتل


@@ -394,11 +384,11 @@ ps:
     trace:
       view_map: نخشه کتل
       edit_map: نخشه سمول
     trace:
       view_map: نخشه کتل
       edit_map: نخشه سمول

-  oauth_clients:
-    show:
-      confirm: آيا تاسې ډاډه ياست؟
-    index:
-      application: کاريال نوم
+  application:
+    auth_providers:
+      github:
+        title: د گېټ هب له لارې ننوتل
+        alt: د يو گېټ هب گڼون له لارې ننوتل

   users:
     new:
       title: نومليکنه
   users:
     new:
       title: نومليکنه