diff --git a/presentation/src/main/res/values-de-rDE/strings.xml b/presentation/src/main/res/values-de-rDE/strings.xml
index b1123cfb..3fccdf1b 100644
--- a/presentation/src/main/res/values-de-rDE/strings.xml
+++ b/presentation/src/main/res/values-de-rDE/strings.xml
@@ -200,7 +200,7 @@
 	<string name="screen_settings_keep_unlocked_while_editing_files">Entsperrt bleiben</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files_summary">Halte Tresore geöffnet während dem Editieren einer Datei</string>
 	<!-- ## screen: cloud settings -->
-	<string name="screen_cloud_settings_onedrive_connections">OneDrive Verbindungen</string>
+	<string name="screen_cloud_settings_onedrive_connections">OneDrive-Verbindungen</string>
 	<string name="screen_cloud_settings_webdav_connections">WebDAV-Verbindungen</string>
 	<string name="screen_cloud_settings_pcloud_connections">pCloud-Verbindungen</string>
 	<string name="screen_cloud_settings_s3_connections">S3-Verbindungen</string>
@@ -246,29 +246,29 @@
 	<string name="dialog_rename_vault_title">Tresor umbenennen</string>
 	<string name="dialog_rename_node_folder_title">Ordner umbenennen</string>
 	<string name="dialog_rename_node_file_title">Datei umbenennen</string>
-	<string name="dialog_unsaved_changes_title">Du hast nicht gespeicherte Änderungen</string>
-	<string name="dialog_unsaved_changes_message">Möchtest du wirklich beenden, ohne zu speichern?</string>
+	<string name="dialog_unsaved_changes_title">Es bestehen ungespeicherte Änderungen</string>
+	<string name="dialog_unsaved_changes_message">Möchtest du die App wirklich ohne zu speichern beenden?</string>
 	<string name="dialog_unsaved_changes_discard">Verwerfen</string>
 	<string name="dialog_file_name_placeholder">text.txt</string>
 	<string name="dialog_delete_vault_message">Möchtest du diesen Tresor wirklich entfernen?</string>
 	<string name="dialog_delete_vault_hint">Dieser Vorgang wird den Tresor nur aus dieser Liste entfernen und nicht tatsächlich löschen.</string>
-	<string name="dialog_upload_file_title">Lade hoch&#8230;</string>
+	<string name="dialog_upload_file_title">Wird hochgeladen &#8230;</string>
 	<string name="dialog_upload_file_remaining">Datei %1$d von %2$d</string>
-	<string name="dialog_export_file_title">Exportiere (%1$d/%2$d)</string>
-	<string name="dialog_progress_please_wait">Bitte warten&#8230;</string>
-	<string name="dialog_progress_creating_folder">Erstelle Ordner&#8230;</string>
+	<string name="dialog_export_file_title">Wird exportiert (%1$d/%2$d)</string>
+	<string name="dialog_progress_please_wait">Bitte warten &#8230;</string>
+	<string name="dialog_progress_creating_folder">Ordner wird erstellt &#8230;</string>
 	<string name="dialog_progress_creating_text_file">Erstelle Text-Datei&#8230;</string>
-	<string name="action_progress_authentication">Authentifizierung&#8230;</string>
-	<string name="action_progress_renaming">Benenne um&#8230;</string>
-	<string name="action_progress_deleting">Lösche&#8230;</string>
-	<string name="dialog_progress_unlocking_vault">Entsperre Tresor&#8230;</string>
-	<string name="dialog_progress_change_password">Passwort ändern&#8230;</string>
-	<string name="dialog_progress_creating_vault">Erstelle&#8230;</string>
-	<string name="dialog_progress_upload_file">Lade hoch&#8230;</string>
-	<string name="dialog_progress_download_file">Lade herunter&#8230;</string>
-	<string name="dialog_progress_encryption">Verschlüssele&#8230;</string>
-	<string name="dialog_progress_decryption">Entschlüssele&#8230;</string>
-	<string name="action_progress_moving">Verschiebe&#8230;</string>
+	<string name="action_progress_authentication">Authentifizierung &#8230;</string>
+	<string name="action_progress_renaming">Wird umbenannt &#8230;</string>
+	<string name="action_progress_deleting">Wird gelöscht &#8230;</string>
+	<string name="dialog_progress_unlocking_vault">Tresor wird entsperrt &#8230;</string>
+	<string name="dialog_progress_change_password">Passwort wird geändert &#8230;</string>
+	<string name="dialog_progress_creating_vault">Tresor wird erstellt &#8230;</string>
+	<string name="dialog_progress_upload_file">Wird hochgeladen &#8230;</string>
+	<string name="dialog_progress_download_file">Wird heruntergeladen &#8230;</string>
+	<string name="dialog_progress_encryption">Wird verschlüsselt &#8230;</string>
+	<string name="dialog_progress_decryption">Wird entschlüsselt &#8230;</string>
+	<string name="action_progress_moving">Wird verschoben &#8230;</string>
 	<string name="dialog_lock_vault">Sperren</string>
 	<string name="dialog_accept_ssl_certificate_title">Ungültiges SSL-Zertifikat</string>
 	<string name="dialog_accept_ssl_certificate_hint">Das SSL-Zertifikat ist ungültig. Möchtest du ihm trotzdem vertrauen?</string>
