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

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index cbfb12d700ea0d802a5402cb64896720b95c05aa..755636e1de7c507158007e8d71863749e92cfe17 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
-      tracepoint: Dawtey şopi
-      tracetag: Etikete şopi
+      tracepoint: Nuqtaya rêçe
+      tracetag: Etiketê rêçe
       user: Karber
       user_preference: Tercihê Karberi
       user_token: Moriya Karberi

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 2c0d6726e3535855f6b7837c9fce80194594cdc3..967969d34bd3e9c566afcc1c137fe997a51cb95e 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -191,7 +191,7 @@ sr:
       none: Ниједан
       openid: OpenID
       google: Google
-      facebook: Facebook
+      facebook: Фејсбук
       github: GitHub
       wikipedia: Википедија
   api: