diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 1024fab6fc..a3f4367ebc 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">الأصغر أولا</string>
 
     <string name="drawer_item_all_files">كل الملفات</string>
-    <string name="drawer_item_files">الملفات</string>
     <string name="drawer_item_home">الرئيسية</string>
     <string name="drawer_item_favorites">المفضلة </string>
     <string name="drawer_item_photos">الصور</string>
@@ -77,9 +76,6 @@
     <string name="file_list_empty_headline_server_search_videos">لا يوجد فيديوهات</string>
     <string name="upload_list_empty_headline">لا توجد تحميلات</string>
     <string name="file_list_folder">مجلد</string>
-    <string name="file_list_folders">مجلدات</string>
-    <string name="file_list_file">ملف</string>
-    <string name="file_list_files">ملفات</string>
     <string name="filedetails_select_file">اضغظ على الملف ليتم عرض خيارات أكثر</string>
     <string name="filedetails_size">الحجم :</string>
     <string name="filedetails_type">النوع :</string>
@@ -96,7 +92,6 @@
     <string name="common_cancel">إلغاء</string>
     <string name="common_back">رجوع</string>
     <string name="common_save">حفظ</string>
-    <string name="common_save_exit">حفظ &amp; خروج</string>
     <string name="common_error">خطأ</string>
     <string name="common_loading">تحميل ...</string>
     <string name="common_unknown">غير معروف</string>
@@ -105,7 +100,6 @@
     <string name="about_title">حول</string>
     <string name="change_password">عدل كلمة السر</string>
     <string name="delete_account">حذف الحساب</string>
-    <string name="create_account">حساب جديد</string>
     <string name="upload_chooser_title">الرفع من ...</string>
     <string name="uploader_info_dirname">اسم المجلد</string>
     <string name="uploader_upload_in_progress_ticker">يتم الرفع ...</string>
@@ -266,7 +260,6 @@
     <string name="file_migration_ok_finished">مكتملة</string>
     <string name="file_migration_use_data_folder">استعمل</string>
 
-    <string name="prefs_category_accounts">حسابات</string>
     <string name="prefs_add_account">أضف حسابا</string>
     <string name="drawer_manage_accounts">إدارة الحسابات</string>
     <string name="actionbar_logger">سجل</string>
diff --git a/src/main/res/values-ast/strings.xml b/src/main/res/values-ast/strings.xml
index 6a7cc323cb..d09e722a1d 100644
--- a/src/main/res/values-ast/strings.xml
+++ b/src/main/res/values-ast/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Lo más pequeño</string>
 
     <string name="drawer_item_all_files">Tolos ficheros</string>
-    <string name="drawer_item_files">Ficheros</string>
     <string name="drawer_item_home">Aniciu</string>
     <string name="drawer_item_favorites">Favoritos</string>
     <string name="drawer_item_photos">Semeyes</string>
@@ -80,9 +79,6 @@
     <string name="file_list_empty_text_videos_filter">La to gueta nun devolvió vídeos.</string>
     <string name="upload_list_empty_headline">Nun hai xubes disponibles</string>
     <string name="file_list_folder">Carpeta</string>
-    <string name="file_list_folders">Carpetes</string>
-    <string name="file_list_file">Ficheru</string>
-    <string name="file_list_files">Ficheros</string>
     <string name="filedetails_select_file">Calca nun ficheru p\'amosar información adicional</string>
     <string name="filedetails_size">Tamañu:</string>
     <string name="filedetails_type">Triba:</string>
@@ -100,7 +96,6 @@
     <string name="common_cancel_sync">Encaboxar sincronización</string>
     <string name="common_cancel">Encaboxar</string>
     <string name="common_back">Atrás</string>
-    <string name="common_save_exit">Guardar y colar</string>
     <string name="common_error">Fallu</string>
     <string name="common_loading">Cargando&#8230;</string>
     <string name="common_unknown">desconocí­u</string>
@@ -108,7 +103,6 @@
     <string name="about_title">Tocante</string>
     <string name="change_password">Camudar contraseña</string>
     <string name="delete_account">Desaniciar cuenta</string>
-    <string name="create_account">Crear cuenta</string>
     <string name="upload_chooser_title">Xubir dende&#8230;</string>
     <string name="uploader_info_dirname">Nome de la carpeta</string>
     <string name="uploader_upload_in_progress_ticker">Xubiendo&#8230;</string>
@@ -278,7 +272,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Xubir namái na Wi-Fi</string>
-    <string name="instant_upload_on_wifi">Xubir namái semeyes na Wi-Fi</string>
     <string name="instant_video_upload_on_wifi">Xubir namái vídeos na Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Namái xubir al cargar</string>
     <string name="instant_upload_on_charging">Namái xubir al cargar</string>
@@ -342,7 +335,6 @@
     <string name="file_migration_use_data_folder">Usar</string>
 
     <string name="file_migration_source_not_readable_title">¡El direutoriu fonte nun ye lleible!</string>
-    <string name="prefs_category_accounts">Cuentes</string>
     <string name="prefs_add_account">Amestar cuenta</string>
     <string name="drawer_manage_accounts">Xestionar cuentes</string>
     <string name="auth_redirect_non_secure_connection_title">Conexón segura redirixida pente una ruta insegura.</string>
diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml
index c09588c966..74e32ef50d 100644
--- a/src/main/res/values-bg-rBG/strings.xml
+++ b/src/main/res/values-bg-rBG/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Най-малък</string>
 
     <string name="drawer_item_all_files">Всички файлове</string>
-    <string name="drawer_item_files">Файлове</string>
     <string name="drawer_item_home">Начало</string>
     <string name="drawer_item_favorites">Любими</string>
     <string name="drawer_item_photos">Снимки</string>
@@ -91,9 +90,6 @@
     <string name="file_list_empty_headline_server_search_photos">Няма снимки</string>
     <string name="file_list_empty_search">Вероятно е в друга директория</string>
     <string name="file_list_folder">папка</string>
-    <string name="file_list_folders">папки</string>
-    <string name="file_list_file">файл</string>
-    <string name="file_list_files">файлове</string>
     <string name="filedetails_select_file">Натиснете върху файл, за да видите допълнителна информация.</string>
     <string name="filedetails_size">Размер:</string>
     <string name="filedetails_type">Тип:</string>
@@ -110,7 +106,6 @@
     <string name="common_cancel">Отказ</string>
     <string name="common_back">Назад</string>
     <string name="common_save">Запазване</string>
-    <string name="common_save_exit">Запис и излизане</string>
     <string name="common_error">Грешка</string>
     <string name="common_loading">Зареждане &#8230;</string>
     <string name="common_unknown">неясна</string>
@@ -119,7 +114,6 @@
     <string name="about_title">Относно</string>
     <string name="change_password">Промяна на парола</string>
     <string name="delete_account">Изтриване</string>
-    <string name="create_account">Създаване на профил</string>
     <string name="upload_chooser_title">Качване от &#8230;</string>
     <string name="uploader_info_dirname">Име на папката</string>
     <string name="uploader_upload_in_progress_ticker">Качване &#8230;</string>
@@ -298,7 +292,6 @@
     <string name="file_migration_updating_index">Обновяване на индекс&#8230;</string>
     <string name="file_migration_cleaning">Почистване&#8230;</string>
     <string name="file_migration_ok_finished">Завършен</string>
-    <string name="prefs_category_accounts">Профили</string>
     <string name="prefs_add_account">Добавяне на профил</string>
     <string name="drawer_manage_accounts">Управление на профилите</string>
     <string name="actionbar_logger">Журнали</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index bfeb2d5d0d..83fb9cd6bb 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Més petit primer</string>
 
     <string name="drawer_item_all_files">Tots els fitxers</string>
-    <string name="drawer_item_files">Fitxers</string>
     <string name="drawer_item_home">Casa</string>
     <string name="drawer_item_favorites">Favorites</string>
     <string name="drawer_item_photos">Fotos</string>
@@ -84,9 +83,6 @@
     <string name="file_list_empty_headline_server_search_photos">No hi ha imatges</string>
     <string name="upload_list_empty_headline">No hi ha pujades disponibles</string>
     <string name="file_list_folder">carpeta</string>
-    <string name="file_list_folders">carpetes</string>
-    <string name="file_list_file">fitxer</string>
-    <string name="file_list_files">fitxers</string>
     <string name="filedetails_select_file">Feu clic en un fitxer per mostrar informació addicional.</string>
     <string name="filedetails_size">Mida:</string>
     <string name="filedetails_type">Tipus:</string>
@@ -103,7 +99,6 @@
     <string name="common_cancel">Cancel·la</string>
     <string name="common_back">Enrera</string>
     <string name="common_save">Deseu</string>
-    <string name="common_save_exit">Desa i surt</string>
     <string name="common_error">Error</string>
     <string name="common_loading">Carregant&#8230;</string>
     <string name="common_unknown">desconegut</string>
@@ -112,7 +107,6 @@
     <string name="about_title">Quant a</string>
     <string name="change_password">Canvia la contrasenya</string>
     <string name="delete_account">Elimina el compte</string>
-    <string name="create_account">Crea un compte</string>
     <string name="upload_chooser_title">Puja fitxer des de&#8230;</string>
     <string name="uploader_info_dirname">Nom de la carpeta</string>
     <string name="uploader_upload_in_progress_ticker">S\'està pujant&#8230;</string>
@@ -302,7 +296,6 @@
     <string name="file_migration_override_data_folder">Reemplaça</string>
     <string name="file_migration_use_data_folder">Utilitza</string>
 
-    <string name="prefs_category_accounts">Comptes</string>
     <string name="prefs_add_account">Afegeix compte</string>
     <string name="drawer_manage_accounts">Gestió de comptes</string>
     <string name="actionbar_logger">Registres</string>
diff --git a/src/main/res/values-cs-rCZ/strings.xml b/src/main/res/values-cs-rCZ/strings.xml
index c7eca9b277..38a43f6147 100644
--- a/src/main/res/values-cs-rCZ/strings.xml
+++ b/src/main/res/values-cs-rCZ/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Nejprve nejmenší</string>
 
     <string name="drawer_item_all_files">Všechny soubory</string>
-    <string name="drawer_item_files">Soubor</string>
     <string name="drawer_item_home">Domů</string>
     <string name="drawer_item_favorites">Oblíbené</string>
     <string name="drawer_item_photos">Fotky</string>
@@ -86,7 +85,6 @@
     <string name="file_list_seconds_ago">před pár sekundami</string>
     <string name="file_list_empty_headline">Nejsou zde žádné soubory</string>
     <string name="file_list_empty">Nahrajte nějaký obsah, nebo synchronizujte s vašimi zařízeními!</string>
-    <string name="file_list_empty_favorites">Označte nějaké soubory jako oblíbené nebo synchronizujte se svými přístroji.</string>
     <string name="file_list_empty_favorites_filter_list">Zde budou zobrazeny soubory a adresáře označené jako oblíbené</string>
     <string name="file_list_empty_favorites_filter">Vaše vyhledávání nenalezlo žádné oblíbené soubory</string>
     <string name="file_list_loading">Načítání&#8230;</string>
@@ -112,9 +110,6 @@
     <string name="upload_list_empty_text">Nahrajte nějaký obsah, nebo aktivujte okamžité nahrání!</string>
     <string name="upload_list_empty_text_auto_upload">Nahrajte nějaký obsah nebo aktivujte automatické nahrávání.</string>
     <string name="file_list_folder">adresář</string>
-    <string name="file_list_folders">adresářů</string>
-    <string name="file_list_file">soubor</string>
-    <string name="file_list_files">souborů</string>
     <string name="filedetails_select_file">Více informací získáte klepnutím na soubor.</string>
     <string name="filedetails_size">Velikost:</string>
     <string name="filedetails_type">Typ:</string>
@@ -134,7 +129,6 @@
     <string name="common_cancel">Zrušit</string>
     <string name="common_back">Zpět</string>
     <string name="common_save">Uložit</string>
-    <string name="common_save_exit">Uložit &amp; ukončit</string>
     <string name="common_error">Chyba</string>
     <string name="common_loading">Načítání &#8230;</string>
     <string name="common_unknown">neznámý</string>
@@ -144,7 +138,6 @@
     <string name="change_password">Změnit heslo</string>
     <string name="delete_account">Odebrat účet</string>
     <string name="delete_account_warning">Smazat účet %s?\n\nTuto akci nelze vzít zpět.</string>
-    <string name="create_account">Vytvořit účet</string>
     <string name="upload_chooser_title">Nahrát z &#8230;</string>
     <string name="uploader_info_dirname">Název adresáře</string>
     <string name="uploader_upload_in_progress_ticker">Odesílám &#8230;</string>
@@ -330,7 +323,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Nahrávat pouze přes wifi</string>
-    <string name="instant_upload_on_wifi">Nahrávat obrázky pouze na Wi-Fi</string>
     <string name="instant_video_upload_on_wifi">Nahrávat videa pouze přes wifi</string>
     <string name="instant_video_upload_on_charging">Nahrávat pouze při nabíjení</string>
     <string name="instant_upload_on_charging">Nahrávat pouze při nabíjení</string>
@@ -411,7 +403,6 @@
     <string name="file_migration_source_not_readable_title">Ze zdrojového adresáře nelze číst!</string>
     <string name="file_migration_source_not_readable">Opravdu chcete změnit adresář úložiště na %1$s?\n\nPoznámka: Všechna data budou stažena znovu.</string>
 
-    <string name="prefs_category_accounts">Účty</string>
     <string name="prefs_add_account">Přidat účet</string>
     <string name="drawer_manage_accounts">Spravovat účty</string>
     <string name="auth_redirect_non_secure_connection_title">Zabezpečené spojení je přesměrováváno nezabezpečenou trasou.</string>
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index 0256140e24..90a18cfe48 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Mindste først</string>
 
     <string name="drawer_item_all_files">Alle filer</string>
-    <string name="drawer_item_files">Filer</string>
     <string name="drawer_item_home">Hjem</string>
     <string name="drawer_item_favorites">Favoritter</string>
     <string name="drawer_item_photos">Fotos</string>
@@ -85,9 +84,6 @@
     <string name="file_list_empty_headline_server_search_photos">Ingen fotos</string>
     <string name="upload_list_empty_headline">Ingen uploads tilgængelige</string>
     <string name="file_list_folder">mappe</string>
-    <string name="file_list_folders">mapper</string>
-    <string name="file_list_file">fil</string>
-    <string name="file_list_files">fil</string>
     <string name="filedetails_select_file">Tryk på en fil for at vise yderligere information.</string>
     <string name="filedetails_size">Størelse:</string>
     <string name="filedetails_type">Type:</string>
@@ -104,7 +100,6 @@
     <string name="common_cancel">Annuller</string>
     <string name="common_back">Tilbage</string>
     <string name="common_save">Gem</string>
-    <string name="common_save_exit">Gem og luk</string>
     <string name="common_error">Fejl</string>
     <string name="common_loading">Indlæser...</string>
     <string name="common_unknown">ukendt</string>
@@ -113,7 +108,6 @@
     <string name="about_title">Om</string>
     <string name="change_password">Skift kodeord</string>
     <string name="delete_account">Fjern konto</string>
-    <string name="create_account">Opret konto</string>
     <string name="upload_chooser_title">Upload fra ...</string>
     <string name="uploader_info_dirname">Mappenavn</string>
     <string name="uploader_upload_in_progress_ticker">Uploader ...</string>
@@ -291,7 +285,6 @@
     <string name="file_migration_updating_index">Opdaterer index&#8230;</string>
     <string name="file_migration_cleaning">Oprydning&#8230;</string>
     <string name="file_migration_ok_finished">Færdiggjort</string>
-    <string name="prefs_category_accounts">Konti</string>
     <string name="prefs_add_account">Tilføj konto</string>
     <string name="drawer_manage_accounts">Administrer konti</string>
     <string name="actionbar_logger">Logge</string>
diff --git a/src/main/res/values-de-rDE/strings.xml b/src/main/res/values-de-rDE/strings.xml
index 412de968f7..4008b22381 100644
--- a/src/main/res/values-de-rDE/strings.xml
+++ b/src/main/res/values-de-rDE/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Kleinste zuerst</string>
 
     <string name="drawer_item_all_files">Alle Dateien</string>
-    <string name="drawer_item_files">Dateien</string>
     <string name="drawer_item_home">Home</string>
     <string name="drawer_item_favorites">Favoriten</string>
     <string name="drawer_item_photos">Fotos</string>
@@ -90,7 +89,6 @@
     <string name="file_list_empty_headline"> Keine Dateien vorhanden </string>
     <string name="folder_list_empty_headline">Keine Ordner vorhanden</string>
     <string name="file_list_empty">Laden Sie Inhalt hoch oder synchronisieren Sie mit Ihren Geräten.</string>
-    <string name="file_list_empty_favorites">Favorisieren Sie einige Dateien oder synchronisieren Sie Ihre Geräte.</string>
     <string name="file_list_empty_favorites_filter_list">Dateien und Ordner, die als Favoriten markiert werden, erscheinen hier</string>
     <string name="file_list_empty_favorites_filter">Keine favorisierten Dateien in Ihrem Verlauf gefunden.</string>
     <string name="file_list_loading">Lade&#8230;</string>
@@ -117,9 +115,6 @@
     <string name="upload_list_empty_text">Laden Sie Inhalte hoch oder aktivieren Sie den Sofortupload.</string>
     <string name="upload_list_empty_text_auto_upload">Laden Sie Inhalte hoch oder aktivieren Sie den Auto Upload!</string>
     <string name="file_list_folder">Ordner</string>
-    <string name="file_list_folders">Ordner</string>
-    <string name="file_list_file">Datei</string>
-    <string name="file_list_files">Dateien</string>
     <string name="filedetails_select_file">Klicken Sie auf eine Datei für weitere Informationen.</string>
     <string name="filedetails_size">Größe:</string>
     <string name="filedetails_type">Art:</string>
@@ -139,7 +134,6 @@
     <string name="common_cancel">Abbrechen</string>
     <string name="common_back">Zurück</string>
     <string name="common_save">Speichern</string>
-    <string name="common_save_exit">Speichern &amp; verlassen</string>
     <string name="common_error">Fehler</string>
     <string name="common_loading">Lade &#8230;</string>
     <string name="common_unknown">unbekannt</string>
@@ -150,7 +144,6 @@
     <string name="change_password">Passwort ändern</string>
     <string name="delete_account">Benutzerkonto löschen</string>
     <string name="delete_account_warning">Konto %s mit allen lokalen Dateien löschen?\n\nLöschen kann nicht rückgängig gemacht werden.</string>
-    <string name="create_account">Benutzerkonto erstellen</string>
     <string name="avatar">Avatar</string>
     <string name="active_user">Aktiver Nutzer</string>
     <string name="upload_chooser_title">Dateien hochladen von &#8230;</string>
@@ -339,7 +332,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Nur über W-Lan hochladen</string>
-    <string name="instant_upload_on_wifi">Bilder nur über W-Lan hochladen</string>
     <string name="instant_video_upload_on_wifi">Videos nur über W-Lan hochladen</string>
     <string name="instant_video_upload_on_charging">Nur während des Ladens hochladen</string>
     <string name="instant_upload_on_charging">Nur während des Ladens hochladen</string>
@@ -422,7 +414,6 @@
     <string name="file_migration_source_not_readable_title">Quellverzeichnis kann nicht gelesen werden!</string>
     <string name="file_migration_source_not_readable">Möchten Sie wirklich den Speicherpfad in %1$s ändern?\n\nHinweis: Alle Daten müssen dann erneut heruntergeladen werden. </string>
 
-    <string name="prefs_category_accounts">Konten</string>
     <string name="prefs_add_account">Konto hinzufügen</string>
     <string name="drawer_manage_accounts">Konten verwalten</string>
     <string name="auth_redirect_non_secure_connection_title">Die gesicherte Verbindung wird durch eine ungesicherte Route geleitet.</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index e57564cba2..a484ce5347 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Kleinste zuerst</string>
 
     <string name="drawer_item_all_files">Alle Dateien</string>
-    <string name="drawer_item_files">Dateien</string>
     <string name="drawer_item_home">Home</string>
     <string name="drawer_item_favorites">Favoriten</string>
     <string name="drawer_item_photos">Fotos</string>
@@ -90,7 +89,6 @@
     <string name="file_list_empty_headline"> Keine Dateien vorhanden </string>
     <string name="folder_list_empty_headline">Keine Ordner vorhanden</string>
     <string name="file_list_empty">Lade Inhalt hoch oder synchronisiere mit Deinen Geräten.</string>
-    <string name="file_list_empty_favorites">Favorisiere einige Dateien oder synchronisiere deine Geräte.</string>
     <string name="file_list_empty_favorites_filter_list">Dateien und Ordner, die als Favoriten markiert werden, erscheinen hier</string>
     <string name="file_list_empty_favorites_filter">Keine favorisierten Dateien in deinem Verlauf gefunden.</string>
     <string name="file_list_loading">Lade&#8230;</string>
@@ -117,9 +115,6 @@
     <string name="upload_list_empty_text">Lade Inhalte hoch oder aktiviere den Sofortupload.</string>
     <string name="upload_list_empty_text_auto_upload">Lade Inhalte hoch oder aktiviere den Sofortupload.</string>
     <string name="file_list_folder">Ordner</string>
-    <string name="file_list_folders">Ordner</string>
-    <string name="file_list_file">Datei</string>
-    <string name="file_list_files">Dateien</string>
     <string name="filedetails_select_file">Klicke auf eine Datei für weitere Informationen.</string>
     <string name="filedetails_size">Größe:</string>
     <string name="filedetails_type">Art:</string>
@@ -139,7 +134,6 @@
     <string name="common_cancel">Abbrechen</string>
     <string name="common_back">Zurück</string>
     <string name="common_save">Speichern</string>
-    <string name="common_save_exit">Speichern &amp; verlassen</string>
     <string name="common_error">Fehler</string>
     <string name="common_loading">Lade &#8230;</string>
     <string name="common_unknown">unbekannt</string>
@@ -150,7 +144,6 @@
     <string name="change_password">Passwort ändern</string>
     <string name="delete_account">Benutzerkonto löschen</string>
     <string name="delete_account_warning">Konto %s mit allen lokalen Dateien löschen?\n\nLöschen kann nicht rückgängig gemacht werden.</string>
-    <string name="create_account">Benutzerkonto erstellen</string>
     <string name="avatar">Avatar</string>
     <string name="active_user">Aktiver Nutzer</string>
     <string name="upload_chooser_title">Dateien hochladen von &#8230;</string>
@@ -339,7 +332,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Nur über W-Lan hochladen</string>
-    <string name="instant_upload_on_wifi">Bilder nur über W-Lan hochladen</string>
     <string name="instant_video_upload_on_wifi">Videos nur über W-Lan hochladen</string>
     <string name="instant_video_upload_on_charging">Nur während des Ladens hochladen</string>
     <string name="instant_upload_on_charging">Nur während des Ladens hochladen</string>
@@ -422,7 +414,6 @@
     <string name="file_migration_source_not_readable_title">Quellverzeichnis kann nicht gelesen werden!</string>
     <string name="file_migration_source_not_readable">Möchtest Du wirklich den Speicherpfad in %1$s ändern?\n\nHinweis: Alle Daten müssen dann erneut heruntergeladen werden.</string>
 
-    <string name="prefs_category_accounts">Konten</string>
     <string name="prefs_add_account">Konto hinzufügen</string>
     <string name="drawer_manage_accounts">Konten verwalten</string>
     <string name="auth_redirect_non_secure_connection_title">Die gesicherte Verbindung wird durch eine ungesicherte Route geleitet.</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 666a3ce3b5..23ab9a0066 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Μικρότερο πρώτα</string>
 
     <string name="drawer_item_all_files">Όλα τα αρχεία</string>
-    <string name="drawer_item_files">Αρχεία</string>
     <string name="drawer_item_home">Αρχική</string>
     <string name="drawer_item_favorites">Αγαπημένα</string>
     <string name="drawer_item_photos">Φωτογραφίες</string>
@@ -85,7 +84,6 @@
     <string name="file_list_seconds_ago">δευτερόλεπτα πριν</string>
     <string name="file_list_empty_headline">Δεν υπάρχουν αρχεία</string>
     <string name="file_list_empty">Μεταφόρτωση περιεχομένου ή συγχρονισμός με τις συσκευές σας.</string>
-    <string name="file_list_empty_favorites">Σημειώστε ως αγαπημένα ορισμένα αρχεία ή συγχρονίστε τα με τις συσκευές σας.</string>
     <string name="file_list_empty_favorites_filter_list">Τα αρχεία ή οι φάκελοι που σημειώσατε ως αγαπημένα θα εμφανιστούν εδώ</string>
     <string name="file_list_empty_favorites_filter">Δεν βρέθηκαν αρχεία σημειωμένα ως αγαπημένα για το ερώτημά σας.</string>
     <string name="file_list_loading">Φόρτωση&#8230;</string>
@@ -111,9 +109,6 @@
     <string name="upload_list_empty_text">Μεταφορτώστε περιεχόμενο ή ενεργοποιήστε την άμεση μεταφόρτωση.</string>
     <string name="upload_list_empty_text_auto_upload">Μεταφορτώστε περιεχόμενο ή ενεργοποιήστε την αυτόματη μεταφόρτωση.</string>
     <string name="file_list_folder">φάκελος</string>
-    <string name="file_list_folders">φάκελοι</string>
-    <string name="file_list_file">αρχείο</string>
-    <string name="file_list_files">αρχεία</string>
     <string name="filedetails_select_file">Αγγίξτε κάποιο αρχείο για να προβάλετε περισσότερες πληροφορίες.</string>
     <string name="filedetails_size">Μέγεθος:</string>
     <string name="filedetails_type">Τύπος:</string>
@@ -133,7 +128,6 @@
     <string name="common_cancel">Ακύρωση</string>
     <string name="common_back">Επιστροφή</string>
     <string name="common_save">Αποθήκευση</string>
-    <string name="common_save_exit">Αποθήκευση &amp; έξοδος</string>
     <string name="common_error">Σφάλμα</string>
     <string name="common_loading">Φόρτωση &#8230;</string>
     <string name="common_unknown">άγνωστο</string>
@@ -143,7 +137,6 @@
     <string name="change_password">Αλλαγή συνθημτικού</string>
     <string name="delete_account">Αφαίρεση λογαριασμού</string>
     <string name="delete_account_warning">Διαγραφή λογαριασμού %s με όλα τα τοπικά αρχεία?\n\n\Διαγράφοντας τα δεν θα υπάρξει επαναφορά.</string>
-    <string name="create_account">Δημιουργία λογαριασμού</string>
     <string name="upload_chooser_title">Μεταφόρτωση από &#8230;</string>
     <string name="uploader_info_dirname">Όνομα φακέλου</string>
     <string name="uploader_upload_in_progress_ticker">Μεταφόρτωση &#8230;</string>
@@ -325,7 +318,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Μεταφόρτωση μόνο μέσω wifi</string>
-    <string name="instant_upload_on_wifi">Μεταφόρτωση φωτογραφιών μόνο μέσω wifi</string>
     <string name="instant_video_upload_on_wifi">Μεταφόρτωση βίντεο μόνο μέσω wifi</string>
     <string name="instant_video_upload_on_charging">Μεταφόρτωση μόνο κατά τη διάρκεια φόρτισης</string>
     <string name="instant_upload_on_charging">Μεταφόρτωση μόνο κατά τη διάρκεια φόρτισης</string>
@@ -406,7 +398,6 @@
     <string name="file_migration_source_not_readable_title">Ο πηγαίος φάκελος δεν ειναι αναγνώσιμος!</string>
     <string name="file_migration_source_not_readable">Θέλετε ακόμη να αλλάξετε το μονοπάτι αποθήκευσης σε %1$s;\n\nΣημείωση: όλα τα δεδομένα θα πρέπει να κατεβαστούν ξανά. </string>
 
-    <string name="prefs_category_accounts">Λογαριασμοί</string>
     <string name="prefs_add_account">Προσθήκη λογαριασμού</string>
     <string name="drawer_manage_accounts">Διαχείριση λογαριασμών</string>
     <string name="auth_redirect_non_secure_connection_title">Η ασφαλής σύνδεση ανακατευθύνεται μέσω μιας μη ασφαλούς διαδρομής.</string>
diff --git a/src/main/res/values-en-rGB/strings.xml b/src/main/res/values-en-rGB/strings.xml
index c38dbf45c6..a818d2a320 100644
--- a/src/main/res/values-en-rGB/strings.xml
+++ b/src/main/res/values-en-rGB/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Smallest first</string>
 
     <string name="drawer_item_all_files">All files</string>
-    <string name="drawer_item_files">Files</string>
     <string name="drawer_item_home">Home</string>
     <string name="drawer_item_favorites">Favourites</string>
     <string name="drawer_item_photos">Photos</string>
@@ -89,7 +88,6 @@
     <string name="file_list_empty_headline">No files here</string>
     <string name="folder_list_empty_headline">No folders here</string>
     <string name="file_list_empty">Upload some content or sync with your devices.</string>
-    <string name="file_list_empty_favorites">Favorite some files or sync with your devices.</string>
     <string name="file_list_empty_favorites_filter_list">Files and folders you mark as favorites will show up here</string>
     <string name="file_list_empty_favorites_filter">Your search returned no favorited files.</string>
     <string name="file_list_loading">Loading&#8230;</string>
@@ -116,9 +114,6 @@
     <string name="upload_list_empty_text">Upload some content or activate instant uploading.</string>
     <string name="upload_list_empty_text_auto_upload">Upload some content or activate auto upload.</string>
     <string name="file_list_folder">folder</string>
-    <string name="file_list_folders">folders</string>
-    <string name="file_list_file">file</string>
-    <string name="file_list_files">file</string>
     <string name="filedetails_select_file">Tap on a file to display additional information.</string>
     <string name="filedetails_size">Size:</string>
     <string name="filedetails_type">Type:</string>
@@ -138,7 +133,6 @@
     <string name="common_cancel">Cancel</string>
     <string name="common_back">Back</string>
     <string name="common_save">Save</string>
-    <string name="common_save_exit">Save &amp; exit</string>
     <string name="common_error">Error</string>
     <string name="common_loading">Loading &#8230;</string>
     <string name="common_unknown">unknown</string>
@@ -149,7 +143,6 @@
     <string name="change_password">Change password</string>
     <string name="delete_account">Remove account</string>
     <string name="delete_account_warning">Delete account %s with all local files?\n\nDeleting cannot be undone.</string>
-    <string name="create_account">Create account</string>
     <string name="avatar">Avatar</string>
     <string name="active_user">Active user</string>
     <string name="upload_chooser_title">Upload from &#8230;</string>
@@ -338,7 +331,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Only upload on Wi-Fi</string>
-    <string name="instant_upload_on_wifi">Only upload pictures on Wi-Fi</string>
     <string name="instant_video_upload_on_wifi">Only upload videos on Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Only upload when charging</string>
     <string name="instant_upload_on_charging">Only upload when charging</string>
@@ -421,7 +413,6 @@
     <string name="file_migration_source_not_readable_title">Source directory not readable!</string>
     <string name="file_migration_source_not_readable">Do you still want to change the storage path to %1$s?\n\nNote: All data will have to be downloaded again.</string>
 