@@ -376,12 +376,12 @@
 	<string name="notification_auto_upload_failed_due_to_vault_locked">Tresor gesperrt während dem hochladen, zum weiteren Hochladen entsperren</string>
 	<string name="notification_auto_upload_failed_due_to_vault_not_found">Der Tresor für den automatischen Upload existiert nicht mehr.</string>
 	<string name="notification_open_writable_file_title">Datei mit Schreibrechten geöffnet</string>
-	<string name="notification_open_writable_file_message">Tresor bleibt entsperrt bis die Datei nicht mehr editiert wird</string>
+	<string name="notification_open_writable_file_message">Tresor bleibt entsperrt, bis die Bearbeitung abgeschlossen wurde</string>
 	<string name="notification_update_check_finished_latest">Neueste Version installiert</string>
 	<string name="notification_authenticating">Melde an&#8230;</string>
 	<string name="screen_settings_lru_cache">Zwischenspeicher</string>
 	<string name="screen_settings_lru_cache_toggle_summary">Speichere kürzlich geöffnete Dateien lokal und verschlüsselt auf dem Gerät für eine spätere Wiederverwendung beim erneuten öffnen</string>
-	<string name="screen_settings_lru_cache_size">Zwischenspeichergröße insgesamt</string>
+	<string name="screen_settings_lru_cache_size">Zwischenspeichergröße gesamt</string>
 	<string name="screen_settings_clear_lru_cache_size">Zwischenspeicher leeren</string>
 	<string name="screen_settings_lru_cache_changed__restart_toast">Änderungen werden nach einem Neustart der App aktiv</string>
 	<string name="screen_settings_license">Registriert für</string>
@@ -389,7 +389,7 @@
 	<string name="dialog_settings_update_check_interval_title">Intervall der Aktualisierungsprüfung</string>
 	<string name="screen_settings_check_updates">Nach Aktualisierungen suchen</string>
 	<string name="screen_settings_last_check_updates">Letzte Ausführung %1$s</string>
-	<string name="dialog_cache_size_title">Zwischenspeichergröße pro Cloud</string>
+	<string name="dialog_cache_size_title">Zwischenspeichergröße je Cloud</string>
 	<!-- lock timeout names -->
 	<string name="lock_timeout_instant">Sofort</string>
 	<string name="lock_timeout_1m">1 Minute</string>
@@ -406,11 +406,11 @@
 	<string name="cache_size_5000m">5 GB</string>
 	<!-- screen scheme mode names -->
 	<string name="screen_settings_style_mode">Design</string>
-	<string name="follow_system">Automatisch (System-Einstellung verwenden)</string>
+	<string name="follow_system">Automatisch (Systemeinstellung verwenden)</string>
 	<string name="light">Hell</string>
 	<string name="dark">Dunkel</string>
 	<!-- update interval names -->
-	<string name="update_interval_1d">Einmal am Tag</string>
-	<string name="update_interval_1w">Einmal pro Woche</string>
-	<string name="update_interval_1m">Einmal im Monat</string>
+	<string name="update_interval_1d">Täglich</string>
+	<string name="update_interval_1w">Wöchentlich</string>
+	<string name="update_interval_1m">Monatlich</string>
 </resources>
diff --git a/presentation/src/main/res/values-hr-rHR/strings.xml b/presentation/src/main/res/values-hr-rHR/strings.xml
index 4b3cc52f..79586830 100644
--- a/presentation/src/main/res/values-hr-rHR/strings.xml
+++ b/presentation/src/main/res/values-hr-rHR/strings.xml
@@ -1,26 +1,197 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<!-- # app -->
+	<string name="share_with_label">Šifriraj</string>
 	<!-- # error messages -->
