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

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

diff --git a/config/locales/ps.yml b/config/locales/ps.yml
index 7965f252cece85094293c6c1673c92b358d9bdc5..a118d65ed2cc5e7c2323ed58e7b4dec03843ab44 100644 (file)
--- a/config/locales/ps.yml
+++ b/config/locales/ps.yml
@@ -310,22 +310,20 @@ ps:
     confirm_email:
       button: تاييد
   messages:
-    inbox:
+    messages_table:
       date: نېټه
     message_summary:
       reply_button: ځوابول
       destroy_button: ړنگول
     new:
       title: پيغام لېږل
-    outbox:
-      date: نېټه
     show:
       title: پيغام لوستل
       reply_button: ځواب
     sent_message_summary:
       destroy_button: ړنگول
   passwords:
-    lost_password:
+    new:
       heading: آيا پټنوم مو هېر شوی؟
       email address: 'برېښليک پته:'
   profiles:
@@ -346,8 +344,6 @@ ps:
       title: وتل
       logout_button: وتل
   site:
-    about:
-      copyright_html: <span>&copy;</span>د اوفن سټریټ ميپ<br>مرسته کوونکی
     copyright:
       foreign:
         title: د دې ژباړې په اړه
@@ -360,8 +356,6 @@ ps:
       user_page_link: د کارن مخ
     export:
       licence: منښتليک
-      options: خوښنې
-      format: بڼه
     sidebar:
       search_results: د پلټنې پايلې
       close: تړل
@@ -374,15 +368,13 @@ ps:
         entry:
           forest: ځنگل
           park: پارک
-          lake:
-          - ډنډ
-          - زېرمتون
+          lake: ډنډ
+          reservoir: زېرمتون
           farm: کرونده
           cemetery: هديره
           military: پوځي سيمه
-          school:
-          - ښوونځی
-          - پوهنتون
+          school: ښوونځی
+          university: پوهنتون
   traces:
     new:
       visibility_help: دا څه مانا لري؟
@@ -456,8 +448,6 @@ ps:
       hide: پټول
       comment: تبصره
   javascripts:
-    map:
-      copyright: © <a href='%{copyright_url}'>د اوفن سټریټ ميپ مرسته کوونکی</a>
     directions:
       distance: واټن
       instructions: