From ba3221715297758d85824ca87222ed8a94d286bd Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 14 Mar 2017 11:09:45 +0100
Subject: [PATCH] pulled translations from transifex

---
 src/main/res/values-ar/strings.xml     |  3 +++
 src/main/res/values-de/strings.xml     |  2 ++
 src/main/res/values-es/strings.xml     |  2 ++
 src/main/res/values-it/strings.xml     |  2 ++
 src/main/res/values-ja/strings.xml     |  2 ++
 src/main/res/values-nl/strings.xml     |  2 ++
 src/main/res/values-sr/strings.xml     | 22 ++++++++++++++++++++++
 src/main/res/values-tr-rTR/strings.xml |  5 +++++
 8 files changed, 40 insertions(+)

diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 5f265b491..6ce5a93f7 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -192,6 +192,7 @@
   <string name="last_seen_day">آخر ظهور منذ 1 يوم</string>
   <string name="last_seen_days">آخر ظهور منذ %d يوم</string>
   <string name="never_seen">لم يظهر متصلا حتى الآن</string>
+  <string name="install_openkeychain">هذه الرسالة مشفرة. قم بتثبيت OpenKeychain لفك الشيفرة.</string>
   <string name="unknown_otr_fingerprint">بصمة OTR مجهولة</string>
   <string name="openpgp_messages_found">تم العثور على رسائل مشفرة بال OpenPGP</string>
   <string name="reception_failed">خطأ في التلقي</string>
@@ -199,8 +200,10 @@
   <string name="otr_fingerprint">بصمة OTR</string>
   <string name="openpgp_key_id">معرف ID مفتاح ال OpenPGP</string>
   <string name="omemo_fingerprint">بصمة OMEMO</string>
+  <string name="omemo_fingerprint_x509">بصمة v\\OMEMO</string>
   <string name="this_device_omemo_fingerprint">بصمة OMEMO الخاصة بك</string>
   <string name="other_devices">أجهزة أخرى</string>
+  <string name="trust_omemo_fingerprints">ثق في بصمات أوميمو OMEMO</string>
   <string name="done">تم</string>
   <string name="verify">تأكيد</string>
   <string name="decrypt">فك الشيفرة</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 3241e9c9c..de908cca5 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -471,6 +471,8 @@
   <string name="disable_account">Konto abschalten</string>
   <string name="contact_is_typing">%s schreibt…</string>
   <string name="contact_has_stopped_typing">%s schreibt nicht mehr</string>
+  <string name="contacts_are_typing">%s schreiben...</string>
+  <string name="contacts_have_stopped_typing">%s schreiben nicht mehr</string>
   <string name="pref_chat_states">Tipp-Benachrichtigung</string>
   <string name="pref_chat_states_summary">Informiere deine Kontakte, wenn du eine Nachricht schreibst</string>
   <string name="send_location">Standort senden</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index e7b0e4af9..69864ab58 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -471,6 +471,8 @@
   <string name="disable_account">Deshabilitar Cuenta</string>
   <string name="contact_is_typing">%s está escribiendo...</string>
   <string name="contact_has_stopped_typing">%s ha dejado de escribir</string>
+  <string name="contacts_are_typing">%s están escribiendo...</string>
+  <string name="contacts_have_stopped_typing">%s han dejado de escribir</string>
   <string name="pref_chat_states">Notificación de escritura</string>
   <string name="pref_chat_states_summary">Permitir a tus contactos saber cuando estás escribiendo un mensaje</string>
   <string name="send_location">Enviar ubicación</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index ee281a84e..18600d9a1 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -471,6 +471,8 @@
   <string name="disable_account">Disabilita l\'account</string>
   <string name="contact_is_typing">%s sta digitando...</string>
   <string name="contact_has_stopped_typing">%s ha smesso di digitare</string>
+  <string name="contacts_are_typing">%s stanno scrivendo…</string>
+  <string name="contacts_have_stopped_typing">%s hanno smesso di scrivere</string>
   <string name="pref_chat_states">Notifiche di composizione</string>
   <string name="pref_chat_states_summary">Fai sapere ai tuoi contatti quando stai scrivendo loro un messaggio</string>
   <string name="send_location">Invia la posizione</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index e5536c23a..c2cf22a79 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -471,6 +471,8 @@
   <string name="disable_account">アカウントを無効にする</string>
   <string name="contact_is_typing">%s は入力中…</string>
   <string name="contact_has_stopped_typing">%s は入力を停止しました</string>
+  <string name="contacts_are_typing">%s さんが入力中…</string>
+  <string name="contacts_have_stopped_typing">%s さんが入力を止めました</string>
   <string name="pref_chat_states">入力中通知</string>
   <string name="pref_chat_states_summary">あなたがメッセージを書いているときに、連絡先に知らせます</string>
   <string name="send_location">位置を送信</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index a42bd9c97..ec8cf901a 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -471,6 +471,8 @@
   <string name="disable_account">Account uitschakelen</string>
   <string name="contact_is_typing">%s is aan het typen…</string>
   <string name="contact_has_stopped_typing">%s is gestopt met typen</string>
