Merge branch 'master' into feature/add-communities-page

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

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 99312bfdef70fd3a7f62bede7f8f1c2dcc57e1e4..e5d2db786c79a0caea5a42e8dc26ab2860633d5d 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -288,6 +288,14 @@ diq:
       title_friend: Qeydê vurnayışê embazan
       title_nearby: Nezdıra vurriyayışê setê karberi
       load_more: Tayêna bar ke
       title_friend: Qeydê vurnayışê embazan
       title_nearby: Nezdıra vurriyayışê setê karberi
       load_more: Tayêna bar ke

+  dashboards:
+    contact:
+      km away: '%{count} km duriyo'
+      m away: '%{count} metre nezdiyo'
+    popup:
+      your location: Heruna mı
+      nearby mapper: Xeritoğo emıryan
+      friend: Embaz

   diary_entries:
     new:
       title: Roceko newe definayış
   diary_entries:
     new:
       title: Roceko newe definayış


@@ -837,6 +845,14 @@ diq:
       title: Parola reset ke
       heading: Parolay %{user} reset ke
       reset: Parola reset ke
       title: Parola reset ke
       heading: Parolay %{user} reset ke
       reset: Parola reset ke

+  preferences:
+    edit:
+      cancel: Bıtexelne
+  profiles:
+    edit:
+      image: 'Resım:'
+      new image: Yew resım cı ke
+      home location: 'Herune:'

   sessions:
     new:
       title: Cıkewtış
   sessions:
     new:
       title: Cıkewtış


@@ -1015,9 +1031,6 @@ diq:
       status: 'Weziyet:'
       description: Şınasnayış
       user location: Heruna karberi
       status: 'Weziyet:'
       description: Şınasnayış
       user location: Heruna karberi

-      settings_link_text: eyari
-      km away: '%{count} km duriyo'
-      m away: '%{count} metre nezdiyo'

       role:
         administrator: |-
           Na karber administratora<br>
       role:
         administrator: |-
           Na karber administratora<br>


@@ -1042,10 +1055,6 @@ diq:
       unhide_user: nê karberi menımnê
       delete_user: nê karberi esternê
       confirm: Tesdiq ke
       unhide_user: nê karberi menımnê
       delete_user: nê karberi esternê
       confirm: Tesdiq ke

-    popup:
-      your location: Heruna mı
-      nearby mapper: Xeritoğo emıryan
-      friend: Embaz

     account:
       title: Hesabi bıvurne
       my settings: Eyarê mı
     account:
       title: Hesabi bıvurne
       my settings: Eyarê mı


@@ -1062,11 +1071,7 @@ diq:
         heading: 'Pêron rê akerde vurnayış:'
       contributor terms:
         link text: no çıko?
         heading: 'Pêron rê akerde vurnayış:'
       contributor terms:
         link text: no çıko?

-      image: 'Resım:'
-      new image: Yew resım cı ke
-      home location: 'Herune:'

       save changes button: Vurnayışan qeyd ke
       save changes button: Vurnayışan qeyd ke

-      return to profile: Peyser şo profil

     index:
       title: Karberi
       heading: Karberi
     index:
       title: Karberi
       heading: Karberi


@@ -1080,7 +1085,6 @@ diq:
     suspended:
       title: Hesab Darideyo
       heading: Hesab Darideyo
     suspended:
       title: Hesab Darideyo
       heading: Hesab Darideyo

-      webmaster: idaroğê sita

   user_role:
     grant:
       confirm: Tesdiq ke
   user_role:
     grant:
       confirm: Tesdiq ke