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

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

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 4ed01b2973d889729a97dc3517856bd3f1dd5f81..0081b009abf0a2cb306d4c25da02ac42f2126dcf 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -73,8 +73,8 @@ diq:
       report: Rapor kerê
       session: Ronıştış
       trace: Şop
       report: Rapor kerê
       session: Ronıştış
       trace: Şop

-      tracepoint: Dawtey şopi
-      tracetag: Etikete şopi
+      tracepoint: Nuqtaya rêçe
+      tracetag: Etiketê rêçe

       user: Karber
       user_preference: Tercihê Karberi
       user_token: Moriya Karberi
       user: Karber
       user_preference: Tercihê Karberi
       user_token: Moriya Karberi


@@ -150,7 +150,6 @@ diq:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

       github: GitHub
       wikipedia: Wikipedia
   api:
       github: GitHub
       wikipedia: Wikipedia
   api:


@@ -295,6 +294,7 @@ diq:
     contact:
       km away: '%{count} km duriyo'
       m away: '%{count} metre nezdiyo'
     contact:
       km away: '%{count} km duriyo'
       m away: '%{count} metre nezdiyo'

+      latest_edit_html: 'vurnayışê peyênê %{ago}:'

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


@@ -951,8 +951,6 @@ diq:
       description: 'Şınasnayış:'
       tags: 'Etiketi:'
       none: Çıniyo
       description: 'Şınasnayış:'
       tags: 'Etiketi:'
       none: Çıniyo

-    trace_paging_nav:
-      showing_page: Pele %{page}

     trace:
       pending: PAWEDEYO
       count_points:
     trace:
       pending: PAWEDEYO
       count_points:


@@ -1012,7 +1010,6 @@ diq:
       mapper since: 'Demê herdnigarwaniye:'
       ct undecided: Darıdeyo
       ct declined: Red kerd
       mapper since: 'Demê herdnigarwaniye:'
       ct undecided: Darıdeyo
       ct declined: Red kerd

-      latest edit: 'vurnayışê peyênê %{ago}:'

       email address: 'Adresa e-postey:'
       created from: 'Vıraşten ra:'
       status: 'Weziyet:'
       email address: 'Adresa e-postey:'
       created from: 'Vıraşten ra:'
       status: 'Weziyet:'