From 4d38ba906f040570eb96bdcc9c5d434ec2a99a54 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 11 Jan 2016 11:19:41 +0100
Subject: pulled translations from transifex

---
 src/main/res/values-ar/strings.xml     | 1 -
 src/main/res/values-bg/strings.xml     | 9 ++++++---
 src/main/res/values-ca/strings.xml     | 1 -
 src/main/res/values-cs/strings.xml     | 9 ++++++---
 src/main/res/values-de/strings.xml     | 7 ++-----
 src/main/res/values-el/strings.xml     | 1 -
 src/main/res/values-es/strings.xml     | 3 ---
 src/main/res/values-eu/strings.xml     | 3 ---
 src/main/res/values-fr/strings.xml     | 3 ---
 src/main/res/values-id/strings.xml     | 1 -
 src/main/res/values-it/strings.xml     | 3 ---
 src/main/res/values-iw/strings.xml     | 3 ---
 src/main/res/values-ja/strings.xml     | 3 ---
 src/main/res/values-ko/strings.xml     | 1 -
 src/main/res/values-nb-rNO/strings.xml | 3 ---
 src/main/res/values-nl/strings.xml     | 3 ---
 src/main/res/values-pl/strings.xml     | 3 ---
 src/main/res/values-pt/strings.xml     | 1 -
 src/main/res/values-ro-rRO/strings.xml | 3 ---
 src/main/res/values-ru/strings.xml     | 3 ---
 src/main/res/values-sk/strings.xml     | 3 ---
 src/main/res/values-sr/strings.xml     | 3 ---
 src/main/res/values-sv/strings.xml     | 3 ---
 src/main/res/values-zh-rCN/strings.xml | 3 ---
 src/main/res/values-zh-rTW/strings.xml | 1 -
 25 files changed, 14 insertions(+), 63 deletions(-)

diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 08d1dcbe..d9128abc 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -193,7 +193,6 @@
   <string name="skip">تجاهل</string>
   <string name="disable_notifications">ايقاف التنبيهات</string>
   <string name="disable_notifications_for_this_conversation">ايقاف التنبيهات لتلك المحادثة</string>
-  <string name="notifications_disabled">التنبيهات غير فعاله</string>
   <string name="enable">تفعيل</string>
   <string name="conference_requires_password">الغرفة تطلب كلمة مرور</string>
   <string name="enter_password">أدخل كلمة المرور</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 9ac85726..40735189 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -89,6 +89,7 @@
   <string name="openkeychain_required_long">Conversations използва външно приложение с име <b>OpenKeychain</b>, за да шифрова и дешифрова съобщенията и да управлява публичните Ви ключове.\n\nOpenKeychain е лицензирано под условията на GPLv3 и е налично в F-Droid и Google Play.\n\n<small>(Моля, рестартирайте Conversations след това.)</small></string>
   <string name="restart">Рестартиране</string>
   <string name="install">Инсталиране</string>
+  <string name="openkeychain_not_installed">Моля, инсталирайте OpenKeychain</string>
   <string name="offering">предлагане…</string>
   <string name="waiting">изчакване…</string>
   <string name="no_pgp_key">Не е открит OpenPGP ключ</string>
@@ -108,8 +109,6 @@
   <string name="pref_vibrate_summary">Също така да има и вибрация при получаване на ново съобщение</string>
   <string name="pref_sound">Звук</string>
   <string name="pref_sound_summary">Изпълнение на звук с известието</string>
-  <string name="pref_conference_notifications">Известия в публичните беседи</string>
-  <string name="pref_conference_notifications_summary">Известяване винаги, когато пристигне ново съобщение в публична беседа, а не само когато тя е отбелязана</string>
   <string name="pref_notification_grace_period">Продължителност на отсрочване на известията</string>
   <string name="pref_notification_grace_period_summary">Изключва известията за кратко, след като бъде получено копие на съобщение</string>
   <string name="pref_advanced_options">Разширени настройки</string>
@@ -263,7 +262,6 @@
   <string name="skip">Пропускане</string>
   <string name="disable_notifications">Изключване на известията</string>
   <string name="disable_notifications_for_this_conversation">Изключване на известията за този разговор</string>
