diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index e3a71f6975a664261ce243a6d5bb03a8f48b091e..cefcdf06278bc5a7e4685f5abc067da1f36e4913 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -95,9 +95,6 @@
   <string name="pref_notifications">الإشعارات</string>
   <string name="pref_notifications_summary">أخبرني عندما تصل رساله جديده</string>
   <string name="pref_vibrate">إعداد الإهتزاز</string>
-  <string name="pref_vibrate_summary">تفعيل الاهتزاز عندما تصل رساله جديده</string>
-  <string name="pref_sound">التبيه الصوتي</string>
-  <string name="pref_sound_summary">سماع صوت عندما تصل رساله</string>
   <string name="pref_never_send_crash">لا ترسل تقارير أخطاء</string>
   <string name="pref_never_send_crash_summary">الغاء ارسال تقارير الأخطاء يقلل من فرص حل المشكلة سريعا فكن متعاون</string>
   <string name="pref_confirm_messages">تأكيد الرسالة</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index daa07b085cff65eb48719fa7edb576ee4d1c3fb0..064639631aacf3dba966d2310b70c4ca960765c5 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -107,9 +107,11 @@
   <string name="pref_notifications">Известия</string>
   <string name="pref_notifications_summary">Известяване при получаване на ново съобщение</string>
   <string name="pref_vibrate">Вибрация</string>
-  <string name="pref_vibrate_summary">Също така да има и вибрация при получаване на ново съобщение</string>
-  <string name="pref_sound">Звук</string>
-  <string name="pref_sound_summary">Изпълнение на звук с известието</string>
+  <string name="pref_vibrate_summary">Вибриране при получаване на ново съобщение</string>
+  <string name="pref_led">Известие чрез светодиода</string>
+  <string name="pref_led_summary">Мигане на индикаторния светодиод при получаване на ново съобщение</string>
+  <string name="pref_sound">Тон на звънене</string>
+  <string name="pref_sound_summary">Изпълнение на звук при получаване на ново съобщение</string>
   <string name="pref_notification_grace_period">Продължителност на отсрочване на известията</string>
   <string name="pref_notification_grace_period_summary">Изключва известията за кратко, след като бъде получено копие на съобщение</string>
   <string name="pref_advanced_options">Разширени</string>
@@ -577,4 +579,5 @@
   <string name="no_keys_just_confirm">Вие вече имате доверие на този контакт. Избирайки „готово“, Вие просто потвърждавате, че %s е част от тази беседа.</string>
   <string name="select_image_and_crop">Изберете изображение и изрежете</string>
   <string name="this_account_is_disabled">Вие сте деактивирали този профил</string>
+  <string name="security_error_invalid_file_access">Грешка в сигурността: неправилен достъп до файл</string>
 </resources>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 1c06d9abf8d4c19e73660391e687cc1b833d67c3..2a9aa8c559c40823634ca829663275d78eace1f8 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -96,9 +96,6 @@
   <string name="pref_notifications">Notificacions</string>
   <string name="pref_notifications_summary">Notifica quan arriba un nou missatge</string>
   <string name="pref_vibrate">Vibra</string>
-  <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_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_never_send_crash">Mai enviïs informes d\'errors</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 7642e2978b969ab99c772f1cfa6fc91e199e2762..c70eac63243dc8b14b2f75d123a1b22fe21660df 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -107,9 +107,6 @@
   <string name="pref_notifications">Upozornění</string>
   <string name="pref_notifications_summary">Upozornit při přijetí nové zprávy</string>
   <string name="pref_vibrate">Vibrovat</string>
-  <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_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">Rozšířené</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 68325e00da59620cc18eb1dd1f96349835133be1..523dc1e15695d4f4daf3c99f9ff0f42b9a3dba20 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -108,6 +108,8 @@
   <string name="pref_notifications_summary">Benachrichtigen bei Erhalt einer neuen Nachricht</string>
   <string name="pref_vibrate">Vibrieren</string>
   <string name="pref_vibrate_summary">Vibrieren bei Erhalt einer neuen Nachricht</string>
+  <string name="pref_led">LED Benachrichtigung</string>
+  <string name="pref_led_summary">Blinke bei Erhalt einer neuen Nachricht</string>
   <string name="pref_sound">Benachrichtigungston</string>
   <string name="pref_sound_summary">Benachrichtigungston wiedergeben</string>
   <string name="pref_notification_grace_period">Gnadenfrist</string>
@@ -577,4 +579,5 @@
   <string name="no_keys_just_confirm">Du vertraust diesem Kontakt bereits. Durch Auswählen von \"Fertig\" bestätigst du, dass %s Teil dieser Konferenz ist.</string>
   <string name="select_image_and_crop">Bild auswählen und zuschneiden</string>
   <string name="this_account_is_disabled">Du hast dieses Konto deaktiviert</string>
+  <string name="security_error_invalid_file_access">Sicherheitsfehler: Dateizugriff nicht erlaubt</string>
 </resources>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 804a2146f07ccc90a71c7247e36d8bab351429fb..6a3bec9698702e7450a0bbb7811168950ab2455a 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -96,9 +96,6 @@
   <string name="pref_notifications">Ειδοποιήσεις</string>
   <string name="pref_notifications_summary">Ειδοποίηση όταν λαμβάνεται ένα νέο μήνυμα</string>
   <string name="pref_vibrate">Δόνηση</string>
-  <string name="pref_vibrate_summary">Επίσης δόνηση όταν έρχεται ένα νέο μήνυμα</string>
-  <string name="pref_sound">Ήχος</string>
-  <string name="pref_sound_summary">Αναπαραγωγή ήχου κλήσης με την ειδοποίηση</string>
   <string name="pref_notification_grace_period">Περίοδος χάριτος ειδοποιήσεων</string>
   <string name="pref_notification_grace_period_summary">Απενεργοποίηση ειδοποιήσεων για λίγο χρόνο μετά από τη λήψη ακριβούς αντιγράφου</string>
   <string name="pref_never_send_crash">Να μην αποστέλλονται αναφορές λαθών</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 5af941b33a162ab05c1376c55f2de4e1e594f705..b45a024866c7211f750f4c9c7d31609b6cbd9113 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -107,9 +107,6 @@
   <string name="pref_notifications">Notificaciones</string>
   <string name="pref_notifications_summary">Notificar cuando llega un nuevo mensaje</string>
   <string name="pref_vibrate">Vibrar</string>
-  <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_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">Avanzado</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index ed9fbeb5ca4c482b493c05d3a5e2a3dd3426c64e..061d4fd4e12d1aecd909d4387ca7f79c2379cecc 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -107,9 +107,6 @@
   <string name="pref_notifications">Jakinarazpenak</string>
   <string name="pref_notifications_summary">Mezu berri bat heltzerakoan jakinarazi</string>
   <string name="pref_vibrate">Dardaratu</string>
-  <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_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">Aurreratua</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 889f50922235739eb4838b1d94b697561d495ee9..3ddb3e771a1e4ad9c69774b274abe9fb82aada5a 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -105,9 +105,6 @@
   <string name="pref_notifications">Notifications</string>
   <string name="pref_notifications_summary">Notifier de l\'arrivée d\'un message.</string>
   <string name="pref_vibrate">Vibration</string>
-  <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_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">Avancé</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 0a414b9e6bf0246a81a786a719e9615ee1c154b4..cdab2e030bff0b435f1de572bfe2427289e013dd 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -61,9 +61,6 @@
   <string name="pref_notifications">Notificacións</string>
   <string name="pref_notifications_summary">Notifica cuando chega unha nova mensaxe</string>
   <string name="pref_vibrate">Tremer</string>
-  <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_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_never_send_crash">Nunca enviar informe de erros</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 3b5d10ffd1f4eb6567981413eb4ae0531705c4fb..ab149bf00af12c9da1514a244f8e7da97c348c1c 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -101,9 +101,6 @@
   <string name="pref_notifications">Notifikasi</string>
   <string name="pref_notifications_summary">Notifikasikan jika pesan baru tiba</string>
   <string name="pref_vibrate">Getar</string>
-  <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_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">Lanjutan</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 83bcbda01a58a0a650944b5c5b339a32c12807ab..8f00ad6af3f4aff3e82382936c7f9a7c94609d21 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -105,9 +105,6 @@
   <string name="pref_notifications">Notifiche</string>
   <string name="pref_notifications_summary">Notifica quando arriva un nuovo messaggio</string>
   <string name="pref_vibrate">Vibra</string>
-  <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_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">Avanzate</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 5b640ff2e008b59ba31ae4357f498bcdd1bd8ce3..7d22efb8beaffdf7e63a7b694b30554bc433051d 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -102,9 +102,6 @@
   <string name="pref_notifications">התראות</string>
   <string name="pref_notifications_summary">תודיע כאשר הודעה חדשה מגיעה</string>
   <string name="pref_vibrate">הרטט</string>
-  <string name="pref_vibrate_summary">הרטט גם כאשר הודעה חדשה מגיעה</string>
-  <string name="pref_sound">צליל</string>
-  <string name="pref_sound_summary">נגן צלצול עם כל התראה</string>
   <string name="pref_notification_grace_period">משך תקופת ארכה</string>
   <string name="pref_notification_grace_period_summary">נטרל התראות לזמן קצר לאחר שהודעת Carbon Copy מתקבלת</string>
   <string name="pref_never_send_crash">לעולם אל תשלח דיווחי קריסה</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 2268ca9666596e45f091bc23f809fb0a0618b41d..2ff16d5bfe36b1e7bf52b6dcff32b8e1334fc9f9 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -107,9 +107,6 @@
   <string name="pref_notifications">通知</string>
   <string name="pref_notifications_summary">新しいメッセージが到着したときに通知します</string>
   <string name="pref_vibrate">振動</string>
-  <string name="pref_vibrate_summary">新しいメッセージが到着したときに振動もします</string>
-  <string name="pref_sound">サウンド</string>
-  <string name="pref_sound_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-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 311d3fdd992a44a6c828d48f4896ac4d34f8ce6a..b4e0311bc5e97956741e95f6ed6a5d0245c06fe0 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -104,9 +104,6 @@
   <string name="pref_notifications">알림 </string>
   <string name="pref_notifications_summary">새 메세지 도착시 알림 </string>
   <string name="pref_vibrate">진동 </string>
-  <string name="pref_vibrate_summary">새 메세지 도착시 진동 </string>
-  <string name="pref_sound">소리 </string>
-  <string name="pref_sound_summary">알림과 동시에 벨소리 재생 </string>
   <string name="pref_notification_grace_period">알림 유예 </string>
   <string name="pref_notification_grace_period_summary">Carbon Copy 수신 후에 잠시동안 알림 해제</string>
   <string name="pref_never_send_crash">충돌 보고서 보내지 않음 </string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index b78c1fba2a93ddcc2dd494331df99cd691fa68c6..d12975bdfe430046b2e912dbb86a6ca72d04368b 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -104,9 +104,6 @@
   <string name="pref_notifications">Varslinger</string>
   <string name="pref_notifications_summary">Varsle når en ny melding ankommer</string>
   <string name="pref_vibrate">Vibrer</string>
-  <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 ved varsel</string>
   <string name="pref_notification_grace_period">Stilleperiode</string>
   <string name="pref_notification_grace_period_summary">Deaktiver varslinger for en kort periode etter at en kopi er mottatt</string>
   <string name="pref_never_send_crash">Aldri send feilrettingsrapporter</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 44e5dab657e9a34d90d505e53f4711df1c3a694a..4e742f8109feb0166eafdf7132de79e648a793d4 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -107,9 +107,6 @@
   <string name="pref_notifications">Meldingen</string>
   <string name="pref_notifications_summary">Melding als een nieuw bericht arriveert</string>
   <string name="pref_vibrate">Trillen</string>
