diff --git a/database/src/main/java/de/mm20/launcher2/database/AppDatabase.kt b/database/src/main/java/de/mm20/launcher2/database/AppDatabase.kt
index 5a61f8f7..143cade4 100644
--- a/database/src/main/java/de/mm20/launcher2/database/AppDatabase.kt
+++ b/database/src/main/java/de/mm20/launcher2/database/AppDatabase.kt
@@ -35,9 +35,9 @@ abstract class AppDatabase : RoomDatabase() {
                                 override fun onCreate(db: SupportSQLiteDatabase) {
                                     super.onCreate(db)
                                     db.execSQL("INSERT INTO Websearch (urlTemplate, label, color, icon) VALUES " +
-                                            "('${context.getString(R.string.websearch_google_url)}', '${context.getString(R.string.websearch_google)}', 0, NULL )," +
-                                            "('${context.getString(R.string.websearch_youtube_url)}', '${context.getString(R.string.websearch_youtube)}', 0, NULL )," +
-                                            "('${context.getString(R.string.websearch_playstore_url)}', '${context.getString(R.string.websearch_playstore)}', 0, NULL );")
+                                            "('${context.getString(R.string.default_websearch_1_url)}', '${context.getString(R.string.default_websearch_1_name)}', 0, NULL )," +
+                                            "('${context.getString(R.string.default_websearch_2_url)}', '${context.getString(R.string.default_websearch_2_name)}', 0, NULL )," +
+                                            "('${context.getString(R.string.default_websearch_3_url)}', '${context.getString(R.string.default_websearch_3_name)}', 0, NULL );")
 
                                     db.execSQL("INSERT INTO Widget (type, data, height, position, label) VALUES " +
                                             "('internal', 'weather', -1, 0, '${context.getString(R.string.widget_name_weather)}')," +
diff --git a/i18n/src/main/res/values-de/strings.xml b/i18n/src/main/res/values-de/strings.xml
index 77295680..a1aa0b1f 100644
--- a/i18n/src/main/res/values-de/strings.xml
+++ b/i18n/src/main/res/values-de/strings.xml
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Kvæsitso</string>
-    <string name="edit_text_search_hint">Suchen</string>
-    <string name="dialog_wait">Wird vorbereitet…</string>
-    <string name="share_menu_store_link">%1$s-Link</string>
-    <string name="share_menu_apk_file">Paketdatei</string>
+    <string name="search_bar_placeholder">Suchen</string>
+    <string name="menu_share_store_link">%1$s-Link</string>
+    <string name="menu_share_apk_file">Paketdatei</string>
     <string name="menu_uninstall">Deinstallieren</string>
     <string name="menu_share">Teilen</string>
-    <string name="app_info">Version %1$s\n%2$s</string>
     <string name="app_info_version">Version %1$s</string>
     <string name="settings">Einstellungen</string>
     <string name="wallpaper">Hintergrundbild</string>
-    <string name="title_activity_settings">Einstellungen</string>
     <string name="calendar_event_allday">ganztägig</string>
     <string name="wind_north">Nord</string>
     <string name="wind_north_east">Nordost</string>
@@ -69,7 +66,6 @@
     <string name="file_type_none">Datei</string>
     <string name="file_type_generic">%1$s-Datei</string>
     <string name="preference_theme_system">Systemeinstellung verwenden</string>
-    <string name="activity_not_found">Keine passende Anwendung installiert!</string>
     <string name="file_type_presentation">Präsentation</string>
     <string name="file_type_compressed">Komprimierte Datei</string>
     <string name="file_type_text">Text-Datei</string>
@@ -91,14 +87,14 @@
     <string name="file_meta_location">Ort: %1$s</string>
     <string name="file_meta_owner">Eigentümer: %1$s</string>
     <string name="preference_screen_services">Dienste</string>
-    <string name="websearch_google">Google</string>
-    <string name="websearch_youtube">YouTube</string>
-    <string name="websearch_playstore">Google Play</string>
-    <string name="websearch_google_url">https://google.de/search?q=${1}</string>
-    <string name="websearch_youtube_url">https://www.youtube.com/results?search_query=${1}</string>
-    <string name="websearch_playstore_url">https://play.google.com/store/search?q=${1}</string>
-    <string name="websearch_dialog_name_hint">Name</string>
-    <string name="websearch_dialog_url_hint">URL</string>
+    <string name="default_websearch_1_name">Google</string>
+    <string name="default_websearch_2_name">YouTube</string>
+    <string name="default_websearch_3_name">Google Play</string>
+    <string name="default_websearch_1_url">https://google.de/search?q=${1}</string>
+    <string name="default_websearch_2_url">https://www.youtube.com/results?search_query=${1}</string>
+    <string name="default_websearch_3_url">https://play.google.com/store/search?q=${1}</string>
+    <string name="websearch_dialog_name">Name</string>
+    <string name="websearch_dialog_url">URL</string>
     <string name="websearch_dialog_url_description">„${1}“ wird durch den eigentlichen Suchbegriff ersetzt.</string>
     <string name="websearch_dialog_url_error">In dieser URL fehlt der Platzhalter „${1}“</string>
     <string name="websearch_dialog_replace_icon">Symbol ersetzen</string>
@@ -119,13 +115,10 @@
     <string name="preference_hide_status_bar">Statusleiste ausblenden</string>
     <string name="preference_hide_nav_bar">Navigationsleiste ausblenden</string>
     <string name="widget_name_music">Musik</string>
-    <string name="contacts_menu_open_externally">In Kontakte-App anzeigen</string>
-    <string name="favorites_menu_pin">An Favoriten anheften</string>
-    <string name="favorites_menu_unpin">Aus Favoriten entfernen</string>
+    <string name="menu_contacts_open_externally">In Kontakte-App anzeigen</string>
+    <string name="menu_favorites_pin">An Favoriten anheften</string>
+    <string name="menu_favorites_unpin">Aus Favoriten entfernen</string>
     <string name="menu_back">Zurück</string>
-    <string name="contact_multiple_numbers">%1$d Telefonnummern</string>
-    <string name="contact_multiple_emails">%1$d E-Mail-Adressen</string>
-    <string name="contact_multiple_postals">%1$d Postadressen</string>
     <string name="menu_app_info">App-Info</string>
     <string name="menu_launch">Starten</string>
     <string name="menu_open_file">Öffnen</string>
@@ -140,73 +133,74 @@
     <string name="menu_hidden_items">Ausgeblendete Elemente</string>
     <string name="menu_delete">Löschen</string>
     <string name="menu_unhide">Nicht ausblenden</string>
-    <string name="calendar_menu_open_externally">In Kalender-App anzeigen</string>
+    <string name="menu_calendar_open_externally">In Kalender-App anzeigen</string>
     <string name="preference_search_wikipedia_pictures">Bilder anzeigen</string>
     <string name="preference_search_wikipedia_pictures_summary">Erhöht den Datenverbrauch signifikant</string>
     <string name="preference_icon_shape_hexagon">Sechseck</string>
     <string name="preference_icon_shape_triangle">Reuleaux-Dreieck</string>
     <string name="preference_google_signin">Über Google anmelden</string>
     <string name="preference_google_signin_summary">Anmelden, um Google Drive durchsuchen zu können</string>
-    <string name="installation_in_progress">Wird installiert… (%1$d%%)</string>
+    <string name="installation_in_progress">Wird installiert… (%1$s)</string>
     <string name="shortcut_summary">Von %1$s</string>
-    <string name="activity_not_found_searchable">%1$s konnte nicht geöffnet werden</string>
+    <string name="error_activity_not_found">%1$s konnte nicht geöffnet werden</string>
     <string name="provider_metno">MET Norway</string>
-    <string name="weather_sleetshowers">Schneeregenschauer</string>
-    <string name="weather_heavysleet">Starker Schneeregen</string>
-    <string name="weather_lightrainshowersandthunder">Leichte Regenschauer und Gewitter</string>
-    <string name="weather_heavyrain">Starkregen</string>
-    <string name="weather_lightsnowandthunder">Leichter Schneefall und Gewitter</string>
-    <string name="weather_lightrain">Leichter Regen</string>
-    <string name="weather_lightrainshowers">Leichte Regenschauer</string>
-    <string name="weather_lightsnow">Leichter Schnee</string>
-    <string name="weather_heavysleetshowersandthunder">Starke Schneeregenschauer und Gewitter</string>
-    <string name="weather_lightsnowshowers">Leichte Schneeschauer</string>
-    <string name="weather_lightssleetshowersandthunder">Leichte Schneeregenschauer und Gewitter</string>
-    <string name="weather_snowandthunder">Schneefall und Gewitter</string>
-    <string name="weather_heavysleetshowers">Starke Schneeregenschauer</string>
-    <string name="weather_heavysnow">Starker Schneefall</string>
-    <string name="weather_cloudy">Bedeckt</string>
-    <string name="weather_lightrainandthunder">Leichter Regen und Gewitter</string>
-    <string name="weather_snow">Schneefall</string>
-    <string name="weather_hail">Hagel</string>
-    <string name="weather_thunder">Gewitter</string>
-    <string name="weather_heavysnowshowers">Starke Schneeschauer</string>
-    <string name="weather_heavyrainshowers">Starke Regenschauer</string>
-    <string name="weather_rainshowersandthunder">Regenschauer und Gewitter</string>
-    <string name="weather_clearsky">Klarer Himmel</string>
-    <string name="weather_sleet">Schneeregen</string>
-    <string name="weather_rain">Regen</string>
-    <string name="weather_sleetandthunder">Schneeregen und Gewitter</string>
-    <string name="weather_lightssnowshowersandthunder">Leichte Schneeschauer und Gewitter</string>
-    <string name="weather_heavyrainshowersandthunder">Starke Regenschauer und Gewitter</string>
-    <string name="weather_fair">Heiter</string>
-    <string name="weather_fog">Nebel</string>
-    <string name="weather_sleetshowersandthunder">Schneeregenschauer und Gewitter</string>
-    <string name="weather_rainandthunder">Regen und Gewitter</string>
-    <string name="weather_lightsleet">Leichter Schneeregen</string>
-    <string name="weather_heavysleetandthunder">Starker Schneeregen und Gewitter</string>
-    <string name="weather_partlycloudy">Teilweise bewölkt</string>
-    <string name="weather_heavysnowandthunder">Starker Schneefall und Gewitter</string>
-    <string name="weather_rainshowers">Regenschauer</string>
-    <string name="weather_lightsleetandthunder">Light sleet and thunder</string>
-    <string name="weather_heavysnowshowersandthunder">Starke Schneeschauer und Gewitter</string>
-    <string name="weather_lightsleetshowers">Light sleet showers</string>
-    <string name="weather_snowshowersandthunder">Schneeschauer und Gewitter</string>
-    <string name="weather_snowshowers">Schneeschauer</string>
-    <string name="weather_heavyrainandthunder">Starkregen und Gewitter</string>
-    <string name="weather_unknown">Unbekannt</string>
+    <string name="weather_condition_sleetshowers">Schneeregenschauer</string>
+    <string name="weather_condition_heavysleet">Starker Schneeregen</string>
+    <string name="weather_condition_lightrainshowersandthunder">Leichte Regenschauer und Gewitter</string>
+    <string name="weather_condition_heavyrain">Starkregen</string>
+    <string name="weather_condition_lightsnowandthunder">Leichter Schneefall und Gewitter</string>
+    <string name="weather_condition_lightrain">Leichter Regen</string>
+    <string name="weather_condition_lightrainshowers">Leichte Regenschauer</string>
+    <string name="weather_condition_lightsnow">Leichter Schnee</string>
+    <string name="weather_condition_heavysleetshowersandthunder">Starke Schneeregenschauer und Gewitter</string>
+    <string name="weather_condition_lightsnowshowers">Leichte Schneeschauer</string>
+    <string name="weather_condition_lightssleetshowersandthunder">Leichte Schneeregenschauer und Gewitter</string>
+    <string name="weather_condition_snowandthunder">Schneefall und Gewitter</string>
+    <string name="weather_condition_heavysleetshowers">Starke Schneeregenschauer</string>
+    <string name="weather_condition_heavysnow">Starker Schneefall</string>
+    <string name="weather_condition_cloudy">Bedeckt</string>
+    <string name="weather_condition_lightrainandthunder">Leichter Regen und Gewitter</string>
+    <string name="weather_condition_snow">Schneefall</string>
+    <string name="weather_condition_hail">Hagel</string>
+    <string name="weather_condition_thunder">Gewitter</string>
+    <string name="weather_condition_heavysnowshowers">Starke Schneeschauer</string>
+    <string name="weather_condition_heavyrainshowers">Starke Regenschauer</string>
+    <string name="weather_condition_rainshowersandthunder">Regenschauer und Gewitter</string>
+    <string name="weather_condition_clearsky">Klarer Himmel</string>
+    <string name="weather_condition_sleet">Schneeregen</string>
+    <string name="weather_condition_rain">Regen</string>
+    <string name="weather_condition_sleetandthunder">Schneeregen und Gewitter</string>
+    <string name="weather_condition_lightssnowshowersandthunder">Leichte Schneeschauer und Gewitter</string>
+    <string name="weather_condition_heavyrainshowersandthunder">Starke Regenschauer und Gewitter</string>
+    <string name="weather_condition_fair">Heiter</string>
+    <string name="weather_condition_fog">Nebel</string>
+    <string name="weather_condition_sleetshowersandthunder">Schneeregenschauer und Gewitter</string>
+    <string name="weather_condition_rainandthunder">Regen und Gewitter</string>
+    <string name="weather_condition_lightsleet">Leichter Schneeregen</string>
+    <string name="weather_condition_heavysleetandthunder">Starker Schneeregen und Gewitter</string>
+    <string name="weather_condition_partlycloudy">Teilweise bewölkt</string>
+    <string name="weather_condition_heavysnowandthunder">Starker Schneefall und Gewitter</string>
+    <string name="weather_condition_rainshowers">Regenschauer</string>
+    <string name="weather_condition_lightsleetandthunder">Light sleet and thunder</string>
+    <string name="weather_condition_heavysnowshowersandthunder">Starke Schneeschauer und Gewitter</string>
+    <string name="weather_condition_lightsleetshowers">Light sleet showers</string>
+    <string name="weather_condition_snowshowersandthunder">Schneeschauer und Gewitter</string>
+    <string name="weather_condition_snowshowers">Schneeschauer</string>
+    <string name="weather_condition_heavyrainandthunder">Starkregen und Gewitter</string>
+    <string name="weather_condition_wind">Wind</string>
+    <string name="weather_condition_unknown">Unbekannt</string>
     <string name="preference_legacy_icon_bg">Symbol-Hintergrund</string>
     <string name="preference_legacy_icon_bg_summary">Stil von Legacy-Icons</string>
     <string name="easter_egg_1">Hier gibt es keine Easter Eggs, es sei denn Ihr hättet sie mitgebracht.</string>
     <string name="easter_egg_2">Bitte, hör auf, du verschwendest deine Zeit</string>
     <string name="easter_egg_3">Ich werde es nicht noch einmal sagen: hier sind definitiv keine Easter Eggs versteckt.</string>
     <string name="easter_egg_text">Tja, da sind Sie. Herzlichen Glückwunsch. War es das wert?</string>
-    <string name="permission_calendar_widget">Kalender-Berechtigung gewähren, um Ihre nächsten Termine hier anzuzeigen.</string>
-    <string name="permission_calendar_search">Kalender-Berechtigung gewähren, um Termine zu durchsuchen.</string>
-    <string name="permission_contact_search">Kontakt-Berechtigung gewähren, um Kontakte zu durchsuchen.</string>
-    <string name="permission_files_search">Speicher-Berechtigung gewähren, um Fotos, Medien und Dokumente auf diesem Gerät zu durchsuchen.</string>
+    <string name="missing_permission_calendar_widget">Kalender-Berechtigung gewähren, um Ihre nächsten Termine hier anzuzeigen.</string>
+    <string name="missing_permission_calendar_search">Kalender-Berechtigung gewähren, um Termine zu durchsuchen.</string>
+    <string name="missing_permission_contact_search">Kontakt-Berechtigung gewähren, um Kontakte zu durchsuchen.</string>
+    <string name="missing_permission_files_search">Speicher-Berechtigung gewähren, um Fotos, Medien und Dokumente auf diesem Gerät zu durchsuchen.</string>
     <string name="close">Schließen</string>
-    <string name="custom_icon">Eigenes Symbol</string>
+    <string name="websearch_dialog_custom_icon">Eigenes Symbol</string>
     <string name="widget_action_adjust_height">Höhe anpassen</string>
     <string name="widget_action_remove">Entfernen</string>
     <string name="widget_action_settings">Einstellungen</string>
@@ -232,18 +226,17 @@
     <string name="preference_ms_signin_summary">Anmelden, um OneDrive durchsuchen zu können</string>
     <string name="preference_nextcloud_signin">Bei Nextcloud anmelden</string>
     <string name="preference_nextcloud_signin_summary">Anmelden, um Ihren Nextcloud-Server durchsuchen zu können</string>
-    <string name="preference_account_checking_status">Status wird abgerufen…</string>
     <string name="preference_about_telegram">Telegram-Gruppe</string>
     <string name="preference_about_fdroid">F-Droid-Repository</string>
     <string name="menu_item_edit_favs">Favoriten bearbeiten</string>
-    <string name="edit_favorites_dialog_stage2">Nicht angeheftet – häufig genutzt</string>
-    <string name="edit_favorites_dialog_stage1">Angeheftet – automatisch sortiert</string>
-    <string name="edit_favorites_dialog_stage0">Angeheftet – manuell sortiert</string>
-    <string name="login_flow_next">Weiter</string>
-    <string name="next_cloud_server_url">Nextcloud-Server-URL</string>
-    <string name="next_cloud_server_url_empty">Server-URL darf nicht leer sein.</string>
+    <string name="edit_favorites_dialog_unpinned">Nicht angeheftet – häufig genutzt</string>
+    <string name="edit_favorites_dialog_pinned_unsorted">Angeheftet – automatisch sortiert</string>
+    <string name="edit_favorites_dialog_pinned_sorted">Angeheftet – manuell sortiert</string>
+    <string name="login_flow_continue">Weiter</string>
+    <string name="nextcloud_server_url">Nextcloud-Server-URL</string>
+    <string name="nextcloud_server_url_empty">Server-URL darf nicht leer sein.</string>
     <string name="preference_category_services_nextcloud">Nextcloud</string>
-    <string name="next_cloud_server_invalid_url">Diese URL verweist auf keine gültige Nextcloud-Installation</string>
+    <string name="nextcloud_server_invalid_url">Diese URL verweist auf keine gültige Nextcloud-Installation</string>
     <string name="login_flow_login">Anmelden</string>
     <string name="owncloud_server_url">Owncloud-Server-URL</string>
     <string name="preference_category_services_owncloud">Owncloud</string>
@@ -275,8 +268,9 @@
     <string name="calendar_widget_new_event">Termin erstellen</string>
     <string name="weather_widget_show_details">Details anzeigen</string>
     <string name="weather_widget_hide_details">Details ausblenden</string>
-    <string name="weather_humidity">Luftfeuchte:</string>
-    <string name="weather_precipitation">Niederschlag:</string>
+    <string name="weather_details_humidity">Luftfeuchte: %1$s</string>
+    <string name="weather_details_precipitation">Niederschlag: %1$s</string>
+    <string name="weather_details_wind">Wind: %1$s</string>
     <string name="preference_category_license">Lizenz</string>
     <string name="preference_about_license">Diese App ist freie Software.</string>
     <string name="preference_about_license_summary">Lizenziert unter der GNU General Public License 3.0</string>
@@ -284,11 +278,9 @@
         <item quantity="one">+%1$d laufender Termin aus vergangenen Tagen</item>
         <item quantity="other">+%1$d laufende Termine aus vergangenen Tagen</item>
     </plurals>
-    <string name="weather_wind">Wind:</string>
     <string name="preference_themed_icons">Eingefärbte Symbole</string>
     <string name="preference_themed_icons_summary">Symbole an das Farbschema der App anpassen</string>
     <string name="weather_no_data">Keine Wetterdaten verfügbar.</string>
-    <string name="weather_location_not_found">Dieser Standort konnte nicht gefunden werden.</string>
 
     <string name="preference_category_grid">Raster</string>
     <string name="preference_grid_column_count">Spaltenanzahl</string>
@@ -296,8 +288,8 @@
     <string name="grant_permission">Gewähren</string>
     <string name="missing_permission_auto_location">Standortzugriff wird benötigt, um den Standort automatisch zu ermitteln</string>
     <string name="missing_permission_music_widget">Benachrichtigungszugriff wird benötigt, um Medienwiedergabe zu steuern</string>
-    <string name="missing_permission_contact_search">Kontakteberechtigung ist erforderlich, um Kontakte durchsuchen zu können</string>
-    <string name="missing_permission_calendar_search">Kalenderberechtigung ist erforderlich, um Kalender durchsuchen zu können</string>
+    <string name="missing_permission_contact_search_settings">Kontakteberechtigung ist erforderlich, um Kontakte durchsuchen zu können</string>
+    <string name="missing_permission_calendar_search_settings">Kalenderberechtigung ist erforderlich, um Kalender durchsuchen zu können</string>
     <string name="weather_widget_set_location">Standort festlegen</string>
 
     <string name="preference_screen_debug">Debug</string>
@@ -374,8 +366,8 @@
     <string name="music_widget_no_data">Bisher wurden keine Medien abgespielt</string>
 
     <string name="missing_permission_calendar_widget_settings">Kalenderzugriff wird benötigt um Termine abzurufen</string>
-    <string name="missing_permission_file_search">Speicher-Berechtigung wird benötigt um lokale Dateien zu durchsuchen</string>
-    <string name="missing_permission_file_search_android10">Alle Dateien verwalten-Berechtigung wird benötigt um lokale Dateien zu durchsuchen</string>
+    <string name="missing_permission_file_search_settings">Speicher-Berechtigung wird benötigt um lokale Dateien zu durchsuchen</string>
+    <string name="missing_permission_file_search_settings_android10">Alle Dateien verwalten-Berechtigung wird benötigt um lokale Dateien zu durchsuchen</string>
     <string name="missing_permission_notification_badges">Benachrichtigungszugriff wird benötigt um Benachrichtigungsplaketten anzuzeigen</string>
 
     <string name="websearch_dialog_create_title">Websuche hinzufügen</string>
diff --git a/i18n/src/main/res/values-de/units.xml b/i18n/src/main/res/values-de/units.xml
index 9a640ce9..5d1bc7bf 100644
--- a/i18n/src/main/res/values-de/units.xml
+++ b/i18n/src/main/res/values-de/units.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:locale="de">
     <string name="unit_meter_symbol">m</string>
     <plurals name="unit_meter">
         <item quantity="one">Meter</item>
diff --git a/i18n/src/main/res/values-fr/strings.xml b/i18n/src/main/res/values-fr/strings.xml
index b8f6ac5c..bd9f99a6 100644
--- a/i18n/src/main/res/values-fr/strings.xml
+++ b/i18n/src/main/res/values-fr/strings.xml
@@ -1,26 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" tools:locale="en">
+<resources xmlns:tools="http://schemas.android.com/tools" tools:locale="fr">
     <string name="app_name">Kvæsitso</string>
     <!-- Shown in the search bar when the search field is empty -->
-    <string name="edit_text_search_hint">Rechercher</string>
-    <!-- A dialog for an action that requires a short amount of time. Used when sharing APK files -->
-    <string name="dialog_wait">Préparation...</string>
+    <string name="search_bar_placeholder">Rechercher</string>
     <!-- Shown in the app detail share menu if the application was installed from an app store -->
-    <string name="share_menu_store_link">Lien %1$s</string>
+    <string name="menu_share_store_link">Lien %1$s</string>
     <!-- Share app menu when both, link and apk share are available-->
-    <string name="share_menu_apk_file">Fichier du programme</string>
+    <string name="menu_share_apk_file">Fichier du programme</string>
     <!-- Uninstall an application -->
     <string name="menu_uninstall">Désinstaller</string>
     <!-- Share something -->
     <string name="menu_share">Partager</string>
-    <!-- %1$s is the app version, %2$s the package name of an app -->
-    <string name="app_info">Version %1$s\n%2$s</string>
+    <string name="app_info_version">Version %1$s</string>
     <!-- Menu entry for launcher settings -->
     <string name="settings">Paramètres</string>
     <!-- Set the device's wallpaper -->
     <string name="wallpaper">Papier-peint</string>
-    <!-- Launcher settings title -->
-    <string name="title_activity_settings">Paramètres</string>
     <!-- Calendar events that last the entire day -->
     <string name="calendar_event_allday">Journée entière</string>
     <!-- Wind direction, used in weather widget -->
@@ -102,7 +97,6 @@
     <string name="file_type_image">Photo</string>
     <string name="file_type_none">Fichier</string>
     <string name="file_type_generic">Fichier %1$s</string>
-    <string name="activity_not_found">Aucune application appropriée n\'est installée.</string>
     <string name="file_type_presentation">Présentation</string>
     <string name="file_type_compressed">Fichier compressé</string>
     <string name="file_type_text">Fichier texte</string>
@@ -124,14 +118,14 @@
     <string name="file_meta_owner">Propriétaire: %1$s</string>
     <string name="preference_screen_services">Services</string>
     <string name="preference_theme_system">Suivre le système</string>
-    <string name="websearch_google">Google</string>
-    <string name="websearch_youtube">YouTube</string>
-    <string name="websearch_playstore">Google Play</string>
-    <string name="websearch_google_url">https://google.com/search?q=${1}</string>
-    <string name="websearch_youtube_url">https://www.youtube.com/results?search_query=${1}</string>
-    <string name="websearch_playstore_url">https://play.google.com/store/search?q=${1}</string>
-    <string name="websearch_dialog_name_hint">Nom</string>
-    <string name="websearch_dialog_url_hint">URL</string>
+    <string name="default_websearch_1_name">Google</string>
+    <string name="default_websearch_2_name">YouTube</string>
+    <string name="default_websearch_3_name">Google Play</string>
+    <string name="default_websearch_1_url">https://google.com/search?q=${1}</string>
+    <string name="default_websearch_2_url">https://www.youtube.com/results?search_query=${1}</string>
+    <string name="default_websearch_3_url">https://play.google.com/store/search?q=${1}</string>
+    <string name="websearch_dialog_name">Nom</string>
+    <string name="websearch_dialog_url">URL</string>
     <string name="websearch_dialog_url_description">\'${1}\' va être remplacé par la recherche actuelle.</string>
     <string name="websearch_dialog_url_error">Le placeholder \'${1}\' est manquant dans cette URL</string>
     <string name="websearch_dialog_replace_icon">Remplacer l\'icône</string>
@@ -154,13 +148,10 @@
     <string name="preference_light_status_bar">Icônes de la barre de statut sombres</string>
     <string name="preference_light_nav_bar">Icônes de la barre de navigation sombres</string>
     <string name="widget_name_music">Musique</string>
-    <string name="contacts_menu_open_externally">Ouvrir dans l\'application de contacts</string>
-    <string name="favorites_menu_pin">Ajouter aux favoris</string>
-    <string name="favorites_menu_unpin">Enlever</string>
+    <string name="menu_contacts_open_externally">Ouvrir dans l\'application de contacts</string>
+    <string name="menu_favorites_pin">Ajouter aux favoris</string>
+    <string name="menu_favorites_unpin">Enlever</string>
     <string name="menu_back">Retour</string>
-    <string name="contact_multiple_numbers">%1$d numéros de téléphone</string>
-    <string name="contact_multiple_emails">%1$d adresses mail</string>
-    <string name="contact_multiple_postals">%1$d adresses postales</string>
     <string name="menu_app_info">Informations sur l\'application</string>
     <string name="preference_screen_services_summary">Gérer les comptes et les services</string>
     <string name="preference_category_services_google">Google</string>
@@ -174,15 +165,15 @@
     <string name="menu_unhide">Ne pas cacher</string>
     <string name="menu_hidden_items">Applications cachées</string>
     <string name="menu_delete">Supprimer</string>
-    <string name="calendar_menu_open_externally">Ouvrir dans l\'application de calendrier</string>
+    <string name="menu_calendar_open_externally">Ouvrir dans l\'application de calendrier</string>
     <string name="preference_search_wikipedia_pictures">Voir les photos</string>
     <string name="preference_search_wikipedia_pictures_summary">Augmente considérablement l\'utilisation des données</string>
     <string name="preference_google_signin">Se connecter avec Google</string>
     <string name="preference_google_signin_summary">Se connecter pour rechercher dans Google Drive</string>
     <string name="preference_icon_shape_hexagon">Hexagone</string>
     <string name="shortcut_summary">Par %1$s</string>
-    <string name="installation_in_progress">Installation en cours... (%1$d%%)</string>
-    <string name="activity_not_found_searchable">Impossible d\'ouvrir %1$s</string>
+    <string name="installation_in_progress">Installation en cours… (%1$s)</string>
+    <string name="error_activity_not_found">Impossible d\'ouvrir %1$s</string>
     <string name="preference_legacy_icon_bg">Arrière-plan de l\'icône</string>
     <string name="preference_legacy_icon_bg_summary">Style d\'icône legacy</string>
     <!-- Easter egg preference toasts -->
@@ -190,12 +181,12 @@
     <string name="easter_egg_2">Merci d\'arrêter, vous perdez votre temps.</string>
     <string name="easter_egg_3">Je ne vais pas le répéter: il n\'y a absoluement aucun easter easter egg caché ici.</string>
     <string name="easter_egg_text">Bien, vous m\'avez trouvé. Bravo. Cela en valait-il la peine ?</string>
-    <string name="permission_calendar_widget">Accorder la permission d\'accès au calendrier pour afficher les évènements à venir ici.</string>
-    <string name="permission_calendar_search">Accorder la permission pour rechercher dans le calendrier.</string>
-    <string name="permission_files_search">Accorder la permission d\'accès au stockage pour rechercher des photos, des médias et des documents sur cet appareil.</string>
-    <string name="permission_contact_search">Accorder la permission d\'accès aux contacts pour rechercher dans les contacts.</string>
+    <string name="missing_permission_calendar_widget">Accorder la permission d\'accès au calendrier pour afficher les évènements à venir ici.</string>
+    <string name="missing_permission_calendar_search">Accorder la permission pour rechercher dans le calendrier.</string>
+    <string name="missing_permission_files_search">Accorder la permission d\'accès au stockage pour rechercher des photos, des médias et des documents sur cet appareil.</string>
+    <string name="missing_permission_contact_search">Accorder la permission d\'accès aux contacts pour rechercher dans les contacts.</string>
     <string name="close">Fermer</string>
-    <string name="custom_icon">Icône personnalisée</string>
+    <string name="websearch_dialog_custom_icon">Icône personnalisée</string>
     <string name="widget_action_adjust_height">Ajuster la hauteur</string>
     <string name="widget_action_remove">Retirer</string>
     <string name="widget_action_settings">Paramètres</string>
@@ -220,18 +211,17 @@
     <string name="preference_ms_signin_summary">Se connecter pour rechercher dans OneDrive</string>
     <string name="preference_nextcloud_signin">Se connecter avec Nextcloud</string>
     <string name="preference_nextcloud_signin_summary">Se connecter pour rechercher dans votre serveur Nextcloud</string>
-    <string name="preference_account_checking_status">Vérifie la statut...</string>
     <string name="preference_about_telegram">Groupe Telegram</string>
     <string name="preference_about_fdroid">Dépôt F-Droid</string>
     <string name="menu_item_edit_favs">Éditer les favoris</string>
-    <string name="edit_favorites_dialog_stage2">Pas épinglé – utilisé fréquemment</string>
-    <string name="edit_favorites_dialog_stage1">Épinglé – trié automatiquement</string>
-    <string name="edit_favorites_dialog_stage0">Épinglé – trié manuellement</string>
-    <string name="login_flow_next">Suivant</string>
-    <string name="next_cloud_server_url">URL du serveur Nextcloud</string>
-    <string name="next_cloud_server_url_empty">L\'URL ne peut pas être vide</string>
+    <string name="edit_favorites_dialog_unpinned">Pas épinglé – utilisé fréquemment</string>
+    <string name="edit_favorites_dialog_pinned_unsorted">Épinglé – trié automatiquement</string>
+    <string name="edit_favorites_dialog_pinned_sorted">Épinglé – trié manuellement</string>
+    <string name="login_flow_continue">Suivant</string>
+    <string name="nextcloud_server_url">URL du serveur Nextcloud</string>
+    <string name="nextcloud_server_url_empty">L\'URL ne peut pas être vide</string>
     <string name="preference_category_services_nextcloud">Nextcloud</string>
-    <string name="next_cloud_server_invalid_url">Cette URL ne dirige pas vers une installation Nextcloud valide</string>
+    <string name="nextcloud_server_invalid_url">Cette URL ne dirige pas vers une installation Nextcloud valide</string>
 
     <string name="owncloud_server_url">URL du serveur Owncloud</string>
     <string name="preference_category_services_owncloud">Owncloud</string>
@@ -266,58 +256,57 @@
     </plurals>
 
     <!-- Weather widget -->
-    <string name="weather_sleetshowers">Averses de grésil</string>
-    <string name="weather_heavysleet">Fort grésil</string>
-    <string name="weather_lightrainshowersandthunder">Légères averses et orage</string>
-    <string name="weather_heavyrain">Forte pluie</string>
-    <string name="weather_lightsnowandthunder">Légère neige et orage</string>
-    <string name="weather_lightrain">Légère pluie</string>
-    <string name="weather_lightrainshowers">Légères averses</string>
-    <string name="weather_lightsnow">Légère neige</string>
-    <string name="weather_heavysleetshowersandthunder">Fortes averses de grésil et orage</string>
-    <string name="weather_lightsnowshowers">Légères averses de neige</string>
-    <string name="weather_lightssleetshowersandthunder">Légères averses de grésil et orage</string>
-    <string name="weather_snowandthunder">Neige et orage</string>
-    <string name="weather_heavysleetshowers">Fortes averses de grésil</string>
-    <string name="weather_heavysnow">Forte neige</string>
-    <string name="weather_cloudy">Nuageux</string>
-    <string name="weather_lightrainandthunder">Légère pluie et orage</string>
-    <string name="weather_snow">Neige</string>
-    <string name="weather_hail">Grêle</string>
-    <string name="weather_thunder">Orage</string>
-    <string name="weather_heavysnowshowers">Fortes averses de neige</string>
-    <string name="weather_heavyrainshowers">Fortes averses</string>
-    <string name="weather_rainshowersandthunder">Averses et orage</string>
-    <string name="weather_clearsky">Ciel clair</string>
-    <string name="weather_sleet">Grésil</string>
-    <string name="weather_rain">Pluie</string>
-    <string name="weather_sleetandthunder">Grésil et orage</string>
-    <string name="weather_lightssnowshowersandthunder">Légères averses de neige et orage</string>
-    <string name="weather_heavyrainshowersandthunder">Fortes averses et orage</string>
-    <string name="weather_fair">Beau temps</string>
-    <string name="weather_fog">Brouillard</string>
-    <string name="weather_sleetshowersandthunder">Averses de grésil et orage</string>
-    <string name="weather_rainandthunder">Pluie et orage</string>
-    <string name="weather_lightsleet">Léger grésil</string>
-    <string name="weather_heavysleetandthunder">Fort grésil et orage</string>
-    <string name="weather_partlycloudy">Partiellement nuageux</string>
-    <string name="weather_heavysnowandthunder">Forte neige et orage</string>
-    <string name="weather_rainshowers">Averses</string>
-    <string name="weather_lightsleetandthunder">Léger grésil et orage</string>
-    <string name="weather_heavysnowshowersandthunder">Fortes averses de neige et orage</string>
-    <string name="weather_lightsleetshowers">Légère averses de grésil</string>
-    <string name="weather_snowshowersandthunder">Averses de neige et orage</string>
-    <string name="weather_snowshowers">Averses de neige</string>
-    <string name="weather_heavyrainandthunder">Forte pluie et orage</string>
-    <string name="weather_unknown">Inconnu</string>
+    <string name="weather_condition_sleetshowers">Averses de grésil</string>
+    <string name="weather_condition_heavysleet">Fort grésil</string>
+    <string name="weather_condition_lightrainshowersandthunder">Légères averses et orage</string>
+    <string name="weather_condition_heavyrain">Forte pluie</string>
+    <string name="weather_condition_lightsnowandthunder">Légère neige et orage</string>
+    <string name="weather_condition_lightrain">Légère pluie</string>
+    <string name="weather_condition_lightrainshowers">Légères averses</string>
+    <string name="weather_condition_lightsnow">Légère neige</string>
+    <string name="weather_condition_heavysleetshowersandthunder">Fortes averses de grésil et orage</string>
+    <string name="weather_condition_lightsnowshowers">Légères averses de neige</string>
+    <string name="weather_condition_lightssleetshowersandthunder">Légères averses de grésil et orage</string>
+    <string name="weather_condition_snowandthunder">Neige et orage</string>
+    <string name="weather_condition_heavysleetshowers">Fortes averses de grésil</string>
+    <string name="weather_condition_heavysnow">Forte neige</string>
+    <string name="weather_condition_cloudy">Nuageux</string>
+    <string name="weather_condition_lightrainandthunder">Légère pluie et orage</string>
+    <string name="weather_condition_snow">Neige</string>
+    <string name="weather_condition_hail">Grêle</string>
+    <string name="weather_condition_thunder">Orage</string>
+    <string name="weather_condition_heavysnowshowers">Fortes averses de neige</string>
+    <string name="weather_condition_heavyrainshowers">Fortes averses</string>
+    <string name="weather_condition_rainshowersandthunder">Averses et orage</string>
+    <string name="weather_condition_clearsky">Ciel clair</string>
+    <string name="weather_condition_sleet">Grésil</string>
+    <string name="weather_condition_rain">Pluie</string>
+    <string name="weather_condition_sleetandthunder">Grésil et orage</string>
+    <string name="weather_condition_lightssnowshowersandthunder">Légères averses de neige et orage</string>
+    <string name="weather_condition_heavyrainshowersandthunder">Fortes averses et orage</string>
+    <string name="weather_condition_fair">Beau temps</string>
+    <string name="weather_condition_fog">Brouillard</string>
+    <string name="weather_condition_sleetshowersandthunder">Averses de grésil et orage</string>
+    <string name="weather_condition_rainandthunder">Pluie et orage</string>
+    <string name="weather_condition_lightsleet">Léger grésil</string>
+    <string name="weather_condition_heavysleetandthunder">Fort grésil et orage</string>
+    <string name="weather_condition_partlycloudy">Partiellement nuageux</string>
+    <string name="weather_condition_heavysnowandthunder">Forte neige et orage</string>
+    <string name="weather_condition_rainshowers">Averses</string>
+    <string name="weather_condition_lightsleetandthunder">Léger grésil et orage</string>
+    <string name="weather_condition_heavysnowshowersandthunder">Fortes averses de neige et orage</string>
+    <string name="weather_condition_lightsleetshowers">Légère averses de grésil</string>
+    <string name="weather_condition_snowshowersandthunder">Averses de neige et orage</string>
+    <string name="weather_condition_snowshowers">Averses de neige</string>
+    <string name="weather_condition_heavyrainandthunder">Forte pluie et orage</string>
+    <string name="weather_condition_unknown">Inconnu</string>
     <string name="weather_widget_show_details">Montrer les détails</string>
     <string name="weather_widget_hide_details">Cacher les détails</string>
-    <string name="weather_humidity">Humidité :</string>
-    <string name="weather_wind">Vent :</string>
+    <string name="weather_details_humidity">Humidité : %1$s</string>
+    <string name="weather_details_wind">Vent : %1$s</string>
+    <string name="weather_details_precipitation">Précipitations : %1$s</string>
     <string name="weather_no_data">Aucune donnée météo disponible.</string>
-    <string name="weather_location_not_found">Cette position est introuvable.</string>
 
-    <string name="weather_precipitation">Précipitations :</string>
     <string name="preference_category_license">License</string>
     <string name="preference_about_license">Cette application est un logiciel libre.</string>
     <string name="preference_about_license_summary">Sous la license GNU General Public License 3.0</string>
@@ -328,11 +317,11 @@
     <string name="grant_permission">Accorder</string>
     <string name="missing_permission_auto_location">La permission d\'accès à la position est nécessaire pour déterminer la position automatiquement</string>
     <string name="missing_permission_music_widget">La permission d\'accès aux notifications est nécessaire pour contrôler la lecture du média</string>
-    <string name="missing_permission_contact_search">La permission d\'accès aux contacts est nécessaire pour rechercher des contacts</string>
-    <string name="missing_permission_calendar_search">La permission d\'accès au calendrier est nécessaire pour rechercher dans le calendrier</string>
+    <string name="missing_permission_contact_search_settings">La permission d\'accès aux contacts est nécessaire pour rechercher des contacts</string>
+    <string name="missing_permission_calendar_search_settings">La permission d\'accès au calendrier est nécessaire pour rechercher dans le calendrier</string>
     <string name="missing_permission_calendar_widget_settings">Ce widget nécessite la permission d\'accès au calendrier</string>
-    <string name="missing_permission_file_search_android10">La permission de gérer tous les fichiers est nécessaire pour rechercher des fichiers locaux</string>
-    <string name="missing_permission_file_search">La permission d\'accès au stockage externe est nécessaire pour rechercher des fichiers locaux</string>
+    <string name="missing_permission_file_search_settings_android10">La permission de gérer tous les fichiers est nécessaire pour rechercher des fichiers locaux</string>
+    <string name="missing_permission_file_search_settings">La permission d\'accès au stockage externe est nécessaire pour rechercher des fichiers locaux</string>
     <string name="missing_permission_notification_badges">La permission d\'accès aux notifications est nécessaire pour afficher les badges de notification</string>
 
     <string name="weather_widget_set_location">Définir la position</string>
diff --git a/i18n/src/main/res/values-fr/units.xml b/i18n/src/main/res/values-fr/units.xml
index eee31bd7..b5770c5e 100644
--- a/i18n/src/main/res/values-fr/units.xml
+++ b/i18n/src/main/res/values-fr/units.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:locale="fr">
     <!--
     Important note: Unit symbols may not contain spaces.
     -->
diff --git a/i18n/src/main/res/values/strings.xml b/i18n/src/main/res/values/strings.xml
index 90ad5c5e..46164399 100644
--- a/i18n/src/main/res/values/strings.xml
+++ b/i18n/src/main/res/values/strings.xml
@@ -1,29 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:locale="en">
+    <!-- Name of the app -->
     <string name="app_name">Kvæsitso</string>
-    <!-- Shown in the search bar when the search field is empty -->
-    <string name="edit_text_search_hint">Search</string>
-    <!-- A dialog for an action that requires a short amount of time. Used when sharing APK files -->
-    <string name="dialog_wait">Preparing…</string>
-    <!-- Shown in the app detail share menu if the application was installed from an app store -->
-    <string name="share_menu_store_link">%1$s link</string>
-    <!-- Share app menu when both, link and apk share are available-->
-    <string name="share_menu_apk_file">Package file</string>
+
+
+    <!-- Share something. Can be anything, an app, a website, a file, … -->
+    <string name="menu_share">Share</string>
+    <!-- Shown in the app detail share menu if the application was installed from an app store
+     %1$s is the name of the app store (e.g. Google Play)-->
+    <string name="menu_share_store_link">%1$s link</string>
+    <!-- Share an APK file, shown in the app detail share menu -->
+    <string name="menu_share_apk_file">Package file</string>
     <!-- Uninstall an application -->
     <string name="menu_uninstall">Uninstall</string>
-    <!-- Share something -->
-    <string name="menu_share">Share</string>
-    <!-- %1$s is the app version, %2$s the package name of an app -->
-    <string name="app_info">Version %1$s\n%2$s</string>
+    <string name="menu_favorites_pin">Pin to favorites</string>
+    <string name="menu_favorites_unpin">Unpin</string>
+    <string name="menu_back">Back</string>
+    <string name="menu_app_info">App info</string>
+    <!-- Launch an app -->
+    <string name="menu_launch">Launch</string>
+    <!-- Open a file in the corresponding app -->
+    <string name="menu_open_file">Open</string>
+    <string name="menu_hide">Hide</string>
+    <string name="menu_unhide">Don\'t hide</string>
+    <string name="menu_hidden_items">Hidden items</string>
+    <!-- Delete something (a file or a web search shortcut) -->
+    <string name="menu_delete">Delete</string>
+    <!-- Open a contact in the contacts app -->
+    <string name="menu_contacts_open_externally">Open in contacts app</string>
+    <!-- Open an event in the calendar app -->
+    <string name="menu_calendar_open_externally">Open in calendar app</string>
+
+    <!-- Shown in the search bar when the search text field is empty -->
+    <string name="search_bar_placeholder">Search</string>
+
+    <!-- App version, used in application details %1$s is the version -->
     <string name="app_info_version">Version %1$s</string>
     <!-- Menu entry for launcher settings -->
     <string name="settings">Settings</string>
     <!-- Set the device's wallpaper -->
     <string name="wallpaper">Wallpaper</string>
-    <!-- Launcher settings title -->
-    <string name="title_activity_settings">Settings</string>
-    <!-- Calendar events that last the entire day -->
-    <string name="calendar_event_allday">all-day</string>
+
     <!-- Wind direction, used in weather widget -->
     <string name="wind_north">North</string>
     <!-- Wind direction, used in weather widget -->
@@ -58,6 +75,331 @@
     <string name="wind_north_north_west">North north west</string>
     <!-- No rain or snow, used in weather widget -->
     <string name="precipitation_none">No precipitation</string>
+
+    <!-- The URL of the Wikipedia instance that is used per default. Can be overridden by user.
+     This should point to the Wikipedia in the given language. If no such Wikipedia exists,
+      a fallback that is suited best for most users of this language should be used
+      (English in most cases) -->
+    <string name="wikipedia_url">https://en.wikipedia.org</string>
+    <!-- Shown in Wikipedia results to indicate where they come from -->
+    <string name="wikipedia_source">From Wikipedia</string>
+
+
+    <!-- File meta data, title of audio tracks -->
+    <string name="file_meta_title">Title: %1$s</string>
+    <!-- File meta data, artist of audio tracks -->
+    <string name="file_meta_artist">Artist: %1$s</string>
+    <!-- File meta data, album of audio tracks -->
+    <string name="file_meta_album">Album: %1$s</string>
+    <!-- File meta data, duration of audio tracks -->
+    <string name="file_meta_duration">Duration: %1$s</string>
+    <!-- File meta data, year of audio tracks -->
+    <string name="file_meta_year">Year: %1$s</string>
+    <!-- File size -->
+    <string name="file_meta_size">Size: %1$s</string>
+    <!-- File path -->
+    <string name="file_meta_path">Path: %1$s</string>
+    <!-- File type (MIME type) -->
+    <string name="file_meta_type">Type: %1$s</string>
+    <!-- File meta, image/video dimensions -->
+    <string name="file_meta_dimensions">Dimensions: %1$s</string>
+    <!-- File meta, app name of APK files -->
+    <string name="file_meta_app_name">App name: %1$s</string>
+    <!-- File meta, version name of APK files -->
+    <string name="file_meta_app_version">Version: %1$s</string>
+    <!-- File meta, package name of APK files -->
+    <string name="file_meta_app_pkgname">Package name: %1$s</string>
+    <!-- File meta, min SDK version (=lowest Android version this APK file is compatible with) of APK files -->
+    <string name="file_meta_app_min_sdk">Min SDK version: %1$s</string>
+    <!-- File meta, owner (for files that are stored in a cloud) -->
+    <string name="file_meta_owner">Owner: %1$s</string>
+    <!-- File meta, location (e.g. location where a photo has been taken) -->
+    <string name="file_meta_location">Location: %1$s</string>
+
+    <string name="file_type_directory">Directory</string>
+    <!-- ZIP, TAR, … archive files  -->
+    <string name="file_type_archive">Archive file</string>
+    <!-- APK file  -->
+    <string name="file_type_android">Android package file</string>
+    <!-- Code file (source code in a programming language) -->
+    <string name="file_type_source_code">Source code file</string>
+    <!-- Word document -->
+    <string name="file_type_document">Document</string>
+    <!-- Excel spreadsheet -->
+    <string name="file_type_spreadsheet">Spreadsheet</string>
+    <!-- Audio file -->
+    <string name="file_type_music">Music file</string>
+    <!-- Video file -->
+    <string name="file_type_video">Video</string>
+    <!-- Picture file -->
+    <string name="file_type_image">Picture</string>
+    <!-- Generic file without file extension -->
+    <string name="file_type_none">File</string>
+    <!-- Powerpoint presentation -->
+    <string name="file_type_presentation">Presentation</string>
+    <!-- BZIP, GZIP, … compressed file -->
+    <string name="file_type_compressed">Compressed file</string>
+    <!-- Plain text (TXT) file -->
+    <string name="file_type_text">Text file</string>
+    <!-- E-book file -->
+    <string name="file_type_ebook">E-book</string>
+    <!-- Google Drawings file -->
+    <string name="file_type_drawing">Drawing</string>
+    <!-- Google Forms file -->
+    <string name="file_type_form">Form</string>
+    <!-- Generic file , %1$s is the file extension -->
+    <string name="file_type_generic">%1$s file</string>
+    <!-- Warning message that is shown when a user attempts to delete a directory -->
+    <string name="alert_delete_directory">The directory %1$s and all its content will be deleted permanently. Proceed?</string>
+    <!-- Warning message that is shown when a user attempts to delete a file -->
+    <string name="alert_delete_file">The file %1$s will be deleted permanently. Proceed?</string>
+
+
+    <!-- A somewhat generic error message that is shown when something (a file of a specific file, an app, …)
+    could not be opened because there was no app installed that could handle the request  -->
+    <string name="error_activity_not_found">Couldn\'t open %1$s</string>
+
+    <!--
+        When the app is first launched, three web search shortcuts will be pre-created (can later be customized by user)
+        This is the name of the first one. Must be in sync with [default_websearch_1_url].
+        Usually Google, but can be substituted with something else if Google is not available in
+        the region of the language or not commonly used.
+       -->
+    <string name="default_websearch_1_name">Google</string>
+    <!--
+        When the app is first launched, three web search shortcuts will be pre-created (can later be customized by user)
+        This is the URL of the first one. Must be in sync with [default_websearch_1_name].
+        Usually Google, but can be substituted with something else if Google is not available in
+        the region of the language or not commonly used.
+       -->
+    <string name="default_websearch_1_url">https://google.com/search?q=${1}</string>
+    <!--
+        When the app is first launched, three web search shortcuts will be pre-created (can later be customized by user)
+        This is the name of the second one. Must be in sync with [default_websearch_2_url].
+        Usually YouTube, but can be substituted with something else if YouTube is not available in
+        the region of the language or not commonly used.
+       -->
+    <string name="default_websearch_2_name">YouTube</string>
+    <!--
+        When the app is first launched, three web search shortcuts will be pre-created (can later be customized by user)
+        This is the URL of the second one. Must be in sync with [default_websearch_2_name].
+        Usually YouTube, but can be substituted with something else if YouTube is not available in
+        the region of the language or not commonly used.
+       -->
+    <string name="default_websearch_2_url">https://www.youtube.com/results?search_query=${1}</string>
+    <!--
+        When the app is first launched, three web search shortcuts will be pre-created (can later be customized by user)
+        This is the name of the third one. Must be in sync with [default_websearch_3_url].
+        Usually Google Play, but can be substituted with something else if Google Play is not available in
+        the region of the language or not commonly used.
+       -->
+    <string name="default_websearch_3_name">Google Play</string>
+    <!--
+        When the app is first launched, three web search shortcuts will be pre-created (can later be customized by user)
+        This is the URL of the third one. Must be in sync with [default_websearch_3_name].
+        Usually Google Play, but can be substituted with something else if Google Play is not available in
+        the region of the language or not commonly used.
+       -->
+    <string name="default_websearch_3_url">https://play.google.com/store/search?q=${1}</string>
+
+
+    <string name="websearch_dialog_create_title">Add web search</string>
+    <string name="websearch_dialog_edit_title">Edit web search</string>
+    <string name="websearch_dialog_name">Name</string>
+    <string name="websearch_dialog_url">URL</string>
+    <string name="websearch_dialog_url_description">\'${1}\' will be replaced by the actual search term.</string>
+    <string name="websearch_dialog_url_error">The placeholder \'${1}\' is missing in this URL</string>
+    <string name="websearch_dialog_replace_icon">Replace icon</string>
+    <string name="websearch_dialog_delete_icon">Delete icon</string>
+    <string name="websearch_dialog_custom_icon">Custom icon</string>
+
+    <string name="menu_edit_widgets">Edit widgets</string>
+    <string name="widget_name_weather">Weather</string>
+    <string name="widget_name_calendar">Calendar</string>
+    <string name="widget_name_music">Music</string>
+    <string name="widget_add_widget">Add widget</string>
+    <!-- Add a third party widget (=a standard Android app widget) -->
+    <string name="widget_add_external">More</string>
+    <!-- Indicates to which app a shortcuts belongs. %1$s: the name of the app -->
+    <string name="shortcut_summary">By %1$s</string>
+    <!-- Progress of the installation of another app. %1$s: the formatted percentage of the installation progress -->
+    <string name="installation_in_progress">Installation in progress… (%1$s)</string>
+
+    <!-- Wait, we have easter eggs? No way! -->
+    <string name="easter_egg_1">There are no easter eggs here, unless you brought them with you.</string>
+    <!-- Wait, we have easter eggs? No way! -->
+    <string name="easter_egg_2">Please, stop it, you are wasting your time</string>
+    <!-- Wait, we have easter eggs? No way! -->
+    <string name="easter_egg_3">I won\'t say it again: there are absolutely no easter eggs hidden here</string>
+    <!-- Wait, we have easter eggs? No way! -->
+    <string name="easter_egg_text">Well, you found me. Congratulations. Was it worth it?</string>
+
+    <!-- Close a dialog -->
+    <string name="close">Close</string>
+    <!-- Turn something off / disable a functionality of the launcher -->
+    <string name="turn_off">Turn off</string>
+
+    <string name="widget_action_adjust_height">Adjust height</string>
+    <string name="widget_action_remove">Remove</string>
+    <string name="widget_action_settings">Settings</string>
+
+    <string name="menu_item_edit_favs">Edit favorites</string>
+    <!-- Edit favorites, title for items that are frequently used but not pinned -->
+    <string name="edit_favorites_dialog_unpinned">Not pinned – frequently used</string>
+    <!-- Edit favorites, title for items that are pinned but have not been sorted by the user -->
+    <string name="edit_favorites_dialog_pinned_unsorted">Pinned – automatically sorted</string>
+    <!-- Edit favorites, title for items that are pinned and have been sorted by the user -->
+    <string name="edit_favorites_dialog_pinned_sorted">Pinned – manually sorted</string>
+
+
+    <!-- Nextcloud login flow, URL-->
+    <string name="nextcloud_server_url">Nextcloud server URL</string>
+    <!-- Nextcloud/Owncloud login flow, empty URL-->
+    <string name="nextcloud_server_url_empty">Server URL must not be empty</string>
+    <!-- Nextcloud login flow, error invalid URL-->
+    <string name="nextcloud_server_invalid_url">This URL does not point to a valid Nextcloud installation</string>
+    <!-- Owncloud login flow, UR-->
+    <string name="owncloud_server_url">Owncloud server URL</string>
+    <!-- Owncloud login flow, error invalid URL-->
+    <string name="owncloud_server_invalid_url">This URL does not point to a valid Owncloud installation</string>
+    <!-- Owncloud login flow, password-->
+    <string name="owncloud_password">Password</string>
+    <!-- Owncloud login flow, user name-->
+    <string name="owncloud_username">User name</string>
+    <!-- Owncloud login flow -->
+    <string name="owncloud_login_2fa_hint">If you have two factor authentication enabled, you must use an app password here.</string>
+    <!-- Owncloud login flow, login failed -->
+    <string name="owncloud_login_failed">Login failed: incorrect username or password.</string>
+    <!-- Owncloud login flow, error: username empty -->
+    <string name="owncloud_username_empty">User name must not be empty</string>
+    <!-- Owncloud login flow, error: password empty -->
+    <string name="owncloud_password_empty">Password must not be empty</string>
+    <!-- Nextcloud/Owncloud login flow, continue button -->
+    <string name="login_flow_continue">Continue</string>
+    <!-- Nextcloud/Owncloud login flow, login button -->
+    <string name="login_flow_login">Log in</string>
+
+
+    <string name="disclaimer">Disclaimer</string>
+    <!-- Info and disclaimer for currency conversions. %1$s: formatted date of last currency data update  -->
+    <string name="disclaimer_currency_converter">"Exchange rates as published once per day by the European Central Bank. All information is provided \"as is\" without any kind of guarantee. No liability is assumed for these information.\n\nLast update: %1$s"</string>
+    <string name="unit_converter_show_all">Show all</string>
+
+    <!-- Used in calendar widget date selector. -->
+    <string name="date_today">Today</string>
+    <!-- Used in calendar widget date selector. -->
+    <string name="date_tomorrow">Tomorrow</string>
+    <!-- Headline used in calendar widget for pinned events -->
+    <string name="calendar_widget_pinned_events">Upcoming</string>
+    <string name="calendar_widget_no_events">No events today</string>
+    <string name="calendar_widget_open_app">Open calendar app</string>
+    <string name="calendar_widget_new_event">New event</string>
+    <!--
+        In the calendar widget, only events that start or end at the selected date are shown.
+        If an event runs for three days, it won't be listed if the second day is selected.
+        Instead, the following text will be shown, %1$d being the total number of
+        running events that neither started nor will end on the selected day.
+        -->
+    <plurals name="calendar_widget_running_events">
+        <item quantity="one">+%1$d running event from past days</item>
+        <item quantity="other">+%1$d running events from past days</item>
+    </plurals>
+    <!-- Calendar events that last the entire day -->
+    <string name="calendar_event_allday">all-day</string>
+
+    <!-- Default title that is shown in the music widget if the app that is playing media did not publish a title -->
+    <string name="music_widget_default_title">%1$s is playing media</string>
+    <string name="music_widget_no_data">No media has been played yet</string>
+
+    <string name="weather_condition_sleetshowers">Sleet showers</string>
+    <string name="weather_condition_heavysleet">Heavy sleet</string>
+    <string name="weather_condition_lightrainshowersandthunder">Light rain showers and thunder</string>
+    <string name="weather_condition_heavyrain">Heavy rain</string>
+    <string name="weather_condition_lightsnowandthunder">Light snow and thunder</string>
+    <string name="weather_condition_lightrain">Light rain</string>
+    <string name="weather_condition_lightrainshowers">Light rain showers</string>
+    <string name="weather_condition_lightsnow">Light snow</string>
+    <string name="weather_condition_heavysleetshowersandthunder">Heavy sleet showers and thunder</string>
+    <string name="weather_condition_lightsnowshowers">Light snow showers</string>
+    <string name="weather_condition_lightssleetshowersandthunder">Lights sleet showers and thunder</string>
+    <string name="weather_condition_snowandthunder">Snow and thunder</string>
+    <string name="weather_condition_heavysleetshowers">Heavy sleet showers</string>
+    <string name="weather_condition_heavysnow">Heavy snow</string>
+    <string name="weather_condition_cloudy">Cloudy</string>
+    <string name="weather_condition_lightrainandthunder">Light rain and thunder</string>
+    <string name="weather_condition_snow">Snow</string>
+    <string name="weather_condition_hail">Hail</string>
+    <string name="weather_condition_thunder">Thunderstorm</string>
+    <string name="weather_condition_heavysnowshowers">Heavy snow showers</string>
+    <string name="weather_condition_heavyrainshowers">Heavy rain showers</string>
+    <string name="weather_condition_rainshowersandthunder">Rain showers and thunder</string>
+    <string name="weather_condition_clearsky">Clear sky</string>
+    <string name="weather_condition_sleet">Sleet</string>
+    <string name="weather_condition_rain">Rain</string>
+    <string name="weather_condition_sleetandthunder">Sleet and thunder</string>
+    <string name="weather_condition_lightssnowshowersandthunder">Lights snow showers and thunder</string>
+    <string name="weather_condition_heavyrainshowersandthunder">Heavy rain showers and thunder</string>
+    <string name="weather_condition_fair">Fair</string>
+    <string name="weather_condition_fog">Fog</string>
+    <string name="weather_condition_sleetshowersandthunder">Sleet showers and thunder</string>
+    <string name="weather_condition_rainandthunder">Rain and thunder</string>
+    <string name="weather_condition_lightsleet">Light sleet</string>
+    <string name="weather_condition_heavysleetandthunder">Heavy sleet and thunder</string>
+    <string name="weather_condition_partlycloudy">Partly cloudy</string>
+    <string name="weather_condition_heavysnowandthunder">Heavy snow and thunder</string>
+    <string name="weather_condition_rainshowers">Rain showers</string>
+    <string name="weather_condition_lightsleetandthunder">Light sleet and thunder</string>
+    <string name="weather_condition_heavysnowshowersandthunder">Heavy snow showers and thunder</string>
+    <string name="weather_condition_lightsleetshowers">Light sleet showers</string>
+    <string name="weather_condition_snowshowersandthunder">Snow showers and thunder</string>
+    <string name="weather_condition_snowshowers">Snow showers</string>
+    <string name="weather_condition_heavyrainandthunder">Heavy rain and thunder</string>
+    <string name="weather_condition_wind">Wind</string>
+    <string name="weather_condition_unknown">Unknown</string>
+    <string name="weather_widget_show_details">Show details</string>
+    <string name="weather_widget_hide_details">Hide details</string>
+    <!-- Humidity details, %1$s: formatted humidity value -->
+    <string name="weather_details_humidity">Humidity: %1$s</string>
+    <!-- Wind details, %1$s: formatted wind values -->
+    <string name="weather_details_wind">Wind: %1$s</string>
+    <!-- Precipitation details, %1$s: formatted precipitation values -->
+    <string name="weather_details_precipitation">Precipitation: %1$s</string>
+    <string name="weather_no_data">No weather data available.</string>
+    <!-- Manually set a location, used in weather widget location permission banner as an
+        alternative to granting the permission -->
+    <string name="weather_widget_set_location">Set location</string>
+
+
+    <!-- Missing location permission in weather widget and weather widget settings settings -->
+    <string name="missing_permission_auto_location">Location access is required to determine the location automatically</string>
+    <!-- Missing notification permission in music widget settings -->
+    <string name="missing_permission_music_widget">Notification access is required to control media playback</string>
+    <!-- Missing contact permission in search settings screen -->
+    <string name="missing_permission_contact_search_settings">Contact permission is required to search contacts</string>
+    <!-- Missing calendar permission in search settings screen -->
+    <string name="missing_permission_calendar_search_settings">Calendar permission is required to search calendar</string>
+    <!-- Missing calendar permission in calendar widget settings screen -->
+    <string name="missing_permission_calendar_widget_settings">This widget requires calendar permission</string>
+    <!-- Missing file permission in search settings screen -->
+    <string name="missing_permission_file_search_settings">External storage permission is required to search local files</string>
+    <!-- Missing file permission in search settings screen.
+        Used in Android 10+ because the required permission has changed from READ_EXTERNAL_STORAGE
+        to MANAGE_EXTERNAL_STORAGE which is labeled differently in the Android OS -->
+    <string name="missing_permission_file_search_settings_android10">Manage all files permission is required to search local files</string>
+    <!-- Missing notification permission, used in badge settings screen -->
+    <string name="missing_permission_notification_badges">Notification access is required to display notification badges</string>
+    <!-- Missing calendar permission, used in calendar widget -->
+    <string name="missing_permission_calendar_widget">Grant calendar permission to display upcoming appointments and events here.</string>
+    <!-- Missing calendar permission, used in calendar search results -->
+    <string name="missing_permission_calendar_search">Grant calendar permission to search your calendar.</string>
+    <!-- Missing files permission, used in files search results -->
+    <string name="missing_permission_files_search">Grant storage permission to search photos, media and document on this device.</string>
+    <!-- Missing files permission, used in contact search results -->
+    <string name="missing_permission_contact_search">Grant contact permission to search your contact.</string>
+
+    <!-- Grant a permission, shown in permission banners -->
+    <string name="grant_permission">Grant</string>
+
     <!-- Appearance preference title -->
     <string name="preference_screen_appearance">Appearance</string>
     <string name="preference_theme">Theme</string>
@@ -74,6 +416,11 @@
     <string name="open_webpage">Open website</string>
     <string name="preference_screen_about_summary">App and license information</string>
     <string name="preference_screen_appearance_summary">Customize the look-and-feel</string>
+    <string name="preference_weather_provider">Provider</string>
+    <string name="provider_metno">MET Norway</string>
+    <string name="provider_openweathermap">OpenWeatherMap</string>
+    <string name="provider_brightsky">Deutscher Wetterdienst (Germany only)</string>
+    <string name="provider_here">HERE</string>
     <string name="preference_category_location">Location</string>
     <string name="preference_automatic_location">Automatic location</string>
     <string name="preference_automatic_location_summary">Use GPS and location services to determine location automatically</string>
@@ -81,130 +428,37 @@
     <string name="preference_imperial_units_summary">Use degrees Fahrenheit and miles per hour</string>
     <string name="preference_imperial_units">Imperial units</string>
     <string name="preference_category_debug">Debug</string>
-    <!-- Wikipedia url prefix -->
-    <string name="wikipedia_url">https://en.wikipedia.org</string>
-    <string name="wikipedia_source">From Wikipedia</string>
     <string name="preference_category_icons">Icons</string>
+    <string name="preference_cards">Cards</string>
+    <string name="preference_cards_summary">Customize card appearance</string>
+    <string name="preference_cards_corner_radius">Corner radius</string>
+    <string name="preference_cards_stroke_width">Stroke width</string>
+    <string name="preference_cards_opacity">Opacity</string>
     <string name="preference_icon_shape">Shape</string>
+    <string name="preference_icon_shape_platform">System default</string>
     <string name="preference_icon_shape_square">Square</string>
     <string name="preference_icon_shape_rounded_square">Rounded square</string>
     <string name="preference_icon_shape_squircle">Squircle</string>
     <string name="preference_icon_shape_triangle">Reuleaux triangle</string>
     <string name="preference_icon_shape_circle">Circle</string>
+    <string name="preference_icon_shape_hexagon">Hexagon</string>
     <string name="preference_category_searchbar">Search bar</string>
-    <string name="file_type_directory">Directory</string>
-    <string name="file_type_archive">Archive file</string>
-    <string name="file_type_android">Android package file</string>
-    <string name="file_type_source_code">Source code file</string>
-    <string name="file_type_document">Document</string>
-    <string name="file_type_spreadsheet">Spreadsheet</string>
-    <string name="file_type_music">Music file</string>
-    <string name="file_type_video">Video</string>
-    <string name="file_type_image">Picture</string>
-    <string name="file_type_none">File</string>
-    <string name="file_type_generic">%1$s file</string>
-    <string name="activity_not_found">No suitable app installed.</string>
-    <string name="file_type_presentation">Presentation</string>
-    <string name="file_type_compressed">Compressed file</string>
-    <string name="file_type_text">Text file</string>
-    <string name="alert_delete_directory">The directory %1$s and all its content will be deleted permanently. Proceed?</string>
-    <string name="alert_delete_file">The file %1$s will be deleted permanently. Proceed?</string>
-    <string name="file_meta_title">Title: %1$s</string>
-    <string name="file_meta_artist">Artist: %1$s</string>
-    <string name="file_meta_album">Album: %1$s</string>
-    <string name="file_meta_duration">Duration: %1$s</string>
-    <string name="file_meta_year">Year: %1$s</string>
-    <string name="file_meta_size">Size: %1$s</string>
-    <string name="file_meta_path">Path: %1$s</string>
-    <string name="file_meta_type">Type: %1$s</string>
-    <string name="file_meta_dimensions">Dimensions: %1$s</string>
-    <string name="file_meta_app_name">App name: %1$s</string>
-    <string name="file_meta_app_version">Version: %1$s</string>
-    <string name="file_meta_app_pkgname">Package name: %1$s</string>
-    <string name="file_meta_app_min_sdk">Min SDK version: %1$s</string>
-    <string name="file_meta_owner">Owner: %1$s</string>
-    <string name="file_meta_location">Location: %1$s</string>
     <string name="preference_screen_services">Services</string>
     <string name="preference_theme_system">Follow system</string>
-    <string name="websearch_google">Google</string>
-    <string name="websearch_youtube">YouTube</string>
-    <string name="websearch_playstore">Google Play</string>
-    <string name="websearch_google_url">https://google.com/search?q=${1}</string>
-    <string name="websearch_youtube_url">https://www.youtube.com/results?search_query=${1}</string>
-    <string name="websearch_playstore_url">https://play.google.com/store/search?q=${1}</string>
-    <string name="websearch_dialog_name_hint">Name</string>
-    <string name="websearch_dialog_url_hint">URL</string>
-    <string name="websearch_dialog_url_description">\'${1}\' will be replaced by the actual search term.</string>
-    <string name="websearch_dialog_url_error">The placeholder \'${1}\' is missing in this URL</string>
-    <string name="websearch_dialog_replace_icon">Replace icon</string>
-    <string name="websearch_dialog_delete_icon">Delete icon</string>
-    <string name="preference_weather_provider">Provider</string>
-    <string name="provider_metno">MET Norway</string>
-    <string name="provider_openweathermap">OpenWeatherMap</string>
-    <string name="provider_brightsky">Deutscher Wetterdienst (Germany only)</string>
-    <string name="provider_here">HERE</string>
     <string name="preference_themed_icons">Themed icons</string>
     <string name="preference_themed_icons_summary">Color icons with the application\'s color scheme</string>
     <string name="preference_icon_pack">Icon pack</string>
     <string name="preference_icon_pack_summary_empty">No icon packs installed</string>
-    <string name="menu_edit_widgets">Edit widgets</string>
-    <string name="widget_name_weather">Weather</string>
-    <string name="widget_name_calendar">Calendar</string>
-    <string name="widget_add_widget">Add widget</string>
-    <string name="widget_add_external">More</string>
     <string name="preference_category_system_bars">System bars</string>
     <string name="preference_light_status_bar">Dark status bar icons</string>
     <string name="preference_light_nav_bar">Dark navigation bar icons</string>
     <string name="preference_hide_status_bar">Hide status bar</string>
     <string name="preference_hide_nav_bar">Hide navigation bar</string>
-    <string name="widget_name_music">Music</string>
-    <string name="contacts_menu_open_externally">Open in contacts app</string>
-    <string name="favorites_menu_pin">Pin to favorites</string>
-    <string name="favorites_menu_unpin">Unpin</string>
-    <string name="menu_back">Back</string>
-    <string name="contact_multiple_numbers">%1$d phone numbers</string>
-    <string name="contact_multiple_emails">%1$d email addresses</string>
-    <string name="contact_multiple_postals">%1$d postal addresses</string>
-    <string name="menu_app_info">App info</string>
-    <string name="menu_launch">Launch</string>
-    <string name="menu_open_file">Open</string>
     <string name="preference_screen_services_summary">Manage connected accounts and services</string>
     <string name="preference_category_services_google">Google</string>
     <string name="preference_signin_user">Signed in as %1$s</string>
     <string name="preference_signin_logout">Log out</string>
     <string name="preference_summary_not_logged_in">You are currently not logged in</string>
-    <string name="file_type_ebook">E-book</string>
-    <string name="file_type_drawing">Drawing</string>
-    <string name="file_type_form">Form</string>
-    <string name="menu_hide">Hide</string>
-    <string name="menu_unhide">Don\'t hide</string>
-    <string name="menu_hidden_items">Hidden items</string>
-    <string name="menu_delete">Delete</string>
-    <string name="calendar_menu_open_externally">Open in calendar app</string>
-    <string name="preference_search_wikipedia_pictures">Show pictures</string>
-    <string name="preference_search_wikipedia_pictures_summary">Significantly increases data usage</string>
-    <string name="preference_google_signin">Sign in with Google</string>
-    <string name="preference_google_signin_summary">Sign in to search Google Drive</string>
-    <string name="preference_icon_shape_hexagon">Hexagon</string>
-    <string name="shortcut_summary">By %1$s</string>
-    <string name="installation_in_progress">Installation in progress… (%1$d%%)</string>
-    <string name="activity_not_found_searchable">Couldn\'t open %1$s</string>
-    <string name="preference_legacy_icon_bg">Icon background</string>
-    <string name="preference_legacy_icon_bg_summary">Legacy icon style</string>
-    <!-- Easter egg preference toasts -->
-    <string name="easter_egg_1">There are no easter eggs here, unless you brought them with you.</string>
-    <string name="easter_egg_2">Please, stop it, you are wasting your time</string>
-    <string name="easter_egg_3">I won\'t say it again: there are absolutely no easter eggs hidden here</string>
-    <string name="easter_egg_text">Well, you found me. Congratulations. Was it worth it?</string>
-    <string name="permission_calendar_widget">Grant calendar permission to display upcoming appointments and events here.</string>
-    <string name="permission_calendar_search">Grant calendar permission to search your calendar.</string>
-    <string name="permission_files_search">Grant storage permission to search photos, media and document on this device.</string>
-    <string name="permission_contact_search">Grant contact permission to search your contact.</string>
-    <string name="close">Close</string>
-    <string name="custom_icon">Custom icon</string>
-    <string name="widget_action_adjust_height">Adjust height</string>
-    <string name="widget_action_remove">Remove</string>
-    <string name="widget_action_settings">Settings</string>
     <string name="preference_icon_shape_pentagon">Pentagon</string>
     <string name="preference_category_wallpaper">Wallpaper</string>
     <string name="preference_dim_wallpaper">Dim wallpaper</string>
@@ -220,110 +474,19 @@
     <string name="preference_cloud_badges_summary">Show a badge for files that are stored in a cloud</string>
     <string name="preference_shortcut_badges">Shortcut badges</string>
     <string name="preference_shortcut_badges_summary">Show a badge which indicates to which app a shortcut belongs</string>
-    <string name="preference_icon_shape_platform">System default</string>
     <string name="preference_category_services_microsoft">Microsoft</string>
     <string name="preference_ms_signin">Sign in with Microsoft</string>
     <string name="preference_ms_signin_summary">Sign in to search OneDrive</string>
     <string name="preference_nextcloud_signin">Sign in to Nextcloud</string>
     <string name="preference_nextcloud_signin_summary">Sign in to search your Nextcloud server</string>
-    <string name="preference_account_checking_status">Checking status…</string>
-    <string name="preference_about_telegram">Telegram group</string>
-    <string name="preference_about_fdroid">F-Droid repository</string>
-    <string name="menu_item_edit_favs">Edit favorites</string>
-    <string name="edit_favorites_dialog_stage2">Not pinned – frequently used</string>
-    <string name="edit_favorites_dialog_stage1">Pinned – automatically sorted</string>
-    <string name="edit_favorites_dialog_stage0">Pinned – manually sorted</string>
-    <string name="login_flow_next">Next</string>
-    <string name="next_cloud_server_url">Nextcloud server URL</string>
-    <string name="next_cloud_server_url_empty">Server URL must not be empty</string>
     <string name="preference_category_services_nextcloud">Nextcloud</string>
-    <string name="next_cloud_server_invalid_url">This URL does not point to a valid Nextcloud installation</string>
-
-    <string name="owncloud_server_url">Owncloud server URL</string>
     <string name="preference_category_services_owncloud">Owncloud</string>
-    <string name="owncloud_server_invalid_url">This URL does not point to a valid Owncloud installation</string>
-    <string name="owncloud_password">Password</string>
-    <string name="owncloud_username">User name</string>
-    <string name="owncloud_login_2fa_hint">If you have two factor authentication enabled, you must use an app password here.</string>
-    <string name="login_flow_login">Log in</string>
-    <string name="owncloud_login_failed">Login failed: incorrect username or password.</string>
     <string name="preference_owncloud_signin">Sign in to Owncloud</string>
     <string name="preference_owncloud_signin_summary">Sign in to search your Owncloud server</string>
-    <string name="owncloud_username_empty">User name must not be empty</string>
-    <string name="owncloud_password_empty">Password must not be empty</string>
-    <string name="preference_cards_summary">Customize card appearance</string>
-    <string name="preference_cards">Cards</string>
-    <string name="preference_cards_corner_radius">Corner radius</string>
-    <string name="preference_cards_stroke_width">Stroke width</string>
-    <string name="preference_cards_opacity">Opacity</string>
-    <string name="disclaimer">Disclaimer</string>
-    <string name="disclaimer_currency_converter">"Exchange rates as published once per day by the European Central Bank. All information is provided \"as is\" without any kind of guarantee. No liability is assumed for these information.\n\nLast update: %1$s"</string>
-    <string name="unit_converter_show_all">Show all</string>
-
-    <string name="date_today">Today</string>
-    <string name="date_tomorrow">Tomorrow</string>
-    <string name="calendar_widget_pinned_events">Upcoming</string>
-    <string name="calendar_widget_no_events">No events today</string>
-    <string name="calendar_widget_open_app">Open calendar app</string>
-    <string name="calendar_widget_new_event">New event</string>
-    <plurals name="calendar_widget_running_events">
-        <item quantity="one">+%1$d running event from past days</item>
-        <item quantity="other">+%1$d running events from past days</item>
-    </plurals>
-
-    <!-- Weather widget -->
-    <string name="weather_sleetshowers">Sleet showers</string>
-    <string name="weather_heavysleet">Heavy sleet</string>
-    <string name="weather_lightrainshowersandthunder">Light rain showers and thunder</string>
-    <string name="weather_heavyrain">Heavy rain</string>
-    <string name="weather_lightsnowandthunder">Light snow and thunder</string>
-    <string name="weather_lightrain">Light rain</string>
-    <string name="weather_lightrainshowers">Light rain showers</string>
-    <string name="weather_lightsnow">Light snow</string>
-    <string name="weather_heavysleetshowersandthunder">Heavy sleet showers and thunder</string>
-    <string name="weather_lightsnowshowers">Light snow showers</string>
-    <string name="weather_lightssleetshowersandthunder">Lights sleet showers and thunder</string>
-    <string name="weather_snowandthunder">Snow and thunder</string>
-    <string name="weather_heavysleetshowers">Heavy sleet showers</string>
-    <string name="weather_heavysnow">Heavy snow</string>
-    <string name="weather_cloudy">Cloudy</string>
-    <string name="weather_lightrainandthunder">Light rain and thunder</string>
-    <string name="weather_snow">Snow</string>
-    <string name="weather_hail">Hail</string>
-    <string name="weather_thunder">Thunderstorm</string>
-    <string name="weather_heavysnowshowers">Heavy snow showers</string>
-    <string name="weather_heavyrainshowers">Heavy rain showers</string>
-    <string name="weather_rainshowersandthunder">Rain showers and thunder</string>
-    <string name="weather_clearsky">Clear sky</string>
-    <string name="weather_sleet">Sleet</string>
-    <string name="weather_rain">Rain</string>
-    <string name="weather_sleetandthunder">Sleet and thunder</string>
-    <string name="weather_lightssnowshowersandthunder">Lights snow showers and thunder</string>
-    <string name="weather_heavyrainshowersandthunder">Heavy rain showers and thunder</string>
-    <string name="weather_fair">Fair</string>
-    <string name="weather_fog">Fog</string>
-    <string name="weather_sleetshowersandthunder">Sleet showers and thunder</string>
-    <string name="weather_rainandthunder">Rain and thunder</string>
-    <string name="weather_lightsleet">Light sleet</string>
-    <string name="weather_heavysleetandthunder">Heavy sleet and thunder</string>
-    <string name="weather_partlycloudy">Partly cloudy</string>
-    <string name="weather_heavysnowandthunder">Heavy snow and thunder</string>
-    <string name="weather_rainshowers">Rain showers</string>
-    <string name="weather_lightsleetandthunder">Light sleet and thunder</string>
-    <string name="weather_heavysnowshowersandthunder">Heavy snow showers and thunder</string>
-    <string name="weather_lightsleetshowers">Light sleet showers</string>
-    <string name="weather_snowshowersandthunder">Snow showers and thunder</string>
-    <string name="weather_snowshowers">Snow showers</string>
-    <string name="weather_heavyrainandthunder">Heavy rain and thunder</string>
-    <string name="weather_unknown">Unknown</string>
-    <string name="weather_widget_show_details">Show details</string>
-    <string name="weather_widget_hide_details">Hide details</string>
-    <string name="weather_humidity">Humidity:</string>
-    <string name="weather_wind">Wind:</string>
-    <string name="weather_no_data">No weather data available.</string>
-    <string name="weather_location_not_found">This location could not be found.</string>
-
-    <string name="weather_precipitation">Precipitation:</string>
+    <string name="preference_about_telegram">Telegram group</string>
+    <string name="preference_about_fdroid">F-Droid repository</string>
+    <string name="preference_legacy_icon_bg">Icon background</string>
+    <string name="preference_legacy_icon_bg_summary">Legacy icon style</string>
     <string name="preference_category_license">License</string>
     <string name="preference_about_license">This app is free software.</string>
     <string name="preference_about_license_summary">Licensed under the GNU General Public License 3.0</string>
@@ -331,18 +494,6 @@
     <string name="preference_category_grid">Grid</string>
     <string name="preference_grid_column_count">Number of columns</string>
 
-    <string name="grant_permission">Grant</string>
-    <string name="missing_permission_auto_location">Location access is required to determine the location automatically</string>
-    <string name="missing_permission_music_widget">Notification access is required to control media playback</string>
-    <string name="missing_permission_contact_search">Contact permission is required to search contacts</string>
-    <string name="missing_permission_calendar_search">Calendar permission is required to search calendar</string>
-    <string name="missing_permission_calendar_widget_settings">This widget requires calendar permission</string>
-    <string name="missing_permission_file_search_android10">Manage all files permission is required to search local files</string>
-    <string name="missing_permission_file_search">External storage permission is required to search local files</string>
-    <string name="missing_permission_notification_badges">Notification access is requried to display notification badges</string>
-
-    <string name="weather_widget_set_location">Set location</string>
-
     <string name="preference_screen_debug">Debug</string>
     <string name="preference_screen_debug_summary">Troubleshooting tools</string>
 
@@ -392,8 +543,11 @@
     <string name="preference_search_nextcloud">Nextcloud</string>
     <string name="preference_search_cloud_summary">Search %1$s\'s files</string>
     <string name="preference_search_owncloud">Owncloud</string>
-
     <string name="preference_screen_calendarwidget">Calendar</string>
+    <string name="preference_search_wikipedia_pictures">Show pictures</string>
+    <string name="preference_search_wikipedia_pictures_summary">Significantly increases data usage</string>
+    <string name="preference_google_signin">Sign in with Google</string>
+    <string name="preference_google_signin_summary">Sign in to search Google Drive</string>
     <string name="preference_calendar_calendars">Calendars</string>
     <string name="preference_calendar_hide_allday">Hide all-day events</string>
     <plurals name="preference_calendar_calendars_summary">
@@ -415,18 +569,15 @@
 
     <string name="preference_wikipedia_customurl">Wikipedia URL</string>
 
-    <string name="music_widget_default_title">%1$s is playing media</string>
-
-    <string name="music_widget_no_data">No media has been played yet</string>
-
-    <string name="websearch_dialog_create_title">Add web search</string>
-    <string name="websearch_dialog_edit_title">Edit web search</string>
-
+    <!-- Used in an info banner if a specific feature requires a Nextcloud account -->
     <string name="no_account_nextcloud">You haven\'t connected a Nextcloud account yet</string>
+    <!-- Used in an info banner if a specific feature requires an Owncloud account -->
     <string name="no_account_owncloud">You haven\'t connected an Owncloud account yet</string>
+    <!-- Used in an info banner if a specific feature requires a Microsoft account -->
     <string name="no_account_microsoft">You haven\'t connected a Microsoft account yet</string>
+    <!-- Used in an info banner if a specific feature requires a Google account -->
     <string name="no_account_google">You haven\'t connected a Google account yet</string>
+    <!-- Used in info banners that indicate that an account is required to enable a certain feature -->
     <string name="connect_account">Connect account</string>
 
-    <string name="turn_off">Turn off</string>
 </resources>
diff --git a/i18n/src/main/res/values/units.xml b/i18n/src/main/res/values/units.xml
index 3060574c..c0c37db0 100644
--- a/i18n/src/main/res/values/units.xml
+++ b/i18n/src/main/res/values/units.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:locale="en">
     <!--
     Important note: Unit symbols may not contain spaces.
     -->
diff --git a/nextcloud/src/main/java/de/mm20/launcher2/nextcloud/LoginActivity.kt b/nextcloud/src/main/java/de/mm20/launcher2/nextcloud/LoginActivity.kt
index f2623296..ebf3e9d1 100644
--- a/nextcloud/src/main/java/de/mm20/launcher2/nextcloud/LoginActivity.kt
+++ b/nextcloud/src/main/java/de/mm20/launcher2/nextcloud/LoginActivity.kt
@@ -29,13 +29,13 @@ class LoginActivity : AppCompatActivity() {
                     url = "https://$url"
                 }
                 if (url.isBlank()) {
-                    binding.serverUrlInputLayout.error = getString(R.string.next_cloud_server_url_empty)
+                    binding.serverUrlInputLayout.error = getString(R.string.nextcloud_server_url_empty)
                     return@launch
                 }
                 if (nextcloudClient.checkNextcloudInstallation(url)) {
                     openLoginPage(url)
                 } else {
-                    binding.serverUrlInputLayout.error = getString(R.string.next_cloud_server_invalid_url)
+                    binding.serverUrlInputLayout.error = getString(R.string.nextcloud_server_invalid_url)
                 }
             }
         }