-    <string name="prefs_category_accounts">Accounts</string>
     <string name="prefs_add_account">Add account</string>
     <string name="drawer_manage_accounts">Manage accounts</string>
     <string name="auth_redirect_non_secure_connection_title">Secure connection redirected through an unsecured route.</string>
diff --git a/src/main/res/values-es-rAR/strings.xml b/src/main/res/values-es-rAR/strings.xml
index 3b94df7319..514fb1d477 100644
--- a/src/main/res/values-es-rAR/strings.xml
+++ b/src/main/res/values-es-rAR/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Más pequeño primero</string>
 
     <string name="drawer_item_all_files">Todos los archivos</string>
-    <string name="drawer_item_files">Archivos</string>
     <string name="drawer_item_home">Inicio</string>
     <string name="drawer_item_favorites">Favoritos</string>
     <string name="drawer_item_photos">Fotos</string>
@@ -89,7 +88,6 @@
     <string name="file_list_empty_headline">No hay archivos aquí</string>
     <string name="folder_list_empty_headline">No hay carpetas aquí</string>
     <string name="file_list_empty">Cargue algún contenido o sincronice con sus dispositivos.</string>
-    <string name="file_list_empty_favorites">Marque algunos archivos como favoritos o sincronice con sus dispositivos.</string>
     <string name="file_list_empty_favorites_filter_list">Los archivos y carpetas que marque como favoritos se mostrarán aquí</string>
     <string name="file_list_empty_favorites_filter">Su búsqueda no regresó archivos marcados como favoritos. </string>
     <string name="file_list_loading">Cargando&#8230;</string>
@@ -116,9 +114,6 @@
     <string name="upload_list_empty_text">Cargue algún contenido o active la carga instantánea</string>
     <string name="upload_list_empty_text_auto_upload">Cargue algún contenido o active la carga automática</string>
     <string name="file_list_folder">carpeta</string>
-    <string name="file_list_folders">carpetas</string>
-    <string name="file_list_file">archivo</string>
-    <string name="file_list_files">archivos</string>
     <string name="filedetails_select_file">Pulse un archivo para mostrar información adicional.</string>
     <string name="filedetails_size">Tamaño:</string>
     <string name="filedetails_type">Tipo:</string>
@@ -138,7 +133,6 @@
     <string name="common_cancel">Cancelar</string>
     <string name="common_back">Atrás</string>
     <string name="common_save">Guardar</string>
-    <string name="common_save_exit">Guardar &amp; salir</string>
     <string name="common_error">Error</string>
     <string name="common_loading">Cargando  &#8230;</string>
     <string name="common_unknown">desconocido</string>
@@ -150,7 +144,6 @@
     <string name="delete_account">Eliminar cuenta</string>
     <string name="delete_account_warning">Borrar cuenta 1 %s con todos los archivos locales?
 \n\nDeleting no se puede deshacer.</string>
-    <string name="create_account">Crear cuenta</string>
     <string name="avatar">Avatar</string>
     <string name="active_user">Usuario activo</string>
     <string name="upload_chooser_title">Cargar desde &#8230;</string>
@@ -339,7 +332,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Cargar sólo mediante Wi-Fi</string>
-    <string name="instant_upload_on_wifi">Cargar imágenes sólo a través de Wi-Fi</string>
     <string name="instant_video_upload_on_wifi">Cargar videos sólo a través de Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Cargar archivos sólo con el dispositivo conectado a la toma de corriente</string>
     <string name="instant_upload_on_charging">Cargar archivos sólo con el dispositivo conectado a la toma de corriente</string>
@@ -422,7 +414,6 @@
     <string name="file_migration_source_not_readable_title">¡El directorio fuente no se puede leer!</string>
     <string name="file_migration_source_not_readable">¿Aún desea cambiar la ruta de almacenamiento a %1$s?\n\nNota: todos los datos tendrán que ser descargados de nuevo. </string>
 
-    <string name="prefs_category_accounts">Cuentas</string>
     <string name="prefs_add_account">Agregar cuenta</string>
     <string name="drawer_manage_accounts">Administrar cuentas</string>
     <string name="auth_redirect_non_secure_connection_title">La conexión segura se está redirigiendo a través de una ruta insegura.</string>
diff --git a/src/main/res/values-es-rMX/strings.xml b/src/main/res/values-es-rMX/strings.xml
index 6403be0b85..d17a74237e 100644
--- a/src/main/res/values-es-rMX/strings.xml
+++ b/src/main/res/values-es-rMX/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Más pequeño primero</string>
 
     <string name="drawer_item_all_files">Todos los archivos</string>
-    <string name="drawer_item_files">Archivos</string>
     <string name="drawer_item_home">Inicio</string>
     <string name="drawer_item_favorites">Favoritos</string>
     <string name="drawer_item_photos">Fotos</string>
@@ -89,7 +88,6 @@
     <string name="file_list_empty_headline">No hay archivos aquí</string>
     <string name="folder_list_empty_headline">No hay carpetas aquí</string>
     <string name="file_list_empty">Carga algún contenido o sincroniza con tus dispositivos.</string>
-    <string name="file_list_empty_favorites">Marca algunos archivos como favoritos o sincroniza con tus dispositivos.</string>
     <string name="file_list_empty_favorites_filter_list">Los archivos y carpetas que marques como favoritos se mostrarán aquí</string>
     <string name="file_list_empty_favorites_filter">Tu búsqueda no regresó archivos marcados como favoritos. </string>
     <string name="file_list_loading">Cargando&#8230;</string>
@@ -116,9 +114,6 @@
     <string name="upload_list_empty_text">Carga algún contenido o activa la carga automática</string>
     <string name="upload_list_empty_text_auto_upload">Carga algún contenido o activa la carga automática</string>
     <string name="file_list_folder">carpeta</string>
-    <string name="file_list_folders">carpetas</string>
-    <string name="file_list_file">archivo</string>
-    <string name="file_list_files">archivos</string>
     <string name="filedetails_select_file">Pulsa un archivo para mostrar información adicional.</string>
     <string name="filedetails_size">Tamaño:</string>
     <string name="filedetails_type">Tipo:</string>
@@ -138,7 +133,6 @@
     <string name="common_cancel">Cancelar</string>
     <string name="common_back">Atrás</string>
     <string name="common_save">Guardar</string>
-    <string name="common_save_exit">Guardar &amp; salir</string>
     <string name="common_error">Error</string>
     <string name="common_loading">Cargando  &#8230;</string>
     <string name="common_unknown">desconocido</string>
@@ -149,7 +143,6 @@
     <string name="change_password">Cambiar contraseña</string>
     <string name="delete_account">Cerrar sesión</string>
     <string name="delete_account_warning">¿Borrar la cuenta %s con todos los archivos locales?\n\nEl borrado no se puede deshacer.</string>
-    <string name="create_account">Crear cuenta</string>
     <string name="avatar">Avatar</string>
     <string name="active_user">Usuario activo</string>
     <string name="upload_chooser_title">Cargar desde &#8230;</string>
@@ -338,7 +331,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Cargar sólo mediante Wi-Fi</string>
-    <string name="instant_upload_on_wifi">Cargar imágenes sólo a través de Wi-Fi</string>
     <string name="instant_video_upload_on_wifi">Cargar videos sólo a través de Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Cargar archivos sólo con el dispositivo conectado a la toma de corriente</string>
     <string name="instant_upload_on_charging">Cargar archivos sólo con el dispositivo conectado a la toma de corriente</string>
@@ -421,7 +413,6 @@
     <string name="file_migration_source_not_readable_title">¡No se puede leer el directorio fuente!</string>
     <string name="file_migration_source_not_readable">¿Aún deseas cambiar la ruta de almacenamiento a %1$s?\n\nNota: todos los datos tendrán que ser descargados de nuevo. </string>
 
-    <string name="prefs_category_accounts">Cuentas</string>
     <string name="prefs_add_account">Agregar cuenta</string>
     <string name="drawer_manage_accounts">Administrar cuentas</string>
     <string name="auth_redirect_non_secure_connection_title">La conexión segura se está redirigiendo a través de una ruta insegura.</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 3b29d2a70c..94fdf2cc0b 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">El más pequeño primero</string>
 
     <string name="drawer_item_all_files">Todos los archivos</string>
-    <string name="drawer_item_files">Archivos</string>
     <string name="drawer_item_home">Inicio</string>
     <string name="drawer_item_favorites">Favoritos</string>
     <string name="drawer_item_photos">Fotos</string>
@@ -89,7 +88,6 @@
     <string name="file_list_empty_headline">No hay archivos aquí</string>
     <string name="folder_list_empty_headline">No hay carpetas aquí</string>
     <string name="file_list_empty">Sube algún contenido o sincroniza con tus dispositivos.</string>
-    <string name="file_list_empty_favorites">Marca como favoritos algunos archivos o sincronízalos con tus dispositivos.</string>
     <string name="file_list_empty_favorites_filter_list">Los archivos y carpetas que marques como favoritos aparecerán aquí</string>
     <string name="file_list_empty_favorites_filter">Tu búsqueda no encontró ningún archivo favorito.</string>
     <string name="file_list_loading">Cargando&#8230;</string>
@@ -116,9 +114,6 @@
     <string name="upload_list_empty_text">Sube algún contenido o activa la subida instantánea.</string>
     <string name="upload_list_empty_text_auto_upload">Sube algún contenido o active la subida automática.</string>
     <string name="file_list_folder">carpeta</string>
-    <string name="file_list_folders">carpetas</string>
-    <string name="file_list_file">archivo</string>
-    <string name="file_list_files">archivos</string>
     <string name="filedetails_select_file">Pulsa sobre un archivo para mostrar información adicional.</string>
     <string name="filedetails_size">Tamaño:</string>
     <string name="filedetails_type">Tipo:</string>
@@ -138,7 +133,6 @@
     <string name="common_cancel">Cancelar</string>
     <string name="common_back">Volver</string>
     <string name="common_save">Guardar</string>
-    <string name="common_save_exit">Guardar y salir</string>
     <string name="common_error">Error</string>
     <string name="common_loading">Cargando &#8230;</string>
     <string name="common_unknown">desconocido</string>
@@ -149,7 +143,6 @@
     <string name="change_password">Cambiar contraseña</string>
     <string name="delete_account">Eliminar cuenta</string>
     <string name="delete_account_warning">¿Borrar cuenta %s con todos sus archivos locales?\n\nEl borrado no se puede deshacer.</string>
-    <string name="create_account">Crear cuenta</string>
     <string name="avatar">Avatar</string>
     <string name="active_user">Usuario activo</string>
     <string name="upload_chooser_title">Subir desde&#8230;</string>
@@ -338,7 +331,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Subir solamente por Wi-Fi</string>
-    <string name="instant_upload_on_wifi">Subir fotos solamente por Wi-Fi</string>
     <string name="instant_video_upload_on_wifi">Subir vídeos solamente por Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Subir solamente al cargar</string>
     <string name="instant_upload_on_charging">Subir solamente al cargar</string>
@@ -421,7 +413,6 @@
     <string name="file_migration_source_not_readable_title">¡No se puede leer el directorio de origen!</string>
     <string name="file_migration_source_not_readable">¿Aún quieres cambiar la ruta de almacenamiento a |%1$s?\n\nNota: habrá que descargar de nuevo todos los datos.</string>
 
-    <string name="prefs_category_accounts">Cuentas</string>
     <string name="prefs_add_account">Agregar cuenta</string>
     <string name="drawer_manage_accounts">Administrar cuentas</string>
     <string name="auth_redirect_non_secure_connection_title">La conexión segura está siendo redirigida a través de una ruta insegura.</string>
diff --git a/src/main/res/values-fi-rFI/strings.xml b/src/main/res/values-fi-rFI/strings.xml
index 1d7f50d958..819814b15a 100644
--- a/src/main/res/values-fi-rFI/strings.xml
+++ b/src/main/res/values-fi-rFI/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Pienin ensin</string>
 
     <string name="drawer_item_all_files">Kaikki tiedostot</string>
-    <string name="drawer_item_files">Tiedostot</string>
     <string name="drawer_item_home">Koti</string>
     <string name="drawer_item_favorites">Suosikit</string>
     <string name="drawer_item_photos">Kuvat</string>
@@ -78,7 +77,6 @@
     <string name="file_list_seconds_ago">sekuntia sitten</string>
     <string name="file_list_empty_headline">Ei tiedostoja</string>
     <string name="file_list_empty">Lähetä sisältöä tai synkronisoi laitteidesi kanssa</string>
-    <string name="file_list_empty_favorites">Lisää tiedostoja suosikeiksi tai synkronoi laitteidesi kanssa.</string>
     <string name="file_list_loading">Ladataan…</string>
     <string name="local_file_list_empty">Tässä kansiossa ei ole tiedostoja</string>
     <string name="file_list_empty_headline_search">Ei kohteita tässä kansiossa</string>
@@ -91,9 +89,6 @@
     <string name="file_list_empty_recently_added">Äskettäin lisättyja tiedostoja ei löytynyt</string>
     <string name="upload_list_empty_headline">Ei lähetettäviä saatavilla</string>
     <string name="file_list_folder">kansio</string>
-    <string name="file_list_folders">kansiot</string>
-    <string name="file_list_file">tiedosto</string>
-    <string name="file_list_files">Tiedostot</string>
     <string name="filedetails_select_file">Napauta tiedostoa nähdäksesi lisätietoja.</string>
     <string name="filedetails_size">Koko:</string>
     <string name="filedetails_type">Tyyppi:</string>
@@ -110,7 +105,6 @@
     <string name="common_cancel">Peru</string>
     <string name="common_back">Takaisin</string>
     <string name="common_save">Tallenna</string>
-    <string name="common_save_exit">Tallenna &amp; poistu</string>
     <string name="common_error">Virhe</string>
     <string name="common_loading">Ladataan…</string>
     <string name="common_unknown">tuntematon</string>
@@ -119,7 +113,6 @@
     <string name="about_title">Tietoja</string>
     <string name="change_password">Vaihda salasana</string>
     <string name="delete_account">Poista tili</string>
-    <string name="create_account">Luo tili</string>
     <string name="upload_chooser_title">Lataus täältä:</string>
     <string name="uploader_info_dirname">Kansion nimi</string>
     <string name="uploader_upload_in_progress_ticker">Lähetetään...</string>
@@ -259,7 +252,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Lähetä vain Wi-Fi-yhteydellä</string>
-    <string name="instant_upload_on_wifi">Lähetä kuvia vain Wi-Fi-yhteydellä</string>
     <string name="instant_video_upload_on_wifi">Lähetä videoita vain Wi-Fi-yhteydellä</string>
     <string name="instant_video_upload_on_charging">Lähetä vain ladattaessa virtaa</string>
     <string name="instant_upload_on_charging">Lähetä vain ladattaessa virtaa</string>
@@ -310,7 +302,6 @@
     <string name="file_migration_override_data_folder">Korvaa</string>
     <string name="file_migration_use_data_folder">Käytä</string>
 
-    <string name="prefs_category_accounts">Tilit</string>
     <string name="prefs_add_account">Lisää tili</string>
     <string name="drawer_manage_accounts">Tilien hallinta</string>
     <string name="actionbar_logger">Lokit</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 130361b478..4adf1a6388 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Le plus petit en premier</string>
 
     <string name="drawer_item_all_files">Tous les fichiers</string>
-    <string name="drawer_item_files">Fichiers</string>
     <string name="drawer_item_home">Accueil</string>
     <string name="drawer_item_favorites">Favoris</string>
     <string name="drawer_item_photos">Photos</string>
@@ -89,7 +88,6 @@
     <string name="file_list_empty_headline">Aucun fichier ici</string>
     <string name="folder_list_empty_headline">Aucun fichier ici</string>
     <string name="file_list_empty">Déposez du contenu ou synchronisez vos appareils.</string>
-    <string name="file_list_empty_favorites">Mettez certains fichiers en favoris ou synchronisez vos appareils.</string>
     <string name="file_list_empty_favorites_filter_list">Les fichiers et dossiers ajoutés à vos favoris apparaîtront ici</string>
     <string name="file_list_empty_favorites_filter">Auncun fichier mis en favori trouvé qui correspond à votre requête.</string>
     <string name="file_list_loading">Chargement&#8230;</string>
@@ -116,9 +114,6 @@
     <string name="upload_list_empty_text">Téléversez du contenu ou activez le téléversement instantané.</string>
     <string name="upload_list_empty_text_auto_upload">Téléversez du contenu ou activez le téléversement automatique.</string>
     <string name="file_list_folder">dossier</string>
-    <string name="file_list_folders">dossiers</string>
-    <string name="file_list_file">fichier</string>
-    <string name="file_list_files">fichiers</string>
     <string name="filedetails_select_file">Appuyez sur un fichier pour afficher des informations supplémentaires.</string>
     <string name="filedetails_size">Taille :</string>
     <string name="filedetails_type">Type :</string>
@@ -138,7 +133,6 @@
     <string name="common_cancel">Annuler</string>
     <string name="common_back">Retour</string>
     <string name="common_save">Sauvegarder</string>
-    <string name="common_save_exit">Enregistrer &amp; quitter</string>
     <string name="common_error">Erreur</string>
     <string name="common_loading">Chargement&#8230;</string>
     <string name="common_unknown">Inconnu</string>
@@ -149,7 +143,6 @@
     <string name="change_password">Changer de mot de passe</string>
     <string name="delete_account">Supprimer le compte</string>
     <string name="delete_account_warning">Supprimer le compte %s ?\n\nCette suppression sera irréversible.</string>
-    <string name="create_account">Créer un compte</string>
     <string name="avatar">Avatar</string>
     <string name="active_user">Utilisateur actif</string>
     <string name="upload_chooser_title">Téléverser depuis&#8230;</string>
@@ -338,7 +331,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Téléverser par wifi uniquement</string>
-    <string name="instant_upload_on_wifi">Téléverser les images via une connexion WiFi uniquement</string>
     <string name="instant_video_upload_on_wifi">Téléverser les images via une connexion WiFi uniquement</string>
     <string name="instant_video_upload_on_charging">Téléverser les images uniquement si le chargeur est branché</string>
     <string name="instant_upload_on_charging">Téléverser les images uniquement si le chargeur est branché</string>
@@ -421,7 +413,6 @@
     <string name="file_migration_source_not_readable_title">Le dossier n\'est pas lisible !</string>
     <string name="file_migration_source_not_readable">Souhaitez-vous modifier le chemin de stockage pour %1$s ?\n\nNote : toutes les données devront être à nouveau téléchargées.</string>
 
-    <string name="prefs_category_accounts">Comptes</string>
     <string name="prefs_add_account">Ajouter un compte</string>
     <string name="drawer_manage_accounts">Gérer les comptes</string>
     <string name="auth_redirect_non_secure_connection_title">Le connexion sécurisée est redirigée vers une route non-sécurisée.</string>
diff --git a/src/main/res/values-he/strings.xml b/src/main/res/values-he/strings.xml
index 607581e9db..eb8768a094 100644
--- a/src/main/res/values-he/strings.xml
+++ b/src/main/res/values-he/strings.xml
@@ -46,9 +46,6 @@
     <string name="file_list_loading">בטעינה …</string>
     <string name="local_file_list_empty">אין קבצים בתיקייה זו:</string>
     <string name="file_list_folder">תקיה</string>
-    <string name="file_list_folders">תקיות</string>
-    <string name="file_list_file">קובץ</string>
-    <string name="file_list_files">קובץ</string>
     <string name="filedetails_select_file">יש לגעת בקובץ כדי להציג פרטים נוספים.</string>
     <string name="filedetails_size">גודל:</string>
     <string name="filedetails_type">סוג:</string>
@@ -65,7 +62,6 @@
     <string name="common_cancel">ביטול</string>
     <string name="common_back">אחורה</string>
     <string name="common_save">שמירה</string>
-    <string name="common_save_exit">שמירה ויציאה</string>
     <string name="common_error">שגיאה</string>
     <string name="common_loading">בטעינה …</string>
     <string name="common_unknown">לא ידוע</string>
@@ -74,7 +70,6 @@
     <string name="about_title">על אודות</string>
     <string name="change_password">שינוי ססמה</string>
     <string name="delete_account">הסרת חשבון</string>
-    <string name="create_account">יצירת חשבון</string>
     <string name="upload_chooser_title">העלאה מהמיקום …</string>
     <string name="uploader_info_dirname">שם התיקייה</string>
     <string name="uploader_upload_in_progress_ticker">מתבצעת העלאה …</string>
@@ -239,7 +234,6 @@
 
     <string name="file_migration_finish_button">סיים</string>
     <string name="file_migration_ok_finished">הסתיים</string>
-    <string name="prefs_category_accounts">חשבונות</string>
     <string name="prefs_add_account">הוספת חשבון</string>
     <string name="drawer_manage_accounts">ניהול חשבונות</string>
     <string name="actionbar_logger">לוגים</string>
diff --git a/src/main/res/values-hu-rHU/strings.xml b/src/main/res/values-hu-rHU/strings.xml
index 5c1a6d0202..ad3842060d 100644
--- a/src/main/res/values-hu-rHU/strings.xml
+++ b/src/main/res/values-hu-rHU/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Kisebbek elöl</string>
 
     <string name="drawer_item_all_files">Összes fájl</string>
-    <string name="drawer_item_files">Fájlok</string>
     <string name="drawer_item_home">Saját mappa</string>
     <string name="drawer_item_favorites">Kedvencek</string>
     <string name="drawer_item_photos">Fényképek</string>
@@ -89,7 +88,6 @@
     <string name="file_list_empty_headline">Nem találhatók fájlok itt</string>
     <string name="folder_list_empty_headline">Itt nincsenek mappák</string>
     <string name="file_list_empty">Töltsön fel új tartalmat vagy szinkronizáljon az eszközeivel</string>
-    <string name="file_list_empty_favorites">Jelölj meg néhány fájl kedvencként vagy szinkronizálj az eszközeiddel.</string>
     <string name="file_list_empty_favorites_filter_list">Azok a fájlok és mappák, amiket kedvenceknek jelöl meg itt fognak megjelenni.</string>
     <string name="file_list_empty_favorites_filter">A keresés nem talált kedvenc fájlokat.</string>
     <string name="file_list_loading">Betöltés&#8230;</string>
@@ -116,9 +114,6 @@
     <string name="upload_list_empty_text">Tölts fel néhány tartalmat, vagy aktiváld az azonnali feltöltést.</string>
     <string name="upload_list_empty_text_auto_upload">Az automatikus feltöltés aktiválásához tölts fel valami tartalmat.</string>
     <string name="file_list_folder">mappa</string>
-    <string name="file_list_folders">mappák</string>
-    <string name="file_list_file">fájl</string>
-    <string name="file_list_files">fájl</string>
     <string name="filedetails_select_file">Érintsen meg egy fájlt a további információkért.</string>
     <string name="filedetails_size">Méret:</string>
     <string name="filedetails_type">Tipus:</string>
@@ -137,7 +132,6 @@
     <string name="common_cancel">Mégsem</string>
     <string name="common_back">Vissza</string>
     <string name="common_save">Mentés</string>
-    <string name="common_save_exit">Mentés és kilépés</string>
     <string name="common_error">Hiba</string>
     <string name="common_loading">Betöltés &#8230;</string>
     <string name="common_unknown">ismeretlen</string>
@@ -147,7 +141,6 @@
     <string name="about_title">Névjegy</string>
     <string name="change_password">A jelszó megváltoztatása</string>
     <string name="delete_account">Fiók eltávolítása</string>
-    <string name="create_account">Fiók létrehozása</string>
     <string name="active_user">Aktív felhasználó</string>
     <string name="upload_chooser_title">Feltöltés innen &#8230;</string>
     <string name="uploader_info_dirname">Mappa neve</string>
@@ -334,7 +327,6 @@
     <string name="file_migration_cleaning">Tisztítás&#8230;</string>
     <string name="file_migration_ok_finished">Kész</string>
     <string name="file_migration_override_data_folder">Csere</string>
-    <string name="prefs_category_accounts">Fiókok</string>
     <string name="prefs_add_account">Fiók hozzáadása</string>
     <string name="drawer_manage_accounts">Fiókok kezelése</string>
     <string name="actionbar_logger">Naplók</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 27e5258611..d88e36e384 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -57,9 +57,6 @@
     <string name="file_list_empty_headline_search">Tidak ada hasil di folder ini</string>
     <string name="upload_list_empty_headline">Tidak ada unggahan yang tersedia</string>
     <string name="file_list_folder">folder</string>
-    <string name="file_list_folders">folder</string>
-    <string name="file_list_file">berkas</string>
-    <string name="file_list_files">berkas</string>
     <string name="filedetails_select_file">Sentuh pada berkas untuk menampilkan informasi tambahan</string>
     <string name="filedetails_size">Ukuran:</string>
     <string name="filedetails_type">Tipe:</string>
@@ -76,7 +73,6 @@
     <string name="common_cancel">Batal</string>
     <string name="common_back">Kembali</string>
     <string name="common_save">Simpan</string>
-    <string name="common_save_exit">Simpan &amp; keluar</string>
     <string name="common_error">Kesalahan</string>
     <string name="common_loading">Memuat &#8230;</string>
     <string name="common_unknown">tidak diketahui</string>
@@ -85,7 +81,6 @@
     <string name="about_title">Tentang</string>
     <string name="change_password">Ubah sandi</string>
     <string name="delete_account">Hapus akun</string>
-    <string name="create_account">Buat akun</string>
     <string name="upload_chooser_title">Unggah dari &#8230;</string>
     <string name="uploader_info_dirname">Nama folder</string>
     <string name="uploader_upload_in_progress_ticker">Mengungggah &#8230;</string>
@@ -263,7 +258,6 @@
     <string name="file_migration_updating_index">Memperbarui indeks&#8230;</string>
     <string name="file_migration_cleaning">Membersihkan&#8230;</string>
     <string name="file_migration_ok_finished">Selesai</string>
-    <string name="prefs_category_accounts">Akun</string>
     <string name="prefs_add_account">Tambah akun</string>
     <string name="drawer_manage_accounts">Kelola akun</string>
     <string name="actionbar_logger">Log</string>
diff --git a/src/main/res/values-is/strings.xml b/src/main/res/values-is/strings.xml
index 40d1ded87b..ed6e89ba43 100644
--- a/src/main/res/values-is/strings.xml
+++ b/src/main/res/values-is/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Minnsta fyrst</string>
 
     <string name="drawer_item_all_files">Allar skrár</string>
-    <string name="drawer_item_files">Skrár</string>
     <string name="drawer_item_home">Heim</string>
     <string name="drawer_item_favorites">Eftirlæti</string>
     <string name="drawer_item_photos">Ljósmyndir</string>
@@ -87,7 +86,6 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
     <string name="file_list_seconds_ago">sek. síðan</string>
     <string name="file_list_empty_headline">Engar skrár hér</string>
     <string name="file_list_empty">Sendu inn eitthvað efni eða samstilltu við tækin þín.</string>
-    <string name="file_list_empty_favorites">Gerðu eitthvað efni að uppáhaldi eða samstilltu við tækin þín.</string>
     <string name="file_list_empty_favorites_filter_list">Skrár og möppur sem þú merkir sem eftirlæti birtast hér</string>
     <string name="file_list_empty_favorites_filter">Leitin skilaði engum eftirlætisskrám</string>
     <string name="file_list_loading">Hleð inn&#8230;</string>
@@ -113,9 +111,6 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
     <string name="upload_list_empty_text">Sendu inn eitthvað efni eða virkjaðu beina innsendingu.</string>
     <string name="upload_list_empty_text_auto_upload">Sendu inn einhverjar myndir eða virkjaðu sjálfvirka innsendingu.</string>
     <string name="file_list_folder">mappa</string>
-    <string name="file_list_folders">möppur</string>
-    <string name="file_list_file">skrá</string>
-    <string name="file_list_files">skrár</string>
     <string name="filedetails_select_file">Bankaðu á skrá til að sjá ítarlegri upplýsingar.</string>
     <string name="filedetails_size">Stærð:</string>
     <string name="filedetails_type">Tegund:</string>
@@ -135,7 +130,6 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
     <string name="common_cancel">Hætta við</string>
     <string name="common_back">Til baka</string>
     <string name="common_save">Vista</string>
-    <string name="common_save_exit">Vista &amp; fara út</string>
     <string name="common_error"><strong>Villa</strong></string>
     <string name="common_loading">Hleð inn &#8230;</string>
     <string name="common_unknown">óþekkt</string>
@@ -145,7 +139,6 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
     <string name="change_password">Breyta lykilorði</string>
     <string name="delete_account">Fjarlægja notandaaðgang</string>
     <string name="delete_account_warning">Eyða aðgangnum %s ásamt öllum tilheyrandi skrám á tölvunni?\n\nEyðingu er ekki hægt að afturkalla.</string>
-    <string name="create_account">Stofna aðgang</string>
     <string name="upload_chooser_title">Senda inn frá &#8230;</string>
     <string name="uploader_info_dirname">Nafn möppu</string>
     <string name="uploader_upload_in_progress_ticker">Sendi inn &#8230;</string>
@@ -330,7 +323,6 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Aðeins senda inn á þráðlausu WiFi-neti</string>
-    <string name="instant_upload_on_wifi">Aðeins senda inn myndir á þráðlausu WiFi-neti</string>
     <string name="instant_video_upload_on_wifi">Aðeins senda inn myndskeið á þráðlausu WiFi-neti</string>
     <string name="instant_video_upload_on_charging">Einungis senda inn þegar verið er að hlaða</string>
     <string name="instant_upload_on_charging">Einungis senda inn þegar verið er að hlaða</string>
@@ -411,7 +403,6 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
     <string name="file_migration_source_not_readable_title">Upprunamappa er ekki lesanleg!</string>
     <string name="file_migration_source_not_readable">Viltu breyta slóð á geymslurými yfir í %1$s?\n\nAthugaðu: Sækja þarf öll gögn aftur.</string>
 
-    <string name="prefs_category_accounts">Notandaaðgangar</string>
     <string name="prefs_add_account">Bæta við notandaaðgangi</string>
     <string name="drawer_manage_accounts">Sýsla með notandaaðganga</string>
     <string name="auth_redirect_non_secure_connection_title">Öruggri tengingu endurbeint í gegnum óörugga leið.</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 1bc19bde8d..ecea771c6f 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Prima i più piccoli</string>
 
     <string name="drawer_item_all_files">Tutti i file</string>
-    <string name="drawer_item_files">File</string>
     <string name="drawer_item_home">Home</string>
     <string name="drawer_item_favorites">Preferiti</string>
     <string name="drawer_item_photos">Foto</string>
@@ -89,7 +88,6 @@
     <string name="file_list_empty_headline">Qui non c\'è alcun file</string>
     <string name="folder_list_empty_headline">Qui non c\'è alcuna cartella</string>
     <string name="file_list_empty">Carica alcuni contenuti o sincronizza con i tuoi dispositivi.</string>
-    <string name="file_list_empty_favorites">Rendi preferiti alcuni file o sincronizza con i tuoi dispositivi.</string>
     <string name="file_list_empty_favorites_filter_list">I file e le cartelle che marchi come preferiti saranno mostrati qui</string>
     <string name="file_list_empty_favorites_filter">La tua ricerca non ha restituito alcun file preferito.</string>
     <string name="file_list_loading">Caricamento in corso&#8230;</string>
@@ -116,9 +114,6 @@
     <string name="upload_list_empty_text">Carica alcuni contenuti o attiva il caricamento istantaneo.</string>
     <string name="upload_list_empty_text_auto_upload">Carica alcuni contenuti o attiva il caricamento automatico.</string>
     <string name="file_list_folder">cartella</string>
-    <string name="file_list_folders">cartelle</string>
-    <string name="file_list_file">file</string>
-    <string name="file_list_files">file</string>
     <string name="filedetails_select_file">Tocca un file per visualizzare informazioni aggiuntive.</string>
     <string name="filedetails_size">Dimensione:</string>
     <string name="filedetails_type">Tipo:</string>
@@ -138,7 +133,6 @@
     <string name="common_cancel">Annulla</string>
     <string name="common_back">Indietro</string>
     <string name="common_save">Salva</string>
-    <string name="common_save_exit">Salva ed esci</string>
     <string name="common_error">Errore</string>
     <string name="common_loading">Caricamento in corso &#8230;</string>
     <string name="common_unknown">sconosciuto</string>
@@ -149,7 +143,6 @@
     <string name="change_password">Modifica la password</string>
     <string name="delete_account">Rimuovi account</string>
     <string name="delete_account_warning">Vuoi eliminare l\'account %s con tutti i file locali?\n\nL\'eliminazione non può essere annullata.</string>
-    <string name="create_account">Crea account</string>
     <string name="avatar">Avatar</string>
     <string name="active_user">Utente attivo</string>
     <string name="upload_chooser_title">Carica file da &#8230;</string>
@@ -338,7 +331,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Carica solo su Wi-Fi</string>
-    <string name="instant_upload_on_wifi">Carica immagini solo in Wi-Fi</string>
     <string name="instant_video_upload_on_wifi">Carica video solo in Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Carica solo durante la ricarica</string>
     <string name="instant_upload_on_charging">Carica solo durante la ricarica</string>
@@ -421,7 +413,6 @@
     <string name="file_migration_source_not_readable_title">Cartella sorgente non leggibile!</string>
     <string name="file_migration_source_not_readable">Vuoi davvero cambiare il percorso di archiviazione a %1$s?\n\nNota: tutti i dati dovranno essere scaricati nuovamente.</string>
 
-    <string name="prefs_category_accounts">Account</string>
     <string name="prefs_add_account">Aggiungi account</string>
     <string name="drawer_manage_accounts">Gestisci account</string>
     <string name="auth_redirect_non_secure_connection_title">Connessione sicura rediretta su un percorso non sicuro.</string>
diff --git a/src/main/res/values-ja-rJP/strings.xml b/src/main/res/values-ja-rJP/strings.xml
index 30fd425dfe..d091edb3f0 100644
--- a/src/main/res/values-ja-rJP/strings.xml
+++ b/src/main/res/values-ja-rJP/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">小さいものが最初</string>
 
     <string name="drawer_item_all_files">すべてのファイル</string>
-    <string name="drawer_item_files">ファイル</string>
     <string name="drawer_item_home">ホーム</string>
     <string name="drawer_item_favorites">お気に入り</string>
     <string name="drawer_item_photos">写真</string>
@@ -87,7 +86,6 @@
     <string name="file_list_empty_headline">ここにファイルはありません</string>
     <string name="folder_list_empty_headline">フォルダーがありません</string>
     <string name="file_list_empty">コンテンツをアップロードするか、デバイスと同期してください。</string>
-    <string name="file_list_empty_favorites">ファイルをお気に入りに登録するか、デバイスと同期してください。</string>
     <string name="file_list_empty_favorites_filter_list">お気に入りに登録されたファイルやフォルダーがここに表示されます</string>
     <string name="file_list_empty_favorites_filter">お気に入りのファイルが見つかりませんでした。</string>
     <string name="file_list_loading">読込中&#8230;</string>
@@ -113,9 +111,6 @@
     <string name="upload_list_empty_text">コンテンツをアップロードするか、インスタントアップロードを有効にしてください。</string>
     <string name="upload_list_empty_text_auto_upload">何かコンテンツをアップロードするか、自動アップロードを有効にしてください。</string>
     <string name="file_list_folder">フォルダー</string>
-    <string name="file_list_folders">フォルダー</string>
-    <string name="file_list_file">ファイル</string>
-    <string name="file_list_files">ファイル</string>
     <string name="filedetails_select_file">ファイルをタップすると追加情報が表示されます。</string>
     <string name="filedetails_size">サイズ:</string>
     <string name="filedetails_type">タイプ:</string>
@@ -134,7 +129,6 @@
     <string name="common_cancel">キャンセル</string>
     <string name="common_back">戻る</string>
     <string name="common_save">保存</string>
-    <string name="common_save_exit">保存 &amp; 終了</string>
     <string name="common_error">エラー</string>
     <string name="common_loading">読込中&#8230;</string>
     <string name="common_unknown">不明</string>
@@ -145,7 +139,6 @@
     <string name="change_password">パスワードを変更</string>
     <string name="delete_account">アカウント削除</string>
     <string name="delete_account_warning">アカウント%sに紐づく全てのローカルファイルを削除しますか？\n\nこの作業は取り消すことができません。</string>
-    <string name="create_account">アカウントを作成</string>
     <string name="avatar">アバター</string>
     <string name="active_user">アクティブなユーザー</string>
     <string name="upload_chooser_title">アップロード &#8230;</string>
@@ -337,7 +330,6 @@
     <string name="file_migration_updating_index">インデックスの更新中&#8230;</string>
     <string name="file_migration_cleaning">クリーニング中&#8230;</string>
     <string name="file_migration_ok_finished">完了</string>
-    <string name="prefs_category_accounts">アカウント</string>
     <string name="prefs_add_account">アカウントを追加</string>
     <string name="drawer_manage_accounts">アカウント管理</string>
     <string name="actionbar_logger">ログ</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 037d373467..76716c70a6 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">작은 것 먼저</string>
 
     <string name="drawer_item_all_files">모든 파일</string>
-    <string name="drawer_item_files">파일</string>
     <string name="drawer_item_home">홈</string>
     <string name="drawer_item_favorites">즐겨찾기</string>
     <string name="drawer_item_photos">사진</string>
@@ -76,15 +75,11 @@
     <string name="file_list_seconds_ago">초 지남</string>
     <string name="file_list_empty_headline">여기에 파일이 없음</string>
     <string name="file_list_empty">콘텐츠를 업로드 하거나 기기와 동기화 하세요.</string>
-    <string name="file_list_empty_favorites">몇몇 파일을 즐겨찾기 하거나 기기와 동기화 하세요.</string>
     <string name="file_list_empty_favorites_filter_list">즐겨찾기 표시한 파일과 폴더가 여기에 나타납니다</string>
     <string name="file_list_loading">불러오는 중&#8230;</string>
     <string name="local_file_list_empty">이 폴더에 파일이 없습니다.</string>
     <string name="file_list_empty_text_photos">몇몇 사진을 업로드 하거나 자동 업로드를 켜세요.</string>
     <string name="file_list_folder">폴더</string>
-    <string name="file_list_folders">폴더</string>
-    <string name="file_list_file">파일</string>
-    <string name="file_list_files">파일</string>
     <string name="filedetails_select_file">파일을 누르면 추가 정보가 표시됩니다.</string>
     <string name="filedetails_size">크기:</string>
     <string name="filedetails_type">종류:</string>
@@ -102,7 +97,6 @@
     <string name="common_cancel">취소</string>
     <string name="common_back">뒤로</string>
     <string name="common_save">저장</string>
-    <string name="common_save_exit">저장 &amp; 종료</string>
     <string name="common_error">오류</string>
     <string name="common_loading">불러오는 중&#8230;</string>
     <string name="common_unknown">알 수 없음</string>
@@ -111,7 +105,6 @@
     <string name="about_title">정보</string>
     <string name="change_password">암호 변경</string>
     <string name="delete_account">계정 삭제</string>
-    <string name="create_account">계정 만들기</string>
     <string name="upload_chooser_title">다음에서 업로드&#8230;</string>
     <string name="uploader_info_dirname">폴더 이름</string>
     <string name="uploader_upload_in_progress_ticker">업로드 중&#8230;</string>
@@ -288,7 +281,6 @@
     <string name="update_link_forbidden_permissions">이 공유를 업데이트할</string>
     <string name="downloader_download_file_not_found">이 파일을 서버에서 더 이상 사용할 수 없습니다</string>
 
-    <string name="prefs_category_accounts">계정</string>
     <string name="prefs_add_account">계정 추가</string>
     <string name="drawer_manage_accounts">계정 관리</string>
     <string name="actionbar_logger">로그</string>
diff --git a/src/main/res/values-lv/strings.xml b/src/main/res/values-lv/strings.xml
index 5c59a6ddfc..61847b0c15 100644
--- a/src/main/res/values-lv/strings.xml
+++ b/src/main/res/values-lv/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Mazākie pirms</string>
 
     <string name="drawer_item_all_files">Visas datnes</string>
-    <string name="drawer_item_files">Faili</string>
     <string name="drawer_item_home">Mājas</string>
     <string name="drawer_item_favorites">Iecienītie</string>
     <string name="drawer_item_photos">Bildes</string>
@@ -78,9 +77,6 @@
     <string name="local_file_list_empty">Šajā mapē nav datņu</string>
     <string name="upload_list_empty_headline">Augšupielādes nav pieejamas.</string>
     <string name="file_list_folder">mape</string>
-    <string name="file_list_folders">mapes</string>
-    <string name="file_list_file">datne</string>
-    <string name="file_list_files">datnes</string>
     <string name="filedetails_select_file">Uzsit uz datnes, lai redzētu papildinformāciju.</string>
     <string name="filedetails_size">Izmērs:</string>
     <string name="filedetails_type">Tips:</string>
@@ -97,7 +93,6 @@
     <string name="common_cancel">Atcelt</string>
     <string name="common_back">Atpakaļ</string>
     <string name="common_save">Saglabāt</string>
-    <string name="common_save_exit">Saglabāt &amp; iziet</string>
     <string name="common_error">Kļūda</string>
     <string name="common_loading">Ielādē &#8230;</string>
     <string name="common_unknown">nezināms</string>
@@ -105,7 +100,6 @@
     <string name="about_title">Par</string>
     <string name="change_password">Mainīt paroli</string>
     <string name="delete_account">Noņemt kontu</string>
-    <string name="create_account">Izveidot kontu</string>
     <string name="upload_chooser_title">Augšupielādēt no &#8230;</string>
     <string name="uploader_info_dirname">Mapes nosaukums</string>
     <string name="uploader_upload_in_progress_ticker">Augšupielādē &#8230;</string>
@@ -269,7 +263,6 @@
     <string name="file_migration_updating_index">Indeksa atjaunināšana&#8230;</string>
     <string name="file_migration_cleaning">Tīrīšana&#8230;</string>
     <string name="file_migration_ok_finished">Pabeigts</string>
-    <string name="prefs_category_accounts">Konti</string>
     <string name="prefs_add_account">Pievienot kontu</string>
     <string name="drawer_manage_accounts">Pārvaldīt kontus</string>
     <string name="actionbar_logger">Žurnāl faili</string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index 535590d060..14aa7be497 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Minste først</string>
 
     <string name="drawer_item_all_files">Alle filer</string>
-    <string name="drawer_item_files">Filer</string>
     <string name="drawer_item_home">Hjem</string>
     <string name="drawer_item_favorites">Favoritter</string>
     <string name="drawer_item_photos">Bilder</string>
@@ -89,7 +88,6 @@
     <string name="file_list_empty_headline">Ingen filer her</string>
     <string name="folder_list_empty_headline">Ingen mapper her</string>
     <string name="file_list_empty">Last opp innhold eller synkroniser med enhetene dine.</string>
-    <string name="file_list_empty_favorites">Marker noen filer som favoritter eller synkroniser enhetene dine.</string>
     <string name="file_list_empty_favorites_filter_list">Filer og mapper du markerer som favoritter vil vises her</string>
     <string name="file_list_empty_favorites_filter">Din spørring returnerte ingen filer markert som favoritter.</string>
     <string name="file_list_loading">Laster&#8230;</string>
@@ -116,9 +114,6 @@
     <string name="upload_list_empty_text">Last opp innhold eller aktiver umiddelbar opplasting.</string>
     <string name="upload_list_empty_text_auto_upload">Last opp noe innhold eller aktiver automatisk opplasting!</string>
     <string name="file_list_folder">mappe</string>
-    <string name="file_list_folders">mapper</string>
-    <string name="file_list_file">fil</string>
-    <string name="file_list_files">fil</string>
     <string name="filedetails_select_file">Trykk på en fil for å vise ekstra informasjon.</string>
     <string name="filedetails_size">Størrelse:</string>
     <string name="filedetails_type">Type:</string>
@@ -138,7 +133,6 @@
     <string name="common_cancel">Avbryt</string>
     <string name="common_back">Tilbake</string>
     <string name="common_save">Lagre</string>
-    <string name="common_save_exit">Lagre &amp; avslutt</string>
     <string name="common_error">Feil</string>
     <string name="common_loading">Laster &#8230;</string>
     <string name="common_unknown">ukjent</string>
@@ -149,7 +143,6 @@
     <string name="change_password">Endre passord</string>
     <string name="delete_account">Fjern konto</string>
     <string name="delete_account_warning">Slett kontoen %s med alle lokale filer?\n\nSletting kan ikke angres.</string>
-    <string name="create_account">Opprett konto</string>
     <string name="avatar">Avatar</string>
     <string name="active_user">Aktiv bruker</string>
     <string name="upload_chooser_title">Last opp fra &#8230;</string>
@@ -338,7 +331,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Bare last opp på Wi-Fi</string>
-    <string name="instant_upload_on_wifi">Bare last opp bilder på Wi-Fi</string>
     <string name="instant_video_upload_on_wifi">Last kun opp filmer via Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Last kun opp under lading</string>
     <string name="instant_upload_on_charging">Last kun opp under lading</string>
@@ -421,7 +413,6 @@
     <string name="file_migration_source_not_readable_title">Målmappa er ikke lesbar!</string>
     <string name="file_migration_source_not_readable">Ønsker du fremdeles å endre lagringssti til %1$s ?\n\nMerk: All data vil måtte lastes ned igjen.</string>
 
-    <string name="prefs_category_accounts">Kontoer</string>
     <string name="prefs_add_account">Legg til en konto</string>
     <string name="drawer_manage_accounts">Håndter kontoer</string>
     <string name="auth_redirect_non_secure_connection_title">Sikker tilkobling videresendes gjennom en usikker rute.</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 6fb80d3fc6..29526d2732 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Kleinste eerst</string>
 
     <string name="drawer_item_all_files">Alle bestanden</string>
-    <string name="drawer_item_files">Bestanden</string>
     <string name="drawer_item_home">Thuis</string>
     <string name="drawer_item_favorites">Favorieten</string>
     <string name="drawer_item_photos">Foto\'s</string>
@@ -90,7 +89,6 @@ Kies er eentje van een provider.</string>
     <string name="file_list_empty_headline">Hier geen bestanden</string>
     <string name="folder_list_empty_headline">Hier zijn geen bestanden</string>
     <string name="file_list_empty">Upload je inhoud of synchroniseer met je apparaten.</string>
-    <string name="file_list_empty_favorites">Maak enkele bestanden favoriet of synchroniseer met je apparaten!</string>
     <string name="file_list_empty_favorites_filter_list">Bestanden en mappen gemarkeerd als favoriet worden hier getoond</string>
     <string name="file_list_empty_favorites_filter">Geen favoriete bestanden gevonden voor je zoekopdracht!</string>
     <string name="file_list_loading">Laden&#8230;</string>
@@ -117,9 +115,6 @@ Kies er eentje van een provider.</string>
     <string name="upload_list_empty_text">Upload enkele gegevens of activeer directe upload.</string>
     <string name="upload_list_empty_text_auto_upload">Upload enkele gegevens of activeer auto-upload.</string>
     <string name="file_list_folder">map</string>
