From 9b91d0bf75751b064bb601c8d3f65d40bc49fea4 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 3 Aug 2015 14:04:26 +0200
Subject: sync translations with transifex

---
 src/main/res/values-ar-rEG/strings.xml |  1 -
 src/main/res/values-bg/strings.xml     |  3 ---
 src/main/res/values-ca/strings.xml     |  3 ---
 src/main/res/values-cs/strings.xml     |  3 ---
 src/main/res/values-de/strings.xml     |  3 ---
 src/main/res/values-el/strings.xml     |  3 ---
 src/main/res/values-es/strings.xml     | 11 ++++-------
 src/main/res/values-eu/strings.xml     |  3 ---
 src/main/res/values-fr/strings.xml     |  2 --
 src/main/res/values-gl/strings.xml     |  2 --
 src/main/res/values-id/strings.xml     |  3 ---
 src/main/res/values-it/strings.xml     | 11 +++++++----
 src/main/res/values-iw/strings.xml     |  2 --
 src/main/res/values-ja/strings.xml     |  3 ---
 src/main/res/values-ko/strings.xml     |  3 ---
 src/main/res/values-nl/strings.xml     |  7 +++----
 src/main/res/values-pl/strings.xml     |  3 ---
 src/main/res/values-pt/strings.xml     |  2 --
 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 |  2 --
 24 files changed, 14 insertions(+), 71 deletions(-)

(limited to 'src/main')

diff --git a/src/main/res/values-ar-rEG/strings.xml b/src/main/res/values-ar-rEG/strings.xml
index c5a43674..0d85e55c 100644
--- a/src/main/res/values-ar-rEG/strings.xml
+++ b/src/main/res/values-ar-rEG/strings.xml
@@ -104,7 +104,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_advanced_options">اعدادات متقدمّة</string>
   <string name="pref_never_send_crash">لا ترسل تقارير أخطاء</string>
   <string name="pref_never_send_crash_summary">الغاء ارسال تقارير الأخطاء يقلل من فرص حل المشكلة سريعا فكن متعاون</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index cff228f7..17c9061c 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -105,8 +105,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>
@@ -427,7 +425,6 @@
   <string name="received_location">Получено местоположение</string>
   <string name="title_undo_swipe_out_conversation">Conversation се затвори</string>
   <string name="title_undo_swipe_out_muc">Напуснахте беседата</string>
-  <string name="pref_certificate_options">Настройки на сертификата</string>
   <string name="pref_dont_trust_system_cas_title">Да не се вярва на системните сертификати</string>
   <string name="pref_dont_trust_system_cas_summary">Всички сертификати трябва да бъдат одобрени на ръка</string>
   <string name="pref_remove_trusted_certificates_title">Премахване на сертификатите</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index b10fb617..74d87736 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -105,8 +105,6 @@
   <string name="pref_vibrate_summary">Vibra quan arriba un nou missatge</string>
   <string name="pref_sound">So</string>
   <string name="pref_sound_summary">Reprodueix el to de trucada amb la notificació</string>
-  <string name="pref_conference_notifications">Notificacions de conferència</string>
-  <string name="pref_conference_notifications_summary">Sempre notifica quan arriba un nou missatge de conferència en comptes de només quan està destacat</string>
   <string name="pref_notification_grace_period">Notificació del període d\'espera</string>
   <string name="pref_notification_grace_period_summary">Desactiva les notificacions durant un breu termini després de rebre una còpia de missatges carbon</string>
   <string name="pref_advanced_options">Opcions avançades</string>
@@ -424,7 +422,6 @@
   <string name="received_location">Localització rebuda</string>
   <string name="title_undo_swipe_out_conversation">Conversa tancada</string>
   <string name="title_undo_swipe_out_muc">S\'ha sortit de la conferència</string>
-  <string name="pref_certificate_options">Opcions de certificats</string>
   <string name="pref_dont_trust_system_cas_title">No confiar en les CAs del sistema</string>
   <string name="pref_dont_trust_system_cas_summary">Tots els certificats han de ser aprovats manualment</string>
   <string name="pref_remove_trusted_certificates_title">Eliminar certificats</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 190fd575..6463d763 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -105,8 +105,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í při konferencích</string>