diff --git a/nextcloud/src/main/res/layout/activity_nextcloud_login.xml b/nextcloud/src/main/res/layout/activity_nextcloud_login.xml
index 1842077d..a52a7809 100644
--- a/nextcloud/src/main/res/layout/activity_nextcloud_login.xml
+++ b/nextcloud/src/main/res/layout/activity_nextcloud_login.xml
@@ -25,7 +25,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginBottom="32dp"
-            android:hint="@string/next_cloud_server_url"
+            android:hint="@string/nextcloud_server_url"
             app:helperTextEnabled="true">
 
             <com.google.android.material.textfield.TextInputEditText
@@ -40,7 +40,7 @@
             style="@style/Widget.MaterialComponents.Button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/login_flow_next" />
+            android:text="@string/login_flow_continue" />
 
     </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/owncloud/src/main/java/de/mm20/launcher2/owncloud/LoginActivity.kt b/owncloud/src/main/java/de/mm20/launcher2/owncloud/LoginActivity.kt
index 84a6c31c..db327d1f 100644
--- a/owncloud/src/main/java/de/mm20/launcher2/owncloud/LoginActivity.kt
+++ b/owncloud/src/main/java/de/mm20/launcher2/owncloud/LoginActivity.kt
@@ -25,7 +25,7 @@ class LoginActivity : AppCompatActivity() {
                     url = "https://$url"
                 }
                 if (url.isBlank()) {
-                    binding.serverUrlInputLayout.error = getString(R.string.next_cloud_server_url_empty)
+                    binding.serverUrlInputLayout.error = getString(R.string.nextcloud_server_url_empty)
                     return@launch
                 }
                 if (owncloudClient.checkOwncloudInstallation(url)) {
diff --git a/owncloud/src/main/res/layout/activity_owncloud_login.xml b/owncloud/src/main/res/layout/activity_owncloud_login.xml
index c4f025f1..10091e60 100644
--- a/owncloud/src/main/res/layout/activity_owncloud_login.xml
+++ b/owncloud/src/main/res/layout/activity_owncloud_login.xml
@@ -40,7 +40,7 @@
             style="@style/Widget.MaterialComponents.Button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/login_flow_next" />
+            android:text="@string/login_flow_continue" />
 
     </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/ui/src/main/AndroidManifest.xml b/ui/src/main/AndroidManifest.xml
index ad741be5..6e9a9dd2 100644
--- a/ui/src/main/AndroidManifest.xml
+++ b/ui/src/main/AndroidManifest.xml
@@ -33,7 +33,7 @@
         <activity
             android:name=".settings.SettingsActivity"
             android:exported="true"
-            android:label="@string/title_activity_settings"
+            android:label="@string/settings"
             android:launchMode="singleTask"
             android:parentActivityName=".launcher.LauncherActivity"
             android:screenOrientation="portrait"
@@ -51,7 +51,6 @@
         <activity
             android:name=".launcher.widgets.picker.PickAppWidgetActivity"
             android:exported="true"
-            android:label="@string/title_activity_settings"
             android:launchMode="singleTask"
             android:parentActivityName=".launcher.LauncherActivity"
             android:screenOrientation="portrait"
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/modals/EditFavoritesView.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/modals/EditFavoritesView.kt
index a0790ba0..54bdb257 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/modals/EditFavoritesView.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/modals/EditFavoritesView.kt
@@ -39,21 +39,21 @@ class EditFavoritesView @JvmOverloads constructor(
             viewModel.getFavorites().toMutableList()
         }
         binding.progressBar.visibility = View.GONE
-        binding.itemList.addView(getLabel(R.string.edit_favorites_dialog_stage0))
+        binding.itemList.addView(getLabel(R.string.edit_favorites_dialog_pinned_sorted))
 
         binding.itemList.setContainerScrollView(binding.scrollView)
 
         var stage = 0
         for (favorite in favorites) {
             if (favorite.pinPosition <= 1 && stage == 0) {
-                getLabel(R.string.edit_favorites_dialog_stage1).let {
+                getLabel(R.string.edit_favorites_dialog_pinned_unsorted).let {
                     it.tag = "stage1"
                     binding.itemList.addDragView(it, it.getChildAt(1))
                 }
                 stage++
             }
             if (favorite.pinPosition == 0 && stage == 1) {
-                getLabel(R.string.edit_favorites_dialog_stage2).let {
+                getLabel(R.string.edit_favorites_dialog_unpinned).let {
                     it.tag = "stage2"
                     binding.itemList.addDragView(it, it.getChildAt(1))
                 }
@@ -63,14 +63,14 @@ class EditFavoritesView @JvmOverloads constructor(
             binding.itemList.addDragView(view, view.getDragHandle())
         }
         if (stage == 0) {
-            getLabel(R.string.edit_favorites_dialog_stage1).let {
+            getLabel(R.string.edit_favorites_dialog_pinned_unsorted).let {
                 it.tag = "stage1"
                 binding.itemList.addDragView(it, it.getChildAt(1))
             }
             stage++
         }
         if (stage == 1) {
-            getLabel(R.string.edit_favorites_dialog_stage2).let {
+            getLabel(R.string.edit_favorites_dialog_unpinned).let {
                 it.tag = "stage2"
                 binding.itemList.addDragView(it, it.getChildAt(1))
             }
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchBar.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchBar.kt
index 057fc91e..1ce7e0e7 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchBar.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchBar.kt
@@ -251,7 +251,7 @@ fun SearchBar(
                 ) {
                     if (value.isEmpty()) {
                         Text(
-                            text = stringResource(R.string.edit_text_search_hint),
+                            text = stringResource(R.string.search_bar_placeholder),
                             style = MaterialTheme.typography.bodyLarge,
                             color = contentColor
                         )
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItem.kt
index a03e08ad..3326a1ea 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItem.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItem.kt
@@ -1,6 +1,5 @@
 package de.mm20.launcher2.ui.launcher.search.apps
 
-import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.animation.*
 import androidx.compose.animation.core.snap
 import androidx.compose.animation.core.tween
@@ -174,7 +173,7 @@ fun AppItem(
             val isPinned by viewModel.isPinned.collectAsState(false)
             val favAction = if (isPinned) {
                 DefaultToolbarAction(
-                    label = stringResource(R.string.favorites_menu_unpin),
+                    label = stringResource(R.string.menu_favorites_unpin),
                     icon = Icons.Rounded.Star,
                     action = {
                         viewModel.unpin()
@@ -182,7 +181,7 @@ fun AppItem(
                 )
             } else {
                 DefaultToolbarAction(
-                    label = stringResource(R.string.favorites_menu_pin),
+                    label = stringResource(R.string.menu_favorites_pin),
                     icon = Icons.Rounded.StarOutline,
                     action = {
                         viewModel.pin()
@@ -225,14 +224,14 @@ fun AppItem(
                 icon = Icons.Rounded.Share,
                 children = listOf(
                     DefaultToolbarAction(
-                        label = stringResource(R.string.share_menu_store_link, storeDetails.label),
+                        label = stringResource(R.string.menu_share_store_link, storeDetails.label),
                         icon = Icons.Rounded.Share,
                         action = {
                             viewModel.shareStoreLink(context, storeDetails.url)
                         }
                     ),
                     DefaultToolbarAction(
-                        label = stringResource(R.string.share_menu_apk_file),
+                        label = stringResource(R.string.menu_share_apk_file),
                         icon = Icons.Rounded.Share
                     ) {
                         scope.launch {
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarItem.kt
index e9b7e7f3..244fdaba 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarItem.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarItem.kt
@@ -1,6 +1,5 @@
 package de.mm20.launcher2.ui.launcher.search.calendar
 
-import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.animation.*
 import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.animation.core.snap
@@ -156,7 +155,7 @@ fun CalendarItem(
                         val isPinned by viewModel.isPinned.collectAsState(false)
                         val favAction = if (isPinned) {
                             DefaultToolbarAction(
-                                label = stringResource(R.string.favorites_menu_unpin),
+                                label = stringResource(R.string.menu_favorites_unpin),
                                 icon = Icons.Rounded.Star,
                                 action = {
                                     viewModel.unpin()
@@ -164,7 +163,7 @@ fun CalendarItem(
                             )
                         } else {
                             DefaultToolbarAction(
-                                label = stringResource(R.string.favorites_menu_pin),
+                                label = stringResource(R.string.menu_favorites_pin),
                                 icon = Icons.Rounded.StarOutline,
                                 action = {
                                     viewModel.pin()
@@ -196,7 +195,7 @@ fun CalendarItem(
 
                     toolbarActions.add(
                         DefaultToolbarAction(
-                            label = stringResource(R.string.calendar_menu_open_externally),
+                            label = stringResource(R.string.menu_calendar_open_externally),
                             icon = Icons.Rounded.OpenInNew,
                             action = {
                                 viewModel.launch(context)
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactItem.kt
index 66442e5f..5cce8f32 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactItem.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactItem.kt
@@ -1,6 +1,5 @@
 package de.mm20.launcher2.ui.launcher.search.contacts
 
-import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.animation.*
 import androidx.compose.animation.core.animateDp
 import androidx.compose.animation.core.snap
@@ -220,7 +219,7 @@ fun ContactItem(
                     val isPinned by viewModel.isPinned.collectAsState(false)
                     val favAction = if (isPinned) {
                         DefaultToolbarAction(
-                            label = stringResource(R.string.favorites_menu_unpin),
+                            label = stringResource(R.string.menu_favorites_unpin),
                             icon = Icons.Rounded.Star,
                             action = {
                                 viewModel.unpin()
@@ -228,7 +227,7 @@ fun ContactItem(
                         )
                     } else {
                         DefaultToolbarAction(
-                            label = stringResource(R.string.favorites_menu_pin),
+                            label = stringResource(R.string.menu_favorites_pin),
                             icon = Icons.Rounded.StarOutline,
                             action = {
                                 viewModel.pin()
@@ -260,7 +259,7 @@ fun ContactItem(
 
                 toolbarActions.add(
                     DefaultToolbarAction(
-                        label = stringResource(R.string.calendar_menu_open_externally),
+                        label = stringResource(R.string.menu_calendar_open_externally),
                         icon = Icons.Rounded.OpenInNew,
                         action = {
                             viewModel.launch(context)
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItem.kt
index 2258ade1..e389cf68 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItem.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItem.kt
@@ -1,6 +1,5 @@
 package de.mm20.launcher2.ui.launcher.search.files
 
-import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.animation.*
 import androidx.compose.animation.core.animateDp
 import androidx.compose.animation.core.snap
@@ -23,7 +22,6 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.ExperimentalUnitApi
 import androidx.compose.ui.unit.dp
 import de.mm20.launcher2.search.data.File
-import de.mm20.launcher2.search.data.LocalFile
 import de.mm20.launcher2.ui.R
 import de.mm20.launcher2.ui.animation.animateTextStyleAsState
 import de.mm20.launcher2.ui.component.DefaultToolbarAction
@@ -142,7 +140,7 @@ fun FileItem(
                     val isPinned by viewModel.isPinned.collectAsState(false)
                     val favAction = if (isPinned) {
                         DefaultToolbarAction(
-                            label = stringResource(R.string.favorites_menu_unpin),
+                            label = stringResource(R.string.menu_favorites_unpin),
                             icon = Icons.Rounded.Star,
                             action = {
                                 viewModel.unpin()
@@ -150,7 +148,7 @@ fun FileItem(
                         )
                     } else {
                         DefaultToolbarAction(
-                            label = stringResource(R.string.favorites_menu_pin),
+                            label = stringResource(R.string.menu_favorites_pin),
                             icon = Icons.Rounded.StarOutline,
                             action = {
                                 viewModel.pin()
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/shortcut/ShortcutItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/shortcut/ShortcutItem.kt
index fd51e73e..17a04767 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/shortcut/ShortcutItem.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/shortcut/ShortcutItem.kt
@@ -1,7 +1,6 @@
 package de.mm20.launcher2.ui.launcher.search.shortcut
 
 
-import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.animation.*
 import androidx.compose.animation.core.snap
 import androidx.compose.animation.core.tween
@@ -26,7 +25,6 @@ import de.mm20.launcher2.ui.ktx.toDp
 import de.mm20.launcher2.ui.ktx.toPixels
 import de.mm20.launcher2.ui.locals.LocalFavoritesEnabled
 import de.mm20.launcher2.ui.modifier.scale
-import kotlinx.coroutines.launch
 import kotlin.math.pow
 import kotlin.math.roundToInt
 
@@ -76,7 +74,7 @@ fun AppItem(
             val isPinned by viewModel.isPinned.collectAsState(false)
             val favAction = if (isPinned) {
                 DefaultToolbarAction(
-                    label = stringResource(R.string.favorites_menu_unpin),
+                    label = stringResource(R.string.menu_favorites_unpin),
                     icon = Icons.Rounded.Star,
                     action = {
                         viewModel.unpin()
@@ -84,7 +82,7 @@ fun AppItem(
                 )
             } else {
                 DefaultToolbarAction(
-                    label = stringResource(R.string.favorites_menu_pin),
+                    label = stringResource(R.string.menu_favorites_pin),
                     icon = Icons.Rounded.StarOutline,
                     action = {
                         viewModel.pin()
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/website/WebsiteItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/website/WebsiteItem.kt
index d2aaa5f2..b39b105c 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/website/WebsiteItem.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/website/WebsiteItem.kt
@@ -1,8 +1,6 @@
 package de.mm20.launcher2.ui.launcher.search.website
 
-import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.animation.*
-import androidx.compose.animation.core.snap
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
@@ -26,14 +24,12 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import coil.compose.rememberImagePainter
-import de.mm20.launcher2.search.data.Application
 import de.mm20.launcher2.search.data.Website
 import de.mm20.launcher2.ui.component.DefaultToolbarAction
 import de.mm20.launcher2.ui.component.Toolbar
 import de.mm20.launcher2.ui.component.ToolbarAction
 import de.mm20.launcher2.ui.R
 import de.mm20.launcher2.ui.ktx.toDp
-import de.mm20.launcher2.ui.launcher.search.apps.AppItem
 import de.mm20.launcher2.ui.locals.LocalFavoritesEnabled
 
 @Composable
@@ -80,7 +76,7 @@ fun WebsiteItem(
             val isPinned by viewModel.isPinned.collectAsState(false)
             val favAction = if (isPinned) {
                 DefaultToolbarAction(
-                    label = stringResource(R.string.favorites_menu_unpin),
+                    label = stringResource(R.string.menu_favorites_unpin),
                     icon = Icons.Rounded.Star,
                     action = {
                         viewModel.unpin()
@@ -89,7 +85,7 @@ fun WebsiteItem(
                 )
             } else {
                 DefaultToolbarAction(
-                    label = stringResource(R.string.favorites_menu_pin),
+                    label = stringResource(R.string.menu_favorites_pin),
                     icon = Icons.Rounded.StarOutline,
                     action = {
                         viewModel.pin()
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/wikipedia/WikipediaItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/wikipedia/WikipediaItem.kt
index 99ec8779..fecd4e7c 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/wikipedia/WikipediaItem.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/wikipedia/WikipediaItem.kt
@@ -1,6 +1,5 @@
 package de.mm20.launcher2.ui.launcher.search.wikipedia
 
-import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.animation.*
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.Image
@@ -25,14 +24,12 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import coil.compose.rememberImagePainter
-import de.mm20.launcher2.search.data.Website
 import de.mm20.launcher2.search.data.Wikipedia
 import de.mm20.launcher2.ui.R
 import de.mm20.launcher2.ui.component.DefaultToolbarAction
 import de.mm20.launcher2.ui.component.Toolbar
 import de.mm20.launcher2.ui.component.ToolbarAction
 import de.mm20.launcher2.ui.ktx.toDp
-import de.mm20.launcher2.ui.launcher.search.website.WebsiteItem
 import de.mm20.launcher2.ui.locals.LocalFavoritesEnabled
 import de.mm20.launcher2.ui.utils.htmlToAnnotatedString
 
@@ -86,7 +83,7 @@ fun WikipediaItem(
             val isPinned by viewModel.isPinned.collectAsState(false)
             val favAction = if (isPinned) {
                 DefaultToolbarAction(
-                    label = stringResource(R.string.favorites_menu_unpin),
+                    label = stringResource(R.string.menu_favorites_unpin),
                     icon = Icons.Rounded.Star,
                     action = {
                         viewModel.unpin()
@@ -95,7 +92,7 @@ fun WikipediaItem(
                 )
             } else {
                 DefaultToolbarAction(
-                    label = stringResource(R.string.favorites_menu_pin),
+                    label = stringResource(R.string.menu_favorites_pin),
                     icon = Icons.Rounded.StarOutline,
                     action = {
                         viewModel.pin()
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidget.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidget.kt
index 8bf0c02f..2ccda5c2 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidget.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidget.kt
@@ -104,7 +104,7 @@ fun CalendarWidget() {
                     modifier = Modifier
                         .fillMaxWidth()
                         .padding(4.dp),
-                    text = stringResource(R.string.permission_calendar_widget),
+                    text = stringResource(R.string.missing_permission_calendar_widget),
                     onClick = { viewModel.requestCalendarPermission(context as AppCompatActivity) }
                 )
             }
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt
index 3e7809bd..7b9b1754 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt
@@ -161,20 +161,20 @@ fun CurrentWeather(forecast: Forecast, imperialUnits: Boolean) {
                     modifier = Modifier.fillMaxWidth()
                 ) {
                     if (forecast.humidity >= 0) {
-                        WeatherDetailRow(
-                            title = stringResource(id = R.string.weather_humidity),
-                            value = "${forecast.humidity.roundToInt()} %"
+                        Text(
+                            stringResource(id = R.string.weather_details_humidity, "${forecast.humidity.roundToInt()} %"),
+                            style = MaterialTheme.typography.bodySmall,
                         )
                     }
-                    WeatherDetailRow(
-                        title = stringResource(id = R.string.weather_wind),
-                        value = formatWindSpeed(imperialUnits, forecast)
+                    Text(
+                        stringResource(id = R.string.weather_details_wind, formatWindSpeed(imperialUnits, forecast)),
+                        style = MaterialTheme.typography.bodySmall,
                     )
                     val precipitation = formatPrecipitation(imperialUnits, forecast)
                     if (precipitation != null) {
-                        WeatherDetailRow(
-                            title = stringResource(id = R.string.weather_precipitation),
-                            value = precipitation
+                        Text(
+                            stringResource(id = R.string.weather_details_precipitation, precipitation),
+                            style = MaterialTheme.typography.bodySmall,
                         )
                     }
                 }
@@ -228,7 +228,7 @@ fun WeatherDetailRow(title: String, value: String) {
     Row {
         Text(
             text = title,
-            modifier = Modifier.padding(end = 8.dp),
+            modifier = Modifier,//.padding(end = 8.dp),
             style = MaterialTheme.typography.bodySmall,
         )
         Text(
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/view/ToolbarView.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/view/ToolbarView.kt
index 4ff5315a..2635d343 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/view/ToolbarView.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/view/ToolbarView.kt
@@ -224,7 +224,7 @@ open class ToolbarSubaction(val title: String, var clickAction: (() -> Unit)) {
 
 class FavoriteToolbarAction(val context: Context, val item: Searchable) : ToolbarAction(
     R.drawable.ic_star_outline,
-    context.getString(R.string.favorites_menu_pin)
+    context.getString(R.string.menu_favorites_pin)
 ), KoinComponent {
 
     private val repository: FavoritesRepository by inject()
@@ -232,10 +232,10 @@ class FavoriteToolbarAction(val context: Context, val item: Searchable) : Toolba
         set(value) {
             field = value
             if (value) {
-                title = context.getString(R.string.favorites_menu_unpin)
+                title = context.getString(R.string.menu_favorites_unpin)
                 icon = R.drawable.ic_star_solid
             } else {
-                title = context.getString(R.string.favorites_menu_pin)
+                title = context.getString(R.string.menu_favorites_pin)
                 icon = R.drawable.ic_star_outline
             }
         }
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt
index b92781eb..b24f4912 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt
@@ -58,7 +58,7 @@ fun FileSearchSettingsScreen() {
                 AnimatedVisibility(hasFilePermission == false) {
                     MissingPermissionBanner(
                         text = stringResource(
-                            if (isAtLeastApiLevel(29)) R.string.missing_permission_file_search_android10 else R.string.missing_permission_file_search
+                            if (isAtLeastApiLevel(29)) R.string.missing_permission_file_search_settings_android10 else R.string.missing_permission_file_search_settings
                         ), onClick = {
                             viewModel.requestFilePermission(context as AppCompatActivity)
                         },
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreen.kt
index ca1c3d7e..9021240e 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreen.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreen.kt
@@ -53,7 +53,7 @@ fun SearchSettingsScreen() {
                 val hasContactsPermission by viewModel.hasContactsPermission.observeAsState()
                 AnimatedVisibility(hasContactsPermission == false) {
                     MissingPermissionBanner(
-                        text = stringResource(R.string.missing_permission_contact_search),
+                        text = stringResource(R.string.missing_permission_contact_search_settings),
                         onClick = {
                             viewModel.requestContactsPermission(context as AppCompatActivity)
                         },
@@ -75,7 +75,7 @@ fun SearchSettingsScreen() {
                 val hasCalendarPermission by viewModel.hasCalendarPermission.observeAsState()
                 AnimatedVisibility(hasCalendarPermission == false) {
                     MissingPermissionBanner(
-                        text = stringResource(R.string.missing_permission_calendar_search),
+                        text = stringResource(R.string.missing_permission_calendar_search_settings),
                         onClick = {
                             viewModel.requestCalendarPermission(context as AppCompatActivity)
                         },
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/websearch/WebSearchSettingsScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/websearch/WebSearchSettingsScreen.kt
index c91d43c5..b230f630 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/settings/websearch/WebSearchSettingsScreen.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/websearch/WebSearchSettingsScreen.kt
@@ -299,7 +299,7 @@ fun EditWebsearchDialog(
                                 .align(Alignment.End)
                         ) {
                             Text(
-                                stringResource(R.string.custom_icon),
+                                stringResource(R.string.websearch_dialog_custom_icon),
                                 style = MaterialTheme.typography.labelLarge
                             )
                         }
@@ -315,7 +315,7 @@ fun EditWebsearchDialog(
                             label = it
                         },
                         label = {
-                            Text(text = stringResource(R.string.websearch_dialog_name_hint))
+                            Text(text = stringResource(R.string.websearch_dialog_name))
                         }
                     )
                     OutlinedTextField(
@@ -327,7 +327,7 @@ fun EditWebsearchDialog(
                             urlTemplate = it
                         },
                         label = {
-                            Text(text = stringResource(R.string.websearch_dialog_url_hint))
+                            Text(text = stringResource(R.string.websearch_dialog_url))
                         },
                     )
                     AnimatedVisibility(showError) {
diff --git a/weather/src/main/java/de/mm20/launcher2/weather/brightsky/BrightskyProvider.kt b/weather/src/main/java/de/mm20/launcher2/weather/brightsky/BrightskyProvider.kt
index a577bf96..23580e20 100644
--- a/weather/src/main/java/de/mm20/launcher2/weather/brightsky/BrightskyProvider.kt
+++ b/weather/src/main/java/de/mm20/launcher2/weather/brightsky/BrightskyProvider.kt
@@ -94,16 +94,16 @@ class BrightskyProvider(
 
     private fun getCondition(icon: String): String? {
         val resId = when (icon) {
-            "clear-day", "clear-night" -> R.string.weather_clearsky
-            "partly-cloudy-day", "partly-cloudy-night" -> R.string.weather_partlycloudy
-            "cloudy" -> R.string.weather_cloudy
-            "fog" -> R.string.weather_fog
-            "wind" -> R.string.weather_wind
-            "rain" -> R.string.weather_rain
-            "sleet" -> R.string.weather_sleet
-            "snow" -> R.string.weather_snow
-            "hail" -> R.string.weather_hail
-            "thunderstorm" -> R.string.weather_thunder
+            "clear-day", "clear-night" -> R.string.weather_condition_clearsky
+            "partly-cloudy-day", "partly-cloudy-night" -> R.string.weather_condition_partlycloudy
+            "cloudy" -> R.string.weather_condition_cloudy
+            "fog" -> R.string.weather_condition_fog
+            "wind" -> R.string.weather_details_wind
+            "rain" -> R.string.weather_condition_rain
+            "sleet" -> R.string.weather_condition_sleet
+            "snow" -> R.string.weather_condition_snow
+            "hail" -> R.string.weather_condition_hail
+            "thunderstorm" -> R.string.weather_condition_thunder
             else -> return null
         }
         return context.getString(resId)
diff --git a/weather/src/main/java/de/mm20/launcher2/weather/metno/MetNoProvider.kt b/weather/src/main/java/de/mm20/launcher2/weather/metno/MetNoProvider.kt
index 05a4d4fb..e2ea8c86 100644
--- a/weather/src/main/java/de/mm20/launcher2/weather/metno/MetNoProvider.kt
+++ b/weather/src/main/java/de/mm20/launcher2/weather/metno/MetNoProvider.kt
@@ -52,48 +52,48 @@ class MetNoProvider(override val context: Context) : LatLonWeatherProvider() {
     private fun conditionForCode(code: String): String {
         return context.getString(
             when (code.substringBefore("_")) {
-                "sleetshowers" -> R.string.weather_sleetshowers
-                "heavysleet" -> R.string.weather_heavysleet
-                "lightrainshowersandthunder" -> R.string.weather_lightrainshowersandthunder
-                "heavyrain" -> R.string.weather_heavyrain
-                "lightsnowandthunder" -> R.string.weather_lightsnowandthunder
-                "lightrain" -> R.string.weather_lightrain
-                "lightrainshowers" -> R.string.weather_lightrainshowers
-                "lightsnow" -> R.string.weather_lightsnow
-                "heavysleetshowersandthunder" -> R.string.weather_heavysleetshowersandthunder
-                "lightsnowshowers" -> R.string.weather_lightsnowshowers
-                "lightssleetshowersandthunder" -> R.string.weather_lightssleetshowersandthunder
-                "snowandthunder" -> R.string.weather_snowandthunder
-                "heavysleetshowers" -> R.string.weather_heavysleetshowers
-                "heavysnow" -> R.string.weather_heavysnow
-                "cloudy" -> R.string.weather_cloudy
-                "lightrainandthunder" -> R.string.weather_lightrainandthunder
-                "snow" -> R.string.weather_snow
-                "heavysnowshowers" -> R.string.weather_heavysnowshowers
-                "heavyrainshowers" -> R.string.weather_heavyrainshowers
-                "rainshowersandthunder" -> R.string.weather_rainshowersandthunder
-                "clearsky" -> R.string.weather_clearsky
-                "sleet" -> R.string.weather_sleet
-                "rain" -> R.string.weather_rain
-                "sleetandthunder" -> R.string.weather_sleetandthunder
-                "lightssnowshowersandthunder" -> R.string.weather_lightssnowshowersandthunder
-                "heavyrainshowersandthunder" -> R.string.weather_heavyrainshowersandthunder
-                "fair" -> R.string.weather_fair
-                "fog" -> R.string.weather_fog
-                "sleetshowersandthunder" -> R.string.weather_sleetshowersandthunder
-                "rainandthunder" -> R.string.weather_rainandthunder
-                "lightsleet" -> R.string.weather_lightsleet
-                "heavysleetandthunder" -> R.string.weather_heavysleetandthunder
-                "partlycloudy" -> R.string.weather_partlycloudy
-                "heavysnowandthunder" -> R.string.weather_heavysnowandthunder
-                "rainshowers" -> R.string.weather_rainshowers
-                "lightsleetandthunder" -> R.string.weather_lightsleetandthunder
-                "heavysnowshowersandthunder" -> R.string.weather_heavysnowshowersandthunder
-                "lightsleetshowers" -> R.string.weather_lightsleetshowers
-                "snowshowersandthunder" -> R.string.weather_snowshowersandthunder
-                "snowshowers" -> R.string.weather_snowshowers
-                "heavyrainandthunder" -> R.string.weather_heavyrainandthunder
-                else -> R.string.weather_unknown
+                "sleetshowers" -> R.string.weather_condition_sleetshowers
+                "heavysleet" -> R.string.weather_condition_heavysleet
+                "lightrainshowersandthunder" -> R.string.weather_condition_lightrainshowersandthunder
+                "heavyrain" -> R.string.weather_condition_heavyrain
+                "lightsnowandthunder" -> R.string.weather_condition_lightsnowandthunder
+                "lightrain" -> R.string.weather_condition_lightrain
+                "lightrainshowers" -> R.string.weather_condition_lightrainshowers
+                "lightsnow" -> R.string.weather_condition_lightsnow
+                "heavysleetshowersandthunder" -> R.string.weather_condition_heavysleetshowersandthunder
+                "lightsnowshowers" -> R.string.weather_condition_lightsnowshowers
+                "lightssleetshowersandthunder" -> R.string.weather_condition_lightssleetshowersandthunder
+                "snowandthunder" -> R.string.weather_condition_snowandthunder
+                "heavysleetshowers" -> R.string.weather_condition_heavysleetshowers
+                "heavysnow" -> R.string.weather_condition_heavysnow
+                "cloudy" -> R.string.weather_condition_cloudy
+                "lightrainandthunder" -> R.string.weather_condition_lightrainandthunder
+                "snow" -> R.string.weather_condition_snow
+                "heavysnowshowers" -> R.string.weather_condition_heavysnowshowers
+                "heavyrainshowers" -> R.string.weather_condition_heavyrainshowers
+                "rainshowersandthunder" -> R.string.weather_condition_rainshowersandthunder
+                "clearsky" -> R.string.weather_condition_clearsky
+                "sleet" -> R.string.weather_condition_sleet
+                "rain" -> R.string.weather_condition_rain
+                "sleetandthunder" -> R.string.weather_condition_sleetandthunder
+                "lightssnowshowersandthunder" -> R.string.weather_condition_lightssnowshowersandthunder
+                "heavyrainshowersandthunder" -> R.string.weather_condition_heavyrainshowersandthunder
+                "fair" -> R.string.weather_condition_fair
+                "fog" -> R.string.weather_condition_fog
+                "sleetshowersandthunder" -> R.string.weather_condition_sleetshowersandthunder
+                "rainandthunder" -> R.string.weather_condition_rainandthunder
+                "lightsleet" -> R.string.weather_condition_lightsleet
+                "heavysleetandthunder" -> R.string.weather_condition_heavysleetandthunder
+                "partlycloudy" -> R.string.weather_condition_partlycloudy
+                "heavysnowandthunder" -> R.string.weather_condition_heavysnowandthunder
+                "rainshowers" -> R.string.weather_condition_rainshowers
+                "lightsleetandthunder" -> R.string.weather_condition_lightsleetandthunder
+                "heavysnowshowersandthunder" -> R.string.weather_condition_heavysnowshowersandthunder
+                "lightsleetshowers" -> R.string.weather_condition_lightsleetshowers
+                "snowshowersandthunder" -> R.string.weather_condition_snowshowersandthunder
+                "snowshowers" -> R.string.weather_condition_snowshowers
+                "heavyrainandthunder" -> R.string.weather_condition_heavyrainandthunder
+                else -> R.string.weather_condition_unknown
             }
         )
     }