From d89d7ade84e9bd46fbc95cc50f4e92761a4ca5ce Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 29 May 2016 13:00:02 +0200
Subject: [PATCH] pulled translations from transifex

---
 src/main/res/values-bg/strings.xml     |  8 ++++++
 src/main/res/values-cs/strings.xml     |  8 ++++++
 src/main/res/values-de/strings.xml     | 12 +++++++--
 src/main/res/values-es/strings.xml     |  8 ++++++
 src/main/res/values-ja/strings.xml     | 14 ++++++++---
 src/main/res/values-sr/strings.xml     |  8 ++++++
 src/main/res/values-tr-rTR/strings.xml | 34 ++++++++++++++++++++++++++
 7 files changed, 87 insertions(+), 5 deletions(-)

diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 2f4dd15ac..be5b01161 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -80,6 +80,7 @@
   <string name="also_end_conversation">Приключване на този разговор след това</string>
   <string name="choose_presence">Изберете присъствие за контакта</string>
   <string name="send_unencrypted_message">Изпр. на нешифр. съобщение</string>
+  <string name="send_message_to_x">Изпращане на съобщение до %s</string>
   <string name="send_otr_message">Изпр. на съобщение, шифр. чрез OTP</string>
   <string name="send_omemo_message">Изпр. на съобщение, шифр. чрез OMEMO</string>
   <string name="send_omemo_x509_message">Изпр. на съобщение, шифр. чрез v\\OMEMO</string>
@@ -248,6 +249,7 @@
   <string name="bookmark_already_exists">Вече съществува такава отметка</string>
   <string name="you">Вие</string>
   <string name="action_edit_subject">Редактиране на темата на беседата</string>
+  <string name="edit_subject_hint">Темата на тази беседа</string>
   <string name="joining_conference">Присъединяване към беседата…</string>
   <string name="leave">Напускане</string>
   <string name="contact_added_you">Контактът е добавен във Вашия списък от контакти</string>
@@ -607,4 +609,10 @@
   <string name="secure_password_generated">Беше създадена сигурна парола</string>
   <string name="device_does_not_support_battery_op">Устройството Ви не поддържа изключването на оптимизациите за използването на батерията</string>
   <string name="show_password">Показване на паролата</string>
+  <string name="registration_please_wait">Неуспешна регистрация. Опитайте отново по-късно</string>
+  <string name="create_conference">Създаване на беседа</string>
+  <string name="join_or_create_conference">Присъединяване към или създаване на беседа</string>
+  <string name="conference_subject">Тема</string>
+  <string name="choose_participants">Изберете участниците</string>
+  <string name="creating_conference">Създаване на беседа…</string>
 </resources>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 33d7669cc..27ffea6a9 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -80,6 +80,7 @@
   <string name="also_end_conversation">Poté ukončit tuto konverzaci</string>
   <string name="choose_presence">Vybrat aktualizaci stavu pro kontakt</string>
   <string name="send_unencrypted_message">Odeslat nešifrovanou zprávu</string>
+  <string name="send_message_to_x">Odeslat zprávu pro %s</string>
   <string name="send_otr_message">Poslat OTR šifrovanou zprávu</string>
   <string name="send_omemo_message">Poslat OMEMO šifrovanou zprávu</string>
   <string name="send_omemo_x509_message">Odeslat v\\OMEMO šifrovanou zprávu</string>
@@ -248,6 +249,7 @@
   <string name="bookmark_already_exists">Tato záložka již existuje</string>
   <string name="you">Já</string>
   <string name="action_edit_subject">Upravit jméno konference</string>
+  <string name="edit_subject_hint">Předmět této konference</string>
   <string name="joining_conference">Připojování ke konferenci...</string>
   <string name="leave">Odejít</string>
   <string name="contact_added_you">Kontakt přidán do seznamu</string>
@@ -610,4 +612,10 @@
   <string name="secure_password_generated">Bylo vygenerováno bezpečné heslo</string>
   <string name="device_does_not_support_battery_op">Tento přístroj nepodporuje vypnutí možnosti optimalizace využití baterie</string>
   <string name="show_password">Zobrazit heslo</string>