-  <string name="pref_conference_notifications_summary">Vždy upozorňovat při nové konferenční zprávě, nejen pokud je vybrána</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>
@@ -427,7 +425,6 @@
   <string name="received_location">Přijmout pozici</string>
   <string name="title_undo_swipe_out_conversation">Conversation zavřena</string>
   <string name="title_undo_swipe_out_muc">Opustil(a) konferenci</string>
-  <string name="pref_certificate_options">Nastavení certifikátu</string>
   <string name="pref_dont_trust_system_cas_title">Nedůvěřovat systémovým CA</string>
   <string name="pref_dont_trust_system_cas_summary">Všechny certifikáty musí být schváleny ručně</string>
   <string name="pref_remove_trusted_certificates_title">Odstranit certifikáty</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index efe00a4f..8c77d0a8 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -105,8 +105,6 @@
   <string name="pref_vibrate_summary">Vibriere, wenn eine neue Nachricht ankommt</string>
   <string name="pref_sound">Klingelton</string>
   <string name="pref_sound_summary">Spiele Klingelton, wenn eine neue Nachricht ankommt</string>
-  <string name="pref_conference_notifications">Konferenz-Benachrichtigungen</string>
-  <string name="pref_conference_notifications_summary">Benachrichtige mich bei jeder Konferenz-Nachricht 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>
@@ -427,7 +425,6 @@
   <string name="received_location">Standort empfangen</string>
   <string name="title_undo_swipe_out_conversation">Unterhaltung beendet</string>
   <string name="title_undo_swipe_out_muc">Konferenz verlassen</string>
-  <string name="pref_certificate_options">Zertifikats-Optionen</string>
   <string name="pref_dont_trust_system_cas_title">Misstraue Zertifizierungsstellen</string>
   <string name="pref_dont_trust_system_cas_summary">Alle Zertifikate müssen manuell bestätigt werden</string>
   <string name="pref_remove_trusted_certificates_title">Zertifikate löschen</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index d796cd6d..b9fc352c 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -105,8 +105,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>
@@ -424,7 +422,6 @@
   <string name="received_location">Ελήφθη τοποθεσία</string>
   <string name="title_undo_swipe_out_conversation">Η συζήτηση έκλεισε</string>
   <string name="title_undo_swipe_out_muc">Έφυγε από την συνδιάσκεψη</string>
-  <string name="pref_certificate_options">Επιλογές πιστοποιητικών</string>
   <string name="pref_dont_trust_system_cas_title">Μη έμπιστες αρχές πιστοποίησης συστήματος</string>
   <string name="pref_dont_trust_system_cas_summary">Όλα τα πιστοποιητικά πρέπει να εγκριθούν χειροκίνητα</string>
   <string name="pref_remove_trusted_certificates_title">Αφαίρεση πιστοποιητικών</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 29938612..f1b5d54c 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -105,14 +105,12 @@
   <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</string>
-  <string name="pref_conference_notifications_summary">Siempre notifica cuando llega un mensaje a una conversación en grupo 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>
   <string name="pref_never_send_crash">Nunca informar de errores</string>
   <string name="pref_never_send_crash_summary">Si envías registros de error ayudas al desarrollo de Conversations</string>
-  <string name="pref_confirm_messages">Confirmar Mensajes</string>
+  <string name="pref_confirm_messages">Confirmar mensajes</string>
   <string name="pref_confirm_messages_summary">Permitir a tus contactos saber cuando recibes y lees un mensaje</string>
   <string name="pref_ui_options">Opciones de interfaz</string>
   <string name="openpgp_error">OpenKeychain reportó un error</string>
@@ -427,13 +425,12 @@
   <string name="received_location">Ubicación recibida</string>
   <string name="title_undo_swipe_out_conversation">Conversación cerrada</string>
   <string name="title_undo_swipe_out_muc">Has salido de la conversación</string>
-  <string name="pref_certificate_options">Opciones de Certificados</string>
   <string name="pref_dont_trust_system_cas_title">No confiar en los CAs del sistema</string>
   <string name="pref_dont_trust_system_cas_summary">Todos los certificados deben ser aprobados manualmente</string>
