Correct merge issues in the last merge from master

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

diff --git a/config/locales/ps.yml b/config/locales/ps.yml
index abd14c3673f52518d70ed477d7a0979c303a8638..09350f46bf5a50857dd05a642f0acf83cbe25cad 100644 (file)
--- a/config/locales/ps.yml
+++ b/config/locales/ps.yml
@@ -1,3 +1,7 @@
+# Messages for Pashto (پښتو)
+# Exported from translatewiki.net
+# Export driver: syck
+# Author: Ahmed-Najib-Biabani-Ibrahimkhel

 ps: 
   activerecord: 
     attributes: 
 ps: 
   activerecord: 
     attributes: 


@@ -6,6 +10,7 @@ ps:
         title: سرليک
         user: کارن
       friend: 
         title: سرليک
         user: کارن
       friend: 

+        friend: ملګری

         user: کارن
       message: 
         title: سرليک
         user: کارن
       message: 
         title: سرليک


@@ -25,5 +30,172 @@ ps:
   browse: 
     map: 
       deleted: ړنګ شو
   browse: 
     map: 
       deleted: ړنګ شو

-  map: 
+    node: 
+      edit: سمول
+      view_history: پېښليک کتل
+    node_details: 
+      coordinates: "کوارډيناټونه:"
+    not_found: 
+      type: 
+        way: لار
+    relation_details: 
+      members: "غړي:"
+    relation_member: 
+      type: 
+        way: لار
+    start_rjs: 
+      object_list: 
+        type: 
+          way: لار
+    timeout: 
+      type: 
+        way: لار
+    way: 
+      edit: سمول
+      view_history: پېښليک کتل
+      way: لار
+  changeset: 
+    changesets: 
+      user: کارن
+  diary_entry: 
+    edit: 
+      language: "ژبه:"
+      save_button: خوندي کول
+      use_map_link: نخشه کارول
+    location: 
+      edit: سمول
+      view: کتل
+    view: 
+      login: ننوتل
+      save_button: خوندي کول
+  geocoder: 
+    description: 
+      types: 
+        cities: ښارونه
+        towns: ښارګوټي
+    direction: 
+      east: ختيځ
+      north: سهېل
+      north_east: سهېل-ختيځ
+      north_west: سهېل-لوېديځ
+      south: سوېل
+      south_east: سوېل-ختيځ
+      south_west: سوېل-لوېديځ
+      west: لوېديځ
+    search_osm_nominatim: 
+      prefix: 
+        amenity: 
+          bank: بانک
+          clinic: کلينيک
+          college: پوهنځی
+          embassy: سفارت
+          hospital: روغتون
+          hotel: هوټل
+          park: پارک
+          pharmacy: درملتون
+          police: پوليس
+          school: ښوونځی
+          shop: هټۍ
+          theatre: نندارتون
+        building: 
+          hotel: هوټل
+          shop: هټۍ
+          stadium: لوبغالی
+          tower: برج
+        highway: 
+          bus_stop: تمځای
+          road: واټ
+        historic: 
+          castle: ماڼۍ
+          church: کليسا
+          house: کور
+          museum: موزيم
+          tower: برج
+        landuse: 
+          cemetery: هديره
+          forest: ځنګل
+          park: پارک
+        leisure: 
+          park: پارک
+        natural: 
+          hill: غونډۍ
+          island: ټاپو
+          peak: څوکه
+          tree: ونه
+          valley: دره
+          water: اوبه
+        place: 
+          airport: هوايي ډګر
+          city: ښار
+          country: هېواد
+          farm: فارم
+          house: کور
+          houses: کورونه
+          island: ټاپو
+          region: سيمه
+          town: ښارګوټی
+          village: کلی
+        shop: 
+          bakery: بټيارۍ
+          gallery: ګالېري
+        tourism: 
+          guest_house: مېلمستون
+          hostel: ليليه
+          hotel: هوټل
+          information: مالومات
+          museum: موزيم
+          picnic_site: مېله ځای
+          valley: دره
+          zoo: ژوبڼ
+  layouts: 
+    home: کور
+    intro_3_partners: ويکي
+    log_in: ننوتل
+    shop: هټۍ

     view: کتل
     view: کتل

+  message: 
+    inbox: 
+      date: نېټه
+    outbox: 
+      date: نېټه
+  site: 
+    search: 
+      submit_text: ورځه
+    sidebar: 
+      close: تړل
+  trace: 
+    edit: 
+      edit: سمول
+      filename: "د دوتنې نوم:"
+      map: نخشه
+      save_button: بدلونونه خوندي کول
+    trace: 
+      edit: سمول
+      map: نخشه
+      view_map: نخشه کتل
+    view: 
+      edit: سمول
+      filename: "د دوتنې نوم:"
+      map: نخشه
+      none: هېڅ
+  user: 
+    account: 
+      image: "انځور:"
+    login: 
+      heading: ننوتل
+      login_button: ننوتل
+      password: "پټنوم:"
+      title: ننوتل
+    logout: 
+      logout_button: وتل
+      title: وتل
+    new: 
+      email address: "برېښليک پته:"
+      password: "پټنوم:"
+    popup: 
+      friend: ملګری
+    reset_password: 
+      password: "پټنوم:"
+    view: 
+      email address: "برېښليک پته:"
+      send message: پيغام لېږل