+	<string name="error_generic">Došlo je do greške</string>
+	<string name="error_authentication_failed">Neuspješna autentikacija</string>
+	<string name="error_authentication_failed_re_authenticate">Neuspješna autentikacija, prijavite se koristeći %1$s</string>
+	<string name="error_no_network_connection">Nema mrežne veze</string>
+	<string name="error_invalid_passphrase">Pogrešna lozinka</string>
+	<string name="error_file_or_folder_exists">Datoteka ili mapa već postoje.</string>
+	<string name="error_vault_version_not_supported">Verzija trezora %1$s nije podržana. Ovaj trezor je stvoren sa starijom ili novijom verzijom Cryptomator-a.</string>
+	<string name="error_vault_config_file_missing_due_to_format_999">%1$s datoteka nedostaje u mapi Vašeg trezora. Budite sigurni da ova datoteka postoji u mapi Vašeg trezora u oblaku.</string>
+	<string name="error_vault_already_exists">Trezor već postoji.</string>
+	<string name="error_no_such_file">Datoteka ne postoji.</string>
+	<string name="error_vault_has_been_locked">Trezor je zaključan.</string>
+	<string name="error_cloud_already_exists">Oblak već postoji.</string>
+	<string name="error_activity_not_found">Molimo preuzmite aplikaciju koja može otvoriti ovu datoteku.</string>
+	<string name="error_server_not_found">Poslužitelj nije pronađen.</string>
+	<string name="error_device_policy_manager_not_found">Molimo otvorite postavke svog uređaja i ručno postavite zaključavanje zaslona</string>
+	<string name="error_export_illegal_file_name">Izvoz neuspješan. Uklonite posebne znakove iz imena datoteka i izvezite ponovno.</string>
+	<string name="error_name_contains_invalid_characters">Ne može sadržavati posebne znakove.</string>
+	<string name="error_names_contains_invalid_characters">Nazivi datoteka ne mogu sadržavati posebne znakove.</string>
+	<string name="error_vault_name_contains_invalid_characters">Naziv trezora ne može sadržavati posebne znakove.</string>
+	<string name="error_general_update">Provjera ažuriranja neuspješna. Došlo je do opće greške.</string>
+	<string name="error_hash_mismatch_update">Provjera ažuriranja neuspješna. Izračunati hash ne odgovara prenesenoj datoteci</string>
+	<string name="error_update_no_internet">Provjera ažuriranja neuspješna. Nema pristupa Internetu.</string>
+	<string name="error_failed_to_decrypt_webdav_password">Neuspješno dešifriranje WebDAV lozinke, molimo ponovno ju dodajte u postavke</string>
+	<string name="error_play_services_not_available">Usluge za Google Play nisu instalirane</string>
+	<string name="error_biometric_auth_aborted">Biometrijska autentikacija prekinuta</string>
+	<string name="error_vault_version_mismatch">Verzija navedena u %1$s je drugačija od one u %2$s</string>
+	<string name="error_vault_key_invalid">%1$s ne odgovara onom u %2$s</string>
+	<string name="error_vault_config_loading">Opća greška kod učitavanja postavki trezora</string>
+	<string name="error_file_not_found_after_opening_using_3party">Lokalna datoteka više ne postoji nakon povratka u Cryptomator. Moguće promjene ne mogu se propagirati nazad u oblak.</string>
+	<string name="error_no_such_bucket">Nepostojeća kanta</string>
+	<string name="error_masterkey_location_not_supported">Prilagođeno mjesto glavnog ključa još nije podržano</string>
 	<!-- # clouds -->
 	<!-- ## cloud names -->
+	<string name="cloud_names_local_storage">Lokalna pohrana</string>
 	<!-- # permission -->
 	<!-- ## permission messages -->
+	<string name="permission_message_export_file">Cryptomator treba pristup pohrani da izveze datoteke</string>
+	<string name="permission_message_upload_file">Cryptomator treba pristup pohrani da prenese datoteke</string>
+	<string name="permission_message_share_file">Cryptomator treba pristup pohrani da dijeli datoteke</string>
+	<string name="permission_revoked_re_request_permission">Cryptomator je izgubio dozvolu pristupa ovoj lokaciji. Ponovno odaberite mapu za povrat dozvole.</string>
+	<string name="snack_bar_action_title_settings">Postavke</string>
+	<string name="snack_bar_action_title_search">Traži</string>
+	<string name="snack_bar_action_title_search_previous">Prethodno</string>
 	<string name="snack_bar_action_title_search_next">Sljedeći</string>