-  <string name="notifications_disabled">Известията са изключени</string>
   <string name="enable">Включване</string>
   <string name="conference_requires_password">Беседата изисква парола</string>
   <string name="enter_password">Въведете парола</string>
@@ -521,4 +519,9 @@
     <item quantity="one">%d съобщение</item>
     <item quantity="other">%d съобщения</item>
   </plurals>
+  <string name="shared_file_with_x">Файлът е споделен с %s</string>
+  <string name="shared_image_with_x">Изображението е споделено с %s</string>
+  <string name="no_storage_permission">Conversations се нуждае от достъп до външно място за съхранение</string>
+  <string name="sync_with_contacts">Синхронизиране с контактите</string>
+  <string name="sync_with_contacts_long">Conversations иска да съчетае Вашия списък в XMPP с контактите Ви, за да показва пълните им имена и снимки..\n\nConversations единствено ще чете контактите Ви и ще ги използва вътрешно, без да ги качва на сървъра Ви.\n\nЩе бъдете помолен/а за позволение за достъп до контактите Ви.</string>
 </resources>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 363eb20b..9f5845f6 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -240,7 +240,6 @@
   <string name="skip">Saltar</string>
   <string name="disable_notifications">Deshabilitar notificacions</string>
   <string name="disable_notifications_for_this_conversation">Deshabilitar notificacions per aquesta conversació</string>
-  <string name="notifications_disabled">Les notificacions estàn deshabilitades</string>
   <string name="enable">Habilitat</string>
   <string name="conference_requires_password">La sala requereix una contrasenya</string>
   <string name="enter_password">Introduir-ho la contrasenya</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 9bf1c3b7..e70d4359 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -89,6 +89,7 @@
   <string name="openkeychain_required_long">Konverzace využívá aplikaci třetí strany, <b>OpenKeychain</b>, k šifrování a dešifrování zpráv a ke správě veřejných klíčů.\n\nOpenKeychain je licencován pod GPLv3 a dostupný na F-Droid a Google Play.\n\n<small>(Po instalaci prosím restartujte aplikaci Konverzace.)</small></string>
   <string name="restart">Restartovat</string>
   <string name="install">Instalovat</string>
+  <string name="openkeychain_not_installed">Nainstalujte prosím OpenKeychain</string>
   <string name="offering">nabízí…</string>
   <string name="waiting">čekám…</string>
   <string name="no_pgp_key">Nebyl nalezen žádný OpenPGP klíč</string>
@@ -108,8 +109,6 @@
   <string name="pref_vibrate_summary">Vibrovat při přijetí nové zprávy</string>
   <string name="pref_sound">Zvuk</string>
   <string name="pref_sound_summary">Přehrát zvuk společně s upozorněním</string>
-  <string name="pref_conference_notifications">Upozornění ve veřejných konferencích</string>
-  <string name="pref_conference_notifications_summary">Vždy upozornit při příchodu zprávy ve veřejných konferencích místo jen pouze pokud je zvýrazněno</string>
   <string name="pref_notification_grace_period">Četnost upozornění</string>
   <string name="pref_notification_grace_period_summary">Neupozorňovat krátce poté co byla obdržena kopie zprávy</string>
   <string name="pref_advanced_options">Pokročilé nastavení</string>
@@ -263,7 +262,6 @@
   <string name="skip">Přeskočit</string>
   <string name="disable_notifications">Vypnout upozornění</string>
   <string name="disable_notifications_for_this_conversation">Vypnout upozornění pro tuto konverzaci</string>
-  <string name="notifications_disabled">Upozornění jsou vypnuta</string>
   <string name="enable">Povolit</string>
   <string name="conference_requires_password">Konference vyžaduje heslo</string>
   <string name="enter_password">Vložit heslo</string>
@@ -524,4 +522,9 @@
     <item quantity="few">%d zprávy</item>
     <item quantity="other">%d zpráv</item>
   </plurals>
+  <string name="shared_file_with_x">Soubor sdílen s %s</string>
+  <string name="shared_image_with_x">Obrázek sdílen s %s</string>
+  <string name="no_storage_permission">Conversations vyžaduje přístup k externímu úložišti</string>
+  <string name="sync_with_contacts">Synchronizovat s kontakty</string>
+  <string name="sync_with_contacts_long">Aplikace Conversations by ráda porovnala váš XMPP seznam s vašimi kontakty, aby mohla zobrazit plná jména a avatary.\n\nConversations načte a porovná kontakty pouze lokálně, bez jejich nahrávání na server.\n\nNyní budete dotázáni na udělení práv pro přístup k seznamu kontaktů.</string>
 </resources>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index ce1071b1..06454cc5 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -109,8 +109,6 @@
   <string name="pref_vibrate_summary">Vibrieren bei Erhalt einer neuen Nachricht</string>
   <string name="pref_sound">Benachrichtigungston</string>
   <string name="pref_sound_summary">Benachrichtigungston wiedergeben</string>
-  <string name="pref_conference_notifications">Benachrichtigungen in öffentlichen Konferenzen</string>
-  <string name="pref_conference_notifications_summary">Bei jeder Nachricht in öffentlichen Konferenzen benachrichtigen und nicht nur, wenn ich angesprochen werde</string>
   <string name="pref_notification_grace_period">Gnadenfrist</string>
   <string name="pref_notification_grace_period_summary">Deaktiviere Benachrichtigungen für eine kurze Zeit nach Erhalt einer Nachricht, die von einem anderen deiner Clients kommt.</string>
   <string name="pref_advanced_options">Erweiterte Optionen</string>
@@ -245,7 +243,7 @@
   <string name="add_back">Auch hinzufügen</string>
   <string name="contact_has_read_up_to_this_point">%s hat bis zu diesem Punkt gelesen</string>
   <string name="publish">Veröffentlichen</string>
-  <string name="touch_to_choose_picture">Avatar anklicken, um ein Bild aus der Galerie auszuwählen</string>
+  <string name="touch_to_choose_picture">Avatar antippen, um Bild aus Galerie auszuwählen</string>
   <string name="publish_avatar_explanation">Achtung: Jeder, der deinen Status sehen darf, sieht auch deinen Avatar.</string>
   <string name="publishing">Veröffentliche…</string>
   <string name="error_publish_avatar_server_reject">Der Server hat die Veröffentlichung des Avatars abgelehnt.</string>
@@ -264,7 +262,6 @@
   <string name="skip">Überspringen</string>
   <string name="disable_notifications">Benachrichtigungen deaktivieren</string>
   <string name="disable_notifications_for_this_conversation">Benachrichtigungen für diese Unterhaltung deaktivieren</string>
-  <string name="notifications_disabled">Benachrichtigungen sind deaktiviert</string>
   <string name="enable">Aktivieren</string>
   <string name="conference_requires_password">Konferenz ist passwortgeschützt</string>
   <string name="enter_password">Passwort eingeben</string>
@@ -510,7 +507,7 @@
   <string name="verified_omemo_key_with_certificate">OMEMO Schlüssel mit Zertifikat bestätigt!</string>
   <string name="device_does_not_support_certificates">Dein Gerät unterstützt das Auswählen von Client-Zertifikaten nicht!</string>
   <string name="pref_connection_options">Verbindungs-Optionen</string>
-  <string name="pref_use_tor">Mit TOR verbinden</string>
+  <string name="pref_use_tor">Über TOR verbinden</string>
   <string name="pref_use_tor_summary">Alle Verbindungen über das TOR-Netzwerk tunneln. Benötigt Orbot</string>
   <string name="account_settings_hostname">Hostname</string>
   <string name="account_settings_port">Port</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index cd8f9e44..54daf96c 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -240,7 +240,6 @@
   <string name="skip">Παράλειψη</string>
   <string name="disable_notifications">Απενεργοποίηση ειδοποιήσεων</string>
   <string name="disable_notifications_for_this_conversation">Απενεργοποίηση ειδοποιήσεων για αυτή την συζήτηση</string>
-  <string name="notifications_disabled">Οι ειδοποιήσεις είναι απενεργοποιημένες</string>
   <string name="enable">Ενεργοποίηση</string>
   <string name="conference_requires_password">Η συζήτηση απαιτεί συνθηματικό</string>
   <string name="enter_password">Εισαγωγή συνθηματικού</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 59842939..ef83b460 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -109,8 +109,6 @@
   <string name="pref_vibrate_summary">Vibra cuando llega un nuevo mensaje</string>
   <string name="pref_sound">Sonido</string>
   <string name="pref_sound_summary">Reproduce tono con la notificación</string>
-  <string name="pref_conference_notifications">Notif. conversación grupo pública</string>
-  <string name="pref_conference_notifications_summary">Siempre notifica cuando llega un mensaje a una conversación en grupo pública y no solo cuando alguien menciona tu nombre en un mensaje</string>
   <string name="pref_notification_grace_period">Notificaciones Carbons</string>
   <string name="pref_notification_grace_period_summary">Deshabilita las notificaciones durante un corto periodo de tiempo después de recibir la copia del mensaje carbon</string>
   <string name="pref_advanced_options">Opciones avanzadas</string>
@@ -264,7 +262,6 @@
   <string name="skip">Omitir</string>
   <string name="disable_notifications">Deshabilitar notificaciones</string>
   <string name="disable_notifications_for_this_conversation">Deshabilitar notificaciones para esta conversación</string>
-  <string name="notifications_disabled">Las notificaciones están deshabilitadas</string>
   <string name="enable">Habilitar</string>
   <string name="conference_requires_password">Esta conversación requiere contraseña</string>
   <string name="enter_password">Introduce la contraseña</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 0ef0a728..28d05858 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -109,8 +109,6 @@
   <string name="pref_vibrate_summary">Dardaratu ere mezu berri bat heltzerakoan</string>
   <string name="pref_sound">Soinua</string>
   <string name="pref_sound_summary">Dei-tonua jo jakinarazpenarekin</string>
-  <string name="pref_conference_notifications">Konferentzia publikoen jakinarazpenak</string>
-  <string name="pref_conference_notifications_summary">Beti jakinarazi konferentzia publiko batean mezu berri bat heltzerakoan eta ez soilik nabarmentzerakoan</string>
   <string name="pref_notification_grace_period">Jakinarazpenen grazia epea</string>
   <string name="pref_notification_grace_period_summary">Jakinarazpenak denbora labur baterako ezgaitu ikatz-kopia bat jaso ondoren</string>
   <string name="pref_advanced_options">Aukera aurreratuak</string>
@@ -264,7 +262,6 @@
   <string name="skip">Orain ez</string>
   <string name="disable_notifications">Jakinarazpenak ezgaitu</string>
   <string name="disable_notifications_for_this_conversation">Elkarrizketa honetarako jakinarazpenak ezgaitu</string>
-  <string name="notifications_disabled">Jakinarazpenak ezgaituta daude</string>
   <string name="enable">Gaitu</string>
   <string name="conference_requires_password">Konferentziak pasahitza behar du</string>
   <string name="enter_password">Sartu pasahitza</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index a0088580..ffd48c47 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -109,8 +109,6 @@
   <string name="pref_vibrate_summary">Vibrer lors de l\'arrivée d\'un message.</string>
   <string name="pref_sound">Sonore</string>
   <string name="pref_sound_summary">Jouer une sonnerie pour notifier.</string>
-  <string name="pref_conference_notifications">Notifications et conf. publiques</string>
-  <string name="pref_conference_notifications_summary">Toujours notifier de l\'arrivée d\'un message dans une conférence publique, même si votre nom n\'y apparaît pas.</string>
   <string name="pref_notification_grace_period">Période sans notification</string>
   <string name="pref_notification_grace_period_summary">Désactiver momentanément les notifications après l\'arrivée d\'une copie carbone.</string>
   <string name="pref_advanced_options">Options avancées</string>
@@ -264,7 +262,6 @@
   <string name="skip">Passer</string>
   <string name="disable_notifications">Désactiver les notifications</string>
   <string name="disable_notifications_for_this_conversation">Désactiver les notifications pour cette conversation</string>
-  <string name="notifications_disabled">Notifications désactivées</string>
   <string name="enable">Activer</string>
   <string name="conference_requires_password">La conférence nécessite un mot de passe</string>
   <string name="enter_password">Entrer le mot de passe</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 47918d3c..419816c8 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -242,7 +242,6 @@
   <string name="skip">Lewati</string>
   <string name="disable_notifications">Nonaktifkan notifikasi</string>
   <string name="disable_notifications_for_this_conversation">Nonaktifkan notifikasi untuk percakapan ini</string>