+  <string name="contacts_are_typing">%s zijn aan het typen…</string>
+  <string name="contacts_have_stopped_typing">%s zijn gestopt met typen</string>
   <string name="pref_chat_states">Aan-het-typen-meldingen</string>
   <string name="pref_chat_states_summary">Laat je contacten weten wanneer je ze een nieuw bericht schrijft</string>
   <string name="send_location">Locatie versturen</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 7278b035c..ee07640d0 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -176,6 +176,7 @@
   <string name="mgmt_account_delete_confirm_text">Ако обришете ваш налог изгубићете сав историјат преписке</string>
   <string name="attach_record_voice">Сними глас</string>
   <string name="account_settings_jabber_id">Џабер ИД</string>
+  <string name="block_jabber_id">Блокирај Џабер ИД</string>
   <string name="account_settings_password">Лозинка</string>
   <string name="account_settings_example_jabber_id">korisnickoime@primer.com</string>
   <string name="account_settings_confirm_password">Потврди лозинку</string>
@@ -469,6 +470,8 @@
   <string name="disable_account">Искључи налог</string>
   <string name="contact_is_typing">%s куца…</string>
   <string name="contact_has_stopped_typing">%s престаде да куца</string>
+  <string name="contacts_are_typing">%s куцају…</string>
+  <string name="contacts_have_stopped_typing">%s престаше да куцају</string>
   <string name="pref_chat_states">Обавештења о куцању</string>
   <string name="pref_chat_states_summary">Обзнаните контактима када им куцате поруке</string>
   <string name="send_location">Пошаљи локацију</string>
@@ -675,4 +678,23 @@
   <string name="share_as_uri">Подели као ИксМПП УРИ</string>
   <string name="share_as_http">Подели као ХТТП везу</string>
   <string name="invalid_barcode">Неисправан 2Д бар-кôд</string>
+  <string name="pref_clean_cache">Очисти кеш</string>
+  <string name="pref_clean_private_storage">Очисти лично складиште</string>
+  <string name="verify_omemo_keys">Овери ОМЕМО кључеве</string>
+  <string name="show_inactive_devices">Прикажи неактивне уређаје</string>
+  <string name="hide_inactive_devices">Сакриј неактивне уређаје</string>
+  <string name="distrust_omemo_key_text">Желите ли заиста да уклоните оверу за овај уређај?\nПоруке које долазе са тог уређаја ће бити означене као непоуздане.</string>
+  <string name="timeout_24_hours">24 сата</string>
+  <string name="timeout_7_days">7 дана</string>
+  <string name="timeout_30_days">30 дана</string>
+  <string name="timeout_6_months">6 месеци</string>
+  <string name="pref_automatically_delete_messages">Аутоматско брисање порука</string>
+  <string name="pref_automatically_delete_messages_description">Аутоматско брисање порука са овог уређаја које су старије од постављеног времена.</string>
+  <string name="encrypting_message">Шифрујем поруку</string>
+  <string name="transcoding_video_progress">Компресујем видео (%s%% завршено)</string>
+  <string name="corresponding_conversations_closed">Одговарајуће преписке затворене.</string>
+  <string name="contact_blocked_past_tense">Контакт блокиран.</string>
+  <string name="pref_notifications_from_strangers">Обавештења од непознатих</string>
+  <string name="pref_notifications_from_strangers_summary">Обавештења за поруке од непознатих.</string>
+  <string name="received_message_from_stranger">Примљена порука од незнанца</string>
 </resources>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index d5a9d2ce3..eced8445f 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -176,6 +176,7 @@
   <string name="mgmt_account_delete_confirm_text">Hesabınızı silerseniz tüm konuşma geçmişiniz silinecek</string>
   <string name="attach_record_voice">Ses kaydet</string>
   <string name="account_settings_jabber_id">Jabber ID</string>
+  <string name="block_jabber_id">Jabber ID engelle</string>
   <string name="account_settings_password">Parola</string>
   <string name="account_settings_example_jabber_id">kullanıcıadı@ornek.com</string>
   <string name="account_settings_confirm_password">Parolayı doğrula</string>
@@ -470,6 +471,8 @@
   <string name="disable_account">Hesabı devre dışı bırak</string>
   <string name="contact_is_typing">%s yazıyor…</string>
   <string name="contact_has_stopped_typing">%s yazmayı bıraktı</string>
+  <string name="contacts_are_typing">%s yazıyor…</string>
+  <string name="contacts_have_stopped_typing">%s yazmayı bıraktı</string>
   <string name="pref_chat_states">Yazma bildirimleri</string>
   <string name="pref_chat_states_summary">Siz onlara ileti yazarken kişilerinizin bunu bilmesini sağlayın</string>
   <string name="send_location">Yer bildirimi gönder</string>
@@ -697,4 +700,6 @@
   <string name="encrypting_message">İletiyi şifrelemek</string>
   <string name="not_fetching_history_retention_period">Yerel saklama süresi nedeniyle ileti getirilmiyor.</string>
   <string name="transcoding_video_progress">Video sıkıştırılıyor (%s%% tamamlandı)</string>
+  <string name="corresponding_conversations_closed">Konuşma sonlandı</string>
+  <string name="contact_blocked_past_tense">Kişi engellendi.</string>
 </resources>