+  <string name="registration_please_wait">Registrace selhala: Zkuste znovu později</string>
+  <string name="create_conference">Vytvořit konferenci</string>
+  <string name="join_or_create_conference">Vytvořit nebo se připojit ke konferenci</string>
+  <string name="conference_subject">Předmět</string>
+  <string name="choose_participants">Vybrat účastníky</string>
+  <string name="creating_conference">Vytváření konference...</string>
 </resources>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 7b6b4e0b7..335c09fb1 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -80,6 +80,7 @@
   <string name="also_end_conversation">Diese Unterhaltung danach beenden</string>
   <string name="choose_presence">Ressource des Kontakts auswählen</string>
   <string name="send_unencrypted_message">Unverschlüsselt schreiben…</string>
+  <string name="send_message_to_x">Sende Nachricht an %s</string>
   <string name="send_otr_message">OTR-verschlüsselt schreiben…</string>
   <string name="send_omemo_message">OMEMO-verschlüsselt schreiben…</string>
   <string name="send_omemo_x509_message">v\\OMEMO-verschlüsselte Nachricht senden</string>
@@ -247,7 +248,8 @@
   <string name="delete_bookmark">Von Kontaktliste entfernen</string>
   <string name="bookmark_already_exists">Die Konferenz befindet sich bereits auf deiner Kontaktliste</string>
   <string name="you">Du</string>
-  <string name="action_edit_subject">Konferenz-Thema bearbeiten</string>
+  <string name="action_edit_subject">Thema dieser Konferenz bearbeiten</string>
+  <string name="edit_subject_hint">Thema dieser Konferenz</string>
   <string name="joining_conference">Konferenz wird betreten…</string>
   <string name="leave">Verlassen</string>
   <string name="contact_added_you">Der Kontakt hat dich zur Kontaktliste hinzugefügt</string>
@@ -307,7 +309,7 @@
   <string name="pref_use_send_button_to_indicate_status_summary">\"Senden\"-Schaltfläche einfärben, um den Online-Status des Kontakts anzuzeigen</string>
   <string name="pref_expert_options_other">Sonstiges</string>
   <string name="pref_conference_name">Konferenz-Name</string>
-  <string name="pref_conference_name_summary">Konferenz-Thema statt Raum-JID als Namen verwenden</string>
+  <string name="pref_conference_name_summary">Thema von Konferenzen anstatt JID als Namen verwenden</string>
   <string name="pref_autojoin">Konferenzen automatisch beitreten</string>
   <string name="pref_autojoin_summary">Autojoin-Flag in Konferenzlesezeichen beachten</string>
   <string name="toast_message_otr_fingerprint">OTR-Fingerabdruck in die Zwischenablage kopiert!</string>
@@ -607,4 +609,10 @@
   <string name="secure_password_generated">Ein sicheres Passwort wurde erstellt</string>
   <string name="device_does_not_support_battery_op">Dein Gerät unterstützt kein Ausschalten der Batterieoptimierung</string>
   <string name="show_password">Passwort anzeigen</string>
+  <string name="registration_please_wait">Fehlgeschlagen: Bitte später versuchen.</string>
+  <string name="create_conference">Konferenz erstellen</string>
+  <string name="join_or_create_conference">Konferenz betreten oder erstellen</string>
+  <string name="conference_subject">Thema</string>
+  <string name="choose_participants">Mitglieder wählen</string>
+  <string name="creating_conference">Erstelle Konferenz…</string>
 </resources>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 7d0edaba2..70ac36331 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -80,6 +80,7 @@
   <string name="also_end_conversation">Además, terminar esta conversación</string>
   <string name="choose_presence">Selecciona recurso del contacto</string>
   <string name="send_unencrypted_message">Enviar mensaje sin cifrar</string>
+  <string name="send_message_to_x">Enviar mensaje a %s</string>
   <string name="send_otr_message">Enviar mensaje cifrado con OTR</string>
   <string name="send_omemo_message">Enviar mensaje cifrado con OMEMO </string>
   <string name="send_omemo_x509_message">Enviar mensaje cifrado v\\OMEMO</string>
@@ -248,6 +249,7 @@
   <string name="bookmark_already_exists">Este marcador ya existe</string>
   <string name="you">Tú</string>
   <string name="action_edit_subject">Editar asunto de la conversación</string>
+  <string name="edit_subject_hint">El asunto de esta conversación</string>
   <string name="joining_conference">Uniéndose a conversación...</string>
   <string name="leave">Salir</string>
   <string name="contact_added_you">El contacto te ha añadido a su lista de contactos</string>