+	<string name="snack_bar_action_title_sort">Razvrstaj</string>
+	<string name="snack_bar_action_title_sort_az">A - Ž</string>
+	<string name="snack_bar_action_title_sort_za">Ž - A</string>
+	<string name="snack_bar_action_title_sort_newest">Prvo najnovije</string>
+	<string name="snack_bar_action_title_sort_oldest">Prvo najstarije</string>
+	<string name="snack_bar_action_title_sort_biggest">Prvo najveće</string>
+	<string name="snack_bar_action_title_sort_smallest">Prvo najmanje</string>
 	<!-- # screens -->
 	<!-- # screen: vault list -->
+	<string name="screen_vault_list_actions_title">Dodaj u Cryptomator</string>
+	<string name="screen_vault_list_action_create_new_vault">Napravi novi trezor</string>
+	<string name="screen_vault_list_action_add_existing_vault">Dodaj postojeći trezor</string>
+	<string name="screen_vault_list_vault_action_delete">Ukloni</string>
+	<string name="screen_vault_list_vault_creation_hint">Pritisnite ovdje za stvaranje novog trezora</string>
+	<string name="screen_vault_list_change_password_successful">Lozinka je uspješno promijenjena</string>
 	<!-- # screen: file browser -->
 	<string name="screen_file_browser_default_title">Trezor</string>
+	<string name="screen_file_browser_add_existing_vault_extra_text">Odaberi datoteku glavnog ključa</string>
+	<string name="screen_file_browser_create_new_vault_button_text">Postavi ovdje</string>
+	<string name="screen_file_browser_create_new_vault_extra_text">Ime trezora: %1$s</string>
+	<string name="screen_file_browser_move_button_text">Premjesti</string>
+	<string name="screen_file_browser_msg_empty_folder">Prazna mapa</string>
+	<string name="screen_file_browser_file_info_label_date">izmijenjeno prije %1$s</string>
+	<string name="screen_file_browser_share_intent_chooser_title">Podijeli s</string>
+	<string name="screen_file_browser_share_destination_title">Odaberi odredište</string>
+	<string name="screen_file_browser_share_button_text">Odaberi</string>
+	<string name="screen_file_browser_nothing_to_share">Ništa za dijeljenje</string>
+	<string name="screen_file_browser_actions_title">Dodaj u %1$s</string>
+	<string name="screen_file_browser_action_create_folder">Izradi mapu</string>
+	<string name="screen_file_browser_action_create_new_text_file">Izradi tekstualnu datoteku</string>
+	<string name="screen_file_browser_action_upload_files">Prenesi datoteke</string>
+	<string name="screen_file_browser_upload_files_chooser_title">Datoteke</string>
+	<string name="screen_file_browser_msg_file_exported">Datoteka izvezena</string>
+	<string name="screen_file_browser_msg_files_exported">Datoteke izvezene</string>
+	<string name="screen_file_browser_nothing_to_export">Ništa za izvoz</string>
+	<string name="screen_file_browser_msg_creating_download_dir_failed">Neuspješno stvaranje mape za preuzimanje</string>
+	<string name="screen_file_browser_node_action_share">Podijeli</string>
+	<string name="screen_file_browser_node_action_rename">Preimenuj</string>
+	<string name="screen_file_browser_node_action_edit_text">Izmjeni</string>
+	<string name="screen_file_browser_node_action_export">Izvezi</string>
+	<string name="screen_file_browser_node_action_delete">Izbriši</string>
+	<string name="screen_file_browser_node_action_open_with_text">Otvori s&#8230;</string>
+	<string name="screen_file_browser_selection_mode_title_zero_elements">Odaberi stavke</string>
+	<string name="screen_file_browser_selection_mode_title_one_or_more_elements">%1$d odabrano</string>
+	<string name="screen_file_browser_select_items">Odaberi</string>
+	<string name="screen_file_browser_select_all_items">Odaberi sve</string>
+	<string name="screen_file_browser_refresh_items">Osvježi</string>
+	<string name="screen_file_browser_no_connection_message">Nema veze</string>
+	<string name="screen_file_browser_no_connection_button_text">Pokušaj ponovno</string>
 	<!-- ## screen: text editor -->
