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

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

diff --git a/config/locales/ps.yml b/config/locales/ps.yml
index fb766e366c9de8e78b3b8c9078b7488d3c751264..2796408464d5693dc5b3b1ec48fc4f50035c180b 100644 (file)
--- a/config/locales/ps.yml
+++ b/config/locales/ps.yml
@@ -94,8 +94,6 @@ ps:
         link text: دا څه دی؟
       save changes button: بدلونونه خوندي کول
   browse:
-    created: جوړ شو
-    closed: تړل شوی
     relation:
       members: غړي
     relation_member:
@@ -120,6 +118,10 @@ ps:
       user: کارن
       comment: تبصره
       area: سيمه
+    index:
+      feed:
+        created: جوړ شو
+        closed: تړل شوی
   dashboards:
     popup:
       friend: ملگری
@@ -310,15 +312,13 @@ ps:
     confirm_email:
       button: تاييد
   messages:
-    inbox:
+    messages_table:
       date: نېټه
     message_summary:
       reply_button: ځوابول
       destroy_button: ړنگول
     new:
       title: پيغام لېږل
-    outbox:
-      date: نېټه
     show:
       title: پيغام لوستل
       reply_button: ځواب
@@ -358,8 +358,6 @@ ps:
       user_page_link: د کارن مخ
     export:
       licence: منښتليک
-      options: خوښنې
-      format: بڼه
     sidebar:
       search_results: د پلټنې پايلې
       close: تړل
@@ -370,18 +368,15 @@ ps:
     key:
       table:
         entry:
-          forest:
-          - ځنگل
+          forest: ځنگل
           park: پارک
-          lake:
-          - ډنډ
-          - زېرمتون
+          lake: ډنډ
+          reservoir: زېرمتون
           farm: کرونده
           cemetery: هديره
           military: پوځي سيمه
-          school:
-          - ښوونځی
-          - پوهنتون
+          school: ښوونځی
+          university: پوهنتون
   traces:
     new:
       visibility_help: دا څه مانا لري؟