diff --git a/.tx/config b/.tx/config
index 8b2d7db5f..492d24c4e 100644
--- a/.tx/config
+++ b/.tx/config
@@ -6,15 +6,18 @@ source_file = app/src/main/res/values/strings.xml
 source_lang = en
 minimum_perc = 20
 file_filter = app/src/main/res/values-<lang>/strings.xml
-lang_map = ar_SA: ar, fi_FI: fi, fr_FR: fr-rFR, nb_NO: nb, sk_SK: sk, sl_SI: sl, tr_TR: tr, zh_CN: zh, zh_TW: zh-rTW
+lang_map = ar_SA: ar, en_GB: en-rGB, fi_FI: fi, fr_FR: fr-rFR, nb_NO: nb, sk_SK: sk, sl_SI: sl, tr_TR: tr, zh_CN: zh, zh_TW: zh-rTW
 type = ANDROID
 
+
+# Attention: fastlane directories are like "en-us", not "en-rUS"!
+
 [davx5.metadata-short-description]
 source_file = fastlane/metadata/android/en-US/short_description.txt
 source_lang = en
 minimum_perc = 100
 file_filter = fastlane/metadata/android/<lang>/short_description.txt
-lang_map = ar_SA: ar, fi_FI: fi, fr_FR: fr-FR, nb_NO: nb, sk_SK: sk, sl_SI: sl, tr_TR: tr, zh_CN: zh, zh_TW: zh-TW
+lang_map = ar_SA: ar, en_GB: en-GB, fi_FI: fi, fr_FR: fr-FR, nb_NO: nb, sk_SK: sk, sl_SI: sl, tr_TR: tr, zh_CN: zh, zh_TW: zh-TW
 type = TXT
 
 [davx5.metadata-full-description]
@@ -22,5 +25,5 @@ source_file = fastlane/metadata/android/en-US/full_description.txt
 source_lang = en
 minimum_perc = 100
 file_filter = fastlane/metadata/android/<lang>/full_description.txt
-lang_map = ar_SA: ar, fi_FI: fi, fr_FR: fr-FR, nb_NO: nb, sk_SK: sk, sl_SI: sl, tr_TR: tr, zh_CN: zh, zh_TW: zh-TW
+lang_map = ar_SA: ar, en_GB: en-GB, fi_FI: fi, fr_FR: fr-FR, nb_NO: nb, sk_SK: sk, sl_SI: sl, tr_TR: tr, zh_CN: zh, zh_TW: zh-TW
 type = TXT
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 8fd047c00..99d05fb42 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -41,6 +41,8 @@
   <string name="intro_tasks_title">Поддръжка на задачи</string>
   <string name="intro_tasks_text1">Ако сървърът поддържа задачи, те могат да бъдат синхронизирани с приложение за задачи:</string>
   <string name="intro_tasks_opentasks">OpenTasks</string>
+  <string name="intro_tasks_opentasks_info">Изглежда не се разработва вече, не се препоръчва.</string>
+  <string name="intro_tasks_tasks_org">Tasks.org</string>
   <string name="intro_tasks_tasks_org_info"><![CDATA[Някои възможности <a href="https://www.davx5.com/faq/tasks/advanced-task-features">(още) не се поддържат</a>.]]></string>
   <string name="intro_tasks_no_app_store">Няма достъпен магазин за приложения</string>
   <string name="intro_tasks_dont_show">Не се нуждая от поддръжка на задачи.*</string>
@@ -60,6 +62,9 @@
   <string name="permissions_calendar_title">Разрешения за календара</string>
   <string name="permissions_calendar_status_off">Календарите не могат да бъдат синхронизирани (не се препоръчва)</string>
   <string name="permissions_calendar_status_on">Календарите могат да бъдат синхронизирани</string>
+  <string name="permissions_notification_title">Разрешение за известия</string>
+  <string name="permissions_notification_status_off">Известията са изключени (непрепоръчително)</string>
+  <string name="permissions_notification_status_on">Известията са еключени</string>
   <string name="permissions_jtx_title">Разрешения за jtx Board</string>
   <string name="permissions_jtx_status_not_installed">Няма (инсталирана) синхронизация на задачи, дневници и бележки</string>
   <string name="permissions_jtx_status_off">Без синхронизиране на задачи, дневници и бележки</string>
@@ -121,8 +126,13 @@
   <string name="navigation_drawer_community">Общност</string>
   <string name="navigation_drawer_donate">Дарения</string>
   <string name="navigation_drawer_privacy_policy">Лични данни</string>
+  <string name="account_list_no_notification_permission">Известията са изключени. Няма да бъдете известявани за грешки при синхронизиране.</string>
   <string name="account_list_no_internet">Няма връзка с интернет. Android няма да извършва синхронизация.</string>
+  <string name="account_list_manage_connections">Управление на връзките</string>
   <string name="account_list_low_storage">Няма достатъчно свободно място. Android няма да извършва синхронизация.</string>
+  <string name="account_list_manage_storage">Управление на хранилището</string>
+  <string name="account_list_datasaver_enabled">Включена е икономия на данни. Синхронизацията във фонов режим е ограничена.</string>
+  <string name="account_list_manage_datasaver">Икономия на трафик</string>
   <string name="account_list_empty">Добре дошли при DAVx⁵!\n\nМожете да добавите регистрация за CalDAV/CardDAV.</string>
   <string name="accounts_global_sync_disabled">Автоматичното синхронизиране е изключено на ниво система</string>
   <string name="accounts_global_sync_enable">Включване</string>
@@ -172,6 +182,8 @@
   <string name="app_settings_notification_settings">Настройки за съобщенията</string>
   <string name="app_settings_notification_settings_summary">Управлявление на каналите за съобщения и техните настройки</string>
   <string name="app_settings_theme_title">Избиране на тема</string>
+  <string name="app_settings_language_title">Избор на език</string>
+  <string name="app_settings_language_system_default">Според системната</string>
   <string-array name="app_settings_theme_names">
     <item>Според системата</item>
     <item>Светла</item>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index f9cbb4adc..8f58292c3 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -41,6 +41,8 @@
   <string name="intro_tasks_title">Suport de tasques</string>
   <string name="intro_tasks_text1">Si el vostre servidor permet les tasques, es poden sincronitzar amb una aplicació que admeti tasques:</string>
   <string name="intro_tasks_opentasks">OpenTasks</string>
+  <string name="intro_tasks_opentasks_info">Sembla que ja no es desenvolupa, no es recomana.</string>
+  <string name="intro_tasks_tasks_org">Tasks.org</string>
   <string name="intro_tasks_tasks_org_info"><![CDATA[Algunes funcions <a href="https://www.davx5.com/faq/tasks/advanced-task-features">no estan disponibles</a> (encara).]]></string>
   <string name="intro_tasks_no_app_store">No hi ha cap mercat d\'aplicacions disponible</string>
   <string name="intro_tasks_dont_show">No necessito suport per les tasques.*</string>
@@ -129,6 +131,8 @@
   <string name="account_list_manage_connections">Gestiona les connexions</string>
   <string name="account_list_low_storage">Espai d\'emmagatzematge baix. L\'Android no executarà la sincronització.</string>
   <string name="account_list_manage_storage">Gestiona l\'emmagatzematge</string>
+  <string name="account_list_datasaver_enabled">S\'ha activat l\'estalviador de dades. La sincronització en segon pla està restringida.</string>
+  <string name="account_list_manage_datasaver">Gestió de l\'estalviador de dades</string>
   <string name="account_list_empty">Us donem la benvinguda a DAVx⁵! \n\nAra podeu afegir un compte CalDAV / CardDAV.</string>
   <string name="accounts_global_sync_disabled">La sincronització automàtica de tot el sistema està inhabilitada</string>
   <string name="accounts_global_sync_enable">Activa</string>
@@ -178,6 +182,8 @@
   <string name="app_settings_notification_settings">Configuració de les notificacions</string>
   <string name="app_settings_notification_settings_summary">Gestiona els canals de notificació i la seva configuració</string>
   <string name="app_settings_theme_title">Selecció del tema</string>
+  <string name="app_settings_language_title">Seleccioneu l\'idioma</string>
+  <string name="app_settings_language_system_default">Predeterminat del sistema</string>
   <string-array name="app_settings_theme_names">
     <item>Predeterminat del sistema</item>
     <item>Clar</item>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index d606c21a8..615b29561 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -179,6 +179,7 @@
   <string name="app_settings_notification_settings">Nastavení oznamování</string>
   <string name="app_settings_notification_settings_summary">Spravovat kanály oznamování a jejich nastavení</string>
   <string name="app_settings_theme_title">Vybrat vzhled</string>
+  <string name="app_settings_language_system_default">Systémová výchozí</string>
   <string-array name="app_settings_theme_names">
     <item>Výchozí systémový</item>
     <item>Světlý</item>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 3d3752c42..3733cfeaf 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -172,6 +172,7 @@
   <string name="app_settings_notification_settings">Notifikations indstillinger</string>
   <string name="app_settings_notification_settings_summary">Håndtér notifikationskanaler og deres opsætning</string>
   <string name="app_settings_theme_title">Vælg tema</string>
+  <string name="app_settings_language_system_default">System standard</string>
   <string-array name="app_settings_theme_names">
     <item>System standard</item>
     <item>Lys</item>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 35a431ad7..fc8d2f17a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -131,6 +131,8 @@
   <string name="account_list_manage_connections">Verbindungen steuern</string>
   <string name="account_list_low_storage">Speicher knapp. Android wird keine Synchronisierung ausführen.</string>
   <string name="account_list_manage_storage">Speicherplatz verwalten</string>