-  <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_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">Geavanceerd</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 15bd09554e8c332cc131e6877b36a8802e5692fa..658f171105a1d9a0e25616de21b3f3eb9fa22809 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -105,9 +105,6 @@
   <string name="pref_notifications">Powiadomienia</string>
   <string name="pref_notifications_summary">Powiadamiaj, gdy nadejdzie wiadomość</string>
   <string name="pref_vibrate">Wibracje</string>
-  <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_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">Zaawansowane</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index ea50da43918fbd720d081a9edcf770680a3c817f..3c41c32a6544fd4cc08d779f96acb3564dd03011 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -105,11 +105,13 @@
   <string name="pref_accept_files_summary">Aceitar automaticamente arquivos menores que...</string>
   <string name="pref_notification_settings">Notificação</string>
   <string name="pref_notifications">Notificações</string>
-  <string name="pref_notifications_summary">Notificar quando uma nova mensagem for recebida</string>
+  <string name="pref_notifications_summary">Notificar ao receber uma nova mensagem</string>
   <string name="pref_vibrate">Vibração</string>
-  <string name="pref_vibrate_summary">Vibrar quando uma nova mensagem for recebida</string>
-  <string name="pref_sound">Som</string>
-  <string name="pref_sound_summary">Som de notificação</string>
+  <string name="pref_vibrate_summary">Vibrar ao receber uma nova mensagem</string>
+  <string name="pref_led">Notificação via LED</string>
+  <string name="pref_led_summary">Piscar a luz de notificação ao receber uma nova mensagem</string>
+  <string name="pref_sound">Toque</string>
+  <string name="pref_sound_summary">Tocar um som ao receber uma nova mensagem</string>
   <string name="pref_notification_grace_period">Tempo de espera da notificação</string>
   <string name="pref_notification_grace_period_summary">Desativar notificações por um curto período após uma copia ser recebida</string>
   <string name="pref_advanced_options">Avançado</string>
@@ -577,4 +579,5 @@
   <string name="no_keys_just_confirm">Você já confia nesse contato. Ao selecionar \'Concluído\', você está apenas confirmando que %s é parte dessa conferência.</string>
   <string name="select_image_and_crop">Selecione e recorte a imagem</string>
   <string name="this_account_is_disabled">Você desabilitou essa conta</string>
+  <string name="security_error_invalid_file_access">Erro de segurança: Acesso inválido ao arquivo</string>
 </resources>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index c779aa7ce04531677103e2679785c6d1ef6383e1..8e50279730f7bfd9dc3ac952ac06fd3074c75d25 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -107,9 +107,6 @@
   <string name="pref_notifications">Notificações</string>
   <string name="pref_notifications_summary">Notificar quando uma nova mensagem for recebida</string>
   <string name="pref_vibrate">Vibrar</string>
-  <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_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">Avançadas</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 090d234e344be66f70b3faa72acb7183ca717a25..d8512d6dec84f8ae815ecb1a9092f5451fd489d8 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -107,9 +107,6 @@
   <string name="pref_notifications">Notificari</string>
   <string name="pref_notifications_summary">Notifica cand un nou mesaj este primit</string>
   <string name="pref_vibrate">Vibreaza</string>
-  <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_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>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index c050b6db9955661de506edf6e655f1eaa7a0574b..c206717c5bce4145d5f942c529ec04805a0519e7 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -105,9 +105,6 @@
   <string name="pref_notifications">Уведомление</string>
   <string name="pref_notifications_summary">Использовать звуковое уведомление когда приходят новые сообщения</string>
   <string name="pref_vibrate">Вибрация</string>
-  <string name="pref_vibrate_summary">Использовать вибрацию когда приходят новые сообщения</string>
-  <string name="pref_sound">Звуковой сигнал</string>
-  <string name="pref_sound_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-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 414fdf69feda9545a132564ec438eeaa1870f7e6..aaa39dd44af1934d31e7de51e0cf4fafbaa4a560 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -99,9 +99,6 @@
   <string name="pref_notifications">Upozornenia</string>
   <string name="pref_notifications_summary">Upozorniť pri prijatí novej správy</string>
   <string name="pref_vibrate">Vibrovať</string>