-  <string name="notifications_disabled">Notifikasi telah dimatikan</string>
   <string name="enable">Aktifkan</string>
   <string name="conference_requires_password">Conference membutuhkan password</string>
   <string name="enter_password">Masukan password</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 0cd04691..3916b532 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -107,8 +107,6 @@
   <string name="pref_vibrate_summary">Vibra anche quando arriva un nuovo messaggio</string>
   <string name="pref_sound">Suono</string>
   <string name="pref_sound_summary">Riproduci una suoneria con la notifica</string>
-  <string name="pref_conference_notifications">Notifiche in Conferenze Pubbliche</string>
-  <string name="pref_conference_notifications_summary">Notifica sempre quando arriva un messaggio in una conferenza pubblica anziché solo quando è evidenziata</string>
   <string name="pref_notification_grace_period">Periodo tra notifiche</string>
   <string name="pref_notification_grace_period_summary">Disabilita le notifiche per un breve lasso di tempo dopo che un messaggio è stato ricevuto</string>
   <string name="pref_advanced_options">Opzioni Avanzate</string>
@@ -261,7 +259,6 @@
   <string name="skip">Salta</string>
   <string name="disable_notifications">Disabilita le notifiche</string>
   <string name="disable_notifications_for_this_conversation">Disabilita le notifiche per questa conversazione</string>
-  <string name="notifications_disabled">Le notifiche sono disabilitate</string>
   <string name="enable">Abilita</string>
   <string name="conference_requires_password">La conferenza richiede una password</string>
   <string name="enter_password">Inserisci la password</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 83741ae3..39dd55b7 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -108,8 +108,6 @@
   <string name="pref_vibrate_summary">הרטט גם כאשר הודעה חדשה מגיעה</string>
   <string name="pref_sound">צליל</string>
   <string name="pref_sound_summary">נגן צלצול עם כל התראה</string>
-  <string name="pref_conference_notifications">התראות בועידות ציבוריות</string>
-  <string name="pref_conference_notifications_summary">תמיד </string>
   <string name="pref_notification_grace_period">משך תקופת ארכה</string>
   <string name="pref_notification_grace_period_summary">נטרל התראות לזמן קצר לאחר שהודעת Carbon Copy מתקבלת</string>
   <string name="pref_advanced_options">אפשרויות מתקדמות</string>
@@ -259,7 +257,6 @@
   <string name="skip">דלג</string>
   <string name="disable_notifications">השבת התראות</string>
   <string name="disable_notifications_for_this_conversation">השבת התראות עבור השיחה הנוכחית</string>
-  <string name="notifications_disabled">ההתראות מושבתות</string>
   <string name="enable">הפעל</string>
   <string name="conference_requires_password">ועידה זאת דורשת סיסמא</string>
   <string name="enter_password">הכנס סיסמא</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 307d21d3..f1c2e792 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -109,8 +109,6 @@
   <string name="pref_vibrate_summary">新しいメッセージが到着したときに振動もします</string>
   <string name="pref_sound">サウンド</string>
   <string name="pref_sound_summary">通知で着信音を再生します</string>
-  <string name="pref_conference_notifications">公開会議で通知</string>
-  <string name="pref_conference_notifications_summary">強調表示されたときだけではなく、公開会議にメッセージが到着したときにいつも通知します</string>
   <string name="pref_notification_grace_period">通知猶予期間</string>
   <string name="pref_notification_grace_period_summary">カーボンコピーを受信した後、短時間、通知を無効にします</string>
   <string name="pref_advanced_options">詳細オプション</string>
@@ -264,7 +262,6 @@
   <string name="skip">スキップ</string>
   <string name="disable_notifications">通知を無効にする</string>
   <string name="disable_notifications_for_this_conversation">この会話の通知を無効にします</string>
-  <string name="notifications_disabled">通知を無効にしました</string>
   <string name="enable">有効</string>
   <string name="conference_requires_password">会議はパスワードが必要です</string>
   <string name="enter_password">パスワードを入力してください</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index d8c28b70..bcc7a800 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -240,7 +240,6 @@
   <string name="skip">건너뛰기 </string>
   <string name="disable_notifications">알림 해제 </string>
   <string name="disable_notifications_for_this_conversation">이 대화의 알림 해제 </string>
-  <string name="notifications_disabled">알림이 해제되었습니다 </string>
   <string name="enable">사용 </string>
   <string name="conference_requires_password">회의에 암호가 필요합니다 </string>
   <string name="enter_password">암호 입력 </string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index 45a9315e..e30a767b 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -109,8 +109,6 @@
   <string name="pref_vibrate_summary">Vibrer også når ny melding ankommer</string>
   <string name="pref_sound">Lyd</string>
   <string name="pref_sound_summary">Spill av ringetone med merknad</string>
-  <string name="pref_conference_notifications">Varslinger i offentlige konferanser</string>
-  <string name="pref_conference_notifications_summary">Alltid varsle om nye meldinger i konferanser, i steden for bare når navnet ditt er markert</string>
   <string name="pref_notification_grace_period">Notifiseringsfrist</string>
   <string name="pref_notification_grace_period_summary">Skru av varslinger en liten stund etter mottak av karbon-kopi</string>
   <string name="pref_advanced_options">Avanserte valg</string>
@@ -264,7 +262,6 @@
   <string name="skip">Hopp over</string>
   <string name="disable_notifications">Skru av varslinger</string>
   <string name="disable_notifications_for_this_conversation">Skru av varslinger for denne samtalen</string>
-  <string name="notifications_disabled">Varslinger avskrudd</string>
   <string name="enable">Skru på</string>
   <string name="conference_requires_password">Konferansen krever passord</string>
   <string name="enter_password">Skriv inn passord</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index c5647159..58a3c556 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -103,8 +103,6 @@
   <string name="pref_vibrate_summary">Tril ook wanneer een nieuw bericht arriveert</string>
   <string name="pref_sound">Geluid</string>
   <string name="pref_sound_summary">Speel beltoon af bij melding</string>
-  <string name="pref_conference_notifications">Meldingen bij groepsgespreken</string>
-  <string name="pref_conference_notifications_summary">Laat altijd een melding zien wanneer er berichten zijn ontvangen in groepsgesprekken in plaats van alleen bij het noemen van je naam</string>
   <string name="pref_notification_grace_period">Uitstelperiode voor meldingen</string>
   <string name="pref_notification_grace_period_summary">Schakel meldingen voor korte tijd uit als er een carbon copy wordt ontvangen</string>
   <string name="pref_advanced_options">Geavanceerde instellingen</string>
@@ -254,7 +252,6 @@
   <string name="skip">Overslaan</string>
   <string name="disable_notifications">Meldingen uitschakelen</string>
   <string name="disable_notifications_for_this_conversation">Meldingen uitschakelen voor dit gesprek</string>
-  <string name="notifications_disabled">Meldingen zijn uitgeschakeld</string>
   <string name="enable">Inschakelen</string>
   <string name="conference_requires_password">Wachtwoord nodig voor toegang tot groepsgesprek</string>
   <string name="enter_password">Wachtwoord invoeren</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 6fc57f30..ad808458 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -103,8 +103,6 @@
   <string name="pref_vibrate_summary">Wibruj, gdy nadejdzie wiadomość</string>
   <string name="pref_sound">Dźwięk</string>
   <string name="pref_sound_summary">Odtwórz dźwięk z powiadomieniem</string>
-  <string name="pref_conference_notifications">Powiadomienia konfrencji</string>
-  <string name="pref_conference_notifications_summary">Zawsze powiadamiaj przy odebraniu wiadomości w publicznej konferencji, a nie tylko przy wywołaniu nicka.</string>
   <string name="pref_notification_grace_period">Opóźnienie powiadomień</string>
   <string name="pref_notification_grace_period_summary">Wyłącz powiadomienia przez krótki czas po otrzymaniu kopii wiadomości</string>
   <string name="pref_advanced_options">Opcje zaawansowane</string>
@@ -254,7 +252,6 @@
   <string name="skip">Pomiń</string>
   <string name="disable_notifications">Wyłącz powiadomienia</string>
   <string name="disable_notifications_for_this_conversation">Wyłącz powiadomienia tej konwersacji</string>