+  <string name="account_list_datasaver_enabled">Datensparer aktiviert. Die Hintergrundsynchronisierung ist eingeschränkt.</string>
+  <string name="account_list_manage_datasaver">Datensparer verwalten</string>
   <string name="account_list_empty">Herzlich willkommen!\n\nSie können jetzt ein CalDAV/CardDAV-Konto hinzufügen.</string>
   <string name="accounts_global_sync_disabled">Systemweite automatische Synchronisierung ist nicht aktiv</string>
   <string name="accounts_global_sync_enable">Aktivieren</string>
@@ -180,6 +182,8 @@
   <string name="app_settings_notification_settings">Benachrichtigungseinstellungen</string>
   <string name="app_settings_notification_settings_summary">Benachrichtigungskanäle und -einstellungen verwalten</string>
   <string name="app_settings_theme_title">Aussehen wählen</string>
+  <string name="app_settings_language_title">Sprache wählen</string>
+  <string name="app_settings_language_system_default">Systemvorgabe</string>
   <string-array name="app_settings_theme_names">
     <item>wie System</item>
     <item>heller Stil</item>
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
new file mode 100644
index 000000000..4b1fbef03
--- /dev/null
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -0,0 +1,433 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--common strings-->
+  <string name="app_name">DAVx⁵</string>
+  <string name="account_invalid">Account does not exist (anymore)</string>
+  <string name="account_title_address_book">DAVx⁵ Address book</string>
+  <string name="address_books_authority_title">Address books</string>
+  <string name="dialog_remove">Remove</string>
+  <string name="dialog_deny">Cancel</string>
+  <string name="field_required">This field is required</string>
+  <string name="help">Help</string>
+  <string name="manage_accounts">Manage accounts</string>
+  <string name="share">Share</string>
+  <string name="database_destructive_migration_title">Database corrupted</string>
+  <string name="database_destructive_migration_text">All accounts have been removed locally.</string>
+  <string name="notification_channel_debugging">Debugging</string>
+  <string name="notification_channel_general">Other important messages</string>
+  <string name="notification_channel_status">Low-priority status messages</string>
+  <string name="notification_channel_sync">Synchronisation</string>
+  <string name="notification_channel_sync_errors">Synchronisation errors</string>
+  <string name="notification_channel_sync_errors_desc">Important errors which stop synchronisation like unexpected server replies</string>
+  <string name="notification_channel_sync_warnings">Synchronisation warnings</string>
+  <string name="notification_channel_sync_warnings_desc">Non-fatal synchronisation problems like certain invalid files</string>
+  <string name="notification_channel_sync_io_errors">Network and I/O errors</string>
+  <string name="notification_channel_sync_io_errors_desc">Timeouts, connection problems, etc. (often temporary)</string>
+  <!--IntroActivity-->
+  <string name="intro_slogan1">Your data. Your choice.</string>
+  <string name="intro_slogan2">Take control.</string>
+  <string name="intro_battery_title">Regular sync intervals</string>
+  <string name="intro_battery_not_whitelisted">Disabled (not recommended)</string>
+  <string name="intro_battery_whitelisted">Enabled (recommended)</string>
+  <string name="intro_battery_text">For synchronisation at regular intervals, %s must be allowed to run in the background. Otherwise, Android may pause synchronisation at any time.</string>
+  <string name="intro_battery_dont_show">I don\'t need regular sync intervals.*</string>
+  <string name="intro_autostart_title">%s compatibility</string>
+  <string name="intro_autostart_text">This device probably blocks synchronisation. If you\'re affected, you can only resolve this manually.</string>
+  <string name="intro_autostart_dont_show">I have done the required settings. Don\'t remind me anymore.*</string>
+  <string name="intro_leave_unchecked">* Leave unchecked to be reminded later. Can be reset in app settings / %s.</string>
+  <string name="intro_more_info">More information</string>
+  <string name="intro_tasks_jtx">jtx Board</string>
+  <string name="intro_tasks_jtx_info"><![CDATA[Supports sync of Tasks, Journals and Notes.]]></string>
+  <string name="intro_tasks_title">Tasks support</string>
+  <string name="intro_tasks_text1">If tasks are supported by your server, they can be synchronised with a supported tasks app:</string>
+  <string name="intro_tasks_opentasks">OpenTasks</string>
+  <string name="intro_tasks_opentasks_info">Doesn\'t seem to be developed anymore – not recommended.</string>
+  <string name="intro_tasks_tasks_org">Tasks.org</string>
+  <string name="intro_tasks_tasks_org_info"><![CDATA[Some features <a href="https://www.davx5.com/faq/tasks/advanced-task-features">are not supported</a> (yet).]]></string>
+  <string name="intro_tasks_no_app_store">No app store available</string>
+  <string name="intro_tasks_dont_show">I don\'t need tasks support.*</string>
+  <string name="intro_open_source_title">Open-source software</string>
+  <string name="intro_open_source_text">We\'re happy that you use %s, which is open-source software. Development, maintenance and support are hard work. Please consider contributing (there are many ways) or a donation. It would be highly appreciated!</string>
+  <string name="intro_open_source_details">How to contribute/donate</string>
+  <string name="intro_open_source_dont_show">Don\'t show in the near future</string>
+  <!--PermissionsActivity-->
+  <string name="permissions_title">Permissions</string>
+  <string name="permissions_text">%s requires permissions to work properly.</string>
+  <string name="permissions_all_title">All of the below</string>
+  <string name="permissions_all_status_off">Use this to enable all features (recommended)</string>
+  <string name="permissions_all_status_on">All permissions granted</string>
+  <string name="permissions_contacts_title">Contacts permissions</string>
+  <string name="permissions_contacts_status_off">No contact sync (not recommended)</string>
+  <string name="permissions_contacts_status_on">Contact sync possible</string>
+  <string name="permissions_calendar_title">Calendar permissions</string>
+  <string name="permissions_calendar_status_off">No calendar sync (not recommended)</string>
+  <string name="permissions_calendar_status_on">Calendar sync possible</string>
+  <string name="permissions_notification_title">Notification permission</string>
+  <string name="permissions_notification_status_off">Notifications disabled (not recommended)</string>
+  <string name="permissions_notification_status_on">Notifications enabled</string>
+  <string name="permissions_jtx_title">jtx Board permissions</string>
+  <string name="permissions_jtx_status_not_installed">No task, journals &amp; notes sync (not installed)</string>
+  <string name="permissions_jtx_status_off">No tasks, journals, notes sync</string>
+  <string name="permissions_jtx_status_on">Tasks, journals, notes sync possible</string>
+  <string name="permissions_opentasks_title">OpenTasks permissions</string>
+  <string name="permissions_tasksorg_title">Tasks permissions</string>
+  <string name="permissions_tasks_status_not_installed">No task sync (not installed)</string>
+  <string name="permissions_tasks_status_off">No task sync</string>
+  <string name="permissions_tasks_status_on">Task sync possible</string>
+  <string name="permissions_autoreset_title">Keep permissions</string>
+  <string name="permissions_autoreset_status_off">Permissions may be reset automatically (not recommended)</string>
+  <string name="permissions_autoreset_status_on">Permissions won\'t be reset automatically</string>
+  <string name="permissions_autoreset_instruction">Click Permissions &gt; uncheck \"Remove permissions if app isn\'t used\"</string>
+  <string name="permissions_app_settings_hint">If a switch doesn\'t work, use app settings / Permissions.</string>
+  <string name="permissions_app_settings">App settings</string>
+  <!--WifiPermissionsActivity-->
+  <string name="wifi_permissions_label">WiFi SSID permissions</string>
+  <string name="wifi_permissions_intro">To be able to access the current WiFi name (SSID), these conditions must be met:</string>
+  <string name="wifi_permissions_location_permission">Precise location permission</string>
+  <string name="wifi_permissions_location_permission_on">Location permission granted</string>
+  <string name="wifi_permissions_location_permission_off">Location permission denied</string>
+  <string name="wifi_permissions_background_location_permission">Background location permission</string>
+  <string name="wifi_permissions_background_location_permission_label">Allow all the time</string>
+  <string name="wifi_permissions_background_location_permission_on"><![CDATA[Location permission set to <b>%s</b>]]></string>
+  <string name="wifi_permissions_background_location_permission_off"><![CDATA[Location permission not set to <b>%s</b>]]></string>
+  <string name="wifi_permissions_background_location_disclaimer">%s uses the Location permission only to determine the current WiFi\'s SSID for SSID-restricted accounts. This will happen even when the app is in background. No location data are collected, stored, processed or sent anywhere.</string>
+  <string name="wifi_permissions_location_enabled">Location always enabled</string>
+  <string name="wifi_permissions_location_enabled_on">Location service is enabled</string>
+  <string name="wifi_permissions_location_enabled_off">Location service is disabled</string>
+  <!--AboutActivity-->
+  <string name="about_translations">Translations</string>
+  <string name="about_libraries">Libraries</string>
+  <string name="about_version">Version %1$s (%2$d)</string>
+  <string name="about_build_date">Compiled on %s</string>
+  <string name="about_copyright">© Ricki Hirner, Bernhard Stockmann (bitfire web engineering GmbH) and contributors</string>
+  <string name="about_flavor_info">This version is only eligible for distribution over Google Play.</string>
+  <string name="about_license_info_no_warranty">This program comes with ABSOLUTELY NO WARRANTY. It is free software, and you are welcome to redistribute it under certain conditions.</string>
+  <string name="about_translations_thanks"><![CDATA[<i>Thanks to: </i> %s]]></string>
+  <!--global settings-->
+  <string name="logging_couldnt_create_file">Couldn\'t create log file</string>
+  <string name="logging_notification_text">Now logging all %s activities</string>
+  <string name="logging_notification_view_share">View/share</string>
+  <string name="logging_notification_disable">Disable</string>
+  <!--AccountsActivity-->
+  <string name="navigation_drawer_open">Open navigation drawer</string>
+  <string name="navigation_drawer_close">Close navigation drawer</string>
+  <string name="navigation_drawer_subtitle">CalDAV/CardDAV Sync Adapter</string>
+  <string name="navigation_drawer_about">About / License</string>
+  <string name="navigation_drawer_beta_feedback">Beta feedback</string>
+  <string name="install_email_client">Please install an email client</string>
+  <string name="install_browser">Please install a Web browser</string>
+  <string name="navigation_drawer_settings">Settings</string>
+  <string name="navigation_drawer_news_updates">News &amp; updates</string>
+  <string name="navigation_drawer_tools">Tools</string>
+  <string name="navigation_drawer_external_links">External links</string>
+  <string name="navigation_drawer_website">Web site</string>
+  <string name="navigation_drawer_manual">Manual</string>
+  <string name="navigation_drawer_faq">FAQ</string>
+  <string name="navigation_drawer_community">Community</string>
+  <string name="navigation_drawer_donate">Donate</string>
+  <string name="navigation_drawer_privacy_policy">Privacy policy</string>
+  <string name="account_list_no_notification_permission">Notifications disabled. You won\'t be notified about sync errors.</string>
+  <string name="account_list_no_internet">No Internet connectivity. Android will not run synchronisation.</string>
+  <string name="account_list_manage_connections">Manage connections</string>
+  <string name="account_list_low_storage">Storage space low. Android will not run synchronisation.</string>
+  <string name="account_list_manage_storage">Manage storage</string>
+  <string name="account_list_datasaver_enabled">Data saver enabled. Background synchronisation is restricted.</string>
+  <string name="account_list_manage_datasaver">Manage data saver</string>
+  <string name="account_list_empty">Welcome to DAVx⁵!\n\nYou can add a CalDAV/CardDAV account now.</string>
+  <string name="accounts_global_sync_disabled">System-wide automatic synchronisation is disabled</string>
+  <string name="accounts_global_sync_enable">Enable</string>
+  <string name="accounts_sync_all">Sync all accounts</string>
+  <!--RefreshCollectionsWorker-->
+  <string name="refresh_collections_worker_refresh_failed">Service detection failed</string>
+  <string name="refresh_collections_worker_refresh_couldnt_refresh">Couldn\'t refresh collection list</string>
+  <!--Battery Optimization-->
+  <string name="battery_optimization_notify_title">Can not run in foreground</string>
+  <string name="battery_optimization_notify_text">Battery optimisation whitelisting required</string>
+  <!--ForegroundService-->
+  <string name="foreground_service_notify_title">Running in foreground</string>
+  <string name="foreground_service_notify_text">On some devices, this is necessary for automatic synchronisation.</string>
+  <!--AppSettingsActivity-->
+  <string name="app_settings">Settings</string>
+  <string name="app_settings_debug">Debugging</string>
+  <string name="app_settings_show_debug_info">Show debug info</string>
+  <string name="app_settings_show_debug_info_details">View/share software and configuration details</string>
+  <string name="app_settings_logging">Verbose logging</string>
+  <string name="app_settings_logging_on">Logging is active</string>
+  <string name="app_settings_logging_off">Logging is disabled</string>
+  <string name="app_settings_battery_optimization">Battery optimisation</string>
+  <string name="app_settings_battery_optimization_whitelisted">App is whitelisted (recommended)</string>
+  <string name="app_settings_battery_optimization_not_whitelisted">App is not whitelisted (not recommended)</string>
+  <string name="app_settings_foreground_service">Keep in foreground</string>
+  <string name="app_settings_foreground_service_details">May help if your device prevents automatic synchronisation</string>
+  <string name="app_settings_connection">Connection</string>
+  <string name="app_settings_proxy">Proxy type</string>
+  <string-array name="app_settings_proxy_types">
+    <item>System default</item>
+    <item>No proxy</item>
+    <item>HTTP</item>
+    <item>SOCKS (for Orbot)</item>
+  </string-array>
+  <string name="app_settings_proxy_host">Proxy host name</string>
+  <string name="app_settings_proxy_port">Proxy port</string>
+  <string name="app_settings_security">Security</string>
+  <string name="app_settings_security_app_permissions">App permissions</string>
+  <string name="app_settings_security_app_permissions_summary">Review permissions required for synchronisation</string>
+  <string name="app_settings_distrust_system_certs">Distrust system certificates</string>
+  <string name="app_settings_distrust_system_certs_on">System and user-added CAs won\'t be trusted</string>
+  <string name="app_settings_distrust_system_certs_off">System and user-added CAs will be trusted (recommended)</string>
+  <string name="app_settings_reset_certificates">Reset (un)trusted certificates</string>
+  <string name="app_settings_reset_certificates_summary">Resets trust of all custom certificates</string>
+  <string name="app_settings_reset_certificates_success">All custom certificates have been cleared</string>
+  <string name="app_settings_user_interface">User interface</string>
+  <string name="app_settings_notification_settings">Notification settings</string>
+  <string name="app_settings_notification_settings_summary">Manage notification channels and their settings</string>
+  <string name="app_settings_theme_title">Select theme</string>
+  <string name="app_settings_language_title">Select language</string>
+  <string name="app_settings_language_system_default">System default</string>
+  <string-array name="app_settings_theme_names">
+    <item>System default</item>
+    <item>Light</item>
+    <item>Dark</item>
+  </string-array>
+  <string name="app_settings_reset_hints">Reset hints</string>
+  <string name="app_settings_reset_hints_summary">Re-enables hints which have been dismissed previously</string>
+  <string name="app_settings_reset_hints_success">All hints will be shown again</string>
+  <string name="app_settings_integration">Integration</string>
+  <string name="app_settings_tasks_provider">Tasks app</string>
+  <string name="app_settings_tasks_provider_synchronizing_with">Synchronising with %s</string>
+  <string name="app_settings_tasks_provider_none">No compatible tasks app found</string>
+  <!--AccountActivity-->
+  <string name="account_carddav">CardDAV</string>
+  <string name="account_caldav">CalDAV</string>
+  <string name="account_webcal">Webcal</string>
+  <string name="account_carddav_missing_permissions">No contacts sync (missing permissions)</string>
+  <string name="account_caldav_missing_calendar_permissions">No calendar sync (missing permissions)</string>
+  <string name="account_caldav_missing_tasks_permissions">No tasks sync (missing permissions)</string>
+  <string name="account_caldav_missing_permissions">No calendar and tasks sync (missing permissions)</string>
+  <string name="account_webcal_missing_calendar_permissions">Can\'t access calendars (missing permissions)</string>
+  <string name="account_permissions_action">Permissions</string>
+  <string name="account_no_address_books">There are no address books (yet).</string>
+  <string name="account_no_calendars">There are no calendars (yet).</string>
+  <string name="account_no_webcals">There are no calendar subscriptions (yet).</string>
+  <string name="account_swipe_down">Swipe down to refresh the list from the server.</string>
+  <string name="account_synchronize_now">Synchronise now</string>
+  <string name="account_synchronizing_now">Synchronising now</string>
+  <string name="account_settings">Account settings</string>
+  <string name="account_rename">Rename account</string>
+  <string name="account_rename_new_name">Unsaved local data may be dismissed. Re-synchronisation is required after renaming. New account name:</string>
+  <string name="account_rename_rename">Rename</string>
+  <string name="account_rename_couldnt_rename">Couldn\'t rename account</string>
+  <string name="account_delete">Delete account</string>
+  <string name="account_delete_confirmation_title">Really delete account?</string>
+  <string name="account_delete_confirmation_text">All local copies of address books, calendars and task lists will be deleted.</string>
+  <string name="account_synchronize_this_collection">synchronise this collection</string>
+  <string name="account_read_only">read-only</string>
+  <string name="account_calendar">calendar</string>
+  <string name="account_task_list">task list</string>
+  <string name="account_journal">journal</string>
+  <string name="account_only_personal">Show only personal</string>
+  <string name="account_refresh_address_book_list">Refresh address book list</string>
+  <string name="account_create_new_address_book">Create new address book</string>
+  <string name="account_refresh_calendar_list">Refresh calendar list</string>
+  <string name="account_create_new_calendar">Create new calendar</string>
+  <string name="account_no_webcal_handler_found">No Webcal-capable app found</string>
+  <string name="account_install_icsx5">Install ICSx⁵</string>
+  <!--AddAccountActivity-->
+  <string name="login_title">Add account</string>
+  <string name="login_type_email">Login with email address</string>
+  <string name="login_email_address">Email address</string>
+  <string name="login_email_address_error">Valid email address required</string>
+  <string name="login_password">Password</string>
+  <string name="login_password_required">Password required</string>
+  <string name="login_type_url">Login with URL and user name</string>
+  <string name="login_url_must_be_http_or_https">URL must begin with http(s)://</string>
+  <string name="login_user_name">User name</string>
+  <string name="login_user_name_required">User name required</string>
+  <string name="login_base_url">Base URL</string>
+  <string name="login_type_url_certificate">Login with URL and client certificate</string>
+  <string name="login_select_certificate">Select certificate</string>
+  <string name="login_login">Login</string>
+  <string name="login_create_account">Create account</string>
+  <string name="login_account_name">Account name</string>
+  <string name="login_account_avoid_apostrophe">Use of apostrophes (\') have been reported to cause problems on some devices.</string>
+  <string name="login_account_name_info">Use your email address as account name because Android will use the account name as ORGANISER field for events you create. You can\'t have two accounts with the same name.</string>
+  <string name="login_account_contact_group_method">Contact group method:</string>
+  <string name="login_account_name_required">Account name required</string>
+  <string name="login_account_name_already_taken">Account name already taken</string>
+  <string name="login_account_not_created">Account could not be created</string>
+  <string name="login_type_advanced">Advanced login (special use cases)</string>
+  <string name="login_use_username_password">Use username/password</string>
+  <string name="login_use_client_certificate">Use client certificate</string>
+  <string name="login_no_certificate_found">No certificate found</string>
+  <string name="login_install_certificate">Install certificate</string>
+  <string name="login_configuration_detection">Configuration detection</string>
+  <string name="login_querying_server">Please wait, querying server…</string>
+  <string name="login_no_caldav_carddav">Couldn\'t find CalDAV or CardDAV service.</string>
+  <string name="login_username_password_wrong">Username (email address) / password wrong?</string>
+  <string name="login_view_logs">Show details</string>
+  <!--AccountSettingsActivity-->
+  <string name="settings_title">Settings: %s</string>
+  <string name="settings_sync">Synchronisation</string>
+  <string name="settings_sync_interval_contacts">Contacts sync. interval</string>
+  <string name="settings_sync_summary_manually">Only manually</string>
+  <string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Every %d minutes + immediately on local changes</string>
+  <string name="settings_sync_interval_calendars">Calendars sync. interval</string>
+  <string name="settings_sync_interval_tasks">Tasks sync. interval</string>
+  <string-array name="settings_sync_interval_names">
+    <item>Only manually</item>
+    <item>Every 15 minutes</item>
+    <item>Every 30 minutes</item>
+    <item>Every hour</item>
+    <item>Every 2 hours</item>
+    <item>Every 4 hours</item>
+    <item>Once a day</item>
+  </string-array>
+  <string name="settings_sync_wifi_only">Sync over WiFi only</string>
+  <string name="settings_sync_wifi_only_on">Synchronisation is restricted to WiFi connections</string>
+  <string name="settings_sync_wifi_only_off">Connection type is not taken into consideration</string>
+  <string name="settings_sync_wifi_only_ssids">WiFi SSID restriction</string>
+  <string name="settings_sync_wifi_only_ssids_on">Will only sync over %s</string>
+  <string name="settings_sync_wifi_only_ssids_on_location_services">Will only sync over %s (requires active location services)</string>
+  <string name="settings_sync_wifi_only_ssids_off">All WiFi connections will be used</string>
+  <string name="settings_sync_wifi_only_ssids_message">Comma-separated names (SSIDs) of allowed WiFi networks (leave blank for all)</string>
+  <string name="settings_sync_wifi_only_ssids_permissions_required">WiFi SSID restriction requires further settings</string>
+  <string name="settings_sync_wifi_only_ssids_permissions_action">Manage</string>
+  <string name="settings_more_info_faq">More information (FAQ)</string>
+  <string name="settings_authentication">Authentication</string>
+  <string name="settings_username">User name</string>
+  <string name="settings_enter_username">Enter user name:</string>
+  <string name="settings_password">Password</string>
+  <string name="settings_password_summary">Update the password according to your server.</string>
+  <string name="settings_enter_password">Enter your password:</string>
+  <string name="settings_certificate_alias">Client certificate alias</string>
+  <string name="settings_certificate_alias_empty">No certificate selected</string>
+  <string name="settings_caldav">CalDAV</string>
+  <string name="settings_sync_time_range_past">Past event time limit</string>
+  <string name="settings_sync_time_range_past_none">All events will be synchronised</string>
+  <plurals name="settings_sync_time_range_past_days">
+    <item quantity="one">Events more than one day in the past will be ignored</item>
+    <item quantity="other">Events more than %d days in the past will be ignored</item>
+  </plurals>
+  <string name="settings_sync_time_range_past_message">Events which are more than this number of days in the past will be ignored (may be 0). Leave blank to synchronise all events.</string>
+  <string name="settings_default_alarm">Default reminder</string>
+  <plurals name="settings_default_alarm_on">
+    <item quantity="one">Default reminder one minute before event</item>
+    <item quantity="other">Default reminder %d minutes before event</item>
+  </plurals>
+  <string name="settings_default_alarm_off">No default reminders are created</string>
+  <string name="settings_default_alarm_message">If default reminders shall be created for events without reminder: the desired number of minutes before the event. Leave blank to disable default reminders.</string>
+  <string name="settings_manage_calendar_colors">Manage calendar colours</string>
+  <string name="settings_manage_calendar_colors_on">Calendar colours are reset at each sync</string>
+  <string name="settings_manage_calendar_colors_off">Calendar colours can be set by other apps</string>
+  <string name="settings_event_colors">Event colour support</string>
+  <string name="settings_event_colors_on">Event colours are synced</string>
+  <string name="settings_event_colors_off">Event colours are not synced</string>
+  <string name="settings_carddav">CardDAV</string>
+  <string name="settings_contact_group_method">Contact group method</string>
+  <string-array name="settings_contact_group_method_entries">
+    <item>Groups are separate vCards</item>
+    <item>Groups are per-contact categories</item>
+  </string-array>
+  <string name="settings_contact_group_method_change">Change group method</string>
+  <!--collection management-->
+  <string name="create_addressbook">Create address book</string>
+  <string name="create_addressbook_display_name_hint">My Address Book</string>
+  <string name="create_calendar">Create calendar</string>
+  <string name="create_calendar_time_zone">Time zone</string>
+  <string name="create_calendar_type">Possible calendar entries</string>
+  <string name="create_calendar_type_vevent">Events</string>
+  <string name="create_calendar_type_vtodo">Tasks</string>
+  <string name="create_calendar_type_vjournal">Notes / journal</string>
+  <string name="create_calendar_type_events_and_tasks">Combined (events and tasks)</string>
+  <string name="create_collection_color">Colour</string>
+  <string name="create_collection_creating">Creating collection</string>
+  <string name="create_collection_display_name">Title</string>
+  <string name="create_collection_display_name_required">Title is required</string>
+  <string name="create_collection_description">Description</string>
+  <string name="create_collection_optional">optional</string>
+  <string name="create_collection_home_set">Storage location</string>
+  <string name="create_collection_home_set_required">Storage location is required</string>
+  <string name="create_collection_create">Create</string>
+  <string name="delete_collection">Delete collection</string>
+  <string name="delete_collection_confirm_title">Are you sure?</string>
+  <string name="delete_collection_confirm_warning">This collection (%s) and all its data will be removed permanently.</string>
+  <string name="delete_collection_data_shall_be_deleted">These data shall be deleted from the server.</string>
+  <string name="delete_collection_deleting_collection">Deleting collection</string>
+  <string name="collection_force_read_only">Force read-only</string>
+  <string name="collection_properties">Properties</string>
+  <string name="collection_properties_url">Address (URL):</string>
+  <string name="collection_properties_copy_url">Copy URL</string>
+  <string name="collection_properties_owner">Owner:</string>
+  <!--debugging and DebugInfoActivity-->
+  <string name="debug_info_title">Debug info</string>
+  <string name="debug_info_archive_caption">ZIP archive</string>
+  <string name="debug_info_archive_subtitle">Contains debug info and logs</string>
+  <string name="debug_info_archive_text">Share the archive to transfer it to a computer, to send it by email or to attach it to a support ticket.</string>
+  <string name="debug_info_archive_share">Share archive</string>
+  <string name="debug_info_attached">Debug info attached to this message (requires attachment support of the receiving app).</string>
+  <string name="debug_info_http_error">HTTP Error</string>
+  <string name="debug_info_server_error">Server Error</string>
+  <string name="debug_info_webdav_error">WebDAV Error</string>
+  <string name="debug_info_io_error">I/O Error</string>
+  <string name="debug_info_http_403_description">The request has been denied. Check involved resources and debug info for details.</string>
+  <string name="debug_info_http_404_description">The requested resource doesn\'t exist (anymore). Check involved resources and debug info for details.</string>
+  <string name="debug_info_http_5xx_description">A server-side problem occured. Please contact your server support.</string>
+  <string name="debug_info_unexpected_error">An unexpected error has occured. View debug info for details.</string>
+  <string name="debug_info_view_details">View details</string>
+  <string name="debug_info_subtitle">Debug info have been collected</string>
+  <string name="debug_info_involved_caption">Involved resources</string>
+  <string name="debug_info_involved_subtitle">Related to the problem</string>
+  <string name="debug_info_involved_remote">Remote resource:</string>
+  <string name="debug_info_involved_local">Local resource:</string>
+  <string name="debug_info_involved_view">View with app</string>
+  <string name="debug_info_logs_caption">Logs</string>
+  <string name="debug_info_logs_subtitle">Verbose logs are available</string>
+  <string name="debug_info_logs_view">View logs</string>
+  <!--ExceptionInfoFragment-->
+  <string name="exception">An error has occurred.</string>
+  <string name="exception_httpexception">An HTTP error has occurred.</string>
+  <string name="exception_ioexception">An I/O error has occurred.</string>
+  <string name="exception_show_details">Show details</string>
+  <!--StorageLowReceiver-->
+  <string name="storage_low_notify_title">Synchronisation paused</string>
+  <string name="storage_low_notify_text">Almost no free space left</string>
+  <!--WebDAV accounts-->
+  <string name="webdav_mounts_title">WebDAV mounts</string>
+  <string name="webdav_mounts_quota_used_available">Quota used: %1$s / available: %2$s</string>
+  <string name="webdav_mounts_share_content">Share content</string>
+  <string name="webdav_mounts_unmount">Unmount</string>
+  <string name="webdav_add_mount_title">Add WebDAV mount</string>
+  <string name="webdav_mounts_empty">Directly access your cloud files by adding a WebDAV mount!</string>
+  <string name="webdav_add_mount_empty_more_info"><![CDATA[See the manual for <a href="%1$s">how WebDAV mounts work</a>.</string>]]></string>
+  <string name="webdav_add_mount_display_name">Display name</string>
+  <string name="webdav_add_mount_url">WebDAV URL</string>
+  <string name="webdav_add_mount_url_invalid">Invalid URL</string>
+  <string name="webdav_add_mount_username">User name</string>
+  <string name="webdav_add_mount_password">Password</string>
+  <string name="webdav_add_mount_add">Add mount</string>
+  <string name="webdav_add_mount_no_support">No WebDAV service at this URL</string>
+  <string name="webdav_remove_mount_title">Remove mount point</string>
+  <string name="webdav_remove_mount_text">Connection details will be lost, but no files will be deleted.</string>
+  <string name="webdav_notification_access">Accessing WebDAV file</string>
+  <string name="webdav_notification_download">Downloading WebDAV file</string>
+  <string name="webdav_notification_upload">Uploading WebDAV file</string>
+  <string name="webdav_provider_root_title">WebDAV mount</string>
+  <!--sync adapters-->
+  <string name="sync_error_permissions">DAVx⁵ permissions</string>
+  <string name="sync_error_permissions_text">Additional permissions required</string>
+  <string name="sync_error_tasks_too_old">%s too old</string>
+  <string name="sync_error_tasks_required_version">Minimum required version: %1$s</string>
+  <string name="sync_error_authentication_failed">Authentication failed (check login credentials)</string>
+  <string name="sync_error_io">Network or I/O error – %s</string>
+  <string name="sync_error_http_dav">HTTP server error – %s</string>
+  <string name="sync_error_local_storage">Local storage error – %s</string>
+  <string name="sync_error_retry">Retry</string>
+  <string name="sync_error_view_item">View item</string>
+  <string name="sync_invalid_contact">Received invalid contact from server</string>
+  <string name="sync_invalid_event">Received invalid event from server</string>
+  <string name="sync_invalid_task">Received invalid task from server</string>
+  <string name="sync_invalid_resources_ignoring">Ignoring one or more invalid resources</string>
+  <!--cert4android-->
+  <string name="certificate_notification_connection_security">DAVx⁵: Connection security</string>
+  <string name="trust_certificate_unknown_certificate_found">DAVx⁵ has encountered an unknown certificate. Do you want to trust it?</string>
+</resources>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 15c40c6f9..179214296 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -172,6 +172,7 @@
   <string name="app_settings_notification_settings">Jakinarazpen-ezarpenak</string>
   <string name="app_settings_notification_settings_summary">Kudeatu jakinarazpen kanalak eta haien ezarpenak</string>
   <string name="app_settings_theme_title">Hautatu gaia</string>
+  <string name="app_settings_language_system_default">Sistemaren lehenetsia</string>
   <string-array name="app_settings_theme_names">
     <item>Sistemaren lehenetsia</item>
     <item>Argia</item>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index c1d95b0e1..cbf2c7319 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -5,9 +5,14 @@
   <string name="account_invalid">حساب کاربری موجود نیست (بیشتر از این)</string>
   <string name="account_title_address_book">کتاب آدرس DAVx⁵</string>
   <string name="address_books_authority_title">کتاب آدرس</string>
+  <string name="dialog_remove">حذف</string>
+  <string name="dialog_deny">لغو</string>
+  <string name="field_required">این قسمت الزامیست</string>
   <string name="help">راهنما</string>
   <string name="manage_accounts">مدیریت حساب‌ها</string>
   <string name="share">اشتراک گذاری</string>
+  <string name="database_destructive_migration_title">پایگاه داده، دارای مشکل است</string>
+  <string name="database_destructive_migration_text">تمام حساب های کاربری حذف شدند.</string>
   <string name="notification_channel_debugging">خطایابی</string>
   <string name="notification_channel_general">پیام های مهم دیگر</string>
   <string name="notification_channel_status">پیامهای وضعیت با اولویت پایین</string>
@@ -31,9 +36,14 @@
   <string name="intro_autostart_dont_show">من تنظیمات مورد نیاز را انجام داده ام. دیگر به من یادآوری نکن. *</string>
   <string name="intro_leave_unchecked">* علامت را بردارید تا بعداً یادآوری شود. در تنظیمات برنامه %s قابل تنظیم مجدد است.</string>
   <string name="intro_more_info">اطلاعات بیشتر</string>
+  <string name="intro_tasks_jtx">jtx Board</string>
+  <string name="intro_tasks_jtx_info"><![CDATA[از فعالیت، یادداشت و ثبت وقایع روزانه پشتیبانی می کند.]]></string>
   <string name="intro_tasks_title">وظایف پشتیبانی</string>
   <string name="intro_tasks_text1">اگر وظایف توسط سرور شما پشتیبانی شود، می توان آنها را همگام سازی کرد:</string>
   <string name="intro_tasks_opentasks">وظایف را باز کنید</string>
+  <string name="intro_tasks_opentasks_info">عدم توسعه توسط برنامه نویسان - توصیه نمیشود.</string>
+  <string name="intro_tasks_tasks_org">Tasks.org</string>
+  <string name="intro_tasks_tasks_org_info"><![CDATA[برخی از قابلیت ها <a href="https://www.davx5.com/faq/tasks/advanced-task-features">پشتیبانی نمیشود</a> (فعلا).]]></string>
   <string name="intro_tasks_no_app_store">فروشگاه در دسترس نیست</string>
   <string name="intro_tasks_dont_show">من به پشتیبانی وظایف نیاز ندارم. *</string>
   <string name="intro_open_source_title">برنامه‌های متن باز</string>
@@ -52,9 +62,17 @@
   <string name="permissions_calendar_title">مجوزهای تقویم</string>
   <string name="permissions_calendar_status_off"> همگام سازی تقویم انجام نشود (توصیه نمی شود)</string>
   <string name="permissions_calendar_status_on">همگام سازی تقویم امکان پذیر است</string>
+  <string name="permissions_notification_title">مجوز اعلان</string>
+  <string name="permissions_notification_status_off">اعلان ها غیرفعال اند (توصیه نمی شود).</string>
+  <string name="permissions_notification_status_on">اعلان ها فعال اند.</string>
+  <string name="permissions_jtx_title">مجوز برنامه jtx Board</string>
+  <string name="permissions_jtx_status_not_installed">تسک، ثبت وقایع و یادداشت ها همگام سازی نمی شوند (برنامه نصب نیست).</string>
+  <string name="permissions_jtx_status_off">تسک، ثبت وقایع و یادداشت ها همگام سازی نمی شوند.</string>
+  <string name="permissions_jtx_status_on">تسک، ثبت وقایع و یادداشت ها همگام سازی می شوند.</string>
   <string name="permissions_opentasks_title">مجوزهای OpenTasks</string>
   <string name="permissions_tasksorg_title">مجوز وظایف</string>
   <string name="permissions_tasks_status_not_installed">بدون همگام سازی  (نصب نشده است)</string>
+  <string name="permissions_tasks_status_off">عدم همگام سازی وظایف</string>
   <string name="permissions_tasks_status_on">امکان همگام سازی وظایف وجود دارد</string>
   <string name="permissions_autoreset_title">نگاه داری مجوزها</string>
   <string name="permissions_autoreset_status_off">مجوزها ممکن است به طور خودکار تنظیم مجدد شوند (توصیه نمی شود)</string>
@@ -65,10 +83,13 @@
   <!--WifiPermissionsActivity-->
   <string name="wifi_permissions_label">مجوزهای SSID WiFi</string>
   <string name="wifi_permissions_intro">برای دسترسی به نام WiFi فعلی (SSID) ، باید این شرایط را داشته باشید:</string>
+  <string name="wifi_permissions_location_permission">مجوز موقعیت دقیق</string>
   <string name="wifi_permissions_location_permission_on">مجوز مکان اعطا شده است</string>
   <string name="wifi_permissions_location_permission_off">مجوز مکان رد شد</string>
   <string name="wifi_permissions_background_location_permission">مجوز مکان پس زمینه</string>
   <string name="wifi_permissions_background_location_permission_label">همیشه اجازه دهید</string>
+  <string name="wifi_permissions_background_location_permission_on"><![CDATA[مجوز موقعیت مکانی به <b>%s</b> تنظیم گردید.]]></string>
+  <string name="wifi_permissions_background_location_permission_off"><![CDATA[مجوز موقعیت مکانی به 1%s1 تنظیم نگردید.]]></string>
   <string name="wifi_permissions_background_location_disclaimer">%sفقط از مجوز مکان برای تعیین SSID WiFi فعلی برای حساب‌های محدود شده با SSID استفاده می‌کند. حتی وقتی برنامه در پس زمینه باشد این اتفاق می افتد. هیچ کدام اطلاعات مکانی  ، ذخیره ، پردازش و یا ارسال نمی شود.</string>
   <string name="wifi_permissions_location_enabled">مکان همیشه فعال است</string>
   <string name="wifi_permissions_location_enabled_on">سرویس مکان فعال است</string>
@@ -80,6 +101,7 @@
   <string name="about_build_date">در %s وارد شده است</string>
   <string name="about_flavor_info">این نسخه تنها برای پخش در Google Play واجد شرایط است.</string>
   <string name="about_license_info_no_warranty">این برنامه کاملاً بدون ضمانت است. این یک نرم افزار رایگان است ، و شما می توانید تحت شرایط خاص توزیع مجدد آن را انجام دهید.</string>
+  <string name="about_translations_thanks"><![CDATA[<i>با تشکر از: </i> %s]]></string>
   <!--global settings-->
   <string name="logging_couldnt_create_file">پرونده ثبت ایجاد نشد</string>
   <string name="logging_notification_text">اکنون همه %s فعالیت ها را ثبت می کنید</string>
@@ -95,13 +117,21 @@
   <string name="install_browser">لطفاً یک مرورگر وب نصب کنید</string>
   <string name="navigation_drawer_settings">تنظیمات</string>
   <string name="navigation_drawer_news_updates">اخبار و amp؛ به روز رسانی</string>
+  <string name="navigation_drawer_tools">ابزارها</string>
   <string name="navigation_drawer_external_links">لینک های خارجی</string>
   <string name="navigation_drawer_website">سایت اینترنتی</string>
   <string name="navigation_drawer_manual">دستی</string>
   <string name="navigation_drawer_faq">FAQ</string>
+  <string name="navigation_drawer_community">انجمن</string>
   <string name="navigation_drawer_donate">کمک</string>
   <string name="navigation_drawer_privacy_policy">سیاست حفظ حریم خصوصی</string>
+  <string name="account_list_no_notification_permission">اعلان ها غیر فعال اند. از همگام سازی با خبر نخواهید شد.</string>
   <string name="account_list_no_internet">بدون اتصال به اینترنت. اندروید همگام سازی را اجرا نمی کند.</string>
+  <string name="account_list_manage_connections">مدیریت ارتباطات</string>
+  <string name="account_list_low_storage">فضای خالی کم است. اندروید همگام سازی را اجرا نخواهد کرد.</string>
+  <string name="account_list_manage_storage">مدیریت حافظه</string>
+  <string name="account_list_datasaver_enabled">محافظ داده فعال است. همگام سازی در پس زمینه محدود می شود.</string>
+  <string name="account_list_manage_datasaver">مدیریت محافظ داده</string>
   <string name="account_list_empty">به همگام‌ساز DAVx⁵ خوش آمدید</string>
   <string name="accounts_global_sync_disabled">همگام سازی خودکار در کل سیستم غیرفعال است</string>
   <string name="accounts_global_sync_enable">فعال</string>
@@ -110,6 +140,8 @@
   <string name="refresh_collections_worker_refresh_failed">تشخیص سرویس ناموفق بود</string>
   <string name="refresh_collections_worker_refresh_couldnt_refresh">لیست مجموعه به روز نشد</string>
   <!--Battery Optimization-->
+  <string name="battery_optimization_notify_title">در پس زمینه اجرا نمی شود.</string>
+  <string name="battery_optimization_notify_text">افزودن به لیست سفید بهینه ساز باتری الزامیست.</string>
   <!--ForegroundService-->
   <string name="foreground_service_notify_title">در حال اجرا در پیش زمینه</string>
   <string name="foreground_service_notify_text">در برخی از دستگاه ها ، این مورد برای همگام سازی خودکار لازم است.</string>
@@ -121,9 +153,21 @@
   <string name="app_settings_logging">ورود به سیستم</string>
   <string name="app_settings_logging_on">ورود به سیستم فعال است</string>
   <string name="app_settings_logging_off">ورود به سیستم غیرفعال است</string>
+  <string name="app_settings_battery_optimization">بهینه ساز باتری</string>
+  <string name="app_settings_battery_optimization_whitelisted">برنامه در لیست سفید قرار دارد (توصیه می شود).</string>
+  <string name="app_settings_battery_optimization_not_whitelisted">برنامه در لیست سفید قرار ندارد (توصیه نمی شود).</string>
   <string name="app_settings_foreground_service">در پیش زمینه نگه دارید</string>
   <string name="app_settings_foreground_service_details">اگر دستگاه شما از همگام سازی خودکار جلوگیری کند ، ممکن است کمک کند</string>
   <string name="app_settings_connection">ارتباط</string>
+  <string name="app_settings_proxy">نوع پروکسی</string>
+  <string-array name="app_settings_proxy_types">
+    <item>پیش فرض سیستم</item>
+    <item>بدون پروکسی</item>
+    <item>HTTP</item>
+    <item>ساکس (برای Orbot)</item>
+  </string-array>
+  <string name="app_settings_proxy_host">هاست پروکسی</string>
+  <string name="app_settings_proxy_port">پورت پروکسی</string>
   <string name="app_settings_security">امنیت</string>
   <string name="app_settings_security_app_permissions">مجوزهای برنامه</string>
   <string name="app_settings_security_app_permissions_summary">مجوزهای لازم برای همگام سازی را مرور کنید</string>
@@ -136,6 +180,14 @@
   <string name="app_settings_user_interface">رابط کاربر</string>
   <string name="app_settings_notification_settings">تنظیمات اعلان</string>
   <string name="app_settings_notification_settings_summary">کانال های اعلان و تنظیمات آنها را مدیریت کنید</string>
+  <string name="app_settings_theme_title">انتخاب تم</string>
+  <string name="app_settings_language_title">انتخاب زبان</string>
+  <string name="app_settings_language_system_default">پیش فرض سیستم</string>
+  <string-array name="app_settings_theme_names">
+    <item>پیش فرض سیستم</item>
+    <item>روشن</item>
+    <item>تیره</item>
+  </string-array>
   <string name="app_settings_reset_hints">تنظیم مجدد نکات</string>
   <string name="app_settings_reset_hints_summary">نکاتی را که قبلاً رد شده اند دوباره فعال می کند</string>
   <string name="app_settings_reset_hints_success">همه نکات دوباره نشان داده خواهد شد</string>
@@ -171,6 +223,7 @@
   <string name="account_read_only">فقط خواندنی</string>
   <string name="account_calendar">تقویم</string>
   <string name="account_task_list">لیست کار</string>
+  <string name="account_journal">وقایع</string>
   <string name="account_only_personal">فقط به صورت شخصی نشان داده شود</string>
   <string name="account_refresh_address_book_list">تازه کردن لیست کتاب آدرس</string>
   <string name="account_create_new_address_book">کتاب آدرس جدید ایجاد کنید</string>
@@ -195,6 +248,7 @@
   <string name="login_login">وارد شدن</string>
   <string name="login_create_account">ساخت حساب</string>
   <string name="login_account_name">عنوان حساب</string>
+  <string name="login_account_avoid_apostrophe">گزارش شده، استفاده از علامت (\') باعث بوجود آمدن مشکل در برخی دستگاه ها می شود.</string>
   <string name="login_account_name_info">از آدرس ایمیل خود به عنوان نام حساب استفاده کنید زیرا Android از نام حساب به عنوان قسمت ORGANIZER برای رویدادهایی که ایجاد می کنید استفاده خواهد کرد. نمی توانید دو حساب با یک نام داشته باشید.</string>
   <string name="login_account_contact_group_method">روش گروه تماس:</string>
   <string name="login_account_name_required">نام حساب لازم است</string>
@@ -291,6 +345,7 @@
   <string name="create_collection_description">شرح</string>
   <string name="create_collection_optional">اختیاری</string>
   <string name="create_collection_home_set">محل ذخیره سازی</string>
+  <string name="create_collection_home_set_required">تعیین محل ذخیره سازی الزامیست</string>
   <string name="create_collection_create">ایجاد</string>
   <string name="delete_collection">حذف مجموعه</string>
   <string name="delete_collection_confirm_title">آیا مطمئن هستید؟</string>
@@ -304,6 +359,10 @@
   <string name="collection_properties_owner">مالک:</string>
   <!--debugging and DebugInfoActivity-->
   <string name="debug_info_title">اطلاعات اشکال زدایی</string>
+  <string name="debug_info_archive_caption">آرشیوسازی ZIP</string>
+  <string name="debug_info_archive_subtitle">حاوی اطلاعات و پیغام های دیباگ</string>
+  <string name="debug_info_archive_text">اشتراک گذاری فایل آرشیو شده، جهت انتقال به کامپیوتر، ارسال از طریق ایمیل و افزودن به تیکت پشتیبانی</string>
+  <string name="debug_info_archive_share">اشتراک گذاری آرشیو</string>
   <string name="debug_info_attached">اطلاعات اشکال زدایی پیوست شده به این پیام (نیاز به پشتیبانی پیوست از برنامه دریافت کننده دارد).</string>
   <string name="debug_info_http_error">خطای HTTP</string>
   <string name="debug_info_server_error">خطای سرور</string>
@@ -329,9 +388,17 @@
   <string name="exception_ioexception">خطای ورودی خروجی رخ داده است.</string>
   <string name="exception_show_details">نمایش جزئیات</string>
   <!--StorageLowReceiver-->
+  <string name="storage_low_notify_text">تقریبا فضای خالی وجود ندارد.</string>
   <!--WebDAV accounts-->
+  <string name="webdav_mounts_share_content">اشتراک گذاری محتوا</string>
+  <string name="webdav_add_mount_display_name">نام نمایشی</string>
+  <string name="webdav_add_mount_url_invalid">URL نامعتبر</string>
   <string name="webdav_add_mount_username">نام کاربری</string>
   <string name="webdav_add_mount_password">گذرواژه</string>
+  <string name="webdav_remove_mount_text">اتصال قطع میگردد، اما هیچ فایلی حذف نخواهد شد.</string>
+  <string name="webdav_notification_access">دسترسی به فایل WebDAB</string>
+  <string name="webdav_notification_download">بارگیری فایل WebDAV</string>
+  <string name="webdav_notification_upload">بارگذاری فایل WebDAV</string>
   <!--sync adapters-->
   <string name="sync_error_permissions">مجوزهای همگام‌ساز DAVx⁵</string>
   <string name="sync_error_permissions_text">مجوزهای اضافی لازم است</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 3e2381131..0a85be067 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -159,6 +159,7 @@
   <string name="app_settings_notification_settings">Paramètres de notification</string>
   <string name="app_settings_notification_settings_summary">Gérer les canaux de notification et leurs paramètres</string>
   <string name="app_settings_theme_title">Sélectionner un thème</string>
+  <string name="app_settings_language_system_default">Valeur du système</string>
   <string-array name="app_settings_theme_names">
     <item>Par défaut</item>
     <item>Clair</item>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index f8b67d81f..1f92d35b3 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -182,6 +182,8 @@
   <string name="app_settings_notification_settings">Axustes das notificacións</string>
   <string name="app_settings_notification_settings_summary">Xestiona as canles de notificación e os seus axustes</string>
   <string name="app_settings_theme_title">Elixe decorado</string>
+  <string name="app_settings_language_title">Elixe o idioma</string>
+  <string name="app_settings_language_system_default">Por defecto no sistema</string>
   <string-array name="app_settings_theme_names">
     <item>Por defecto no sistema</item>
     <item>Claro</item>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 306e457c2..7abf0ac7b 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -25,7 +25,7 @@
   <string name="notification_channel_sync_io_errors_desc">タイムアウト、接続の問題など (多くの場合、一時的なもの)</string>
   <!--IntroActivity-->
   <string name="intro_slogan1">あなたのデータはあなたの手で</string>
-  <string name="intro_slogan2">コントロールを始めよう</string>
+  <string name="intro_slogan2">コントロールを始める</string>
   <string name="intro_battery_title">一定の間隔で同期</string>
   <string name="intro_battery_not_whitelisted">無効 (非推奨)</string>
   <string name="intro_battery_whitelisted">有効 (推奨)</string>
@@ -51,42 +51,42 @@
   <string name="intro_open_source_details">貢献/寄付の方法</string>
   <string name="intro_open_source_dont_show">しばらく非表示にする</string>
   <!--PermissionsActivity-->
-  <string name="permissions_title">権限の許可</string>
+  <string name="permissions_title">許可</string>
   <string name="permissions_text">%s が正しく動作するには権限を許可する必要があります</string>
   <string name="permissions_all_title">以下のすべて</string>
   <string name="permissions_all_status_off">すべての機能を使用する (推奨)</string>
   <string name="permissions_all_status_on">すべての権限が許可されました</string>
-  <string name="permissions_contacts_title">連絡先へのアクセス許可</string>
+  <string name="permissions_contacts_title">連絡先へのアクセス</string>
   <string name="permissions_contacts_status_off">連絡先を同期しない (非推奨)</string>
   <string name="permissions_contacts_status_on">連絡先を同期できます</string>
-  <string name="permissions_calendar_title">カレンダーへのアクセス許可</string>
+  <string name="permissions_calendar_title">カレンダーへのアクセス</string>
   <string name="permissions_calendar_status_off">カレンダーを同期しない (非推奨)</string>
   <string name="permissions_calendar_status_on">カレンダーを同期できます</string>
-  <string name="permissions_notification_title">通知の許可</string>
+  <string name="permissions_notification_title">通知の権限</string>
   <string name="permissions_notification_status_off">通知が無効です (非推奨)</string>
   <string name="permissions_notification_status_on">通知が有効です</string>
-  <string name="permissions_jtx_title">jtx Board の許可</string>
+  <string name="permissions_jtx_title">jtx Board へのアクセス</string>
   <string name="permissions_jtx_status_not_installed">日誌、メモ、タスクを同期しない (未インストール)</string>
   <string name="permissions_jtx_status_off">日誌、メモ、タスクを同期しない</string>
   <string name="permissions_jtx_status_on">日誌、メモ、タスクを同期できます</string>
-  <string name="permissions_opentasks_title">OpenTasks の許可</string>
-  <string name="permissions_tasksorg_title">Tasks の許可</string>
+  <string name="permissions_opentasks_title">OpenTasks へのアクセス</string>
+  <string name="permissions_tasksorg_title">Tasks へのアクセス</string>
   <string name="permissions_tasks_status_not_installed">タスクを同期しない (未インストール)</string>
   <string name="permissions_tasks_status_off">タスクを同期しない</string>
   <string name="permissions_tasks_status_on">タスクを同期できます</string>
-  <string name="permissions_autoreset_title">継続の許可</string>
+  <string name="permissions_autoreset_title">権限を維持</string>
   <string name="permissions_autoreset_status_off">権限が自動的にリセットされることがあります (非推奨)</string>
   <string name="permissions_autoreset_status_on">権限は自動でリセットされません</string>
   <string name="permissions_autoreset_instruction">許可から「アプリが使用されていない場合に権限を削除」を無効化してください</string>
   <string name="permissions_app_settings_hint">スイッチが機能しない場合、アプリ情報 / 許可 にアクセスしてください</string>
   <string name="permissions_app_settings">アプリ設定</string>
   <!--WifiPermissionsActivity-->
-  <string name="wifi_permissions_label">WiFi SSID の許可</string>
+  <string name="wifi_permissions_label">WiFi SSID へのアクセス</string>
   <string name="wifi_permissions_intro">現在の WiFi 名 (SSID) にアクセスするため、これらの条件を満たす必要があります:</string>
-  <string name="wifi_permissions_location_permission">正確な位置情報の許可</string>
-  <string name="wifi_permissions_location_permission_on">位置情報の権限が許可されています</string>
+  <string name="wifi_permissions_location_permission">正確な位置情報へのアクセス</string>
+  <string name="wifi_permissions_location_permission_on">位置情報へのアクセスが許可されています</string>
   <string name="wifi_permissions_location_permission_off">位置情報の権限が拒否されています</string>
-  <string name="wifi_permissions_background_location_permission">バックグラウンドでの位置情報の許可</string>
+  <string name="wifi_permissions_background_location_permission">バックグラウンドでの位置情報へのアクセス</string>
   <string name="wifi_permissions_background_location_permission_label">常に許可</string>
   <string name="wifi_permissions_background_location_permission_on"><![CDATA[位置情報の権限は <b>%s</b> に設定されています]]></string>
   <string name="wifi_permissions_background_location_permission_off"><![CDATA[位置情報の権限は <b>%s</b> に設定されていません]]></string>
@@ -131,6 +131,8 @@
   <string name="account_list_manage_connections">接続を管理</string>
   <string name="account_list_low_storage">残りのストレージ容量が少なくなっています。Android は同期を実行しません。</string>
   <string name="account_list_manage_storage">ストレージを管理</string>
+  <string name="account_list_datasaver_enabled">データサーバーが有効です。バックグラウンド同期が制限されています</string>
+  <string name="account_list_manage_datasaver">データサーバーを管理</string>
   <string name="account_list_empty">DAVx⁵ にようこそ！\n\nCalDAV/CardDAV アカウントを追加できるようになりました。</string>
   <string name="accounts_global_sync_disabled">システム全体の自動同期が無効です</string>
   <string name="accounts_global_sync_enable">有効</string>
@@ -180,6 +182,8 @@
   <string name="app_settings_notification_settings">通知設定</string>
   <string name="app_settings_notification_settings_summary">通知チャネルとその設定を管理します</string>
   <string name="app_settings_theme_title">テーマを選択</string>
+  <string name="app_settings_language_title">言語を選択</string>
+  <string name="app_settings_language_system_default">システム標準</string>
   <string-array name="app_settings_theme_names">
     <item>システムのデフォルト</item>
     <item>ライト</item>
@@ -201,7 +205,7 @@
   <string name="account_caldav_missing_tasks_permissions">タスクを同期しません (権限なし)</string>
   <string name="account_caldav_missing_permissions">カレンダーとタスクを同期しません (権限なし)</string>
   <string name="account_webcal_missing_calendar_permissions">カレンダーにアクセスできません (権限なし)</string>
-  <string name="account_permissions_action">権限の許可</string>
+  <string name="account_permissions_action">許可</string>
   <string name="account_no_address_books">アドレス帳は (まだ) ありません。</string>
   <string name="account_no_calendars">カレンダーは (まだ) ありません。</string>
   <string name="account_no_webcals">カレンダーのサブスクリプションは (まだ) ありません。</string>
@@ -407,8 +411,8 @@
   <string name="webdav_notification_upload">WebDAV ファイルをアップロードしています</string>
   <string name="webdav_provider_root_title">WebDAV マウント</string>
   <!--sync adapters-->
-  <string name="sync_error_permissions">DAVx⁵ アクセス許可</string>
-  <string name="sync_error_permissions_text">追加のアクセス許可が必要です</string>
+  <string name="sync_error_permissions">DAVx⁵ の権限</string>
+  <string name="sync_error_permissions_text">アクセス権限の許可が必要です</string>
   <string name="sync_error_tasks_too_old">%s が古すぎます</string>
   <string name="sync_error_tasks_required_version">最小要求バージョン: %1$s</string>
   <string name="sync_error_authentication_failed">認証に失敗しました (ログイン情報を確認してください)</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 6b2e04f2d..d981c3827 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -171,6 +171,7 @@
   <string name="app_settings_notification_settings">알림 설정</string>
   <string name="app_settings_notification_settings_summary">알림 채널 및 해당 설정 관리</string>
   <string name="app_settings_theme_title">테마 선택</string>
+  <string name="app_settings_language_system_default">시스템 기본값</string>
   <string-array name="app_settings_theme_names">
     <item>시스템 디자인</item>
     <item>밝은 테마</item>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 0ae240847..debc87830 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -24,7 +24,7 @@
   <string name="notification_channel_sync_io_errors">Netwerk en I/O fouten</string>
   <string name="notification_channel_sync_io_errors_desc">Timeouts, connectie problemen, etc. (vaak tijdelijk).</string>
   <!--IntroActivity-->
-  <string name="intro_slogan1">Jouw gegevens, Jouw keuze</string>
+  <string name="intro_slogan1">Jouw gegevens. Jouw keuze.</string>
   <string name="intro_slogan2">Houd zelf de controle</string>
   <string name="intro_battery_title">regelmatige sync-intervallen</string>
   <string name="intro_battery_not_whitelisted">Uitgeschakeld (niet aanbevolen)</string>
@@ -45,7 +45,7 @@
   <string name="intro_tasks_tasks_org">Tasks.org</string>
   <string name="intro_tasks_tasks_org_info"><![CDATA[Sommige functies<a href="https://www.davx5.com/faq/tasks/advanced-task-features">worden (nog) niet ondersteund</a>.]]></string>
   <string name="intro_tasks_no_app_store">Geen app-store beschikbaar</string>
-  <string name="intro_tasks_dont_show">Er is geen taakondersteuning nodig.*</string>
+  <string name="intro_tasks_dont_show">Ik hoef geen ondersteuning van taken.*</string>
   <string name="intro_open_source_title">Open-source software</string>
   <string name="intro_open_source_text">We zijn blij dat de keuze valt op open source software %s. Ontwikkelen, onderhouden en ondersteunen is veel werk. Overweeg daarom bij te dragen (kan op vele manieren) of een donatie. Wij waarderen het zeer!</string>
   <string name="intro_open_source_details">Hoe bijdragen/doneren</string>
@@ -131,6 +131,8 @@
   <string name="account_list_manage_connections">Verbindingen beheren</string>
   <string name="account_list_low_storage">Er is te weinig opslagruimte. Android zal niet synchroniseren.</string>
   <string name="account_list_manage_storage">Opslag beheren</string>
+  <string name="account_list_datasaver_enabled">Gegevensbesparing ingeschakeld. Synchronisatie op de achtergrond is beperkt.</string>
+  <string name="account_list_manage_datasaver">Beheer van gegevensbesparing</string>
   <string name="account_list_empty">Welkom bij DAVx⁵!\n\nJe kunt nu een CalDAV/CardDAV account toevoegen.</string>
   <string name="accounts_global_sync_disabled">Automatisch synchroniseren is voor alle accounts uitgeschakeld</string>
   <string name="accounts_global_sync_enable">Inschakelen</string>
@@ -180,6 +182,8 @@
   <string name="app_settings_notification_settings">App-meldingen</string>
   <string name="app_settings_notification_settings_summary">Meldingskanalen en hun instellingen beheren</string>
   <string name="app_settings_theme_title">Thema selecteren</string>
+  <string name="app_settings_language_title">Selecteer taal</string>
+  <string name="app_settings_language_system_default">Systeemstandaard</string>
   <string-array name="app_settings_theme_names">
     <item>Systeem standaard</item>
     <item>Licht</item>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 75ba69d80..dbef6c3aa 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -182,6 +182,8 @@
   <string name="app_settings_notification_settings">Ustawienia powiadomień</string>
   <string name="app_settings_notification_settings_summary">Zarządzaj kanałami powiadomień i ich ustawieniami</string>
   <string name="app_settings_theme_title">Wybierz motyw</string>
+  <string name="app_settings_language_title">Wybierz język</string>
+  <string name="app_settings_language_system_default">Domyślne ustawienie systemowe</string>
   <string-array name="app_settings_theme_names">
     <item>Domyślne ustawienie systemowe</item>
     <item>Jasny</item>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 655737439..b481d71ac 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -131,6 +131,8 @@
   <string name="account_list_manage_connections">Управление подключениями</string>
   <string name="account_list_low_storage">Место для хранения мало. Android не будет выполнять синхронизацию.</string>
   <string name="account_list_manage_storage">Управление хранилищем</string>
+  <string name="account_list_datasaver_enabled">Экономия трафика включена. Фоновая синхронизация ограничена.</string>
+  <string name="account_list_manage_datasaver">Экономия трафика</string>
   <string name="account_list_empty">Добро пожаловать в DAVx⁵!\n\nТеперь вы можете добавить аккаунт CalDAV/CardDAV.</string>
   <string name="accounts_global_sync_disabled">Синхронизация отключена на уровне устройства</string>
   <string name="accounts_global_sync_enable">Включить</string>
@@ -143,7 +145,7 @@
   <string name="battery_optimization_notify_text">Необходимо добавить в белый список оптимизации батареи</string>
   <!--ForegroundService-->
   <string name="foreground_service_notify_title">Запущен в приоритетном режиме</string>
-  <string name="foreground_service_notify_text">Требуется для автоматической синхронизации на некоторых устройствах.</string>
+  <string name="foreground_service_notify_text">Необходим для автоматической синхронизации на некоторых устройствах.</string>
   <!--AppSettingsActivity-->
   <string name="app_settings">Настройки</string>
   <string name="app_settings_debug">Отладка</string>
@@ -180,6 +182,8 @@
   <string name="app_settings_notification_settings">Настройки уведомлений</string>
   <string name="app_settings_notification_settings_summary">Управление каналами уведомлений и их настройками</string>
   <string name="app_settings_theme_title">Выбор темы</string>
+  <string name="app_settings_language_title">Выбрать язык</string>
+  <string name="app_settings_language_system_default">Определен системой</string>
   <string-array name="app_settings_theme_names">
     <item>Системная</item>
     <item>Светлая</item>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 46b7c6e8c..6f112518e 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -178,6 +178,7 @@
   <string name="app_settings_notification_settings">Aviseringsinställningar</string>
   <string name="app_settings_notification_settings_summary">Hantera aviseringskanaler och deras inställningar</string>
   <string name="app_settings_theme_title">Välj tema</string>
+  <string name="app_settings_language_system_default">Standardinställning för system</string>
   <string-array name="app_settings_theme_names">
     <item>Systemstandard</item>
     <item>Ljus</item>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 926de23b8..4f50922fa 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -172,6 +172,7 @@
   <string name="app_settings_notification_settings">Cài đặt thông báo</string>
   <string name="app_settings_notification_settings_summary">Quản lý các kênh thông báo và cài đặt của chúng</string>
   <string name="app_settings_theme_title">Chọn chủ đề</string>
+  <string name="app_settings_language_system_default">Mặc định hệ thống</string>
   <string-array name="app_settings_theme_names">
     <item>Mặc định hệ thống</item>
     <item>Sáng</item>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index c9498f36b..3eb8aa07b 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -182,6 +182,8 @@
   <string name="app_settings_notification_settings">通知设置</string>
   <string name="app_settings_notification_settings_summary">管理通知渠道等设置</string>
   <string name="app_settings_theme_title">选择主题</string>
+  <string name="app_settings_language_title">选择语言</string>
+  <string name="app_settings_language_system_default">系统默认</string>
   <string-array name="app_settings_theme_names">
     <item>系统默认</item>
     <item>浅色</item>
diff --git a/fastlane/metadata/android/en-GB/full_description.txt b/fastlane/metadata/android/en-GB/full_description.txt
new file mode 100644
index 000000000..f2ab1bbb1
--- /dev/null
+++ b/fastlane/metadata/android/en-GB/full_description.txt
@@ -0,0 +1,5 @@
+DAVx⁵ is a CalDAV/CardDAV management and synchronisation app for Android which natively integrates with Android calendar/contact apps.
+
+Use it with your own server or with a trusted host to keep your contacts, events and tasks under your control.
+
+For more information and a list of tested servers/services, have a look at the Web site.
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-GB/short_description.txt b/fastlane/metadata/android/en-GB/short_description.txt
new file mode 100644
index 000000000..df2e92acd
--- /dev/null
+++ b/fastlane/metadata/android/en-GB/short_description.txt
@@ -0,0 +1 @@
+CalDAV/CardDAV Synchronisation and Client
\ No newline at end of file