-  <string name="pref_remove_trusted_certificates_title">Eliminar Certificados</string>
+  <string name="pref_remove_trusted_certificates_title">Eliminar certificados</string>
   <string name="pref_remove_trusted_certificates_summary">Eliminar manualmente certificados aceptados</string>
   <string name="toast_no_trusted_certs">No aceptar certificados manualmente</string>
-  <string name="dialog_manage_certs_title">Eliminar Certificados</string>
+  <string name="dialog_manage_certs_title">Eliminar certificados</string>
   <string name="dialog_manage_certs_positivebutton">Eliminar seleccionados</string>
   <string name="dialog_manage_certs_negativebutton">Cancelar</string>
   <plurals name="toast_delete_certificates">
@@ -445,7 +442,7 @@
     <item quantity="other">Seleccionados %d contactos</item>
   </plurals>
   <string name="pref_quick_action_summary">Cambiar el botón de enviar por botón de acción rápida</string>
-  <string name="pref_quick_action">Acción Rápida</string>
+  <string name="pref_quick_action">Acción rápida</string>
   <string name="none">Ninguna</string>
   <string name="recently_used">Usada más recientemente</string>
   <string name="choose_quick_action">Elegir acción rápida</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 028acc53..0bb59671 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -105,8 +105,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">Konferentzien jakinarazpenak</string>
-  <string name="pref_conference_notifications_summary">Beti jakinarazi konferentzia 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>
@@ -427,7 +425,6 @@
   <string name="received_location">Kokapena jaso da</string>
   <string name="title_undo_swipe_out_conversation">Elkarrizketa itxi egin da</string>
   <string name="title_undo_swipe_out_muc">Konferentzia utzi egin da</string>
-  <string name="pref_certificate_options">Ziurtagirien aukerak</string>
   <string name="pref_dont_trust_system_cas_title">Sistemaren CAtaz ez fidatu</string>
   <string name="pref_dont_trust_system_cas_summary">Ziurtagiri guztiak eskuz onartu behar dira</string>
   <string name="pref_remove_trusted_certificates_title">Ziurtagiriak kendu</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 05ac82ac..646f5414 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -105,8 +105,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 lors de l\'arrivée d\'un message</string>
-  <string name="pref_conference_notifications">Notifications lors des conférences</string>
-  <string name="pref_conference_notifications_summary">Toujours notifier l\'arrivée d\'un message provenant d\'une conférence.</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>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 477b7580..6a6b23c1 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -69,8 +69,6 @@
   <string name="pref_vibrate_summary">Treme cando chega unha novo mensaxe</string>
   <string name="pref_sound">Son</string>
   <string name="pref_sound_summary">Reproduce un ton ca notificación</string>
-  <string name="pref_conference_notifications">Notificacións de conferencia</string>
-  <string name="pref_conference_notifications_summary">Siempre notifica cuando chega unha mensaxe de conferencia e non solo cuando chega unha mensaxe destacada</string>
   <string name="pref_notification_grace_period">Notificacións Carbons</string>
   <string name="pref_notification_grace_period_summary">Deshabilita as notificacións durante un corto periodo de tiempo despois de recibir a copia da mensaxe carbón</string>
   <string name="pref_advanced_options">Opcións avanzadas</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 6f2d967f..f859bde1 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -105,8 +105,6 @@
   <string name="pref_vibrate_summary">Juga aktifkan getaran bila pesan baru tiba</string>
   <string name="pref_sound">Suara</string>
   <string name="pref_sound_summary">mainkan suara saat menerima notifikasi</string>
-  <string name="pref_conference_notifications">Notifikasi Conference</string>
-  <string name="pref_conference_notifications_summary">Selalu memberitahukan bila pesan conference baru diterima daripada hanya dicetak tebal</string>
   <string name="pref_notification_grace_period">Tenggang waktu pemberitahuan</string>
   <string name="pref_notification_grace_period_summary">Nonaktifkan pemberitahuan untuk waktu yang singkat setelah salinan diterima</string>
   <string name="pref_advanced_options">Opsi Lanjutan</string>
@@ -424,7 +422,6 @@
   <string name="received_location">Lokasi yang diterima</string>
   <string name="title_undo_swipe_out_conversation">Percakapan tertutup</string>
   <string name="title_undo_swipe_out_muc">Tinggalkan conference</string>
-  <string name="pref_certificate_options">Opsi Sertifikat</string>
   <string name="pref_dont_trust_system_cas_title">Jangan percaya sistem CA</string>
   <string name="pref_dont_trust_system_cas_summary">Semua sertifikat harus disetujui secara manual</string>
   <string name="pref_remove_trusted_certificates_title">Hapus sertifikat</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 01299530..372b87e2 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -60,7 +60,7 @@
   <string name="crash_report_title">Errore di Conversations</string>
   <string name="crash_report_message">Se scegli di inviare una segnalazione dell’errore aiuterai lo sviluppo di Conversations\n<b>Attenzione:</b> Questo utilizzerà il tuo account XMPP per inviare la segnalazione agli sviluppatori.</string>
   <string name="send_now">Invia adesso</string>
-  <string name="send_never">Non chiedere mai più</string>
+  <string name="send_never">Non chiedere più</string>
   <string name="problem_connecting_to_account">Impossibile collegarsi tramite questo utente</string>
   <string name="problem_connecting_to_accounts">Impossibile collegarsi tramite più utenti</string>
   <string name="touch_to_fix">Tocca qui per gestire i tuoi utenti</string>
@@ -105,8 +105,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 Conferenze</string>
-  <string name="pref_conference_notifications_summary">Notifica sempre quando arriva un nuovo messaggio da una conferenza, invece che solo quando in primo piano</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>
@@ -293,6 +291,7 @@
   <string name="copy_text">Copia testo</string>
   <string name="copy_original_url">Copia URL originale</string>
   <string name="send_again">Invia di nuovo</string>
+  <string name="file_url">URL del file</string>
   <string name="message_text">Messaggio di testo</string>
   <string name="url_copied_to_clipboard">URL copiato</string>
   <string name="message_copied_to_clipboard">Messaggio copiato</string>
@@ -406,6 +405,7 @@
   <string name="apk">Applicazione Android</string>
   <string name="vcard">Contatto</string>
   <string name="received_x_file">Ricevuto %s</string>
+  <string name="disable_foreground_service">Disabilita i servizi in background</string>
   <string name="touch_to_open_conversations">Tocca per avviare Conversations</string>
   <string name="avatar_has_been_published">Il tuo avatar è stato pubblicato!</string>
   <string name="sending_x_file">Invio %s</string>
@@ -422,7 +422,6 @@
   <string name="received_location">Posizione ricevuta</string>
   <string name="title_undo_swipe_out_conversation">Conversazione interrotta</string>
   <string name="title_undo_swipe_out_muc">Conferenza terminata</string>
-  <string name="pref_certificate_options">Opzioni per i certificati</string>
   <string name="pref_dont_trust_system_cas_title">Non ti fidare delle CA di sistema</string>
   <string name="pref_dont_trust_system_cas_summary">Tutti i certificati devono essere accettati manualmente</string>
   <string name="pref_remove_trusted_certificates_title">Elimina i certificati</string>
@@ -439,4 +438,8 @@
     <item quantity="one">Seleziona il %d contatto</item>
     <item quantity="other">Selezionati %d contatti</item>
   </plurals>
+  <string name="none">Nessuno</string>
+  <string name="recently_used">Usati recentemente</string>
+  <string name="file_not_found_on_remote_host">File non trovato sul server remoto</string>
+  <string name="search_for_contacts_or_groups">Cerca contatti o gruppi</string>
 </resources>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 545ba1c8..8eeaab6b 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -90,8 +90,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>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 35347734..35ccc7dd 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -105,8 +105,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>
@@ -427,7 +425,6 @@
   <string name="received_location">位置を受信しました</string>
   <string name="title_undo_swipe_out_conversation">会話が閉じられました</string>
   <string name="title_undo_swipe_out_muc">退出した会話</string>
-  <string name="pref_certificate_options">証明書オプション</string>
   <string name="pref_dont_trust_system_cas_title">システムの CA を信頼しない</string>
   <string name="pref_dont_trust_system_cas_summary">すべての証明書を手動で承認する必要があります</string>
   <string name="pref_remove_trusted_certificates_title">証明書を削除</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index cdc3737a..a164dd10 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -105,8 +105,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>
@@ -424,7 +422,6 @@
   <string name="received_location">위치 수신 </string>
   <string name="title_undo_swipe_out_conversation">대화 끝남 </string>
   <string name="title_undo_swipe_out_muc">회의에서 나감 </string>