-  <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_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_never_send_crash">Neodosielať detaily o zlyhaní aplikácie</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 5ad8362a5cae2594f1ff1732065ae47bffcfb720..f4091e6b61c467bd1ad0614df12da239a57e31c7 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -107,9 +107,11 @@
   <string name="pref_notifications">Обавештења</string>
   <string name="pref_notifications_summary">Обавести кад стигне нова порука</string>
   <string name="pref_vibrate">Вибрирај</string>
-  <string name="pref_vibrate_summary">Вибрирај кад стигне нова порука</string>
+  <string name="pref_vibrate_summary">Вибрирање кад стигне нова порука</string>
+  <string name="pref_led">ЛЕД светло</string>
+  <string name="pref_led_summary">Трептање ЛЕД светла кад стигне нова порука</string>
   <string name="pref_sound">Звук</string>
-  <string name="pref_sound_summary">Звуци обавештења</string>
+  <string name="pref_sound_summary">Пуштање звука кад стигне нова порука</string>
   <string name="pref_notification_grace_period">Период одгоде обавештења</string>
   <string name="pref_notification_grace_period_summary">Искључи обавештења на кратко по примању карбон копије</string>
   <string name="pref_advanced_options">Напредно</string>
@@ -580,4 +582,5 @@
   <string name="no_keys_just_confirm">Већ се поуздате у овог контакта. Избором „Готово“ само потврђујете да је %s део овог групног ћаскања.</string>
   <string name="select_image_and_crop">Изабери слику и опсеци</string>
   <string name="this_account_is_disabled">Искључили сте овај налог</string>
+  <string name="security_error_invalid_file_access">Безбедносна грешка: неисправан приступ фајлу</string>
 </resources>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 370039c10ac274b82c0f75436ffc242ad3b6877a..2834cbb394771579f862192eb162b268fd05b2c7 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -107,9 +107,6 @@
   <string name="pref_notifications">Notifieringar</string>
   <string name="pref_notifications_summary">Notifiera när meddelande tagits emot</string>
   <string name="pref_vibrate">Vibrera</string>
-  <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_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">Avancerat</string>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index 2d434f039aa4e559a7368c42e621ba23d4e77e1f..a1c08516950996579451c41fd044da0af3b7998d 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -105,9 +105,6 @@
   <string name="pref_notifications">Bildirimler</string>
   <string name="pref_notifications_summary">Yeni ileti geldiğinde bildir</string>
   <string name="pref_vibrate">Titreşim</string>
-  <string name="pref_vibrate_summary">Yeni bir ileti geldiğinde aynı zamanda titreşsin</string>
-  <string name="pref_sound">Ses</string>
-  <string name="pref_sound_summary">Bildirimle birlikte zil çalsın</string>
   <string name="pref_notification_grace_period">Bildirim mühleti</string>
   <string name="pref_notification_grace_period_summary">Karbon kopya alındıktan sonra kısa bir süre için bildirimleri kapa</string>
   <string name="pref_advanced_options">Gelişmiş</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index 935e6fa320c0320e7ccecb58159fee9d186caf1a..2887af13debd84746cbdc8188d54f09028f602cd 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -104,9 +104,6 @@
   <string name="pref_notifications">Thông báo</string>
   <string name="pref_notifications_summary">Thông báo khi có tin nhắn mới</string>
   <string name="pref_vibrate">Rung</string>
-  <string name="pref_vibrate_summary">Rung khi có tin nhắn mới</string>
-  <string name="pref_sound">Âm báo</string>
-  <string name="pref_sound_summary">Chơi nhạc chuông cùng với thông báo</string>
   <string name="pref_notification_grace_period">Thời gian gia hạn thông báo</string>
   <string name="pref_notification_grace_period_summary">Tắt thông báo trong một thời gian ngắn sau khi nhận được bản sao giấy than</string>
   <string name="pref_never_send_crash">Không bao giờ gửi báo cáo dừng chạy</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 8c7705379a9bad022d0cbf784cf9b9b9920d1b11..9f0413345972c8310412fe15528dba7503c4bae1 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -71,6 +71,8 @@
   <string name="send_failed">传递失败</string>
   <string name="send_rejected">拒绝</string>
   <string name="preparing_image">准备传输图像</string>