-  <string name="notifications_disabled">Powiadomienia są wyłączone</string>
   <string name="enable">Włącz</string>
   <string name="conference_requires_password">Konferencja jest zabezpieczona hasłem</string>
   <string name="enter_password">Wprowadź hasło</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 917958f1..e32dadea 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -224,7 +224,6 @@
   <string name="skip">Pular</string>
   <string name="disable_notifications">Desativar notificações</string>
   <string name="disable_notifications_for_this_conversation">Desativar notificações para essa conversa</string>
-  <string name="notifications_disabled">As notificações foram desativadas</string>
   <string name="enable">Ativar</string>
   <string name="conference_requires_password">Essa conferencia requer uma senha</string>
   <string name="enter_password">Informar a senha</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index bb0dea98..a865ac44 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -109,8 +109,6 @@
   <string name="pref_vibrate_summary">Vibreaza cand un nou mesaj este primit</string>
   <string name="pref_sound">Sunet</string>
   <string name="pref_sound_summary">Ton de apel pentru notificare</string>
-  <string name="pref_conference_notifications">Notificari in Conferintele Publice</string>
-  <string name="pref_conference_notifications_summary">Notifica mereu la mesajele scrise in conferintele publice nu doar la cele evidentiate</string>
   <string name="pref_notification_grace_period">Perioada de gratie notificari </string>
   <string name="pref_notification_grace_period_summary">Opreste notificari pentru o scurta perioada dupa ce o copie a mesajului a fost primita</string>
   <string name="pref_advanced_options">Optiuni avansate</string>
@@ -264,7 +262,6 @@
   <string name="skip">Sari</string>
   <string name="disable_notifications">Dezactiveaza notificari</string>
   <string name="disable_notifications_for_this_conversation">Dezactiveaza notificarile pentru aceasta conversatie</string>
-  <string name="notifications_disabled">Notificari dezactivate</string>
   <string name="enable">Activeaza</string>
   <string name="conference_requires_password">Conferinta necesita parola</string>
   <string name="enter_password">Introdu parola</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 0cd25392..f0a670fc 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -109,8 +109,6 @@
   <string name="pref_vibrate_summary">Использовать вибрацию когда приходят новые сообщения</string>
   <string name="pref_sound">Звуковой сигнал</string>
   <string name="pref_sound_summary">Выберите звуковой сигнал для сообщений</string>
-  <string name="pref_conference_notifications">Уведомления в публичных конференциях</string>
-  <string name="pref_conference_notifications_summary">Всегда уведомлять, когда сообщение появляется в публичной конференции вместо простого подсвечивания</string>
   <string name="pref_notification_grace_period">Отсрочка уведомлений</string>
   <string name="pref_notification_grace_period_summary">Не использовать уведомления, если вы прочитали сообщение на другом устройстве</string>
   <string name="pref_advanced_options">Дополнительные параметры</string>
@@ -264,7 +262,6 @@
   <string name="skip">Пропустить</string>
   <string name="disable_notifications">Отключить уведомления</string>
   <string name="disable_notifications_for_this_conversation">Отключить уведомления для текущей беседы</string>
-  <string name="notifications_disabled">Уведомления отключены</string>
   <string name="enable">Включить</string>
   <string name="conference_requires_password">Конференция требует авторизации</string>
   <string name="enter_password">Введите пароль</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index c544d3b4..25a9945e 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -104,8 +104,6 @@
   <string name="pref_vibrate_summary">Vibrovať pri prijatí novej správy</string>
   <string name="pref_sound">Zvuk</string>
   <string name="pref_sound_summary">Prehrať zvuk spolu s upozornením</string>
-  <string name="pref_conference_notifications">Upozornenia vo verejných konverzáciách</string>
-  <string name="pref_conference_notifications_summary">Vždy upozorniť na prichádzajúcu správu vo verejnej konverzácii, nie len keď je zvýraznená</string>
   <string name="pref_notification_grace_period">Doba na prečítanie upozornenia</string>
   <string name="pref_notification_grace_period_summary">Neupozorňovať krátko po obdržaní kópie správy</string>
   <string name="pref_advanced_options">Rozšírené možnosti</string>
@@ -255,7 +253,6 @@
   <string name="skip">Preskočiť</string>
   <string name="disable_notifications">Vypnúť upozornenia</string>
   <string name="disable_notifications_for_this_conversation">Vypnúť upozornenia pre túto konverzáciu</string>