+	<string name="screen_text_editor_save_success">Uspješno pohranjeno</string>
 	<!-- ## screen: share files -->
+	<string name="screen_share_files_title">Pohrani %1$s u&#8230;</string>
+	<string name="screen_share_files_content_text">tekst</string>
+	<string name="screen_share_files_content_file">datoteka</string>
+	<string name="screen_share_files_content_files">datoteke</string>
+	<string name="screen_share_files_msg_filenames_must_be_unique">Ime datoteke treba biti jedinstveno, izmijenite imena duplikata.</string>
+	<string name="screen_share_files_section_location">Pohrani lokaciju</string>
+	<string name="screen_share_files_save_button_text">Pohrani</string>
+	<string name="screen_share_files_msg_success">Šifriranje završeno</string>
 	<!-- ## screen: choose cloud service -->
+	<string name="screen_choose_cloud_service_title">Usluga u oblaku</string>
 	<!-- ## screen: cloud connections -->
+	<string name="screen_cloud_connections_title">Odaberi lokaciju</string>
+	<string name="screen_cloud_connections_no_connections">Pritisnite ovdje da biste dodali lokacije</string>
+	<string name="screen_cloud_error_webdav_not_supported">Čini se da poslužitelj nije WebDAV kompatibilan</string>
+	<string name="screen_cloud_local_error_no_content_provider">Nije pronađen upravitelj dodateka koji podržava otvaranje mapa</string>
 	<!-- ## screen: webdav settings -->
+	<string name="screen_webdav_settings_url_port_label">URL</string>
+	<string name="screen_webdav_settings_username_label">Korisničko ime</string>
+	<string name="screen_webdav_settings_password_label">Lozinka</string>
+	<string name="screen_webdav_settings_done_button_text">Poveži</string>
+	<string name="screen_webdav_settings_msg_url_must_not_be_empty">URL ne može biti prazan.</string>
+	<string name="screen_webdav_settings_msg_url_is_invalid">URL je nevažeći.</string>
+	<string name="screen_webdav_settings_msg_username_must_not_be_empty">Korisničko ime ne može biti prazno.</string>
+	<string name="screen_webdav_settings_msg_password_must_not_be_empty">Lozinka ne može biti prazna.</string>
 	<!-- ## screen: s3 settings -->
+	<string name="screen_s3_settings_display_name_label">Ime za prikaz</string>
+	<string name="screen_s3_settings_access_key_label">Pristupni ključ</string>
+	<string name="screen_s3_settings_secret_key_label">Tajni ključ</string>
+	<string name="screen_s3_settings_bucket_label">Postojeća kanta</string>
+	<string name="screen_s3_settings_endpoint_label">Krajnja točka</string>
+	<string name="screen_s3_settings_region_label">Regija</string>
+	<string name="screen_s3_settings_msg_display_name_not_empty">Ime za prikaz ne može biti prazno</string>
+	<string name="screen_s3_settings_msg_access_key_not_empty">Pristupni ključ ne može biti prazan</string>
+	<string name="screen_s3_settings_msg_secret_key_not_empty">Tajni ključ ne može biti prazan</string>
+	<string name="screen_s3_settings_msg_bucket_not_empty">Kanta ne može biti prazna</string>
+	<string name="screen_s3_settings_msg_endpoint_and_region_not_empty">Krajnja točka ili regija ne mogu biti prazni</string>
 	<!-- ## screen: enter vault name -->
+	<string name="screen_enter_vault_name_msg_name_empty">Ime trezora ne može biti prazno.</string>
+	<string name="screen_enter_vault_name_vault_label">Ime trezora</string>
+	<string name="screen_enter_vault_name_button_text">Stvori</string>
 	<!-- ## screen: set password -->
+	<string name="screen_set_password_title">Postavi lozinku</string>
+	<string name="screen_set_password_msg_password_mismatch">Lozinka ne odgovara ponovno upisanoj lozinci.</string>
 	<string name="screen_set_password_button_text">Gotovo</string>
+	<string name="screen_set_password_hint">VAŽNO: Ako zaboravite svoju lozinku, nema načina za povrat Vaših podataka.</string>
+	<string name="screen_set_password_retype_password_label">Ponovno upišite lozinku</string>
+	<string name="screen_set_password_strength_indicator_0">Preslaba za kreiranje trezora</string>
+	<string name="screen_set_password_strength_indicator_1">Slaba</string>
+	<string name="screen_set_password_strength_indicator_2">Prosječna</string>
+	<string name="screen_set_password_strength_indicator_3">Jaka</string>
+	<string name="screen_set_password_strength_indicator_4">Vrlo jaka</string>
 	<!-- ## screen: settings -->