+  <string name="preparing_images">正在传输图像</string>
+  <string name="sharing_files_please_wait">正在分享文件，请稍候…</string>
   <string name="action_clear_history">清除历史记录</string>
   <string name="clear_conversation_history">清除会话记录</string>
   <string name="clear_histor_msg">删除该会话中所有信息？\n\n<b>注:</b> 该操作不会影响其他设备或服务器保存的信息。</string>
@@ -105,9 +107,6 @@
   <string name="pref_notifications">通知</string>
   <string name="pref_notifications_summary">收到新消息时通知</string>
   <string name="pref_vibrate">震动</string>
-  <string name="pref_vibrate_summary">收到新消息时震动</string>
-  <string name="pref_sound">声音</string>
-  <string name="pref_sound_summary">收到新消息时的铃声</string>
   <string name="pref_notification_grace_period">通知限期</string>
   <string name="pref_notification_grace_period_summary">接收副本短时间内关闭通知</string>
   <string name="pref_advanced_options">高级</string>
@@ -351,6 +350,7 @@
   <string name="choose_file">选择文件</string>
   <string name="receiving_x_file">接收中 %1$s (已完成 %2$d%%)</string>
   <string name="download_x_file">下载 %s</string>
+  <string name="delete_x_file">删除 %s</string>
   <string name="file">文件</string>
   <string name="open_x_file"> 打开 %s</string>
   <string name="sending_file">发送中 (已完成 %1$d%%)</string>
@@ -505,7 +505,7 @@
   <string name="pref_xa_on_silent_mode_summary">当设备进入静音模式时把资源标识改为不可用</string>
   <string name="pref_treat_vibrate_as_silent">静音模式开启振动</string>
   <string name="pref_treat_vibrate_as_silent_summary">当设备进入振动模式时把资源标识改为不可用</string>
-  <string name="pref_show_connection_options">高级边接设置</string>
+  <string name="pref_show_connection_options">高级连接设置</string>
   <string name="pref_show_connection_options_summary">注册账户时显示主机名和端口</string>
   <string name="hostname_example">xmpp.example.com</string>
   <string name="action_add_account_with_certificate">使用证书添加账户</string>
@@ -526,7 +526,7 @@
   <string name="device_does_not_support_certificates">您的设备不支持设备证书选择！</string>
   <string name="pref_connection_options">连接</string>
   <string name="pref_use_tor">通过 Tor 连接</string>
-  <string name="pref_use_tor_summary">所有连接使用 Tor 网络隧道。需要 Orbot</string>
+  <string name="pref_use_tor_summary">所有连接使用 Tor 网络传输，需要 Orbot</string>
   <string name="account_settings_hostname">主机名</string>
   <string name="account_settings_port">端口</string>
   <string name="hostname_or_onion">服务器 - 或者 .orion 地址</string>
@@ -539,6 +539,7 @@
   <string name="load_more_messages">载入更多消息</string>
   <string name="shared_file_with_x">用 %s 分享文件</string>
   <string name="shared_image_with_x">用 %s 分享图片</string>
+  <string name="shared_images_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>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 952035f34ea62a35b86e0cb618fd7fc09d262c34..de91974437885d046bac39a998446c79626af4bf 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -80,9 +80,6 @@
   <string name="pref_notifications">通知</string>
   <string name="pref_notifications_summary">收到新訊息時通知</string>
   <string name="pref_vibrate">震動</string>
-  <string name="pref_vibrate_summary">收到新訊息時震動</string>
-  <string name="pref_sound">聲音</string>
-  <string name="pref_sound_summary">收到新訊息時播放鈴聲</string>
   <string name="pref_notification_grace_period">通知限期</string>
   <string name="pref_notification_grace_period_summary">收到副本後，關閉通知一小段時間</string>
   <string name="pref_never_send_crash">總是不發送故障報告</string>