-  <string name="notifications_disabled">Upozornenia sú vypnuté</string>
   <string name="enable">Povoliť</string>
   <string name="conference_requires_password">Skupinová konverzácia vyžaduje heslo</string>
   <string name="enter_password">Vložiť heslo</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 3b64ea79..a19a6b90 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -109,8 +109,6 @@
   <string name="pref_vibrate_summary">Вибрирај кад стигне нова порука</string>
   <string name="pref_sound">Звук</string>
   <string name="pref_sound_summary">Звуци обавештења</string>
-  <string name="pref_conference_notifications">Обавештења у групним ћаскањима</string>
-  <string name="pref_conference_notifications_summary">Увек обавештавај кад стигне порука у групном ћаскању уместо само кад је означена</string>
   <string name="pref_notification_grace_period">Период одгоде обавештења</string>
   <string name="pref_notification_grace_period_summary">Искључи обавештења на кратко по примању карбон копије</string>
   <string name="pref_advanced_options">Напредне поставке</string>
@@ -264,7 +262,6 @@
   <string name="skip">Прескочи</string>
   <string name="disable_notifications">Искључи обавештења</string>
   <string name="disable_notifications_for_this_conversation">Искључи обавештења за ову преписку</string>
-  <string name="notifications_disabled">Обавештења су искључена</string>
   <string name="enable">Укључи</string>
   <string name="conference_requires_password">Групно ћаскање захтева лозинку</string>
   <string name="enter_password">Унесите лозинку</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 13510248..cf0ce8e6 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -109,8 +109,6 @@
   <string name="pref_vibrate_summary">Vibrera när meddelande tagits emot</string>
   <string name="pref_sound">Ljud</string>
   <string name="pref_sound_summary">Spela ljud med notifiering</string>
-  <string name="pref_conference_notifications">Notifieringar i publika konferenser</string>
-  <string name="pref_conference_notifications_summary">Notifiera alltid för meddelande i en publik konferens istället för endast vid highlight</string>
   <string name="pref_notification_grace_period">Notifieringsfrist</string>
   <string name="pref_notification_grace_period_summary">Inaktivera notifieringar en kort stund efter att en carbon copy tagits emot</string>
   <string name="pref_advanced_options">Avancerade inställningar</string>
@@ -264,7 +262,6 @@
   <string name="skip">Hoppa över</string>
   <string name="disable_notifications">Inaktivera notifieringar</string>
   <string name="disable_notifications_for_this_conversation">Inaktivera notifieringar för denna konversation</string>
-  <string name="notifications_disabled">Notifieringar är inaktiverade</string>
   <string name="enable">Aktivera</string>
   <string name="conference_requires_password">Konferensen kräver lösenord</string>
   <string name="enter_password">Fyll i lösenord</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 87a6e5d9..316e6cda 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -109,8 +109,6 @@
   <string name="pref_vibrate_summary">收到新消息时震动</string>
   <string name="pref_sound">声音</string>
   <string name="pref_sound_summary">收到新消息时的铃声</string>
-  <string name="pref_conference_notifications">公共讨论组内通知</string>
-  <string name="pref_conference_notifications_summary">收到公共讨论组消息时总是通知，而不是仅在高亮时通知</string>
   <string name="pref_notification_grace_period">通知限期</string>
   <string name="pref_notification_grace_period_summary">接收副本短时间内关闭通知</string>
   <string name="pref_advanced_options">高级选项</string>
@@ -264,7 +262,6 @@
   <string name="skip">忽略</string>
   <string name="disable_notifications">关闭通知</string>
   <string name="disable_notifications_for_this_conversation">关闭该会话消息</string>
-  <string name="notifications_disabled">通知已关闭</string>
   <string name="enable">打开通知</string>
   <string name="conference_requires_password">讨论组设有密码</string>
   <string name="enter_password">输入密码</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 19252c90..619e5a6c 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -215,7 +215,6 @@
   <string name="skip">略過</string>
   <string name="disable_notifications">關閉通知</string>
   <string name="disable_notifications_for_this_conversation">關閉該對話消息</string>
-  <string name="notifications_disabled">通知已關閉</string>
   <string name="enable">打開通知</string>
   <string name="conference_requires_password">群組設有密碼</string>
   <string name="enter_password">輸入密碼</string>
-- 
cgit v1.2.3