+	<string name="screen_settings_section_general">Općenito</string>
+	<string name="screen_settings_cloud_settings_label">Usluge u oblaku</string>
+	<string name="screen_settings_biometric_auth">Biometrijska autentikacija</string>
+	<string name="screen_settings_activate_biometric_auth">Aktiviraj biometrijsku autentikaciju</string>
+	<string name="screen_settings_confirm_face_unlock">Potvrdi otključavanje licem (ako je dostupno)</string>
+	<string name="screen_settings_block_app_when_obscured">Blokiraj program kada je zaklonjen</string>
+	<string name="screen_settings_block_app_when_obscured_summary">Blokiraj presretanje unosa i prikaz lažnog korisničkog sučelja</string>
+	<string name="screen_settings_secure_screen">Blokiraj snimke zaslona</string>
+	<string name="screen_settings_secure_screen_summary">Blokiraj snimke zaslona u listi nedavnih i unutar programa</string>
+	<string name="screen_settings_section_search">Traži</string>
+	<string name="screen_settings_live_search">Pretraživanje uživo</string>
+	<string name="screen_settings_live_search_summary">Ažuriraj rezultate pretraživanja pri unosu upita</string>
+	<string name="screen_settings_glob_search">Pretraži koristeći glob uzorak</string>
+	<string name="screen_settings_glob_search_summary">Koristi glob podudaranje uzorka kao što je alice.*.jpg</string>
+	<string name="screen_settings_section_auto_lock">Automatsko zaključavanje</string>
+	<string name="screen_settings_auto_lock_timeout">Zaključaj nakon</string>
+	<string name="screen_settings_auto_lock_on_screen_lock">Kada je ekran onemogućen</string>
+	<string name="screen_settings_section_auto_photo_upload">Automatski prijenos slika</string>
+	<string name="screen_settings_section_auto_photo_upload_vault">Odaberi trezor za prijenos</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle">Aktiviraj</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Snimi slike u pozadini i nakon što se odabrani trezor otključa, počni s prijenosom</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">Trenutno prenesi</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Prenesi direktno ako je trezor zaključan</string>
+	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Preseni samo koristeći WIFI</string>
+	<string name="screen_settings_section_auto_photo_upload_including_videos">Prenesi video</string>
+	<string name="screen_settings_auto_photo_upload_title">Pohrani automatski prenesene datoteke u&#8230;</string>
+	<string name="screen_settings_website_label">Cryptomator web stranica</string>
+	<string name="screen_settings_twitter_label">Pratite nas na Twitteru</string>
+	<string name="screen_settings_facebook_label">Lajkajte nas na Facebooku</string>
+	<string name="screen_settings_section_legal">Pravno</string>
+	<string name="screen_settings_licenses_label">Licence</string>
+	<string name="screen_settings_license_terms_label">Licenčni uvjeti</string>
+	<string name="screen_settings_section_support">Podrška</string>
+	<string name="screen_settings_contact_label">Zatraži pomoć</string>
+	<string name="screen_settings_debug_mode_label">Način rada otklanjanja pogrešaka</string>
+	<string name="screen_settings_error_report_label">Pošalji log datoteku</string>
+	<string name="screen_settings_error_report_failed">Slanje neuspješno</string>
+	<string name="screen_settings_security_label">Savjeti o sigurnosti</string>
+	<string name="screen_settings_section_version">Verzija</string>
+	<string name="screen_settings_advanced_settings">Napredne postavke</string>
+	<string name="screen_settings_background_unlock_preparation_label">Ubrzaj otključavanje</string>
 	<!-- ## screen: cloud settings -->
 	<!-- ## screen: licenses -->
 	<!-- ## screen: authenticate cloud -->
@@ -28,14 +199,33 @@
 	<!-- # dialogs -->
 	<string name="dialog_button_cancel">Odustani</string>
 	<string name="dialog_enter_password_positive_button">Otključaj</string>
+	<string name="dialog_change_password_msg_password_mismatch">Nova lozinka ne odgovara ponovno upisanoj lozinci.</string>
 	<!-- Vault not found -->