-    <string name="file_list_folders">mappen</string>
-    <string name="file_list_file">bestand</string>
-    <string name="file_list_files">bestanden</string>
     <string name="filedetails_select_file">Druk op een bestand om extra informatie weer te geven</string>
     <string name="filedetails_size">Grootte:</string>
     <string name="filedetails_type">Type:</string>
@@ -139,7 +134,6 @@ Kies er eentje van een provider.</string>
     <string name="common_cancel">Annuleren</string>
     <string name="common_back">Terug</string>
     <string name="common_save">Bewaren</string>
-    <string name="common_save_exit">Opslaan &amp; verlaten</string>
     <string name="common_error">Fout</string>
     <string name="common_loading">Laden&#160;&#8230;</string>
     <string name="common_unknown">onbekend</string>
@@ -150,7 +144,6 @@ Kies er eentje van een provider.</string>
     <string name="change_password">Wachtwoord wijzigen</string>
     <string name="delete_account">Account verwijderen</string>
     <string name="delete_account_warning">Verwijder account %s met alle lokale bestanden? Het verwijderen kan niet worden teruggedraaid.</string>
-    <string name="create_account">Account aanmaken</string>
     <string name="avatar">Avatar</string>
     <string name="active_user">Actieve gebruiker</string>
     <string name="upload_chooser_title">Upload van &#8230;</string>
@@ -339,7 +332,6 @@ Kies er eentje van een provider.</string>
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Alleen uploaden via Wi-Fi</string>
-    <string name="instant_upload_on_wifi">Alleen afbeeldingen uploaden via Wi-Fi</string>
     <string name="instant_video_upload_on_wifi">Alleen video\'s uploaden via Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Alleen uploaden bij opladen</string>
     <string name="instant_upload_on_charging">Alleen uploaden bij opladen</string>
@@ -422,7 +414,6 @@ Kies er eentje van een provider.</string>
     <string name="file_migration_source_not_readable_title">Bronmap niet leesbaar!</string>
     <string name="file_migration_source_not_readable">Wil je echt het opslagpad wijzigen naar  %1$s?\n\nLet op: alle gegevens moeten opnieuw worden gedownloaded.</string>
 
-    <string name="prefs_category_accounts">Accounts</string>
     <string name="prefs_add_account">Account toevoegen</string>
     <string name="drawer_manage_accounts">Accounts beheren </string>
     <string name="auth_redirect_non_secure_connection_title">De beveiligde verbinding is omgeleid via een onveilige route.</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 2a053ca5d6..7ba3b863f1 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Najmniejsze najpierw</string>
 
     <string name="drawer_item_all_files">Wszystkie pliki</string>
-    <string name="drawer_item_files">Pliki</string>
     <string name="drawer_item_home">Start</string>
     <string name="drawer_item_favorites">Ulubione</string>
     <string name="drawer_item_photos">Zdjęcia</string>
@@ -82,7 +81,6 @@
     <string name="file_list_seconds_ago">sekund temu</string>
     <string name="file_list_empty_headline">Brak plików</string>
     <string name="file_list_empty">Wyślij zawartość lub synchronizuj ją ze swoimi urządzeniami</string>
-    <string name="file_list_empty_favorites">Dodaj pliki do ulubionych lub synchronizuj je ze swoimi urządzeniami</string>
     <string name="file_list_empty_favorites_filter_list">Tutaj znajdziesz pliki i foldery oznaczone jako ulubione</string>
     <string name="file_list_empty_favorites_filter">Twoje wyszukiwanie nie zwróciło żadnych ulubionych plików</string>
     <string name="file_list_loading">Wczytywanie&#8230;</string>
@@ -107,9 +105,6 @@
     <string name="upload_list_empty_text">Wyślij zawartość lub włącz wysyłanie natychmiastowe.</string>
     <string name="upload_list_empty_text_auto_upload">Wyślij zawartość lub włącz wysyłanie automatyczne.</string>
     <string name="file_list_folder">folder</string>
-    <string name="file_list_folders">foldery</string>
-    <string name="file_list_file">plik</string>
-    <string name="file_list_files">pliki</string>
     <string name="filedetails_select_file">Dotknij plik aby wyświetlić dodatkowe informacje</string>
     <string name="filedetails_size">Rozmiar:</string>
     <string name="filedetails_type">Typ:</string>
@@ -129,7 +124,6 @@
     <string name="common_cancel">Anuluj</string>
     <string name="common_back">Wróć</string>
     <string name="common_save">Zapisz</string>
-    <string name="common_save_exit">Zapisz i wyjdź</string>
     <string name="common_error">Błąd</string>
     <string name="common_loading">Wczytuję &#8230;</string>
     <string name="common_unknown">nieznane</string>
@@ -138,7 +132,6 @@
     <string name="about_title">O aplikacji</string>
     <string name="change_password">Zmień hasło</string>
     <string name="delete_account">Usuń konto</string>
-    <string name="create_account">Utwórz konto</string>
     <string name="upload_chooser_title">Wyślij plik z &#8230;</string>
     <string name="uploader_info_dirname">Nazwa folderu</string>
     <string name="uploader_upload_in_progress_ticker">Wysyłam &#8230;</string>
@@ -320,7 +313,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Wysyłaj tylko przez Wi-Fi</string>
-    <string name="instant_upload_on_wifi">Wysyłaj zdjęcia tylko przez Wi-Fi</string>
     <string name="instant_video_upload_on_wifi">Wysyłaj pliki wideo tylko przez Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Wysyłaj tylko podczas ładowania</string>
     <string name="instant_upload_on_charging">Wysyłaj tylko podczas ładowania</string>
@@ -394,7 +386,6 @@
     <string name="file_migration_source_not_readable_title">Nie można odczytać katalogu źródłowego!</string>
     <string name="file_migration_source_not_readable">Czy nadal chcesz zmienić ścieżkę przechowywania na %1$s?\n\nUwaga: Wszystkie dane będą musiały zostać pobrane ponownie.</string>
 
-    <string name="prefs_category_accounts">Konta</string>
     <string name="prefs_add_account">Dodaj konto</string>
     <string name="drawer_manage_accounts">Zarządzaj kontami</string>
     <string name="auth_redirect_non_secure_connection_title">Bezpieczne połączenie jest przekierowywane przez niezabezpieczone trasy.</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 140bde93b8..f35c99b544 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Menores primeiro</string>
 
     <string name="drawer_item_all_files">Todos os arquivos</string>
-    <string name="drawer_item_files">Arquivos</string>
     <string name="drawer_item_home">Início</string>
     <string name="drawer_item_favorites">Favoritos</string>
     <string name="drawer_item_photos">Fotos</string>
@@ -89,7 +88,6 @@
     <string name="file_list_empty_headline">Nenhum arquivo aqui</string>
     <string name="folder_list_empty_headline">Sem pastas aqui</string>
     <string name="file_list_empty">Enviar um conteúdo ou sincronizar com seus dispositivos.</string>
-    <string name="file_list_empty_favorites">Favoritar algum arquivo ou sincronizar com seus dispositivos.</string>
     <string name="file_list_empty_favorites_filter_list">Arquivos e pastas favoritas serão mostradas aqui</string>
     <string name="file_list_empty_favorites_filter">Sua pesquisa não retornou nenhum arquivo favorito.</string>
     <string name="file_list_loading">Carregando&#8230;</string>
@@ -116,9 +114,6 @@
     <string name="upload_list_empty_text">Enviar algum conteúdo ou ativar o envio automático.</string>
     <string name="upload_list_empty_text_auto_upload">Enviar algum conteúdo ou ativar o envio automático.</string>
     <string name="file_list_folder">pasta</string>
-    <string name="file_list_folders">pastas</string>
-    <string name="file_list_file">arquivo</string>
-    <string name="file_list_files">arquivos</string>
     <string name="filedetails_select_file">Toque em um arquivo para mostrar informações adicionais.</string>
     <string name="filedetails_size">Tamanho:</string>
     <string name="filedetails_type">Tipo:</string>
@@ -138,7 +133,6 @@
     <string name="common_cancel">Cancelar</string>
     <string name="common_back">Voltar</string>
     <string name="common_save">Salvar</string>
-    <string name="common_save_exit">Salvar &amp; sair</string>
     <string name="common_error">Erro</string>
     <string name="common_loading">Carregando &#8230;</string>
     <string name="common_unknown">desconhecido</string>
@@ -149,7 +143,6 @@
     <string name="change_password">Alterar senha</string>
     <string name="delete_account">Excluir conta</string>
     <string name="delete_account_warning">Excluir a conta %s e todos seus arquivos?\n\nEsta exclusão não pode ser desfeita.</string>
-    <string name="create_account">Criar conta</string>
     <string name="avatar">Avatar</string>
     <string name="active_user">Ativar usuário</string>
     <string name="upload_chooser_title">Enviar de &#8230;</string>
@@ -338,7 +331,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Somente enviar por Wi-Fi</string>
-    <string name="instant_upload_on_wifi">Somente enviar imagens por Wi-Fi</string>
     <string name="instant_video_upload_on_wifi">Somente enviar vídeos por Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Somente enviar quando carregando</string>
     <string name="instant_upload_on_charging">Somente enviar quando carregando</string>
@@ -421,7 +413,6 @@
     <string name="file_migration_source_not_readable_title">Diretório fonte não legível!</string>
     <string name="file_migration_source_not_readable">Quer realmente mudar o caminho de armazenamento para %1$s?\n\nAtenção: Todos os dados terão que ser baixados novamente.</string>
 
-    <string name="prefs_category_accounts">Contas</string>
     <string name="prefs_add_account">Adicionar uma conta</string>
     <string name="drawer_manage_accounts">Gerenciar contas</string>
     <string name="auth_redirect_non_secure_connection_title">A conexão segura foi redirecionada através de uma rota insegura.</string>
diff --git a/src/main/res/values-pt-rPT/strings.xml b/src/main/res/values-pt-rPT/strings.xml
index f10e6ceb15..d2f9573121 100644
--- a/src/main/res/values-pt-rPT/strings.xml
+++ b/src/main/res/values-pt-rPT/strings.xml
@@ -56,9 +56,6 @@
     <string name="local_file_list_empty">Não existem ficheiros nesta pasta.</string>
     <string name="upload_list_empty_headline">Não há carregamentos disponíveis.</string>
     <string name="file_list_folder">pasta</string>
-    <string name="file_list_folders">pastas</string>
-    <string name="file_list_file">ficheiro</string>
-    <string name="file_list_files">ficheiros</string>
     <string name="filedetails_select_file">Toque num ficheiro para visualizar a informação adicional.</string>
     <string name="filedetails_size">Tamanho:</string>
     <string name="filedetails_type">Tipo:</string>
@@ -75,7 +72,6 @@
     <string name="common_cancel">Cancelar</string>
     <string name="common_back">Voltar</string>
     <string name="common_save">Guardar</string>
-    <string name="common_save_exit">Guardar e sair</string>
     <string name="common_error">Erro</string>
     <string name="common_loading">A carregar&#8230;</string>
     <string name="common_unknown">desconhecido</string>
@@ -84,7 +80,6 @@
     <string name="about_title">Sobre</string>
     <string name="change_password">Alterar palavra-passe</string>
     <string name="delete_account">Remover conta</string>
-    <string name="create_account">Criar conta</string>
     <string name="upload_chooser_title">Carregar a partir de&#8230;</string>
     <string name="uploader_info_dirname">Nome da pasta</string>
     <string name="uploader_upload_in_progress_ticker">A carregar&#8230;</string>
@@ -249,7 +244,6 @@
     <string name="update_link_forbidden_permissions">para atualizar esta partilha</string>
     <string name="downloader_download_file_not_found">O ficheiro não está mais disponível no servidor</string>
 
-    <string name="prefs_category_accounts">Contas</string>
     <string name="prefs_add_account">Adicionar conta</string>
     <string name="actionbar_logger">Registos de Alterações</string>
 	<string name="log_send_history_button">Histórico de envio</string>
diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml
index 78b0d6f668..046af72049 100644
--- a/src/main/res/values-ro/strings.xml
+++ b/src/main/res/values-ro/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Cel mai mic mai întâi</string>
 
     <string name="drawer_item_all_files">Toate fișierele</string>
-    <string name="drawer_item_files">Fișiere</string>
     <string name="drawer_item_home">Acasă</string>
     <string name="drawer_item_favorites">Favorite</string>
     <string name="drawer_item_photos">Poze</string>
@@ -74,9 +73,6 @@
     <string name="file_list_empty_headline_search">Niciun element găsit în acest director</string>
     <string name="upload_list_empty_headline">Nu există încărcări disponibile</string>
     <string name="file_list_folder">director</string>
-    <string name="file_list_folders">directoare</string>
-    <string name="file_list_file">fișier</string>
-    <string name="file_list_files">fișier</string>
     <string name="filedetails_select_file">Selectați un fișier pentru a afișa informația adițională.</string>
     <string name="filedetails_size">Mărime:</string>
     <string name="filedetails_type">Tip:</string>
@@ -93,7 +89,6 @@
     <string name="common_cancel">Anulează</string>
     <string name="common_back">Înapoi</string>
     <string name="common_save">Salvează</string>
-    <string name="common_save_exit">Salvează &amp; ieși</string>
     <string name="common_error">Eroare</string>
     <string name="common_loading">Se încarcă...</string>
     <string name="common_unknown">necunoscut</string>
@@ -102,7 +97,6 @@
     <string name="about_title">Despre</string>
     <string name="change_password">Schimbă parola</string>
     <string name="delete_account">Sterge contul</string>
-    <string name="create_account">Crează cont</string>
     <string name="upload_chooser_title">Încarcă din...</string>
     <string name="uploader_info_dirname">Nume director</string>
     <string name="uploader_upload_in_progress_ticker">Se încărcarcă...</string>
@@ -281,7 +275,6 @@
     <string name="file_migration_updating_index">Indexul se actualizează&#8230;</string>
     <string name="file_migration_cleaning">Curățare&#8230;</string>
     <string name="file_migration_ok_finished">Finalizat</string>
-    <string name="prefs_category_accounts">Conturi</string>
     <string name="prefs_add_account">Adaugă cont</string>
     <string name="drawer_manage_accounts">Administrare conturi</string>
     <string name="actionbar_logger">Înregistrări</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index af4b138e3f..55a2cad830 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -22,7 +22,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Маленькие–большие</string>
 
     <string name="drawer_item_all_files">Все файлы</string>
-    <string name="drawer_item_files">Файлы</string>
     <string name="drawer_item_home">Главная</string>
     <string name="drawer_item_favorites">Избранное</string>
     <string name="drawer_item_photos">Фотографии</string>
@@ -91,7 +90,6 @@
     <string name="file_list_empty_headline">Здесь нет файлов</string>
     <string name="folder_list_empty_headline">Здесь нет каталогов</string>
     <string name="file_list_empty">Выгрузите что-нибудь или синхронизируйте со своими устройствами!</string>
-    <string name="file_list_empty_favorites">Добавьте файлы в избранное или синхронизируйте со своими устройствами!</string>
     <string name="file_list_empty_favorites_filter_list">Здесь появятся файлы и каталоги, отмеченные как избранные</string>
     <string name="file_list_empty_favorites_filter">По запросу избранных файлов не найдено.</string>
     <string name="file_list_loading">Загружается&#8230;</string>
@@ -118,9 +116,6 @@
     <string name="upload_list_empty_text">Выгрузите что-нибудь или включите моментальную загрузку!</string>
     <string name="upload_list_empty_text_auto_upload">Выгрузите что-нибудь или включите автоматическую выгрузку!</string>
     <string name="file_list_folder">каталог</string>