@@ -607,4 +609,10 @@
   <string name="secure_password_generated">Se ha generado una contraseña segura</string>
   <string name="device_does_not_support_battery_op">Tu dispositivo no soporta la opción de optimización de batería</string>
   <string name="show_password">Mostrar contraseña</string>
+  <string name="registration_please_wait">El registro falló. Prueba de nuevo más tarde</string>
+  <string name="create_conference">Crear conversación en grupo</string>
+  <string name="join_or_create_conference">Unirse o crear conversación en grupo</string>
+  <string name="conference_subject">Asunto</string>
+  <string name="choose_participants">Elige a los participantes</string>
+  <string name="creating_conference">Creando conversación...</string>
 </resources>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 0a9cd2804..2f8652390 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -80,6 +80,7 @@
   <string name="also_end_conversation">その後、この会話を終了</string>
   <string name="choose_presence">連絡する参加を選択</string>
   <string name="send_unencrypted_message">暗号化されていないメッセージを送信</string>
+  <string name="send_message_to_x">メッセージを %s に送信</string>
   <string name="send_otr_message">OTR 暗号化メッセージを送信</string>
   <string name="send_omemo_message">OMEMO 暗号化メッセージを送信</string>
   <string name="send_omemo_x509_message">v\\OMEMO 暗号化メッセージを送信</string>
@@ -247,7 +248,8 @@
   <string name="delete_bookmark">ブックマークを削除</string>
   <string name="bookmark_already_exists">このブックマークはすでに存在します</string>
   <string name="you">あなた</string>
-  <string name="action_edit_subject">会議の件名を編集</string>
+  <string name="action_edit_subject">会議の主題を編集</string>
+  <string name="edit_subject_hint">この会議の主題</string>
   <string name="joining_conference">会議に参加中…</string>
   <string name="leave">退出</string>
   <string name="contact_added_you">連絡先があなたを連絡先リストに追加しました</string>
@@ -307,7 +309,7 @@
   <string name="pref_use_send_button_to_indicate_status_summary">送信ボタンに連絡先ステータスを示す色が付きます</string>
   <string name="pref_expert_options_other">その他</string>
   <string name="pref_conference_name">会議名</string>
-  <string name="pref_conference_name_summary">会議を識別するために JID の代わりにルームのテーマを使用します</string>
+  <string name="pref_conference_name_summary">会議を識別するために JID の代わりにルームの主題を使用します</string>
   <string name="pref_autojoin">自動的に会議に参加</string>
   <string name="pref_autojoin_summary">会議ブックマークの自動参加フラグを尊重します</string>
   <string name="toast_message_otr_fingerprint">OTR フィンガープリントをクリップボードにコピーしました!</string>
@@ -555,7 +557,7 @@
   <string name="sync_with_contacts">連絡先と同期</string>
   <string name="sync_with_contacts_long">Conversations はフルネームやアバターを表示するために、連絡先と XMPP 名簿と一致するようにしたいです。\n\nConversations は、サーバーにアップロードすることはなく、ローカルで連絡先を読んで一致させるだけです。\n\n今、連絡先へのアクセス許可を付与するように求められます。</string>
   <string name="certificate_information">証明書情報</string>
-  <string name="certificate_subject">表題</string>
+  <string name="certificate_subject">主題</string>
   <string name="certificate_issuer">発行者</string>
   <string name="certificate_cn">一般名称</string>
   <string name="certificate_o">組織</string>
@@ -604,4 +606,10 @@
   <string name="secure_password_generated">安全なパスワードが生成されました</string>
   <string name="device_does_not_support_battery_op">お使いのデバイスはバッテリー最適化の停止をサポートしていません</string>
   <string name="show_password">パスワードを表示</string>
+  <string name="registration_please_wait">登録に失敗しました: 後でもう一度試してください</string>
+  <string name="create_conference">会議を作成</string>
+  <string name="join_or_create_conference">会議に参加または作成</string>
+  <string name="conference_subject">主題</string>
+  <string name="choose_participants">参加者を選択</string>
+  <string name="creating_conference">会議の作成中…</string>
 </resources>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 5ad978eb6..6dc6942be 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -80,6 +80,7 @@
   <string name="also_end_conversation">Окончај ову преписку након тога</string>
   <string name="choose_presence">Избор присутности за контакта</string>
   <string name="send_unencrypted_message">Пошаљи нешифровану поруку</string>