-  <string name="pref_certificate_options">인증 설정 </string>
   <string name="pref_dont_trust_system_cas_title">시스템 CA를 신뢰하지 않음 </string>
   <string name="pref_dont_trust_system_cas_summary">모든 인증서는 수동으로 승인되어야 함 </string>
   <string name="pref_remove_trusted_certificates_title">인증서 삭제 </string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 80b6934b..a4ef81ab 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -105,8 +105,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 ringtone af bij melding</string>
-  <string name="pref_conference_notifications">Groepsgespreksmeldingen</string>
-  <string name="pref_conference_notifications_summary">Toon altijd meldingen als er nieuwe berichten arriveren in groepsgesprekken in plaats van alleen wanneer gemarkeerd</string>
   <string name="pref_notification_grace_period">Uitstelperiode voor meldingen</string>
   <string name="pref_notification_grace_period_summary">Zet meldingen voor korte tijd uit als er een carbon copy wordt ontvangen</string>
   <string name="pref_advanced_options">Geavanceerde instellingen</string>
@@ -288,6 +286,7 @@
   <string name="conference_members_only">Dit groepsgesprek is enkel voor leden</string>
   <string name="conference_kicked">Je bent uit dit groepsgesprek geschopt</string>
   <string name="using_account">account %s gebruiken</string>
+  <string name="checking_x">%s op HTTP host nakijken</string>
   <string name="not_connected_try_again">Je bent niet verbonden. Probeer later opnieuw</string>
   <string name="check_x_filesize">Bekijk bestandsgrootte van %s</string>
   <string name="message_options">Berichtopties</string>
@@ -417,7 +416,7 @@
   <string name="disable_account">Account uitzetten</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="pref_chat_states">Type-meldingen</string>
+  <string name="pref_chat_states">Aan het typen meldingen</string>
   <string name="pref_chat_states_summary">Laat je contacten weten wanneer je een nieuw bericht aan het schrijven bent</string>
   <string name="send_location">Locatie versturen</string>
   <string name="show_location">Locatie weergeven</string>
@@ -426,7 +425,6 @@
   <string name="received_location">Locatie ontvangen</string>
   <string name="title_undo_swipe_out_conversation">Gesprek gesloten</string>
   <string name="title_undo_swipe_out_muc">Groepsgesprek verlaten</string>
-  <string name="pref_certificate_options">Certificaatopties</string>
   <string name="pref_dont_trust_system_cas_title">Vertrouw geen systeem-CA\'s.</string>
   <string name="pref_dont_trust_system_cas_summary">Alle certificaten moeten handmatig goedgekeurd worden</string>
   <string name="pref_remove_trusted_certificates_title">Verwijder certificaten</string>
@@ -449,4 +447,5 @@
   <string name="recently_used">Recent gebruikt</string>
   <string name="choose_quick_action">Kies snelle actie</string>
   <string name="file_not_found_on_remote_host">Bestand niet gevonden op externe server</string>
+  <string name="search_for_contacts_or_groups">Zoeken naar contacten of groepen</string>
 </resources>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index ea2ecc52..fb94c605 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -105,8 +105,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 konferencji</string>
-  <string name="pref_conference_notifications_summary">Zawsze powiadamiaj o nowej wiadomości w konferencji</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>
@@ -424,7 +422,6 @@
   <string name="received_location">Otrzymano lokalizację</string>
   <string name="title_undo_swipe_out_conversation">Zamknięto konwersację</string>
   <string name="title_undo_swipe_out_muc">Opuszczono konferencję</string>
-  <string name="pref_certificate_options">Ustawienia certyfikatów</string>
   <string name="pref_dont_trust_system_cas_title">Nie ufaj certyfikatom systemowym</string>
   <string name="pref_dont_trust_system_cas_summary">Wymagaj ręcznego potwierdzania certyfikatów</string>
   <string name="pref_remove_trusted_certificates_title">Usuń certyfikat</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 559ae6cf..041b5e2d 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -99,8 +99,6 @@
   <string name="pref_vibrate_summary">Vibrar também quando uma nova mensagem for recebida</string>
   <string name="pref_sound">Som</string>
   <string name="pref_sound_summary">Tocar um som com a notificação</string>
