diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
index ea736bbed..c8ed3f8ff 100644
--- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
@@ -1561,7 +1561,7 @@ public final class ComposeActivity
             switch (topLevelType) {
                 case "video": {
                     if (mediaSize > STATUS_VIDEO_SIZE_LIMIT) {
-                        displayTransientError(R.string.error_image_upload_size);
+                        displayTransientError(R.string.error_video_upload_size);
                         return;
                     }
                     if (mediaQueued.size() > 0
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 8c33bf129..47ae470d1 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -19,10 +19,8 @@
     <string name="error_media_upload_image_or_video">لا يمكنك إرفاق كلا من الصور و الفيديوهات في نفس المنشور.</string>
     <string name="error_media_upload_sending">اخفقت عملية الرفع.</string>
     <string name="error_report_too_few_statuses">يجب على الأقل اختيار منشور واحد للإبلاغ عنه.</string>
-    <string name="error_invalid_regex">العبارة المنطقية خاطئة</string>
     <string name="error_sender_account_gone">خطأ عند إرسال التبويق.</string>
     <string name="title_home">الرئيسية</string>
-    <string name="title_advanced">الخيارات المتقدمة</string>
     <string name="title_notifications">الاشعارات</string>
     <string name="title_public_local">المحلية</string>
     <string name="title_public_federated">الفدرالية</string>
@@ -159,10 +157,8 @@
     <string name="visibility_unlisted">غير مدرج : لا يُعرَض على الخيوط العمومية</string>
     <string name="visibility_private">لمتابعيك فقط : يُنشر إلى متابعيك فقط</string>
     <string name="visibility_direct">مباشر : يُسرسَل إلى المستخدمين المشار إليهم فقط</string>
-    <string name="pref_title_notification_settings">الاشعارات</string>
     <string name="pref_title_edit_notification_settings">تعديل الاشعارات</string>
     <string name="pref_title_notifications_enabled">الإخطارات</string>
-    <string name="pref_summary_notifications">للحساب %1$s</string>
     <string name="pref_title_notification_alerts">التنبيهات</string>
     <string name="pref_title_notification_alert_sound">إعلام بالصوت</string>
     <string name="pref_title_notification_alert_vibrate">إعلام بالاهتزار</string>
@@ -208,10 +204,6 @@
     <string name="status_text_size_medium">متوسط</string>
     <string name="status_text_size_large">عريض</string>
     <string name="status_text_size_largest">عريض جدا</string>
-    <string name="pref_media_display">عرض الوسائط</string>
-    <string name="media_hide_sensitive">إخفاء الوسائط المعينة كحساسة</string>
-    <string name="media_hide_none">اظهار الوسائط المعينة كمحتوى حساس دائمًا</string>
-    <string name="media_hide_all">إخفاء كافة الوسائط دائما</string>
     <string name="notification_mention_name">إشارات جديدة</string>
     <string name="notification_mention_descriptions">الإخطارات عندما يشار إليك</string>
     <string name="notification_follow_name">متابِعون جدد</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 06fbc5db9..e24976c35 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -136,7 +136,6 @@
     <string name="visibility_private">Només seguidors: només és visible per al teus seguidors</string>
     <string name="visibility_direct">Directa: només és visible per als usuaris mencionats</string>
 
-    <string name="pref_title_notification_settings">Notificacions</string>
     <string name="pref_title_edit_notification_settings">Edita les notificacions</string>
     <string name="pref_title_notifications_enabled">Notificacions</string>
     <string name="pref_title_notification_alerts">Alertes</string>
@@ -231,7 +230,6 @@
 
 <string name="error_sender_account_gone">Error enviant el toot.</string>
 
-    <string name="title_advanced">Avançat</string>
     <string name="title_tab_preferences">Pestanyes</string>
     <string name="title_licenses">Llicències</string>
 
@@ -245,7 +243,6 @@
     <string name="action_unreblog">Elimineu els preferits</string>
     <string name="error_network">S\'ha produït un error de conexió! Si us plau, comprova la teva conexió!</string>
     <string name="error_video_upload_size">Els fitxers han de tenir menys de 40 MB.</string>
-    <string name="error_invalid_regex">Expressió regular invàlida</string>
     <string name="status_media_hidden_title">Multimèdia amagada</string>
     <string name="status_content_show_less">Amagar</string>
 
@@ -286,7 +283,6 @@
     <string name="dialog_delete_toot_warning">Vols eliminar aquest toot\?</string>
     <string name="dialog_redraft_toot_warning">Esborrar i reescriure aquest toot\?</string>
 
-    <string name="pref_summary_notifications">per el compte %1$s</string>
     <string name="pref_title_notification_filter_poll">Finalització de les enquetes</string>
     <string name="pref_title_app_theme">Tema</string>
     <string name="pref_title_timelines">Cronologia</string>
@@ -314,10 +310,6 @@
     <string name="status_text_size_large">Gran</string>
     <string name="status_text_size_largest">Més grand</string>
 
-    <string name="media_hide_sensitive">Ocultar els mèdia marcats com a sensibles</string>
-    <string name="media_hide_none">Mostrar sempre els mèdia marcats com a sensibles</string>
-    <string name="media_hide_all">Ocultar sempre tots els mèdia</string>
-
     <string name="notification_poll_name">Enquestes</string>
     <string name="pref_title_thread_filter_keywords">Converses</string>
     <string name="filter_addition_dialog_title">Afegir un filtre</string>
@@ -326,7 +318,6 @@
     <string name="add_account_name">Afegir un compte</string>
     <string name="action_open_reblogger">Obre l\'autor de l\'impuls</string>
     <string name="action_open_reblogged_by">Mostra els impulsos</string>
-    <string name="pref_media_display">Pantalla dels mèdia</string>
 
     <string name="notification_poll_description">Notificacions d\'enquestes que han finalitzat</string>
 
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 06ca32254..3b24126f1 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -19,10 +19,8 @@
     <string name="error_media_upload_image_or_video">K jednomu tootu nemohou být přiloženy obrázky i videa.</string>
     <string name="error_media_upload_sending">Nahrání selhalo.</string>
     <string name="error_report_too_few_statuses">Musí být nahlášen alespoň jeden toot.</string>
-    <string name="error_invalid_regex">Neplatný regulární výraz</string>
     <string name="error_sender_account_gone">Chyba při odesílání tootu.</string>
     <string name="title_home">Domů</string>
-    <string name="title_advanced">Pokročilé</string>
     <string name="title_notifications">Oznámení</string>
     <string name="title_public_local">Místní</string>
     <string name="title_public_federated">Federovaná</string>
@@ -165,10 +163,8 @@
     <string name="visibility_unlisted">Neuvedený: Neposlat na veřejné časové osy</string>
     <string name="visibility_private">Pouze pro sledující: Poslat pouze sledujícím</string>
     <string name="visibility_direct">Přímý: Poslat pouze zmíněným uživatelům</string>
-    <string name="pref_title_notification_settings">Oznámení</string>
     <string name="pref_title_edit_notification_settings">Oznámení</string>
     <string name="pref_title_notifications_enabled">Oznámení</string>
-    <string name="pref_summary_notifications">pro účet %1$s</string>
     <string name="pref_title_notification_alerts">Upozornění</string>
     <string name="pref_title_notification_alert_sound">Oznamovat se zvukem</string>
     <string name="pref_title_notification_alert_vibrate">Oznamovat s vibrací</string>
@@ -214,10 +210,6 @@
     <string name="status_text_size_medium">Střední</string>
     <string name="status_text_size_large">Velký</string>
     <string name="status_text_size_largest">Největší</string>
-    <string name="pref_media_display">Zobrazení médií</string>
-    <string name="media_hide_sensitive">Skrýt média označená jako citlivá</string>
-    <string name="media_hide_none">Vždy zobrazovat média označená jako citlivá</string>
-    <string name="media_hide_all">Vždy skrývat všechna média</string>
     <string name="notification_mention_name">Nové zmínky</string>
     <string name="notification_mention_descriptions">Oznámení o nových zmínkách</string>
     <string name="notification_follow_name">Noví sledující</string>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index ad05ae42e..181929617 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -18,10 +18,8 @@
     <string name="error_media_upload_image_or_video">Ni allwch atodi delweddau a fideos i\'r un statws.</string>
     <string name="error_media_upload_sending">Methu uwchlwytho.</string>
     <string name="error_report_too_few_statuses">Rhaid rhoi gwybod am o leiaf un statws.</string>
-    <string name="error_invalid_regex">Mynegiant rheolaidd annilys </string>
     <string name="error_sender_account_gone">Methu tŵtio.</string>
     <string name="title_home">Hafan</string>
-    <string name="title_advanced">Dewisiadau Uwch</string>
     <string name="title_notifications">Hysbysiadau</string>
     <string name="title_public_local">Lleol</string>
     <string name="title_public_federated">Ffedereiddwyd</string>
@@ -140,10 +138,8 @@
     <string name="visibility_unlisted">Heb restru: Peidio â dangos ar ffrydiau cyhoeddus</string>
     <string name="visibility_private">Dilynwyr yn Unig: Postio i ddilynwyr yn unig</string>
     <string name="visibility_direct">Uniongyrchol: Postio i ddefnyddwyr y soniwyd amdanynt yn unig</string>
-    <string name="pref_title_notification_settings">Hysbysiadau</string>
     <string name="pref_title_edit_notification_settings">Golygu Hysbysiadau </string>
     <string name="pref_title_notifications_enabled">Hysbysiadau</string>
-    <string name="pref_summary_notifications">i gyfrif %1$s</string>
     <string name="pref_title_notification_alerts">Negeseuon pwysig</string>
     <string name="pref_title_notification_alert_sound">Cael hysbysiad sŵn </string>
     <string name="pref_title_notification_alert_vibrate">Cael hysbysiad crynu </string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e00c5871f..0fddb7e4b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -19,10 +19,8 @@
     <string name="error_media_upload_image_or_video">Bilder und Videos können beide nicht an den Beitrag angehängt werden.</string>
     <string name="error_media_upload_sending">Die Mediendatei konnte nicht hochgeladen werden.</string>
     <string name="error_report_too_few_statuses">Mindestens ein Beitrag muss gemeldet werden.</string>
-    <string name="error_invalid_regex">Ungültiger regulärer Ausdruck</string>
     <string name="error_sender_account_gone">Fehler beim Senden des Status.</string>
     <string name="title_home">Start</string>
-    <string name="title_advanced">Erweitert</string>
     <string name="title_notifications">Benachrichtigungen</string>
     <string name="title_public_local">Lokal</string>
     <string name="title_public_federated">Föderiert</string>
@@ -162,10 +160,8 @@
     <string name="visibility_unlisted">Ungelistet: Nicht in der öffentlichen Timeline sichtbar</string>
     <string name="visibility_private">Nur Folgende: Nur für Folgende sichtbar</string>
     <string name="visibility_direct">Direkt: Nur für Erwähnte sichtbar</string>
-    <string name="pref_title_notification_settings">Benachrichtigungen</string>
     <string name="pref_title_edit_notification_settings">Benachrichtigungseinstellungen</string>
     <string name="pref_title_notifications_enabled">Benachrichtigungen</string>
-    <string name="pref_summary_notifications">für %1$s</string>
     <string name="pref_title_notification_alerts">Benachrichtigungen</string>
     <string name="pref_title_notification_alert_sound">Benachrichtige mit Sound</string>
     <string name="pref_title_notification_alert_vibrate">Benachrichtige mit Vibration</string>
@@ -211,10 +207,6 @@
     <string name="status_text_size_medium">Normal</string>
     <string name="status_text_size_large">Groß</string>
     <string name="status_text_size_largest">Größer</string>
-    <string name="pref_media_display">Medienanzeige</string>
-    <string name="media_hide_sensitive">Verberge Medien welche als heikel makiert sind</string>
-    <string name="media_hide_none">Medien, die als sensibel markiert sind, immer anzeigen</string>
-    <string name="media_hide_all">Medien immer verstecken</string>
     <string name="notification_mention_name">Neue Erwähnungen</string>
     <string name="notification_mention_descriptions">Benachrichtigungen über neue Erwähnungen</string>
     <string name="notification_follow_name">Neue Folgende</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 5b5618242..ef5d48535 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -19,10 +19,8 @@
     <string name="error_media_upload_image_or_video">Bildoj kaj videoj ne povas ambaŭ estas alligita al la sama mesaĝo.</string>
     <string name="error_media_upload_sending">La alŝuto malsukcesis.</string>
     <string name="error_report_too_few_statuses">Almenaŭ unu mesaĝo devas esti signalita.</string>
-    <string name="error_invalid_regex">Nevalida regula esprimo</string>
     <string name="error_sender_account_gone">Eraro dum sendo de la mesaĝo.</string>
     <string name="title_home">Hejmo</string>
-    <string name="title_advanced">Sperta</string>
     <string name="title_notifications">Sciigoj</string>
     <string name="title_public_local">Loka</string>
     <string name="title_public_federated">Fratara</string>
@@ -161,10 +159,8 @@
     <string name="visibility_unlisted">Nelistigita: Ne afiŝi en publikaj tempolinioj</string>
     <string name="visibility_private">Nur por sekvantoj: Afiŝi nur al sekvantoj</string>
     <string name="visibility_direct">Rekta: Afiŝi nur al menciitaj uzantoj</string>
-    <string name="pref_title_notification_settings">Sciigoj</string>
     <string name="pref_title_edit_notification_settings">Sciigoj</string>
     <string name="pref_title_notifications_enabled">Sciigoj</string>
-    <string name="pref_summary_notifications">por konto %1$s</string>
     <string name="pref_title_notification_alerts">Avertoj</string>
     <string name="pref_title_notification_alert_sound">Sciigi per sono</string>
     <string name="pref_title_notification_alert_vibrate">Sciigi per vibro</string>
@@ -210,10 +206,6 @@
     <string name="status_text_size_medium">Meza</string>
     <string name="status_text_size_large">Granda</string>
     <string name="status_text_size_largest">La plej granda</string>
-    <string name="pref_media_display">Apero de aŭdovidaĵoj</string>
-    <string name="media_hide_sensitive">Kaŝi aŭdovidaĵojn markitajn kiel tiklaj</string>
-    <string name="media_hide_none">Ĉiam montri aŭdovidaĵojn markitajn kiel tiklaj</string>
-    <string name="media_hide_all">Ĉiam kaŝi ĉiujn aŭdovidaĵojn</string>
     <string name="notification_mention_name">Novaj mencioj</string>
     <string name="notification_mention_descriptions">Sciigoj pri novajn menciojn</string>
     <string name="notification_follow_name">Novaj sekvantoj</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 53286dd03..852015553 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -19,10 +19,8 @@
     <string name="error_media_upload_image_or_video">No se pueden adjuntar imágenes y vídeos en el mismo estado.</string>
     <string name="error_media_upload_sending">La subida falló.</string>
     <string name="error_report_too_few_statuses">Debe seleccionar al menos un estado.</string>
-    <string name="error_invalid_regex">Expresión regular inválida</string>
     <string name="error_sender_account_gone">Error al publicar.</string>
     <string name="title_home">Inicio</string>
-    <string name="title_advanced">Avanzado</string>
     <string name="title_notifications">Notificaciones</string>
     <string name="title_public_local">Local</string>
     <string name="title_public_federated">Federada</string>
@@ -151,10 +149,8 @@
     <string name="visibility_unlisted">Oculto: No mostrar en historias públicas</string>
     <string name="visibility_private">Privado: Sólo visible para seguidores</string>
     <string name="visibility_direct">Directo: Sólo visible para cuentas mencionadas</string>
-    <string name="pref_title_notification_settings">Notificaciones</string>
     <string name="pref_title_edit_notification_settings">Editar notificaciones</string>
     <string name="pref_title_notifications_enabled">Notificaciones</string>
-    <string name="pref_summary_notifications">para la cuenta %1$s</string>
     <string name="pref_title_notification_alerts">Alertas</string>
     <string name="pref_title_notification_alert_sound">Notificar con sonido</string>
     <string name="pref_title_notification_alert_vibrate">Notificar con vibración</string>
@@ -197,10 +193,6 @@
     <string name="status_text_size_medium">Medio</string>
     <string name="status_text_size_large">Grande</string>
     <string name="status_text_size_largest">Enorme</string>
-    <string name="pref_media_display">Pantalla multimedia</string>
-    <string name="media_hide_sensitive">Ocultar medios marcados como sensibles</string>
-    <string name="media_hide_none">Mostrar siempre los medios marcados como sensibles</string>
-    <string name="media_hide_all">Ocultar siempre todos los medios</string>
     <string name="notification_mention_name">Nuevas menciones</string>
     <string name="notification_mention_descriptions">Notificaciones de nuevas menciones</string>
     <string name="notification_follow_name">Nuevos seguidores</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 27542c30b..79093b70c 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -18,10 +18,8 @@
     <string name="error_media_upload_image_or_video">Ezin dira bideoak eta irudiak tut berean gehitu.</string>
     <string name="error_media_upload_sending">Akatsa igotzerakoan.</string>
     <string name="error_report_too_few_statuses">Gutxienez tut bat hautatu behar da.</string>
-    <string name="error_invalid_regex">Espresio erregular baliogabea.</string>
     <string name="error_sender_account_gone">Akatsa tuta bidaltzerakoan.</string>
     <string name="title_home">Hasiera</string>
-    <string name="title_advanced">Aurreratua</string>
     <string name="title_notifications">Jakinarazpenak</string>
     <string name="title_public_local">Lokala</string>
     <string name="title_public_federated">Federatua</string>
@@ -137,10 +135,8 @@
     <string name="visibility_unlisted">Ezkutukoa: Ez erakutsi istorio publikoetan</string>
     <string name="visibility_private">Pribatua: Jarraitzaileentzat soilik ikusgai</string>
     <string name="visibility_direct">Zuzena: Aipatutako kontuentzat bakarrik ikusgai</string>
-    <string name="pref_title_notification_settings">Jakinarazpenak</string>
     <string name="pref_title_edit_notification_settings">Editatu jakinarazpenak</string>
     <string name="pref_title_notifications_enabled">Jakinarazpenak</string>
-    <string name="pref_summary_notifications">%1$s kontuarentzat</string>
     <string name="pref_title_notification_alerts">Alertak</string>
     <string name="pref_title_notification_alert_sound">Soinuarekin jakinarazi</string>
     <string name="pref_title_notification_alert_vibrate">Bibrazioarekin jakinarazi</string>
@@ -183,10 +179,6 @@
     <string name="status_text_size_medium">Erdikoa</string>
     <string name="status_text_size_large">Handia</string>
     <string name="status_text_size_largest">Oso handia</string>
-    <string name="pref_media_display">Erakutsi media</string>
-    <string name="media_hide_sensitive">Ezkutatu eduki mingarri gisa markatutako multimedia</string>
-    <string name="media_hide_none">Beti erakutsi eduki mingarri gisa markatutako multimedia</string>
-    <string name="media_hide_all">Beti ezkutatu multimedia guztiak</string>
     <string name="notification_mention_name">Aipamen berriak</string>
     <string name="notification_mention_descriptions">Aipamen berrien jakinarazpenak</string>
     <string name="notification_follow_name">Jarritzaile berriak</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 1309f053f..2f9fce1a5 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -18,10 +18,8 @@
     <string name="error_media_upload_image_or_video">تصاویر و فیلم‌ها هر دو نمی‌توانند به یک وضعیت ضمیمه شوند.</string>
     <string name="error_media_upload_sending">بارگذاری ناموفق بود</string>
     <string name="error_report_too_few_statuses">حداقل یک وضعیت باید گزارش شود</string>
-    <string name="error_invalid_regex">عبارت با قاعده نامعتبر است</string>
     <string name="error_sender_account_gone">خطا در ارسال بوق</string>
     <string name="title_home">خانه</string>
-    <string name="title_advanced">پیشرفته</string>
     <string name="title_notifications">اعلان‌ها</string>
     <string name="title_public_local">محلی</string>
     <string name="title_public_federated">فدرال</string>
@@ -133,10 +131,8 @@
     <string name="visibility_unlisted">خارج از لیست: در خط زمانی عمومی نشان نده</string>
     <string name="visibility_private">تنها دنبال‌کنندگان:پست فقط به دنبال‌کنندگان</string>
     <string name="visibility_direct">مستقیم:پست فقط برای کاربران صدا زده شده</string>
-    <string name="pref_title_notification_settings">اعلان‌ها</string>
     <string name="pref_title_edit_notification_settings">ویرایش اعلان‌ها</string>
     <string name="pref_title_notifications_enabled">اعلان‌ها</string>
-    <string name="pref_summary_notifications">برای حساب %1$s</string>
     <string name="pref_title_notification_alerts">هشدارها</string>
     <string name="pref_title_notification_alert_sound">اعلان با صدا</string>
     <string name="pref_title_notification_alert_vibrate">اعلان با لرزش</string>
@@ -179,10 +175,6 @@
     <string name="status_text_size_medium">متوسط</string>
     <string name="status_text_size_large">بزرگ</string>
     <string name="status_text_size_largest">بزرگ‌ترین</string>
-    <string name="pref_media_display">نمایش رسانه</string>
-    <string name="media_hide_sensitive">رسانه‌های نشان‌گذاری شده به عنوان حساس را پنهان کن</string>
-    <string name="media_hide_none">رسانه‌های نشانه‌گذاری شده به عنوان حساس را همواره نشان بده</string>
-    <string name="media_hide_all">همه رسانه‌ها را همواره پنهان کن</string>
     <string name="notification_mention_name">صدا زدن جدید</string>
     <string name="notification_mention_descriptions">هشدار در مورد صدازدن جدید</string>
     <string name="notification_follow_name">دنبال‌کننده‌های جدید</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 107f4eb86..aeb8ef17b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -19,10 +19,8 @@
     <string name="error_media_upload_image_or_video">Un même pouet ne peut contenir à la fois une vidéo et une image.</string>
     <string name="error_media_upload_sending">Échec d’envoi du média.</string>
     <string name="error_report_too_few_statuses">Au moins un pouet doit été signalé.</string>
-    <string name="error_invalid_regex">Expression régulière invalide</string>
     <string name="error_sender_account_gone">Erreur lors de l’envoi du pouet.</string>
     <string name="title_home">Accueil</string>
-    <string name="title_advanced">Avancé</string>
     <string name="title_notifications">Notifications</string>
     <string name="title_public_local">Local</string>
     <string name="title_public_federated">Global</string>
@@ -165,10 +163,8 @@
     <string name="visibility_unlisted">Non listé : ne pas afficher dans les fils publics</string>
     <string name="visibility_private">Abonné·e·s uniquement : seul·e·s vos abonné·e·s verront vos statuts</string>
     <string name="visibility_direct">Direct : n’envoyer qu’aux personnes mentionnées</string>
-    <string name="pref_title_notification_settings">Notifications</string>
     <string name="pref_title_edit_notification_settings">Modifier les notifications</string>
     <string name="pref_title_notifications_enabled">Notifications</string>
-    <string name="pref_summary_notifications">pour le compte %1$s</string>
     <string name="pref_title_notification_alerts">Alertes</string>
     <string name="pref_title_notification_alert_sound">Notifier avec un son</string>
     <string name="pref_title_notification_alert_vibrate">Notifier avec une vibration</string>
@@ -214,10 +210,6 @@
     <string name="status_text_size_medium">Moyen</string>
     <string name="status_text_size_large">Grand</string>
     <string name="status_text_size_largest">Plus grand</string>
-    <string name="pref_media_display">Affichage des médias</string>
-    <string name="media_hide_sensitive">Masquer les médias marqués comme sensibles</string>
-    <string name="media_hide_none">Toujours afficher les médias marqués comme sensibles</string>
-    <string name="media_hide_all">Toujours masquer tous les médias</string>
     <string name="notification_mention_name">Nouvelles mentions</string>
     <string name="notification_mention_descriptions">Notifications pour les nouvelles mentions</string>
     <string name="notification_follow_name">Nouveaux abonnés</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index eb52ea16b..d3cf3a8dd 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -19,10 +19,8 @@
     <string name="error_media_upload_image_or_video">Képek és videók egyszerre nem csatolhatók ugyanazon tülköléshez.</string>
     <string name="error_media_upload_sending">Feltöltés sikertelen.</string>
     <string name="error_report_too_few_statuses">Legalább egy tülkölésnek jelentve kell lennie.</string>
-    <string name="error_invalid_regex">Érvénytelen reguláris kifejezés</string>
     <string name="error_sender_account_gone">A tülk elküldése nem sikerult.</string>
     <string name="title_home">Kezdőlap</string>
-    <string name="title_advanced">Haladó</string>
     <string name="title_notifications">Értesítések</string>
     <string name="title_public_local">Helyi</string>
     <string name="title_public_federated">Egyesített</string>
@@ -157,7 +155,6 @@
     <string name="visibility_unlisted">Listázatlan: Nem jelenik meg a nyilvános idővonalon</string>
     <string name="visibility_private">Csak követőknek: Posztolás csak követőknek</string>
     <string name="visibility_direct">Közvetlen: Posztolás csak az említett felhasználóknak</string>
-    <string name="pref_title_notification_settings">Értesítések</string>
     <string name="pref_title_edit_notification_settings">Értesítések szerkesztése</string>
     <string name="pref_title_notifications_enabled">Értesítések</string>
     <string name="pref_title_notification_alerts">Figyelmeztetések</string>
@@ -200,9 +197,6 @@
     <string name="status_text_size_medium">Közepes</string>
     <string name="status_text_size_large">Nagy</string>
     <string name="status_text_size_largest">Legnagyobb</string>
-    <string name="media_hide_sensitive">Rejtsd el az érzékenynek jelölt médiát</string>
-    <string name="media_hide_none">Mindig mutasd az érzékenynek jelölt médiát</string>
-    <string name="media_hide_all">Mindig rejtsd el a média tartalmakat</string>
     <string name="notification_mention_name">Új említések</string>
     <string name="notification_mention_descriptions">Értesítések új említések esetén</string>
     <string name="notification_follow_name">Új követők</string>
@@ -301,7 +295,6 @@
 
     <string name="dialog_redraft_toot_warning">Törlöd és újraírod ezt a tootot\?</string>
 
-    <string name="pref_summary_notifications">a %1$s fióknak</string>
     <string name="pref_title_notification_filter_poll">befejeződött a szavazás</string>
     <string name="pref_title_timeline_filters">Szűrők</string>
 
@@ -309,7 +302,6 @@
 
     <string name="pref_title_language">Nyelv</string>
     <string name="pref_publishing">Közzététel (szerverrel szinkronizált)</string>
-    <string name="pref_media_display">Média megjelenítése</string>
 
     <string name="notification_poll_name">Szavazások</string>
     <string name="notification_poll_description">Értesítés a befejezett szavazásokról</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index bf52a08d0..55ebcaf57 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -19,10 +19,8 @@
     <string name="error_media_upload_image_or_video">Immagini e video non possono essere allegati allo stesso stato.</string>
     <string name="error_media_upload_sending">Il caricamento non è riuscito.</string>
     <string name="error_report_too_few_statuses">Almeno uno stato deve essere segnalato.</string>
-    <string name="error_invalid_regex">Espressione regolare non valida</string>
     <string name="error_sender_account_gone">Errore nell\'invio del toot.</string>
     <string name="title_home">Home</string>
-    <string name="title_advanced">Avanzato</string>
     <string name="title_notifications">Notifiche</string>
     <string name="title_public_local">Locale</string>
     <string name="title_public_federated">Federata</string>
@@ -161,10 +159,8 @@
     <string name="visibility_unlisted">Non Elencato: non visibile sulla timeline pubblica e locale</string>
     <string name="visibility_private">Solo Follower: visibile solo dai tuoi follower</string>
     <string name="visibility_direct">Diretto: visibile solo agli utenti menzionati</string>
-    <string name="pref_title_notification_settings">Notifiche</string>
     <string name="pref_title_edit_notification_settings">Modifica Notifiche</string>
     <string name="pref_title_notifications_enabled">Notifiche</string>
-    <string name="pref_summary_notifications">per l\'account %1$s</string>
     <string name="pref_title_notification_alerts">Allarmi</string>
     <string name="pref_title_notification_alert_sound">Notifica con suoneria</string>
     <string name="pref_title_notification_alert_vibrate">Notifica con vibrazione</string>
@@ -210,10 +206,6 @@
     <string name="status_text_size_medium">Normale</string>
     <string name="status_text_size_large">Grande</string>
     <string name="status_text_size_largest">Grandissimo</string>
-    <string name="pref_media_display">Media mostrati</string>
-    <string name="media_hide_sensitive">Nascondi media segnati come sensibili</string>
-    <string name="media_hide_none">Mostra sempre media segnati come sensibili</string>
-    <string name="media_hide_all">Nascondi sempre tutti i media</string>
     <string name="notification_mention_name">Nuove Menzioni</string>
     <string name="notification_mention_descriptions">Notifiche quando qualcuno ti menziona</string>
     <string name="notification_follow_name">Nuove persone che ti seguono</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 30a44ced4..6e55221aa 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -18,10 +18,8 @@
     <string name="error_media_upload_image_or_video">画像と動画を同時に投稿することはできません。</string>
     <string name="error_media_upload_sending">アップロードに失敗しました。</string>
     <string name="error_report_too_few_statuses">少なくとも1つの投稿を報告してください。</string>
-    <string name="error_invalid_regex">無効な正規表現です</string>
     <string name="error_sender_account_gone">トゥート送信時のエラーです。</string>
     <string name="title_home">ホーム</string>
-    <string name="title_advanced">詳細</string>
     <string name="title_notifications">通知</string>
     <string name="title_public_local">ローカル</string>
     <string name="title_public_federated">連合</string>
@@ -154,10 +152,8 @@
     <string name="visibility_unlisted">未収載：公開タイムラインには表示しない</string>
     <string name="visibility_private">フォロワー限定：フォロワーだけに公開</string>
     <string name="visibility_direct">ダイレクト：返信先のユーザーだけに公開</string>
-    <string name="pref_title_notification_settings">通知</string>
     <string name="pref_title_edit_notification_settings">通知を設定</string>
     <string name="pref_title_notifications_enabled">プッシュ通知</string>
-    <string name="pref_summary_notifications">対象: %1$s</string>
     <string name="pref_title_notification_alerts">通知時の動作</string>
     <string name="pref_title_notification_alert_sound">着信音を鳴らす</string>
     <string name="pref_title_notification_alert_vibrate">バイブレーションする</string>
@@ -202,10 +198,6 @@
     <string name="status_text_size_medium">中</string>
     <string name="status_text_size_large">大</string>
     <string name="status_text_size_largest">最大</string>
-    <string name="pref_media_display">メディアの表示</string>
-    <string name="media_hide_sensitive">閲覧注意としてマークされたメディアは隠す</string>
-    <string name="media_hide_none">閲覧注意としてマークされたメディアも常に表示する</string>
-    <string name="media_hide_all">全てのメディアを常に隠す</string>
     <string name="notification_mention_name">新しい返信</string>
     <string name="notification_mention_descriptions">新しい返信の通知</string>
     <string name="notification_follow_name">新しいフォロワー</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index a7b155073..a2154afb4 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -19,10 +19,8 @@
     <string name="error_media_upload_image_or_video">Afbeeldingen en video\'s kunnen niet allebei aan dezelfde toot worden toegevoegd.</string>
     <string name="error_media_upload_sending">Uploaden mislukt.</string>
     <string name="error_report_too_few_statuses">Minstens een status moet gerapporteerd worden.</string>
-    <string name="error_invalid_regex">Ongeldige reguliere uitdrukking</string>
     <string name="error_sender_account_gone">Fout tijdens verzenden toot.</string>
     <string name="title_home">Start</string>
-    <string name="title_advanced">Gevorderd</string>
     <string name="title_notifications">Meldingen</string>
     <string name="title_public_local">Lokaal</string>
     <string name="title_public_federated">Globaal</string>
@@ -161,10 +159,8 @@
     <string name="visibility_unlisted">Minder openbaar: niet op openbare tijdlijnen tonen</string>
     <string name="visibility_private">Alleen volgers: alleen aan jouw volgers tonen</string>
     <string name="visibility_direct">Direct: alleen aan vermelde gebruikers tonen</string>
-    <string name="pref_title_notification_settings">Meldingen</string>
     <string name="pref_title_edit_notification_settings">Meldingen bewerken</string>
     <string name="pref_title_notifications_enabled">Meldingen</string>
-    <string name="pref_summary_notifications">voor account %1$s</string>
     <string name="pref_title_notification_alerts">Waarschuwen met</string>
     <string name="pref_title_notification_alert_sound">geluid</string>
     <string name="pref_title_notification_alert_vibrate">trillen</string>
@@ -209,10 +205,6 @@
     <string name="status_text_size_medium">Standaard</string>
     <string name="status_text_size_large">Groot</string>
     <string name="status_text_size_largest">Grootst</string>
-    <string name="pref_media_display">Mediaweergave</string>
-    <string name="media_hide_sensitive">Als gevoelig gemarkeerde media verbergen</string>
-    <string name="media_hide_none">Als gevoelig gemarkeerde media altijd verbergen</string>
-    <string name="media_hide_all">Media altijd verbergen</string>
     <string name="notification_mention_name">Nieuwe vermeldingen</string>
     <string name="notification_mention_descriptions">Meldingen over nieuwe vermeldingen</string>
     <string name="notification_follow_name">Nieuwe volgers</string>
diff --git a/app/src/main/res/values-no-rNB/strings.xml b/app/src/main/res/values-no-rNB/strings.xml
index a71dbad88..2b9f9485e 100644
--- a/app/src/main/res/values-no-rNB/strings.xml
+++ b/app/src/main/res/values-no-rNB/strings.xml
@@ -20,11 +20,9 @@
     <string name="error_media_upload_image_or_video">Bilder og videoer kan ikke kobles til samme status.</string>
     <string name="error_media_upload_sending">Opplastingen feilet.</string>
     <string name="error_report_too_few_statuses">Minst en status må rapporteres.</string>
-    <string name="error_invalid_regex">Ugyldig regulært utrykk</string>
     <string name="error_sender_account_gone">En feil oppsto under sending av tootet.</string>
 
     <string name="title_home">Hjem</string>
-    <string name="title_advanced">Avansert</string>
     <string name="title_notifications">Varsler</string>
     <string name="title_public_local">Lokal tidslinje</string>
     <string name="title_public_federated">Forent tidslinje</string>
@@ -184,10 +182,8 @@
     <string name="visibility_private">Vis bare til følgere</string>
     <string name="visibility_direct">Vis bare til nevnte brukere</string>
 
-    <string name="pref_title_notification_settings">Varsler</string>
     <string name="pref_title_edit_notification_settings">Varsler</string>
     <string name="pref_title_notifications_enabled">Varsler</string>
-    <string name="pref_summary_notifications">for konto %1$s</string>
     <string name="pref_title_notification_alerts">Varsling</string>
     <string name="pref_title_notification_alert_sound">Varsle med lyd</string>
     <string name="pref_title_notification_alert_vibrate">Varsle med vibrasjon</string>
@@ -224,8 +220,6 @@
 
     <string name="pref_status_text_size">Tekststørrelse</string>
 
-    <string name="pref_media_display">Mediavisning</string>
-
     <string name="notification_follow_name">Nye følgere</string>
     <string name="notification_follow_description">Varsler om nye følgere</string>
     <string name="notification_boost_name">Boosts</string>
@@ -438,10 +432,6 @@
     <string name="status_text_size_large">Stor</string>
     <string name="status_text_size_largest">Størst</string>
 
-    <string name="media_hide_sensitive">Skjul media markert som sensitivt</string>
-    <string name="media_hide_none">Vis alltid media markert som sensitivt</string>
-    <string name="media_hide_all">Skjul alltid media</string>
-
     <string name="pref_title_notification_filter_poll">Avstemminger er avsluttet</string>
     <string name="notification_poll_name">Avstemminger</string>
     <string name="notification_poll_description">Varsler om avstemminger som er avsluttet</string>
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index f9a62e365..2e62464d8 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -18,10 +18,8 @@
     <string name="error_media_upload_image_or_video">Se pòt pas ajustar imatges e una vidèo dins lo meteis estatut.</string>
     <string name="error_media_upload_sending">Fracàs en mandar.</string>
     <string name="error_report_too_few_statuses">Cal almens denonciar un estatut.</string>
-    <string name="error_invalid_regex">Expression regulara invalida</string>
     <string name="error_sender_account_gone">Error en enviar lo tut.</string>
     <string name="title_home">Acuèlh</string>
-    <string name="title_advanced">Advançat</string>
     <string name="title_notifications">Notificacions</string>
     <string name="title_public_federated">Federacion</string>
     <string name="title_view_thread">Tut</string>
@@ -136,10 +134,8 @@
     <string name="visibility_unlisted">Pas-listada : es pas visibla a las cronologias publicas</string>
     <string name="visibility_private">Solament seguidors : pas que visibla pels vòstres seguidors</string>
     <string name="visibility_direct">Dirècta : pas que visibla al monde mencionats</string>
-    <string name="pref_title_notification_settings">Notificacions</string>
     <string name="pref_title_edit_notification_settings">Modificar las notificacions</string>
     <string name="pref_title_notifications_enabled">Notificacions</string>
-    <string name="pref_summary_notifications">pel compte %1$s</string>
     <string name="pref_title_notification_alerts">Alèrtas</string>
     <string name="pref_title_notification_alert_sound">Notificar amb un son</string>
     <string name="pref_title_notification_alert_vibrate">Notificra amb una vibracion</string>
@@ -313,8 +309,6 @@
     <string name="pref_default_media_sensitivity">Totjorn marcar los mèdias coma sensibles</string>
     <string name="pref_failed_to_sync">Fracàs de la sincronizacion dels paramètres</string>
 
-    <string name="pref_media_display">Afichatge dels mèdias</string>
-
     <string name="about_tusky_version">Tusky %s</string>
     <string name="abbreviated_days_ago">%dd</string>
     <string name="abbreviated_hours_ago">%dh</string>
@@ -388,10 +382,6 @@
 
     <string name="app_theme_system">Utilizar lo tèma sistèma</string>
 
-    <string name="media_hide_sensitive">Amagar los mèdias marcats coma sensibles</string>
-    <string name="media_hide_none">Totjorn mostrar los mèdias marcat coma sensibles</string>
-    <string name="media_hide_all">Totjorn amagar los mèdias</string>
-
     <string name="notifications_clear">Netejar</string>
     <string name="notifications_apply_filter">Filtrar</string>
     <string name="filter_apply">Aplicar</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 32a8d8159..19a49e7b0 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -17,10 +17,8 @@
     <string name="error_media_upload_image_or_video">Do wpisu nie mogą być dołączone jednocześnie obrazy i pliki wideo.</string>
     <string name="error_media_upload_sending">Wysyłanie nie powiodło się.</string>
     <string name="error_report_too_few_statuses">Musisz zgłosić przynajmniej jeden wpis.</string>
-    <string name="error_invalid_regex">Nieprawidłowe wyrażenie regularne.</string>
     <string name="error_sender_account_gone">Wysyłanie wpisu nie powiodło się.</string>
     <string name="title_home">Strona główna</string>
-    <string name="title_advanced">Zaawansowane</string>
     <string name="title_notifications">Powiadomienia</string>
     <string name="title_public_local">Lokalne</string>
     <string name="title_public_federated">Federalne</string>
@@ -135,10 +133,8 @@
     <string name="visibility_unlisted">Niepubliczne: Nie wyświetlaj na publicznych osiach czasu</string>
     <string name="visibility_private">Tylko śledzeni: Wyświetlaj tylko śledzonym</string>
     <string name="visibility_direct">Bezpośrednio: Widoczne tylko dla wspomnianych</string>
-    <string name="pref_title_notification_settings">Powiadomienia</string>
     <string name="pref_title_edit_notification_settings">Edytuj powiadomienia</string>
     <string name="pref_title_notifications_enabled">Powiadomienia</string>
-    <string name="pref_summary_notifications">dla konta %1$s</string>
     <string name="pref_title_notification_alerts">Alerty</string>
     <string name="pref_title_notification_alert_sound">Powiadamiaj dźwiękiem</string>
     <string name="pref_title_notification_alert_vibrate">Powiadamiaj wibracją</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 3e01c9d62..8147117bf 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -18,10 +18,8 @@
     <string name="error_media_upload_image_or_video">Imagens e vídeos não podem ser anexados no mesmo toot.</string>
     <string name="error_media_upload_sending">Falha no envio.</string>
     <string name="error_report_too_few_statuses">Pelo menos um toot deve ser denunciado.</string>
-    <string name="error_invalid_regex">Expressão regular inválida</string>
     <string name="error_sender_account_gone">Erro ao enviar toot.</string>
     <string name="title_home">Página inicial</string>
-    <string name="title_advanced">Avançado</string>
     <string name="title_notifications">Notificações</string>
     <string name="title_public_local">Local</string>
     <string name="title_public_federated">Global</string>
@@ -149,10 +147,8 @@
     <string name="visibility_unlisted">Não-listado: Não postar em timelines públicas</string>
     <string name="visibility_private">Privado: Postar apenas para seguidores</string>
     <string name="visibility_direct">Direto: Postar apenas para usuários mencionados</string>
-    <string name="pref_title_notification_settings">Notificações</string>
     <string name="pref_title_edit_notification_settings">Editar notificações</string>
     <string name="pref_title_notifications_enabled">Notificações</string>
-    <string name="pref_summary_notifications">para a conta %1$s</string>
     <string name="pref_title_notification_alerts">Alertas</string>
     <string name="pref_title_notification_alert_sound">Notificar com som</string>
     <string name="pref_title_notification_alert_vibrate">Notificar com vibração</string>
@@ -195,7 +191,6 @@
     <string name="status_text_size_medium">Médio</string>
     <string name="status_text_size_large">Grande</string>
     <string name="status_text_size_largest">Maior</string>
-    <string name="media_hide_sensitive">Ocultar mídia marcada como sensível</string>
 
     <string name="notification_mention_name">Novas Menções</string>
     <string name="notification_mention_descriptions">Notificar sobre novas menções</string>
@@ -325,11 +320,6 @@
     <string name="pref_title_language">Idioma</string>
     <string name="post_privacy_followers_only">Apenas para seguidores</string>
 
-    <string name="pref_media_display">Visualizador de mídia</string>
-
-    <string name="media_hide_none">Sempre mostrar mídia marcada como sensível</string>
-    <string name="media_hide_all">Sempre ocultar todas as mídias</string>
-
     <string name="notification_poll_name">Enquetes</string>
     <string name="notification_poll_description">Notificar enquetes que já terminaram</string>
 
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 47428b7c3..b674401ea 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -20,11 +20,9 @@
     <string name="error_media_upload_image_or_video">Изображения и видео не могут быть прикрекплены к статусу одновременно.</string>
     <string name="error_media_upload_sending">Загрузка не удалась.</string>
     <string name="error_report_too_few_statuses">Должен быть выбран хотя бы один статус.</string>
-    <string name="error_invalid_regex">Неправильное регулярное выражение</string>
     <string name="error_sender_account_gone">Ошибка при отправке поста.</string>
 
     <string name="title_home">Главная</string>
-    <string name="title_advanced">Дополнительно</string>
     <string name="title_notifications">Уведомления</string>
     <string name="title_public_local">Локальная лента</string>
     <string name="title_public_federated">Глобальная лента</string>
@@ -184,10 +182,8 @@
     <string name="visibility_private">Приватный: Показать только подписчикам</string>
     <string name="visibility_direct">Направленный: Показать только упомянутым</string>
 
-    <string name="pref_title_notification_settings">Уведомления</string>
     <string name="pref_title_edit_notification_settings">Уведомления</string>
     <string name="pref_title_notifications_enabled">Push-уведомления</string>
-    <string name="pref_summary_notifications">для аккаунта %1$s</string>
     <string name="pref_title_notification_alerts">Предупреждения</string>
     <string name="pref_title_notification_alert_sound">Звуковые уведомления</string>
     <string name="pref_title_notification_alert_vibrate">Использовать вибрацию</string>
@@ -240,12 +236,6 @@
     <string name="status_text_size_large">Большой</string>
     <string name="status_text_size_largest">Огромный</string>
 
-    <string name="pref_media_display">Отображение медиафайлов</string>
-
-    <string name="media_hide_sensitive">Скрывать чувствительные медиафайлы</string>
-    <string name="media_hide_none">Всегда показывать чувствительные медиафайлы</string>
-    <string name="media_hide_all">Всегда скрывать все медиафайлы</string>
-
     <string name="notification_mention_name">Упоминания</string>
     <string name="notification_mention_descriptions">Уведомлять о новых упоминаниях</string>
     <string name="notification_follow_name">Новые подписчики</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 71cf74700..a6abf0e85 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -19,11 +19,9 @@
     <string name="error_media_upload_image_or_video">Slike in videoposnetki ne morejo biti dodani istemu statusu.</string>
     <string name="error_media_upload_sending">Prenos ni uspel.</string>
     <string name="error_report_too_few_statuses">Prijaviti je treba vsaj en status.</string>
-    <string name="error_invalid_regex">Neveljaven regularni izraz</string>
     <string name="error_sender_account_gone">Napaka pri pošiljanju tuta.</string>
 
     <string name="title_home">Domov</string>
-    <string name="title_advanced">Napredno</string>
     <string name="title_notifications">Obvestila</string>
     <string name="title_public_local">Lokalno</string>
     <string name="title_public_federated">Združeno</string>
@@ -185,10 +183,8 @@
     <string name="visibility_private">Samo sledilci: Objavi samo sledilcem</string>
     <string name="visibility_direct">Neposredno: Objavi samo pri omenjenih uporabnikih</string>
 
-    <string name="pref_title_notification_settings">Obvestila</string>
     <string name="pref_title_edit_notification_settings">Obvestila</string>
     <string name="pref_title_notifications_enabled">Obvestila</string>
-    <string name="pref_summary_notifications">za račun %1$s</string>
     <string name="pref_title_notification_alerts">Opozorila</string>
     <string name="pref_title_notification_alert_sound">Obvesti z zvokom</string>
     <string name="pref_title_notification_alert_vibrate">Obvesti z vibracijo</string>
@@ -225,8 +221,6 @@
 
     <string name="pref_status_text_size">Velikost besedila statusa</string>
 
-    <string name="pref_media_display">Prikaz medijev</string>
-
     <string name="notification_mention_name">Nove omembe</string>
     <string name="notification_mention_descriptions">Obvestila o novih omembah</string>
     <string name="notification_follow_name">Novi sledilci</string>
@@ -446,10 +440,6 @@
     <string name="status_text_size_large">Velika</string>
     <string name="status_text_size_largest">Največja</string>
 
-    <string name="media_hide_sensitive">Skrij medij, ki je označen kot občutljiv</string>
-    <string name="media_hide_none">Vedno prikaži medij, ki je označen kot občutljiv</string>
-    <string name="media_hide_all">Vedno skrij vse medije</string>
-
     <string name="notification_poll_name">Ankete</string>
     <string name="notification_poll_description">Obvestilo o anketah, ki so se končale</string>
 
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index e613a3b14..8a09a53f9 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -19,10 +19,8 @@
     <string name="error_media_upload_image_or_video">Bilder och videoklipp kan inte båda bifogas i samma status.</string>
     <string name="error_media_upload_sending">Uppladdningen misslyckades.</string>
     <string name="error_report_too_few_statuses">Minst en status måste rapporteras.</string>
-    <string name="error_invalid_regex">Ogiltigt reguljärt uttryck</string>
     <string name="error_sender_account_gone">Misslyckades med att få ett inloggningsnamn.</string>
     <string name="title_home">Hem</string>
-    <string name="title_advanced">Avancerat</string>
     <string name="title_notifications">Notifikationer</string>
     <string name="title_public_local">Lokalt</string>
     <string name="title_public_federated">Federerat</string>
@@ -162,10 +160,8 @@
     <string name="visibility_unlisted">Olistad: Visa inte i offentliga tidslinjer</string>
     <string name="visibility_private">Enbart-följare: Ses enbart av följare</string>
     <string name="visibility_direct">Direkt: Skicka endast till nämnda användare</string>
-    <string name="pref_title_notification_settings">Notifieringar</string>
     <string name="pref_title_edit_notification_settings">Redigera notifieringar</string>
     <string name="pref_title_notifications_enabled">Notifieringar</string>
-    <string name="pref_summary_notifications">för konto %1$s</string>
     <string name="pref_title_notification_alerts">Alarm</string>
     <string name="pref_title_notification_alert_sound">Meddela med ljud</string>
     <string name="pref_title_notification_alert_vibrate">Meddela med vibration</string>
@@ -211,10 +207,6 @@
     <string name="status_text_size_medium">Mellan</string>
     <string name="status_text_size_large">Stor</string>
     <string name="status_text_size_largest">Största</string>
-    <string name="pref_media_display">Visa media</string>
-    <string name="media_hide_sensitive">Dölj media som markerat känsligt</string>
-    <string name="media_hide_none">Visa alltid media som är markerat känsligt</string>
-    <string name="media_hide_all">Dölj alltid media</string>
     <string name="notification_mention_name">Nya omnämnanden</string>
     <string name="notification_mention_descriptions">Notifieringar om nya omnämnanden</string>
     <string name="notification_follow_name">Nya följare</string>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 2f32da17d..c76ead3ad 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -18,7 +18,6 @@
     <string name="error_media_upload_sending">பதிவேற்றம் தோல்வியுற்றது.</string>
     <string name="error_report_too_few_statuses">குறைந்தபட்சம் ஒரு நிலையை அறிவிக்க வேண்டும்.</string>
     <string name="title_home">முகப்பு</string>
-    <string name="title_advanced">மேம்பட்ட</string>
     <string name="title_notifications">அறிவிப்புகள்</string>
     <string name="title_public_local">அருகாமயில்</string>
     <string name="title_public_federated">ஒருங்கிணைந்த</string>
@@ -125,10 +124,8 @@
     <string name="visibility_unlisted">அனைவருக்கும் காட்டாதே</string>
     <string name="visibility_private">பின்பற்றுபவர்களுக்கு மட்டும் காண்பி</string>
     <string name="visibility_direct">குறிபிடபட்டுள்ள பயனர்களுக்கு மட்டும் காண்பி</string>
-    <string name="pref_title_notification_settings">அறிவிப்புகள்</string>
     <string name="pref_title_edit_notification_settings">அறிவிப்புகளை திருத்த</string>
     <string name="pref_title_notifications_enabled">அறிவிப்புகள்</string>
-    <string name="pref_summary_notifications">%1$s கணக்குக்கு</string>
     <string name="pref_title_notification_alerts">எச்சரிக்கைகள்</string>
     <string name="pref_title_notification_alert_sound">ஒலி மூலம் தெரிவிக்கவும்</string>
     <string name="pref_title_notification_alert_vibrate">அதிர்வுடன் தெரிவிக்கவும்</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index a840efeb0..ae5bd99c8 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -19,10 +19,8 @@
     <string name="error_media_upload_image_or_video">Aynı iletiye kem video hem resim eklenemez.</string>
     <string name="error_media_upload_sending">Yükleme başarsız.</string>
     <string name="error_report_too_few_statuses">Her bildirme en azından bir iletiyi işaret etmeli.</string>
-    <string name="error_invalid_regex">Geçersiz düzenli ifade</string>
     <string name="error_sender_account_gone">Toot gönderilirken hata oluştu.</string>
     <string name="title_home">Ana sayfa</string>
-    <string name="title_advanced">Gelişmiş</string>
     <string name="title_notifications">Bildirimler</string>
     <string name="title_public_local">Yerel</string>
     <string name="title_public_federated">Birleşmiş</string>
@@ -150,10 +148,8 @@
     <string name="visibility_unlisted">Saklı: Herkese açık ancak sosyal çizelgesinde çıkmaz</string>
     <string name="visibility_private">Özel: Sadece takipçiler ve bahsedilenlere açık</string>
     <string name="visibility_direct">Direkt: Sadece bahsedilen kullanıcılara açık</string>
-    <string name="pref_title_notification_settings">Bildirimler</string>
     <string name="pref_title_edit_notification_settings">Bildirimleri düzelt</string>
     <string name="pref_title_notifications_enabled">Anlık bildirimler</string>
-    <string name="pref_summary_notifications">hesap için %1$s</string>
     <string name="pref_title_notification_alerts">Uyarılar</string>
     <string name="pref_title_notification_alert_sound">Sesle bildir</string>
     <string name="pref_title_notification_alert_vibrate">Titremeyle bildir</string>
@@ -196,10 +192,6 @@
     <string name="status_text_size_medium">Orta</string>
     <string name="status_text_size_large">Büyük</string>
     <string name="status_text_size_largest">En büyük</string>
-    <string name="pref_media_display">Medya göster</string>
-    <string name="media_hide_sensitive">Hassas olarak işaretlenmiş medyayı gizle</string>
-    <string name="media_hide_none">Hassas olarak işaretlenmiş medyayı göster</string>
-    <string name="media_hide_all">Tüm medyayı gizle</string>
     <string name="notification_mention_name">Yeni Bahsedilenler</string>
     <string name="notification_mention_descriptions">Yeni bahsedilenler hakkında bildirim</string>
     <string name="notification_follow_name">Yeni Takipçiler</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 49003ee54..f4301ace7 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -19,11 +19,9 @@
     <string name="error_media_upload_image_or_video">无法在嘟文中同时插入视频和图片</string>
     <string name="error_media_upload_sending">媒体文件上传失败</string>
     <string name="error_report_too_few_statuses">至少要报告 1 则嘟文</string>
-    <string name="error_invalid_regex">正则表达式无效</string>
     <string name="error_sender_account_gone">嘟文发送时出错</string>
 
     <string name="title_home">主页</string>
-    <string name="title_advanced">高级</string>
     <string name="title_notifications">通知</string>
     <string name="title_public_local">本站时间轴</string>
     <string name="title_public_federated">跨站公共时间轴</string>
@@ -187,10 +185,8 @@
     <string name="visibility_private">仅关注者：只有经过你确认后关注你的用户可见</string>
     <string name="visibility_direct">私信：只有被提及的用户可见</string>
 
-    <string name="pref_title_notification_settings">通知</string>
     <string name="pref_title_edit_notification_settings">通知设置</string>
     <string name="pref_title_notifications_enabled">通知</string>
-    <string name="pref_summary_notifications">帐号 %1$s</string>
     <string name="pref_title_notification_alerts">提醒</string>
     <string name="pref_title_notification_alert_sound">通知铃声</string>
     <string name="pref_title_notification_alert_vibrate">振动</string>
@@ -244,12 +240,6 @@
     <string name="status_text_size_large">大</string>
     <string name="status_text_size_largest">最大</string>
 
-    <string name="pref_media_display">媒体显示</string>
-
-    <string name="media_hide_sensitive">自动隐藏敏感媒体</string>
-    <string name="media_hide_none">总是显示敏感媒体</string>
-    <string name="media_hide_all">总是隐藏所有媒体</string>
-
     <string name="notification_mention_name">提及</string>
     <string name="notification_mention_descriptions">当有用户在嘟文中提及我时</string>
     <string name="notification_follow_name">关注</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 3cb31e533..ed0714de4 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -19,11 +19,9 @@
     <string name="error_media_upload_image_or_video">無法在嘟文中同時插入影片和圖片</string>
     <string name="error_media_upload_sending">媒體檔案上傳失敗</string>
     <string name="error_report_too_few_statuses">至少要檢舉 1 則嘟文</string>
-    <string name="error_invalid_regex">正規表示式無效</string>
     <string name="error_sender_account_gone">嘟文發送時出錯</string>
 
     <string name="title_home">主頁</string>
-    <string name="title_advanced">進階</string>
     <string name="title_notifications">通知</string>
     <string name="title_public_local">本站時間軸</string>
     <string name="title_public_federated">跨站公開時間軸</string>
@@ -169,11 +167,6 @@
 
 
 
-
-
-
-
-
     <string name="dialog_title_finishing_media_upload">正在完成上傳…</string>
     <string name="dialog_message_uploading_media">正在上傳…</string>
     <string name="dialog_download_image">下載</string>
@@ -187,10 +180,8 @@
     <string name="visibility_private">僅關注者：只有經過你確認後關注你的使用者可見</string>
     <string name="visibility_direct">私信：只有被提及的使用者可見</string>
 
-    <string name="pref_title_notification_settings">通知</string>
     <string name="pref_title_edit_notification_settings">通知設定</string>
     <string name="pref_title_notifications_enabled">通知</string>
-    <string name="pref_summary_notifications">帳號 %1$s</string>
     <string name="pref_title_notification_alerts">提醒</string>
     <string name="pref_title_notification_alert_sound">通知鈴聲</string>
     <string name="pref_title_notification_alert_vibrate">振動</string>
@@ -244,12 +235,6 @@
     <string name="status_text_size_large">大</string>
     <string name="status_text_size_largest">最大</string>
 
-    <string name="pref_media_display">媒體顯示</string>
-
-    <string name="media_hide_sensitive">自動隱藏敏感媒體</string>
-    <string name="media_hide_none">總是顯示敏感媒體</string>
-    <string name="media_hide_all">總是隱藏所有媒體</string>
-
     <string name="notification_mention_name">提及</string>
     <string name="notification_mention_descriptions">當有使用者在嘟文中提及我時</string>
     <string name="notification_follow_name">關注</string>
diff --git a/app/src/main/res/values-zh-rMO/strings.xml b/app/src/main/res/values-zh-rMO/strings.xml
index 3cb31e533..ed0714de4 100644
--- a/app/src/main/res/values-zh-rMO/strings.xml
+++ b/app/src/main/res/values-zh-rMO/strings.xml
@@ -19,11 +19,9 @@
     <string name="error_media_upload_image_or_video">無法在嘟文中同時插入影片和圖片</string>
     <string name="error_media_upload_sending">媒體檔案上傳失敗</string>
     <string name="error_report_too_few_statuses">至少要檢舉 1 則嘟文</string>
-    <string name="error_invalid_regex">正規表示式無效</string>
     <string name="error_sender_account_gone">嘟文發送時出錯</string>
 
     <string name="title_home">主頁</string>
-    <string name="title_advanced">進階</string>
     <string name="title_notifications">通知</string>
     <string name="title_public_local">本站時間軸</string>
     <string name="title_public_federated">跨站公開時間軸</string>
@@ -169,11 +167,6 @@
 
 
 
-
-
-
-
-
     <string name="dialog_title_finishing_media_upload">正在完成上傳…</string>
     <string name="dialog_message_uploading_media">正在上傳…</string>
     <string name="dialog_download_image">下載</string>
@@ -187,10 +180,8 @@
     <string name="visibility_private">僅關注者：只有經過你確認後關注你的使用者可見</string>
     <string name="visibility_direct">私信：只有被提及的使用者可見</string>
 
-    <string name="pref_title_notification_settings">通知</string>
     <string name="pref_title_edit_notification_settings">通知設定</string>
     <string name="pref_title_notifications_enabled">通知</string>
-    <string name="pref_summary_notifications">帳號 %1$s</string>
     <string name="pref_title_notification_alerts">提醒</string>
     <string name="pref_title_notification_alert_sound">通知鈴聲</string>
     <string name="pref_title_notification_alert_vibrate">振動</string>
@@ -244,12 +235,6 @@
     <string name="status_text_size_large">大</string>
     <string name="status_text_size_largest">最大</string>
 
-    <string name="pref_media_display">媒體顯示</string>
-
-    <string name="media_hide_sensitive">自動隱藏敏感媒體</string>
-    <string name="media_hide_none">總是顯示敏感媒體</string>
-    <string name="media_hide_all">總是隱藏所有媒體</string>
-
     <string name="notification_mention_name">提及</string>
     <string name="notification_mention_descriptions">當有使用者在嘟文中提及我時</string>
     <string name="notification_follow_name">關注</string>
diff --git a/app/src/main/res/values-zh-rSG/strings.xml b/app/src/main/res/values-zh-rSG/strings.xml
index da37814a1..c6f1e629e 100644
--- a/app/src/main/res/values-zh-rSG/strings.xml
+++ b/app/src/main/res/values-zh-rSG/strings.xml
@@ -19,11 +19,9 @@
     <string name="error_media_upload_image_or_video">无法在嘟文中同时插入视频和图片</string>
     <string name="error_media_upload_sending">媒体文件上传失败</string>
     <string name="error_report_too_few_statuses">至少要报告 1 则嘟文</string>
-    <string name="error_invalid_regex">正则表达式无效</string>
     <string name="error_sender_account_gone">嘟文发送时出错</string>
 
     <string name="title_home">主页</string>
-    <string name="title_advanced">高级</string>
     <string name="title_notifications">通知</string>
     <string name="title_public_local">本站时间轴</string>
     <string name="title_public_federated">跨站公共时间轴</string>
@@ -187,10 +185,8 @@
     <string name="visibility_private">仅关注者：只有经过你确认后关注你的用户可见</string>
     <string name="visibility_direct">私信：只有被提及的用户可见</string>
 
-    <string name="pref_title_notification_settings">通知</string>
     <string name="pref_title_edit_notification_settings">通知设置</string>
     <string name="pref_title_notifications_enabled">通知</string>
-    <string name="pref_summary_notifications">帐号 %1$s</string>
     <string name="pref_title_notification_alerts">提醒</string>
     <string name="pref_title_notification_alert_sound">通知铃声</string>
     <string name="pref_title_notification_alert_vibrate">振动</string>
@@ -244,12 +240,6 @@
     <string name="status_text_size_large">大</string>
     <string name="status_text_size_largest">最大</string>
 
-    <string name="pref_media_display">媒体显示</string>
-
-    <string name="media_hide_sensitive">自动隐藏敏感媒体</string>
-    <string name="media_hide_none">总是显示敏感媒体</string>
-    <string name="media_hide_all">总是隐藏所有媒体</string>
-
     <string name="notification_mention_name">提及</string>
     <string name="notification_mention_descriptions">当有用户在嘟文中提及我时</string>
     <string name="notification_follow_name">关注</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 3cb31e533..587b71527 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -19,11 +19,9 @@
     <string name="error_media_upload_image_or_video">無法在嘟文中同時插入影片和圖片</string>
     <string name="error_media_upload_sending">媒體檔案上傳失敗</string>
     <string name="error_report_too_few_statuses">至少要檢舉 1 則嘟文</string>
-    <string name="error_invalid_regex">正規表示式無效</string>
     <string name="error_sender_account_gone">嘟文發送時出錯</string>
 
     <string name="title_home">主頁</string>
-    <string name="title_advanced">進階</string>
     <string name="title_notifications">通知</string>
     <string name="title_public_local">本站時間軸</string>
     <string name="title_public_federated">跨站公開時間軸</string>
@@ -168,12 +166,6 @@
     <string name="dialog_whats_an_instance">請輸入你帳號所在的 Mastodon 站點的域名或地址</string>
 
 
-
-
-
-
-
-
     <string name="dialog_title_finishing_media_upload">正在完成上傳…</string>
     <string name="dialog_message_uploading_media">正在上傳…</string>
     <string name="dialog_download_image">下載</string>
@@ -187,10 +179,8 @@
     <string name="visibility_private">僅關注者：只有經過你確認後關注你的使用者可見</string>
     <string name="visibility_direct">私信：只有被提及的使用者可見</string>
 
-    <string name="pref_title_notification_settings">通知</string>
     <string name="pref_title_edit_notification_settings">通知設定</string>
     <string name="pref_title_notifications_enabled">通知</string>
-    <string name="pref_summary_notifications">帳號 %1$s</string>
     <string name="pref_title_notification_alerts">提醒</string>
     <string name="pref_title_notification_alert_sound">通知鈴聲</string>
     <string name="pref_title_notification_alert_vibrate">振動</string>
@@ -244,12 +234,6 @@
     <string name="status_text_size_large">大</string>
     <string name="status_text_size_largest">最大</string>
 
-    <string name="pref_media_display">媒體顯示</string>
-
-    <string name="media_hide_sensitive">自動隱藏敏感媒體</string>
-    <string name="media_hide_none">總是顯示敏感媒體</string>
-    <string name="media_hide_all">總是隱藏所有媒體</string>
-
     <string name="notification_mention_name">提及</string>
     <string name="notification_mention_descriptions">當有使用者在嘟文中提及我時</string>
     <string name="notification_follow_name">關注</string>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3cd5fd7d2..cdd9ff025 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -34,7 +34,6 @@
     <color name="color_primary_dark_black">#111111</color> <!--Dark Dark-->
     <color name="color_background_black">#000000</color>
     <color name="window_background_black">#000000</color>
-    <color name="edit_text_color_black">#FFFFFF</color>
     <color name="text_color_primary_black">#FFFFFF</color>
     <color name="toolbar_background_black">#111111</color>
     <color name="dialog_background_black">#111111</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 247646d06..81f7896bb 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -37,7 +37,6 @@
     <dimen name="avatar_radius_80dp">10dp</dimen> <!-- 1/8 of 80dp -->
     <dimen name="avatar_radius_48dp">6dp</dimen> <!-- 1/8 of 48dp -->
     <dimen name="avatar_radius_42dp">5.25dp</dimen> <!-- 1/8 of 42dp -->
-    <dimen name="avatar_radius_40dp">5dp</dimen> <!-- 1/8 of 40dp -->
     <dimen name="avatar_radius_36dp">4.5dp</dimen> <!-- 1/8 of 36dp -->
     <dimen name="avatar_radius_24dp">3dp</dimen> <!-- 1/8 of 24dp -->
 </resources>
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 2aa4f90f4..5e57942e9 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -6,7 +6,6 @@
     <string name="oauth_scheme" translatable="false">oauth2redirect</string>
     <string name="preferences_file_key" translatable="false">com.keylesspalace.tusky.PREFERENCES</string>
 
-    <string name="text_content_warning_button">CW</string>
     <string name="status_sensitive_media_template" translatable="false">&lt;b>%1$s&lt;/b>&lt;br>%2$s</string>
 
     <string-array name="post_privacy_values">
diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml
index 60893e5c9..c4de3448f 100644
--- a/app/src/main/res/values/integers.xml
+++ b/app/src/main/res/values/integers.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <integer name="profile_media_column_count">3</integer>
-
-    <!-- Images larger than this will be downscaled to avoid OpenGL errors -->
-    <integer name="media_max_width">1920</integer>
-    <integer name="media_max_height">1920</integer>
 </resources>
diff --git a/app/src/main/res/values/string-arrays.xml b/app/src/main/res/values/string-arrays.xml
index 935dc1245..c4bd4a1e6 100644
--- a/app/src/main/res/values/string-arrays.xml
+++ b/app/src/main/res/values/string-arrays.xml
@@ -23,10 +23,4 @@
         <item>@string/status_text_size_largest</item>
     </string-array>
 
-    <string-array name="media_display_names">
-        <item>@string/media_hide_sensitive</item>
-        <item>@string/media_hide_none</item>
-        <item>@string/media_hide_all</item>
-    </string-array>
-
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 043d810c9..99afdc707 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,11 +19,9 @@
     <string name="error_media_upload_image_or_video">Images and videos cannot both be attached to the same status.</string>
     <string name="error_media_upload_sending">The upload failed.</string>
     <string name="error_report_too_few_statuses">At least one status must be reported.</string>
-    <string name="error_invalid_regex">Invalid regular expression</string>
     <string name="error_sender_account_gone">Error sending toot.</string>
 
     <string name="title_home">Home</string>
-    <string name="title_advanced">Advanced</string>
     <string name="title_notifications">Notifications</string>
     <string name="title_public_local">Local</string>
     <string name="title_public_federated">Federated</string>
@@ -187,10 +185,8 @@
     <string name="visibility_private">Followers-Only: Post to followers only</string>
     <string name="visibility_direct">Direct: Post to mentioned users only</string>
 
-    <string name="pref_title_notification_settings">Notifications</string>
     <string name="pref_title_edit_notification_settings">Notifications</string>
     <string name="pref_title_notifications_enabled">Notifications</string>
-    <string name="pref_summary_notifications">for account %1$s</string>
     <string name="pref_title_notification_alerts">Alerts</string>
     <string name="pref_title_notification_alert_sound">Notify with a sound</string>
     <string name="pref_title_notification_alert_vibrate">Notify with vibration</string>
@@ -247,12 +243,6 @@
     <string name="status_text_size_large">Large</string>
     <string name="status_text_size_largest">Largest</string>
 
-    <string name="pref_media_display">Media display</string>
-
-    <string name="media_hide_sensitive">Hide media marked as sensitive</string>
-    <string name="media_hide_none">Always show media marked as sensitive</string>
-    <string name="media_hide_all">Always hide all media</string>
-
     <string name="notification_mention_name">New Mentions</string>
     <string name="notification_mention_descriptions">Notifications about new mentions</string>
     <string name="notification_follow_name">New Followers</string>