+  <string name="send_message_to_x">Пошаљи поруку за %s</string>
   <string name="send_otr_message">Пошаљи ОТР шифровану поруку</string>
   <string name="send_omemo_message">Пошаљи ОМЕМО шифровану поруку</string>
   <string name="send_omemo_x509_message">Пошаљи v\\ОМЕМО шифровану поруку</string>
@@ -248,6 +249,7 @@
   <string name="bookmark_already_exists">Овај обележивач већ постоји</string>
   <string name="you">Ви</string>
   <string name="action_edit_subject">Уреди предмет групног ћаскања</string>
+  <string name="edit_subject_hint">Предмет групног ћаскања</string>
   <string name="joining_conference">Придружујем се групном ћаскању…</string>
   <string name="leave">Напусти</string>
   <string name="contact_added_you">Контакт вас је додао на списак контаката</string>
@@ -609,4 +611,10 @@
   <string name="secure_password_generated">Безбедна лозинка је направљена</string>
   <string name="device_does_not_support_battery_op">Ваш уређај не подржава искључивање оптимизације батерије</string>
   <string name="show_password">Прикажи лозинку</string>
+  <string name="registration_please_wait">Регистрација није успела: покушајте поново касније</string>
+  <string name="create_conference">Направи групно ћаскање</string>
+  <string name="join_or_create_conference">Придружи се или направи групно ћаскање</string>
+  <string name="conference_subject">Предмет</string>
+  <string name="choose_participants">Додај учеснике</string>
+  <string name="creating_conference">Правим групно ћаскање…</string>
 </resources>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index a2634ca69..30e9049de 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -80,6 +80,7 @@
   <string name="also_end_conversation">Sonrasında bu sohbeti sonlandır</string>
   <string name="choose_presence">Kaynak kişiyi seçin</string>
   <string name="send_unencrypted_message">Şifrelenmemiş ileti gönder</string>
+  <string name="send_message_to_x">%s kişisine mesaj gönder</string>
   <string name="send_otr_message">OTR ile şifrelenmiş ileti gönder</string>
   <string name="send_omemo_message">OMEMO ile şifrelenmiş ileti gönder</string>
   <string name="send_omemo_x509_message">v\\OMEMO ile şifrelenmiş ileti gönder</string>
@@ -105,6 +106,7 @@
   <string name="pref_accept_files_summary">…‘den küçük olan dosyaları otomatik olarak kabul et</string>
   <string name="pref_attachments">Ekler</string>
   <string name="pref_return_to_previous">Hızlı Paylaşım</string>
+  <string name="pref_return_to_previous_summary">Bir şey paylaştıktan sonra bir grup sohbetine dönmek yerine önceki etkinliğe dön</string>
   <string name="pref_notification_settings">Bildirim</string>
   <string name="pref_notifications">Bildirimler</string>
   <string name="pref_notifications_summary">Yeni ileti geldiğinde bildir</string>
@@ -165,6 +167,8 @@
   <string name="mgmt_account_disable">Geçici olarak devre dışı bırak</string>
   <string name="mgmt_account_publish_avatar">Avatar yayınla</string>
   <string name="mgmt_account_publish_pgp">OpenPGP genel anahtarını yayınla</string>
+  <string name="openpgp_has_been_published">OpenPGP genel anahtar yayınlandı.</string>
+  <string name="republish_pgp_keys">OpenPGP genel anahtarınızı yeniden yayınlamayı unutmayın!</string>
   <string name="mgmt_account_enable">Hesabı etkinleştir</string>
   <string name="mgmt_account_are_you_sure">Emin misiniz?</string>
   <string name="mgmt_account_delete_confirm_text">Hesabınızı silerseniz bütün sohbet geçmişiniz silinecek</string>
@@ -245,6 +249,7 @@
   <string name="bookmark_already_exists">Bu yer imi zaten mevcut</string>
   <string name="you">Siz</string>
   <string name="action_edit_subject">Grup sohbet konusunu düzenle</string>
+  <string name="edit_subject_hint">Bu grup sohbetin konusu</string>
   <string name="joining_conference">Grup sohbete katiliyor</string>
   <string name="leave">Ayrıl</string>
   <string name="contact_added_you">Kişi sizi listesine ekledi</string>
@@ -411,6 +416,7 @@
   <string name="disable_all_accounts">Bütün hesapları devre dışı bırak</string>
   <string name="perform_action_with">Kullanarak tamamla</string>
   <string name="no_affiliation">Ortaklık yok</string>