+	<string name="dialog_vault_not_found_positive_button_text">Ukloni</string>
+	<string name="dialog_existing_file_positive_button">Zamijeni</string>
+	<string name="dialog_existing_file_message">Datoteka s imenom \'%1$s\' već postoji.</string>
+	<string name="dialog_replace_negative_button_at_least_two_but_not_all_files_exist">Preskoči postojeće</string>
+	<string name="dialog_replace_positive_button_all_files_exist">Zamijeni sve</string>
+	<string name="dialog_replace_positive_button_some_files_exist">Zamijeni postojeće</string>
+	<string name="dialog_replace_positive_button_single_file_exists">Zamijeni</string>
+	<string name="dialog_file_name_placeholder">tekst.txt</string>
+	<string name="dialog_upload_file_title">Prenosi se&#8230;</string>
+	<string name="dialog_progress_upload_file">Prenosi se&#8230;</string>
+	<string name="dialog_progress_download_file">Preuzima se&#8230;</string>
+	<string name="dialog_progress_encryption">Šifrira se&#8230;</string>
 	<string name="dialog_lock_vault">Zaključaj</string>
+	<string name="dialog_accept_ssl_certificate_details">Detalji</string>
+	<string name="dialog_debug_mode_disclaimer_hint">U ovom načinu, osjetljivi podaci mogu biti zapisani u log datoteku na Vašem uređaju (npr. datoteke i putanje). Lozinke, kolačići itd. su izričito isključeni.\n\nZapamtite da isključite način za otklanjanje pogrešaka čim prije je to moguće.</string>
+	<string name="dialog_debug_mode_disclaimer_title">Pažnja</string>
+	<string name="dialog_debug_mode_positive_button">Omogući</string>
+	<string name="dialog_disable_app_obscured_disclaimer_title">Pažnja</string>
 	<string name="dialog_app_is_obscured_info_neutral_button">Zatvori</string>
 	<string name="dialog_sym_link_back_button">Nazad</string>
 	<!-- # error reports -->
 	<!-- # misc -->
 	<!-- ## file size helper -->
 	<!-- ## date helper -->
+	<string name="time_unit_minutes_pl">minute</string>
 	<!-- ## biometric authentication -->
 	<!-- notification -->
 	<!-- lock timeout names -->
diff --git a/presentation/src/main/res/values-uk-rUA/strings.xml b/presentation/src/main/res/values-uk-rUA/strings.xml
index 439c1898..57715fe4 100644
--- a/presentation/src/main/res/values-uk-rUA/strings.xml
+++ b/presentation/src/main/res/values-uk-rUA/strings.xml
@@ -9,6 +9,8 @@
 	<string name="error_no_network_connection">Відсутнє з\'єднання з мережею</string>
 	<string name="error_invalid_passphrase">Неправильний пароль</string>
 	<string name="error_file_or_folder_exists">Файл чи тека вже існує.</string>
+	<string name="error_vault_version_not_supported">Версія сховища %1$s не підтримується. Це сховище було створено застарілою або новішою версією Cryptomator.</string>
+	<string name="error_vault_config_file_missing_due_to_format_999">%1$s Файл відсутній у вашому сховищі. Переконайтеся, що цей файл існує у теці вашого сховища у хмарі.</string>
 	<string name="error_vault_already_exists">Сховище вже існує.</string>
 	<string name="error_no_such_file">Файлу не існує.</string>
 	<string name="error_vault_has_been_locked">Сховище було заблоковано.</string>
@@ -111,6 +113,7 @@
 	<string name="screen_cloud_connections_title">Обрати місцерозташування</string>
 	<string name="screen_cloud_connections_no_connections">Натисніть сюди щоб додати розташування</string>
 	<string name="screen_cloud_error_webdav_not_supported">Схоже, сервер не сумісний з WebDAV</string>
+	<string name="screen_cloud_local_error_no_content_provider">Не знайдено менеджер файлів, який підтримує відкриття директорій</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">Адреса посилання</string>
 	<string name="screen_webdav_settings_username_label">Ім\'я користувача</string>
@@ -193,6 +196,7 @@
 	<string name="screen_settings_keep_unlocked_while_editing_files">Залишати розблокованим</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files_summary">Залишати сховища розблокованими під час редагування файлів</string>
 	<!-- ## screen: cloud settings -->