-    <string name="file_list_folders">каталоги</string>
-    <string name="file_list_file">файл</string>
-    <string name="file_list_files">файлы</string>
     <string name="filedetails_select_file">Нажмите на файл для отображения дополнительной информации.</string>
     <string name="filedetails_size">Размер:</string>
     <string name="filedetails_type">Тип:</string>
@@ -140,7 +135,6 @@
     <string name="common_cancel">Отменить</string>
     <string name="common_back">Назад</string>
     <string name="common_save">Сохранить</string>
-    <string name="common_save_exit">Сохранить и выйти</string>
     <string name="common_error">Ошибка</string>
     <string name="common_loading">Загружаю &#8230;</string>
     <string name="common_unknown">неизвестно</string>
@@ -151,7 +145,6 @@
     <string name="change_password">Сменить пароль</string>
     <string name="delete_account">Удалить аккаунт</string>
     <string name="delete_account_warning">Удалить аккаунт %s и все связанные с ним файлы?\n\n\Удаление не может быть отменено.</string>
-    <string name="create_account">Создать аккаунт</string>
     <string name="avatar">Аватар</string>
     <string name="active_user">Активный пользователь</string>
     <string name="upload_chooser_title">Выгрузить из &#8230;</string>
@@ -340,7 +333,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Выгружать только через Wi-Fi</string>
-    <string name="instant_upload_on_wifi">Выгружать изображения только через Wi-Fi</string>
     <string name="instant_video_upload_on_wifi">Выгружать видео только через Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Выгружать только при зарядке</string>
     <string name="instant_upload_on_charging">Выгружать только при зарядке</string>
@@ -423,7 +415,6 @@
     <string name="file_migration_source_not_readable_title">Исходный каталог недоступен для чтения!</string>
     <string name="file_migration_source_not_readable">Вы действительно хотите изменить расположение хранилища на %1$s?\n\nВнимание: придётся заново скачать все данные.</string>
 
-    <string name="prefs_category_accounts">Аккаунты</string>
     <string name="prefs_add_account">Добавить аккаунт</string>
     <string name="drawer_manage_accounts">Управление аккаунтами</string>
     <string name="auth_redirect_non_secure_connection_title">Безопасное соединение перенаправлено через небезопасный маршрут.</string>
diff --git a/src/main/res/values-sk-rSK/strings.xml b/src/main/res/values-sk-rSK/strings.xml
index 5f5a18075b..3c0b8a62cb 100644
--- a/src/main/res/values-sk-rSK/strings.xml
+++ b/src/main/res/values-sk-rSK/strings.xml
@@ -65,9 +65,6 @@
     <string name="file_list_empty_headline_search">Žiadne výsledky v tomto priečinku</string>
     <string name="upload_list_empty_headline">Žiadne súbory na nahratie nie sú dostupné</string>
     <string name="file_list_folder">priečinok</string>
-    <string name="file_list_folders">priečinky</string>
-    <string name="file_list_file">súbor</string>
-    <string name="file_list_files">súbor</string>
     <string name="filedetails_select_file">Viac informácií získate kliknutím na súbor.</string>
     <string name="filedetails_size">Veľkosť:</string>
     <string name="filedetails_type">Typ:</string>
@@ -84,7 +81,6 @@
     <string name="common_cancel">Zrušiť</string>
     <string name="common_back">Späť</string>
     <string name="common_save">Uložiť</string>
-    <string name="common_save_exit">Uložiť a ukončiť</string>
     <string name="common_error">Chyba</string>
     <string name="common_loading">Načítavam...</string>
     <string name="common_unknown">neznámy</string>
@@ -93,7 +89,6 @@
     <string name="about_title">O</string>
     <string name="change_password">Zmeniť heslo</string>
     <string name="delete_account">Odstrániť účet</string>
-    <string name="create_account">Vytvoriť účet</string>
     <string name="upload_chooser_title">Odoslať z ...</string>
     <string name="uploader_info_dirname">Názov priečinka</string>
     <string name="uploader_upload_in_progress_ticker">Odosielam ...</string>
@@ -272,7 +267,6 @@
     <string name="file_migration_updating_index">Aktualizujem zoznam&#8230;</string>
     <string name="file_migration_cleaning">Čistenie&#8230;</string>
     <string name="file_migration_ok_finished">Hotovo</string>
-    <string name="prefs_category_accounts">Účty</string>
     <string name="prefs_add_account">Pridať účet</string>
     <string name="drawer_manage_accounts">Správa účtov</string>
     <string name="actionbar_logger">Logy</string>
diff --git a/src/main/res/values-sl/strings.xml b/src/main/res/values-sl/strings.xml
index d4b297d55a..56a3011604 100644
--- a/src/main/res/values-sl/strings.xml
+++ b/src/main/res/values-sl/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Najmanjše</string>
 
     <string name="drawer_item_all_files">Vse datoteke</string>
-    <string name="drawer_item_files">Datoteke</string>
     <string name="drawer_item_home">Domov</string>
     <string name="drawer_item_favorites">Priljubljene</string>
     <string name="drawer_item_photos">Slike</string>
@@ -103,9 +102,6 @@
     <string name="upload_list_empty_text">Naloži kakšno vsebino ali vključi hipno nalaganje.</string>
     <string name="upload_list_empty_text_auto_upload">Naloži kakšno vsebino ali vključi samodejno nalaganje.</string>
     <string name="file_list_folder">mapa</string>
-    <string name="file_list_folders">mape</string>
-    <string name="file_list_file">datoteka</string>
-    <string name="file_list_files">datoteke</string>
     <string name="filedetails_select_file">Pritisnite na datoteko za prikaz dodatnih podrobnosti.</string>
     <string name="filedetails_size">Velikost:</string>
     <string name="filedetails_type">Vrsta:</string>
@@ -124,7 +120,6 @@
     <string name="common_cancel">Prekliči</string>
     <string name="common_back">Nazaj</string>
     <string name="common_save">Shrani</string>
-    <string name="common_save_exit">Shrani in končaj</string>
     <string name="common_error">Napaka</string>
     <string name="common_loading">Nalaganje &#8230;</string>
     <string name="common_unknown">neznano</string>
@@ -134,7 +129,6 @@
     <string name="about_title">O oblaku %1$s</string>
     <string name="change_password">Spremeni geslo</string>
     <string name="delete_account">Odstrani račun</string>
-    <string name="create_account">Ustvari račun</string>
     <string name="active_user">Aktivni uporabnik</string>
     <string name="upload_chooser_title">Pošlji datoteko iz &#8230;</string>
     <string name="uploader_info_dirname">Ime mape</string>
@@ -321,7 +315,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Nalagaj samo na WiFi-ju</string>
-    <string name="instant_upload_on_wifi">Naloži samo slike na WiFi-ju</string>
     <string name="instant_video_upload_on_wifi">Naloži samo posnetke na WiFi-ju</string>
     <string name="instant_video_upload_on_charging">Nalagaj samo med polnjenjem</string>
     <string name="instant_upload_on_charging">Nalagaj samo med polnjenjem</string>
@@ -404,7 +397,6 @@
     <string name="file_migration_source_not_readable_title">Izvorna mapa ni berljiva!</string>
     <string name="file_migration_source_not_readable">Ali še vedno želiš spremeniti mesto shrambe na %1$s?\n\nVedi: Vse podatke moram prebrati ponovno.</string>
 
-    <string name="prefs_category_accounts">Računi</string>
     <string name="prefs_add_account">Dodaj račun</string>
     <string name="drawer_manage_accounts">Uredi račune</string>
     <string name="actionbar_logger">Dnevnik</string>
diff --git a/src/main/res/values-sq/strings.xml b/src/main/res/values-sq/strings.xml
index a0c51b0a8c..cf2f9f354d 100644
--- a/src/main/res/values-sq/strings.xml
+++ b/src/main/res/values-sq/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Më i vogli në fillim</string>
 
     <string name="drawer_item_all_files">Të gjithë skedarët</string>
-    <string name="drawer_item_files">Skedarët</string>
     <string name="drawer_item_home">Kryefaqja</string>
     <string name="drawer_item_favorites">Të preferuarat</string>
     <string name="drawer_item_photos">Fotot</string>
@@ -89,7 +88,6 @@
     <string name="file_list_empty_headline">Këtu nuk ka asnjë skedar</string>
     <string name="folder_list_empty_headline">Këtu nuk ka dosje</string>
     <string name="file_list_empty">Ngarko disa të dhëna ose sinkronizo me pajisjet e tua!</string>
-    <string name="file_list_empty_favorites">Shto disa skedarë të preferuar ose sinkronizoji me pajisjet e tua</string>
     <string name="file_list_empty_favorites_filter_list">Skedarët dhe direktoritë që i shënoni si të preferuara do të shfaqen këtu</string>
     <string name="file_list_empty_favorites_filter">Kërkimi juaj nuk gjeti asnjë skedar të preferuar</string>
     <string name="file_list_loading">Po ngarkohet&#8230;</string>
@@ -116,9 +114,6 @@
     <string name="upload_list_empty_text">Ngarko disa të dhëna ose aktivizo ngarkimin e menjëhershëm.</string>
     <string name="upload_list_empty_text_auto_upload">Ngarko disa përmbajtje ose aktivizo ngarkimin direkt. </string>
     <string name="file_list_folder">dosje</string>
-    <string name="file_list_folders">dosje</string>
-    <string name="file_list_file">Skedar</string>
-    <string name="file_list_files">Skedar</string>
     <string name="filedetails_select_file">Prekni mbi një kartelë që të shfaqen të dhëna shtesë.</string>
     <string name="filedetails_size">Madhësi:</string>
     <string name="filedetails_type">Lloj:</string>
@@ -138,7 +133,6 @@
     <string name="common_cancel">Anuloje</string>
     <string name="common_back">Mbrapsht</string>
     <string name="common_save">Ruaj</string>
-    <string name="common_save_exit">Ruaje &amp; dil</string>
     <string name="common_error">Gabim</string>
     <string name="common_loading">Po ngarkohet &#8230;</string>
     <string name="common_unknown">panjohur</string>
@@ -149,7 +143,6 @@
     <string name="change_password">Ndryshoni fjalëkalimin</string>
     <string name="delete_account">Hiqe llogarinë</string>
     <string name="delete_account_warning">Fshij llogarinë %s me të gjithë skedarët lokalë?\n\nFshirja nuk mund të zhbëhet.</string>
-    <string name="create_account">Krijoni llogari</string>
     <string name="avatar">Avatari</string>
     <string name="active_user">Përdorues aktiv</string>
     <string name="upload_chooser_title">Ngarkojeni prej &#8230;</string>
@@ -338,7 +331,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Ngarko vetëm nëpërmjet WiFi</string>
-    <string name="instant_upload_on_wifi">Fotot ngarkoji vetëm përmes wifi-it</string>
     <string name="instant_video_upload_on_wifi">Videot ngarkoji vetëm përmes wifi-it</string>
     <string name="instant_video_upload_on_charging">Ngarkoni vetëm kur jeni duke e karikuar</string>
     <string name="instant_upload_on_charging">Ngarkoni vetëm kur jeni duke e karikuar</string>
@@ -421,7 +413,6 @@
     <string name="file_migration_source_not_readable_title">Direktoria burim nuk është lexueshme!</string>
     <string name="file_migration_source_not_readable">Dëshironi akoma të ndryshoni adresën e ruajtjes së %1$s?/n/nNote: Të gjitha të dhënat do të shkarkohen sërish. </string>
 
-    <string name="prefs_category_accounts">Llogari</string>
     <string name="prefs_add_account">Shtoni llogari</string>
     <string name="drawer_manage_accounts">Menaxhoni llogaritë</string>
     <string name="auth_redirect_non_secure_connection_title">Lidhja e sigurt është ridrejtuar përmes një rruge të pasigurt.</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 96db1d25ed..00bce83b11 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Најмање прво</string>
 
     <string name="drawer_item_all_files">Све датотеке</string>
-    <string name="drawer_item_files">Датотеке</string>
     <string name="drawer_item_home">Почетак</string>
     <string name="drawer_item_favorites">Фаворити</string>
     <string name="drawer_item_photos">Слике</string>
@@ -83,9 +82,6 @@
     <string name="file_list_loading">Учитавам&#8230;</string>
     <string name="local_file_list_empty">Нема датотека у овом директоријуму.</string>
     <string name="file_list_folder">директоријум</string>
-    <string name="file_list_folders">директоријуми</string>
-    <string name="file_list_file">датотека</string>
-    <string name="file_list_files">датетеке</string>
     <string name="filedetails_select_file">Кликните на датотеку ради приказа додатних информација.</string>
     <string name="filedetails_size">Величина:</string>
     <string name="filedetails_type">Врста:</string>
@@ -100,14 +96,12 @@
     <string name="common_cancel_sync">Откажи синхронизацију</string>
     <string name="common_cancel">Откажи</string>
     <string name="common_back">Назад</string>
-    <string name="common_save_exit">Сачувај и изађи</string>
     <string name="common_error">Грешка</string>
     <string name="common_loading">Учитавам &#8230;</string>
     <string name="common_error_unknown">Непозната грешка</string>
     <string name="about_title">О програму</string>
     <string name="change_password">Измени лозинку</string>
     <string name="delete_account">Уклони налог</string>
-    <string name="create_account">Креирај налог</string>
     <string name="upload_chooser_title">Отпреми из…</string>
     <string name="uploader_info_dirname">Назив директоријума</string>
     <string name="uploader_upload_in_progress_ticker">Отпремам &#8230;</string>
@@ -257,7 +251,6 @@
     <string name="update_link_forbidden_permissions">да ажурирате овај фајл</string>
     <string name="downloader_download_file_not_found">Фајл није више доступан на серверу</string>
 
-    <string name="prefs_category_accounts">Налози</string>
     <string name="prefs_add_account">Додај налог</string>
     <string name="actionbar_logger">Записници</string>
 	<string name="log_send_history_button">Пошаљи историјат</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 682ea01873..cac63450b5 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -65,9 +65,6 @@
     <string name="file_list_empty_headline_search">Tomt i denna mapp</string>
     <string name="upload_list_empty_headline">Inga nerladdningar tillgängliga</string>
     <string name="file_list_folder">mapp</string>
-    <string name="file_list_folders">mappar</string>
-    <string name="file_list_file">fil</string>
-    <string name="file_list_files">filer</string>
     <string name="filedetails_select_file">Peka på en fil för att visa mer information.</string>
     <string name="filedetails_size">Storlek:</string>
     <string name="filedetails_type">Typ:</string>
@@ -84,7 +81,6 @@
     <string name="common_cancel">Avbryt</string>
     <string name="common_back">Tillbaka</string>
     <string name="common_save">Spara</string>
-    <string name="common_save_exit">Spara &amp; avsluta</string>
     <string name="common_error">Fel</string>
     <string name="common_loading">Laddar &#8230;</string>
     <string name="common_unknown">okänt</string>
@@ -93,7 +89,6 @@
     <string name="about_title">Om</string>
     <string name="change_password">Ändra lösenord</string>
     <string name="delete_account">Radera konto</string>
-    <string name="create_account">Skapa konto</string>
     <string name="upload_chooser_title">Ladda upp från &#8230;</string>
     <string name="uploader_info_dirname">Mappnamn</string>
     <string name="uploader_upload_in_progress_ticker">Laddar upp &#8230;</string>
@@ -271,7 +266,6 @@
     <string name="file_migration_updating_index">Uppdaterar index&#8230;</string>
     <string name="file_migration_cleaning">Rensar upp&#8230;</string>
     <string name="file_migration_ok_finished">Slutförd</string>
-    <string name="prefs_category_accounts">Konton</string>
     <string name="prefs_add_account">Lägg till konto</string>
     <string name="drawer_manage_accounts">Hantera konton</string>
     <string name="actionbar_logger">Loggar</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 2c736c9adb..1062106384 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Küçükten Büyüğe</string>
 
     <string name="drawer_item_all_files">Tüm dosyalar</string>