+  <string name="no_role">Çevrimdışı</string>
   <string name="outcast">Bağlantısız</string>
   <string name="member">Üye</string>
   <string name="advanced_mode">Gelişmiş kip</string>
@@ -502,6 +508,8 @@
   <string name="pref_use_white_background">Beyaz arka plan kullan</string>
   <string name="pref_use_white_background_summary">Alınan iletileri beyaz arka plan üzerinde siyah yazıyla göster</string>
   <string name="account_status_tor_unavailable">Tor ağına erişilemiyor</string>
+  <string name="account_status_bind_failure">Bağlantı başarısız</string>
+  <string name="account_status_host_unknown">Bilinmeyen sunucu</string>
   <string name="server_info_broken">Bozuk</string>
   <string name="pref_presence_settings">Durum</string>
   <string name="pref_away_when_screen_off">Ekran kapandığında uzakta</string>
@@ -521,6 +529,7 @@
   <string name="fetching_mam_prefs">Arşivleme tercihleri alınıyor. Lütfen bekleyin...</string>
   <string name="unable_to_fetch_mam_prefs">Arşivleme tercihleri alınamadı</string>
   <string name="captcha_required">Captcha gerekli</string>
+  <string name="captcha_hint">Resimdeki yazıyı girin</string>
   <string name="certificate_chain_is_not_trusted">Sertifika zinciri güvenilir değil</string>
   <string name="jid_does_not_match_certificate">Jabber ID sertifikayla eşleşmiyor</string>
   <string name="action_renew_certificate">Sertifikayı yenile</string>
@@ -578,4 +587,29 @@
   <string name="security_error_invalid_file_access">Güvenlik hatası: Geçersiz dosya erişimi</string>
   <string name="no_application_to_share_uri">URI paylaşmak için uygulama bulunamadı</string>
   <string name="share_uri_with">URI paylaş ile...</string>
+  <string name="welcome_text">XMPP sağlayıcıdan bağımsız bir protokoldür. Bu istemciyi tercih ettiğiniz herhangi bir  XMMP sunucusuyla kullanabilirsiniz.\n Kullanılabilirlik sağlamak için conversation.im sağlayıcısında hesap oluşturmayı daha kolay hale getirdik; Conversation için özelleşmiş bir servis sağlayıcı. </string>
+  <string name="magic_create_text">conversation.im sağlayıcısında hesap açma sürecinde size yol göstereceğiz.\nconversation.im i bir servis sağlayıcı olarak kullandığınızda diğer sağlayıcıları kullanan kullanıcılar tam Jabber kimliğinizi vererek iletişim kurabilirsiniz. </string>
+  <string name="your_full_jid_will_be">Tam Jabber kimliğiniz %s olacak</string>
+  <string name="create_account">Hesap Oluştur</string>
+  <string name="use_own_provider">Kendi sağlayıcımı kullan</string>
+  <string name="pick_your_username">Kullanıcı adınızı seçin</string>
+  <string name="pref_manually_change_presence">Durumunuzu elle değiştirin</string>
+  <string name="pref_manually_change_presence_summary">Durumunuzu değiştirmek için avatarınıza dokunun</string>
+  <string name="change_presence">Durum Değiştir</string>
+  <string name="status_message">Durum iletisi</string>
+  <string name="all_accounts_on_this_device">Bu cihazdaki tüm hesaplara uygula</string>
+  <string name="presence_chat">Sohbet için uygun</string>
+  <string name="presence_online">Çevrimiçi</string>
+  <string name="presence_away">Uzakta</string>
+  <string name="presence_xa">Mevcut Değil</string>
+  <string name="presence_dnd">Meşgul</string>
+  <string name="secure_password_generated">Güvenli bir parola oluşturuldu</string>
+  <string name="device_does_not_support_battery_op">Cihazınız pil optimizasyonunu devre dışı bırakmayı desteklemiyor</string>
+  <string name="show_password">Parola göster</string>
+  <string name="registration_please_wait">Hesap oluşturulamadı: Sonra tekrar deneyin</string>
+  <string name="create_conference">Grup Sohbet başlat</string>
+  <string name="join_or_create_conference">Grup Sohbete katıl veya başlat</string>
+  <string name="conference_subject">Konu</string>
+  <string name="choose_participants">Katılımcıları seç</string>
+  <string name="creating_conference">Grup Sohbet başlatılıyor...</string>
 </resources>