-  <string name="pref_conference_notifications">Notificações de conferência</string>
-  <string name="pref_conference_notifications_summary">Sempre notificar quando uma nova mensagem de conferencia for recebida ao invés de apenas quando a mesma for ressaltada</string>
   <string name="pref_notification_grace_period">Período de carência da notificação</string>
   <string name="pref_notification_grace_period_summary">Desativar notificações por um curto período após a copia oculta ser recebida</string>
   <string name="pref_advanced_options">Opções avançadas</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 56a87ffc..053a675c 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -105,8 +105,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>
@@ -424,7 +422,6 @@
   <string name="received_location">Получено местоположение</string>
   <string name="title_undo_swipe_out_conversation">Беседа окончена</string>
   <string name="title_undo_swipe_out_muc">Покинул беседу</string>
-  <string name="pref_certificate_options">Опции сертификата</string>
   <string name="pref_dont_trust_system_cas_title">Не доверять системным УЦ</string>
   <string name="pref_dont_trust_system_cas_summary">Все сертификаты должны быть подтверждены вручную</string>
   <string name="pref_remove_trusted_certificates_title">Удалить сертификат</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index d6238794..6f3bf982 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -105,8 +105,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 pri skupinovej konverzácii</string>
-  <string name="pref_conference_notifications_summary">Vždy upozorniť pri novej konferenčnej správe, nie len ak 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>
@@ -426,7 +424,6 @@
   <string name="received_location">Prijatá poloha</string>
   <string name="title_undo_swipe_out_conversation">Konverzácia zatvorená</string>
   <string name="title_undo_swipe_out_muc">Opustil skupinovú konverzáciu</string>
-  <string name="pref_certificate_options">Možnosti certifikátu</string>
   <string name="pref_dont_trust_system_cas_title">Nedôverovať systému CAs</string>
   <string name="pref_dont_trust_system_cas_summary">Všetky certifikáty musia byť ručne schválené</string>
   <string name="pref_remove_trusted_certificates_title">Odstrániť certifikáty</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 082cfa46..96db8b7e 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -105,8 +105,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>
@@ -427,7 +425,6 @@
   <string name="received_location">Примљена локација</string>
   <string name="title_undo_swipe_out_conversation">Преписка затворена</string>
   <string name="title_undo_swipe_out_muc">Напусти конференцију</string>
-  <string name="pref_certificate_options">Опције сертификата</string>
   <string name="pref_dont_trust_system_cas_title">Не веруј системским сертификационим телима</string>
   <string name="pref_dont_trust_system_cas_summary">Сви сертификати морају ручно да се одобре</string>
   <string name="pref_remove_trusted_certificates_title">Уклони сертификате</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 98ab7110..6c4436a8 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -105,8 +105,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">Konferensnotifieringar</string>
-  <string name="pref_conference_notifications_summary">Notifiera alltid när nytt konferensmeddelande tagits emot i stä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>
@@ -427,7 +425,6 @@
   <string name="received_location">Mottog position</string>
   <string name="title_undo_swipe_out_conversation">Konversation stängd</string>
   <string name="title_undo_swipe_out_muc">Lämnade konferens</string>
-  <string name="pref_certificate_options">Certifikatalternativ</string>
   <string name="pref_dont_trust_system_cas_title">Lita inte på systemets CAs</string>
   <string name="pref_dont_trust_system_cas_summary">Alla certifikat måste manuellt godkännas</string>
   <string name="pref_remove_trusted_certificates_title">Ta bort certifikat</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 0d95ee18..7a67ffdd 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -105,8 +105,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>
@@ -424,7 +422,6 @@
   <string name="received_location">位置已收到</string>
   <string name="title_undo_swipe_out_conversation">Conversation 已关闭</string>
   <string name="title_undo_swipe_out_muc">离开讨论组</string>
-  <string name="pref_certificate_options">证书选项</string>
   <string name="pref_dont_trust_system_cas_title">不相信系统 CA</string>
   <string name="pref_dont_trust_system_cas_summary">所有证书必须人工通过</string>
   <string name="pref_remove_trusted_certificates_title">移除证书</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 1fd7c4bf..8a4d3539 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -89,8 +89,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>
-- 
cgit v1.2.3