+	<string name="screen_cloud_settings_onedrive_connections">Підключення OneDrive</string>
 	<string name="screen_cloud_settings_webdav_connections">Підключення через WebDAV</string>
 	<string name="screen_cloud_settings_pcloud_connections">підключення до pCloud</string>
 	<string name="screen_cloud_settings_s3_connections">S3 підключення</string>
@@ -246,10 +250,40 @@
 	<string name="dialog_delete_vault_hint">Ця дія тільки прибере сховище з цього списку, але не видалить його.</string>
 	<string name="dialog_upload_file_title">Завантаження&#8230;</string>
 	<string name="dialog_upload_file_remaining">Файл %1$d з %2$d</string>
+	<string name="dialog_export_file_title">Експорт (%1$d/%2$d)</string>
+	<string name="dialog_progress_please_wait">Будь ласка, зачекайте&#8230;</string>
+	<string name="dialog_progress_creating_folder">Створення папки&#8230;</string>
+	<string name="dialog_progress_creating_text_file">Створення текстового файлу&#8230;</string>
+	<string name="action_progress_authentication">Автентифікація&#8230;</string>
+	<string name="action_progress_renaming">Перейменування&#8230;</string>
+	<string name="action_progress_deleting">Видалення&#8230;</string>
+	<string name="dialog_progress_unlocking_vault">Розблокування сховища&#8230;</string>
+	<string name="dialog_progress_change_password">Зміна пароля&#8230;</string>
+	<string name="dialog_progress_creating_vault">Створення сховища&#8230;</string>
 	<string name="dialog_progress_upload_file">Завантаження&#8230;</string>
+	<string name="dialog_progress_download_file">Завантаження&#8230;</string>
+	<string name="dialog_progress_encryption">Шифрування&#8230;</string>
+	<string name="dialog_progress_decryption">Розшифрування&#8230;</string>
+	<string name="action_progress_moving">Переміщення&#8230;</string>
 	<string name="dialog_lock_vault">Заблокувати</string>
+	<string name="dialog_accept_ssl_certificate_title">Неправильний SSL сертифікат</string>
+	<string name="dialog_accept_ssl_certificate_hint">Сертифікат SSL недійсний. Довіряти йому у будь-якому випадку?</string>
+	<string name="dialog_accept_ssl_certificate_details">Докладно</string>
+	<string name="dialog_accept_ssl_certificate_security_checkbox">Це може спричинити ризики безпеки. Я знаю, що роблю.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_title">Вимкнути оптимізацію використання батареї</string>
+	<string name="dialog_ask_ignore_battery_optimizations_hint">Щоб отримати нові зображення та відео, не працюючи у фоновому режимі, нам потрібно відмовитися від оптимізації батареї. Але не хвилюйся, %1$s не споживає багато енергії.\n\nЩоб застосувати його, змініть \'Не оптимізовано\' на \'Усі програми\', виберіть %1$s і виберіть «Не оптимівати» після натискання на «%2$s» в цьому діалоговому вікні.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_checkbox">Не запитувати знову?</string>
+	<string name="dialog_http_security_hint">Використання HTTP небезпечне. Рекомендуємо замість цього використовувати HTTPS. Якщо ви усвідомлюєте ризики, ви можете продовжити з HTTP.</string>
+	<string name="dialog_http_security_checkbox">Змінити на HTTPS</string>
 	<string name="dialog_http_security_title">Використовувати HTTPS?</string>
+	<string name="dialog_no_screen_lock_hint">Не встановлено блокування екрану. Щоб надійно зберегти свої облікові дані, встановіть ключ чи пароль після натискання ОК.</string>
+	<string name="dialog_no_screen_lock_title">Встановити блокування екрану?</string>
+	<string name="dialog_no_screen_lock_checkbox">Встановлення блокування екрану</string>
+	<string name="dialog_no_biometric_auth_set_up_title">В системі не налаштовано базову автентифікацію</string>
+	<string name="dialog_no_biometric_auth_set_up_message">Встановіть як мінімум один відбиток/одне обличчя для використання цього сервісу.</string>
+	<string name="dialog_debug_mode_disclaimer_title">Увага</string>
 	<string name="dialog_debug_mode_positive_button">Увімкнути</string>
+	<string name="dialog_disable_app_obscured_disclaimer_title">Увага</string>
 	<string name="dialog_disable_app_obscured_positive_button">Вимкнути</string>
 	<string name="dialog_app_is_obscured_info_neutral_button">Закрити</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_hint">Ця дія видалить підключення до хмари та всі сховища з цієї хмари.</string>