-    <string name="drawer_item_files">Dosyalar</string>
     <string name="drawer_item_home">Giriş</string>
     <string name="drawer_item_favorites">Sık Kullanılanlar</string>
     <string name="drawer_item_photos">Fotoğraflar</string>
@@ -89,7 +88,6 @@
     <string name="file_list_empty_headline">Burada herhangi bir dosya yok</string>
     <string name="folder_list_empty_headline">Burada herhangi bir klasör yok</string>
     <string name="file_list_empty">Bazı içerikler yükleyin ya da aygıtlarınızla eşitleyin.</string>
-    <string name="file_list_empty_favorites">Bazı dosyaları sık kullanılanlara ekleyin ya da aygıtlarınızla paylaşın.</string>
     <string name="file_list_empty_favorites_filter_list">Sık kullanılanlara eklediğiniz dosya ve klasörler burada görüntülenir</string>
     <string name="file_list_empty_favorites_filter">Arama sonucunda sık kullanılan bir dosya bulunamadı.</string>
     <string name="file_list_loading">Yükleniyor&#8230;</string>
@@ -116,9 +114,6 @@
     <string name="upload_list_empty_text">Bazı içerikler yükleyin ya da anında yüklemeyi etkinleştirin.</string>
     <string name="upload_list_empty_text_auto_upload">Bazı içerikler yükleyin ya da otomatik yüklemeyi etkinleştirin.</string>
     <string name="file_list_folder">klasör</string>
-    <string name="file_list_folders">klasör</string>
-    <string name="file_list_file">dosya</string>
-    <string name="file_list_files">dosya</string>
     <string name="filedetails_select_file">Ek bilgileri görmek için dosyaya dokunun.</string>
     <string name="filedetails_size">Boyut:</string>
     <string name="filedetails_type">Tür:</string>
@@ -138,7 +133,6 @@
     <string name="common_cancel">İptal</string>
     <string name="common_back">Geri</string>
     <string name="common_save">Kaydet</string>
-    <string name="common_save_exit">Kaydet ve Çık</string>
     <string name="common_error">Hata</string>
     <string name="common_loading">Yükleniyor&#8230;</string>
     <string name="common_unknown">bilinmiyor</string>
@@ -149,7 +143,6 @@
     <string name="change_password">Parola değiştir</string>
     <string name="delete_account">Hesabı kaldır</string>
     <string name="delete_account_warning">%s hesabı tüm yerel dosyaları ile silinsin mi?\n\nSilme işlemi geri alınamaz.</string>
-    <string name="create_account">Hesap oluştur</string>
     <string name="avatar">Avatar</string>
     <string name="active_user">Etkin kullanıcı</string>
     <string name="upload_chooser_title">Şuradan yükle&#8230;</string>
@@ -338,7 +331,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Yalnız kablosuz ağ üzerinden yüklensin</string>
-    <string name="instant_upload_on_wifi">Fotoğraflar yalnız kablosuz ağ üzerinden yüklensin</string>
     <string name="instant_video_upload_on_wifi">Görüntüler yalnız kablosuz ağ üzerinden yüklensin</string>
     <string name="instant_video_upload_on_charging">Yalnız şarj edilirken yüklensin</string>
     <string name="instant_upload_on_charging">Yalnız şarj edilirken yüklensin</string>
@@ -421,7 +413,6 @@
     <string name="file_migration_source_not_readable_title">Kaynak klasör okunabilir değil!</string>
     <string name="file_migration_source_not_readable">Depolama yolunu gene de %1$s olarak değiştirmek istediğinizden emin misiniz?\n\nNot: Tüm verilerin yeniden indirilmesi gerekecek.</string>
 
-    <string name="prefs_category_accounts">Hesaplar</string>
     <string name="prefs_add_account">Hesap ekle</string>
     <string name="drawer_manage_accounts">Hesap yönetimi</string>
     <string name="auth_redirect_non_secure_connection_title">Güvenli bağlantı, güvenli olmayan bir hedefe yönlendiriliyor.</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index ddeadbc985..50d18d66f6 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Менші попереду</string>
 
     <string name="drawer_item_all_files">Усі файли</string>
-    <string name="drawer_item_files">Файли</string>
     <string name="drawer_item_home">Старт</string>
     <string name="drawer_item_favorites">Улюблені</string>
     <string name="drawer_item_photos">Фото</string>
@@ -82,9 +81,6 @@
     <string name="file_list_empty_headline_server_search_photos">Жодного фото</string>
     <string name="upload_list_empty_headline">Немає доступних вивантажень.</string>
     <string name="file_list_folder">тека</string>
-    <string name="file_list_folders">теки</string>
-    <string name="file_list_file">файл</string>
-    <string name="file_list_files">файл</string>
     <string name="filedetails_select_file">Натисніть на файлі для відображення додаткової інформації</string>
     <string name="filedetails_size">Розмір:</string>
     <string name="filedetails_type">Тип:</string>
@@ -101,7 +97,6 @@
     <string name="common_cancel">Відмінити</string>
     <string name="common_back">Назад</string>
     <string name="common_save">Зберегти</string>
-    <string name="common_save_exit">Зберегти та вийти</string>
     <string name="common_error">Помилка</string>
     <string name="common_loading">Завантаження...</string>
     <string name="common_unknown">невідомо</string>
@@ -110,7 +105,6 @@
     <string name="about_title">Про</string>
     <string name="change_password">Змінити пароль</string>
     <string name="delete_account">Видалити обліковий запис</string>
-    <string name="create_account">Створити запис</string>
     <string name="upload_chooser_title">Завантажити з …</string>
     <string name="uploader_info_dirname">Ім\'я теки</string>
     <string name="uploader_upload_in_progress_ticker">Завантаження …</string>
@@ -263,7 +257,6 @@
     <string name="unshare_link_forbidden_permissions">для закриття доступу до файла</string>
     <string name="downloader_download_file_not_found">Файл більше не доступний на сервері</string>
 
-    <string name="prefs_category_accounts">Облікові записи</string>
     <string name="prefs_add_account">Додати обліковий запис</string>
     <string name="actionbar_logger">Журнали</string>
 	<string name="log_send_history_button">Надіслати історію</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 35711cd53b..150e99b5b6 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">文件从小到大排序</string>
 
     <string name="drawer_item_all_files">全部文件</string>
-    <string name="drawer_item_files">文件</string>
     <string name="drawer_item_home">首页</string>
     <string name="drawer_item_favorites">收藏</string>
     <string name="drawer_item_photos">照片</string>
@@ -88,7 +87,6 @@
     <string name="file_list_empty_headline">这里没有文件
 </string>
     <string name="file_list_empty">上传一些内容或与您的设备同步。</string>
-    <string name="file_list_empty_favorites">把一些文件设为“我喜欢的”或者从设备同步</string>
     <string name="file_list_empty_favorites_filter_list">你标记为“我喜欢的”文件和文件夹会显示在这里</string>
     <string name="file_list_empty_favorites_filter">没有找到您搜索的“我喜欢的”。</string>
     <string name="file_list_loading">加载中&#8230;</string>
@@ -114,9 +112,6 @@
     <string name="upload_list_empty_text">上传一些内容或启用即时上传。</string>
     <string name="upload_list_empty_text_auto_upload">上传一些内容或启用自动上传。</string>
     <string name="file_list_folder">文件夹</string>
-    <string name="file_list_folders">文件夹</string>
-    <string name="file_list_file">文件</string>
-    <string name="file_list_files">文件</string>
     <string name="filedetails_select_file">点击一个文件可以显示额外的信息。</string>
     <string name="filedetails_size">大小：</string>
     <string name="filedetails_type">类型：</string>
@@ -136,7 +131,6 @@
     <string name="common_cancel">取消</string>
     <string name="common_back">返回</string>
     <string name="common_save">保存</string>
-    <string name="common_save_exit">保存并退出</string>
     <string name="common_error">错误</string>
     <string name="common_loading">加载中 &#8230;</string>
     <string name="common_unknown">未知</string>
@@ -146,7 +140,6 @@
     <string name="change_password">修改密码</string>
     <string name="delete_account">删除账号</string>
     <string name="delete_account_warning">是否删除该账户 %s 并且删除所有文件?\n\n一经删除无法撤销该操作</string>
-    <string name="create_account">创建账号</string>
     <string name="upload_chooser_title">上传自 &#8230;</string>
     <string name="uploader_info_dirname">文件夹名称</string>
     <string name="uploader_upload_in_progress_ticker">上传 &#8230;</string>
@@ -328,7 +321,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">仅在Wi-Fi下上传</string>
-    <string name="instant_upload_on_wifi">仅在Wi-Fi下上传图片</string>
     <string name="instant_video_upload_on_wifi">仅在Wi-Fi下上传视频</string>
     <string name="instant_video_upload_on_charging">仅在充电时上传</string>
     <string name="instant_upload_on_charging">仅在充电时上传</string>
@@ -409,7 +401,6 @@
     <string name="file_migration_source_not_readable_title">源目录不可读！</string>
     <string name="file_migration_source_not_readable">您确认更改存储目录到%1$s吗？注意：此操作后一切数据均需重新下载</string>
 
-    <string name="prefs_category_accounts">账号</string>
     <string name="prefs_add_account">添加账号</string>
     <string name="drawer_manage_accounts">管理账号</string>
     <string name="auth_redirect_non_secure_connection_title">安全连接通过不安全的路由重定向。</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index ded1f5716a..48e0a3d4b8 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">從最小開始排列</string>
 
     <string name="drawer_item_all_files">所有檔案</string>
-    <string name="drawer_item_files">檔案</string>
     <string name="drawer_item_home">家目錄</string>
     <string name="drawer_item_favorites">最愛</string>
     <string name="drawer_item_photos">相片</string>
@@ -85,7 +84,6 @@
     <string name="file_list_seconds_ago">幾秒前</string>
     <string name="file_list_empty_headline">目前沒有檔案</string>
     <string name="file_list_empty">上傳一些項目或與你的設備同步！</string>
-    <string name="file_list_empty_favorites">把文件加到最愛或著從您的設備同步</string>
     <string name="file_list_empty_favorites_filter_list">您標記為最愛的檔案與資料夾將會顯示在這裡</string>
     <string name="file_list_empty_favorites_filter">您搜尋的結果顯示無已收藏檔案。</string>
     <string name="file_list_loading">載入中&#8230;</string>
@@ -111,9 +109,6 @@
     <string name="upload_list_empty_text">上傳一些聯絡人或者啟用即時上傳</string>
     <string name="upload_list_empty_text_auto_upload">上傳一些聯絡人或者啟用自動上傳</string>
     <string name="file_list_folder">資料夾</string>
-    <string name="file_list_folders">資料夾</string>
-    <string name="file_list_file">檔案</string>
-    <string name="file_list_files">檔案</string>
     <string name="filedetails_select_file">在檔案上輕觸來顯示更多資訊</string>
     <string name="filedetails_size">大小：</string>
     <string name="filedetails_type">類型：</string>
@@ -133,7 +128,6 @@
     <string name="common_cancel">取消</string>
     <string name="common_back">返回</string>
     <string name="common_save">儲存</string>
-    <string name="common_save_exit">儲存並離開</string>
     <string name="common_error">錯誤</string>
     <string name="common_loading">載入中&#8230;</string>
     <string name="common_unknown">未知</string>
@@ -143,7 +137,6 @@
     <string name="change_password">變更密碼</string>
     <string name="delete_account">刪除帳戶</string>
     <string name="delete_account_warning">刪除使用者帳號%s與其所屬檔案？刪除後將無法復原。</string>
-    <string name="create_account">建立帳戶</string>
     <string name="upload_chooser_title">上傳自&#8230;</string>
     <string name="uploader_info_dirname">資料夾名稱</string>
     <string name="uploader_upload_in_progress_ticker">上傳中&#8230;</string>
@@ -325,7 +318,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">只透過 WiFi 上傳</string>
-    <string name="instant_upload_on_wifi">只透過 WiFi 上傳圖片</string>
     <string name="instant_video_upload_on_wifi">只透過 WiFi 上傳影片</string>
     <string name="instant_video_upload_on_charging">只在充電時上傳</string>
     <string name="instant_upload_on_charging">只在充電時上傳</string>
@@ -407,7 +399,6 @@
     <string name="file_migration_source_not_readable">你仍然要更改%1$s的路徑?
 注意:所有檔案會再次被下載</string>
 
-    <string name="prefs_category_accounts">帳戶</string>
     <string name="prefs_add_account">新增帳戶</string>
     <string name="drawer_manage_accounts">管理帳戶</string>
     <string name="auth_redirect_non_secure_connection_title">此安全連線是來自不安全路徑重新導向</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 9b6acb3519..a78197b1dd 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -21,7 +21,6 @@
     <string name="menu_item_sort_by_size_smallest_first">Smallest first</string>
 
     <string name="drawer_item_all_files">All files</string>
-    <string name="drawer_item_files">Files</string>
     <string name="drawer_item_home">Home</string>
     <string name="drawer_item_favorites">Favorites</string>
     <string name="drawer_item_photos">Photos</string>
@@ -89,7 +88,6 @@
     <string name="file_list_empty_headline">No files here</string>
     <string name="folder_list_empty_headline">No folders here</string>
     <string name="file_list_empty">Upload some content or sync with your devices.</string>
-    <string name="file_list_empty_favorites">Favorite some files or sync with your devices.</string>
     <string name="file_list_empty_favorites_filter_list">Files and folders you mark as favorites will show up here</string>
     <string name="file_list_empty_favorites_filter">Your search returned no favorited files.</string>
     <string name="file_list_loading">Loading&#8230;</string>
@@ -116,9 +114,6 @@
     <string name="upload_list_empty_text">Upload some content or activate instant uploading.</string>
     <string name="upload_list_empty_text_auto_upload">Upload some content or activate auto upload.</string>
     <string name="file_list_folder">folder</string>
-    <string name="file_list_folders">folders</string>
-    <string name="file_list_file">file</string>
-    <string name="file_list_files">files</string>
     <string name="filedetails_select_file">Tap on a file to display additional information.</string>
     <string name="filedetails_size">Size:</string>
     <string name="filedetails_type">Type:</string>
@@ -138,7 +133,6 @@
     <string name="common_cancel">Cancel</string>
     <string name="common_back">Back</string>
     <string name="common_save">Save</string>
-    <string name="common_save_exit">Save &amp; exit</string>
     <string name="common_error">Error</string>
     <string name="common_loading">Loading &#8230;</string>
     <string name="common_unknown">unknown</string>
@@ -149,7 +143,6 @@
     <string name="change_password">Change password</string>
     <string name="delete_account">Remove account</string>
     <string name="delete_account_warning">Delete account %s with all local files?\n\nDeleting cannot be undone.</string>
-    <string name="create_account">Create account</string>
     <string name="avatar">Avatar</string>
     <string name="active_user">Active user</string>
     <string name="upload_chooser_title">Upload from &#8230;</string>
@@ -339,7 +332,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Only upload on Wi-Fi</string>
-    <string name="instant_upload_on_wifi">Only upload pictures on Wi-Fi</string>
     <string name="instant_video_upload_on_wifi">Only upload videos on Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Only upload when charging</string>
     <string name="instant_upload_on_charging">Only upload when charging</string>
@@ -422,7 +414,6 @@
     <string name="file_migration_source_not_readable_title">Source directory not readable!</string>
     <string name="file_migration_source_not_readable">Do you still want to change the storage path to %1$s?\n\nNote: All data will have to be downloaded again.</string>
 
-    <string name="prefs_category_accounts">Accounts</string>
     <string name="prefs_add_account">Add account</string>
     <string name="drawer_manage_accounts">Manage accounts</string>
     <string name="auth_redirect_non_secure_connection_title">Secure connection redirected through an unsecured route.</string>