diff --git a/src/main/res/values-b+en+001/strings.xml b/src/main/res/values-b+en+001/strings.xml
index 87a96fd1ce..3049db192e 100644
--- a/src/main/res/values-b+en+001/strings.xml
+++ b/src/main/res/values-b+en+001/strings.xml
@@ -141,9 +141,12 @@
     <string name="confirmation_remove_folder_alert">Do you really want to delete %1$s and it\'s content?</string>
     <string name="confirmation_remove_folders_alert">Do you really want to delete the selected items and their contents?</string>
     <string name="confirmation_remove_local">Local only</string>
+    <string name="conflict_already_existing_file">Already existing file</string>
     <string name="conflict_keep_both">Keep both</string>
     <string name="conflict_message">Which files do you want to keep? If you select both versions, the local file will have a number appended to its name.</string>
+    <string name="conflict_message_description">If you select both versions, the local file will have a number appended to its name.</string>
     <string name="conflict_message_headline">Which files do you wish to keep?</string>
+    <string name="conflict_new_file">New file</string>
     <string name="conflict_title">File conflict</string>
     <string name="conflict_use_local_version">local version</string>
     <string name="conflict_use_server_version">server version</string>
@@ -170,7 +173,9 @@
     <string name="copy_move_to_encrypted_folder_not_supported">Copy/move into encrypted folder currently not supported.</string>
     <string name="copy_to">Copy to…</string>
     <string name="could_not_download_image">Could not download full image</string>
+    <string name="could_not_retrieve_url">Could not retrieve URL</string>
     <string name="create_dir_fail_msg">Could not create folder</string>
+    <string name="create_new">Create new</string>
     <string name="create_new_document">Create new document</string>
     <string name="create_new_folder">Create new folder</string>
     <string name="create_new_presentation">Create new presentation</string>
@@ -361,8 +366,10 @@
     <string name="hint_password">Password</string>
     <string name="host_not_available">Server not available</string>
     <string name="host_your_own_server">Host your own server</string>
+    <string name="instant_upload_existing">Also upload existing files</string>
     <string name="instant_upload_on_charging">Only upload when charging</string>
     <string name="instant_upload_path">/InstantUpload</string>
+    <string name="invalid_url">Invalid URL</string>
     <string name="learn_more">Learn more</string>
     <string name="link">Link</string>
     <string name="list_layout">Listed layout</string>
@@ -568,6 +575,8 @@
     <string name="share_group_clarification">%1$s (group)</string>
     <string name="share_internal_link">Share internal link</string>
     <string name="share_internal_link_text">Only works for users with access to this %1$s</string>
+    <string name="share_internal_link_to_file_text">Internal share link only works for users with access to this file</string>
+    <string name="share_internal_link_to_folder_text">Internal share link only works for users with access to this folder</string>
     <string name="share_known_remote_clarification">%1$s ( at %2$s )</string>
     <string name="share_link_empty_password">You must enter a password</string>
     <string name="share_link_file_error">An error occurred while trying to share this file or folder</string>
@@ -668,9 +677,14 @@
     <string name="sync_fail_ticker">Sync failed</string>
     <string name="sync_fail_ticker_unauthorized">Sync failed, log in again</string>
     <string name="sync_file_nothing_to_do_msg">File contents already synchronised</string>
+    <string name="sync_folder_failed_content">Sync of folder %1$s could not be completed</string>
     <string name="sync_foreign_files_forgotten_explanation">As of version 1.3.16, files uploaded from this device are copied into the local %1$s folder to prevent data loss when a single file is synced with multiple accounts.\n\nDue to this change, all files uploaded with earlier versions of this app were copied into the %2$s folder. However, an error prevented the completion of this operation during account synchronization. You may either leave the file(s) as is and delete the link to %3$s, or move the file(s) into the %1$s folder and retain the link to %4$s.\n\nListed below are the local file(s), and the remote file(s) in %5$s they were linked to.</string>
     <string name="sync_foreign_files_forgotten_ticker">Some local files were forgotten</string>
     <string name="sync_in_progress">Fetching most recent version of the file.</string>
+    <string name="sync_not_enough_space_dialog_action_choose">Choose what to sync</string>
+    <string name="sync_not_enough_space_dialog_action_free_space">Free up space</string>
+    <string name="sync_not_enough_space_dialog_placeholder">%1$s is %2$s, but there is only %3$s available on device.</string>
+    <string name="sync_not_enough_space_dialog_title">Not enough space</string>
     <string name="sync_status_button">Sync status button</string>
     <string name="sync_string_files">Files</string>
     <string name="synced_folder_settings_button">Settings button</string>
@@ -685,6 +699,8 @@
     <string name="tags">Tags</string>
     <string name="test_server_button">Test server connection</string>
     <string name="thumbnail">Thumbnail</string>
+    <string name="thumbnail_for_existing_file_description">Thumbnail for existing file</string>
+    <string name="thumbnail_for_new_file_desc">Thumbnail for new file</string>
     <string name="timeout_richDocuments">Loading takes very long…</string>
     <string name="trashbin_activity_title">Deleted files</string>
     <string name="trashbin_empty_headline">No deleted files</string>
@@ -720,9 +736,11 @@
     <string name="upload_list_delete">Delete</string>
     <string name="upload_list_empty_headline">No uploads available</string>
     <string name="upload_list_empty_text_auto_upload">Upload some content or activate auto upload.</string>
+    <string name="upload_list_resolve_conflict">Resolve conflict</string>
     <string name="upload_local_storage_full">Local storage full</string>
     <string name="upload_local_storage_not_copied">File could not be copied to local storage</string>
     <string name="upload_lock_failed">Locking folder failed</string>
+    <string name="upload_old_android">Encryption is only possible with &gt;= Android 5.0</string>
     <string name="upload_query_move_foreign_files">Insufficient space prevents copying the selected files into the %1$s folder. Would you like to move them there instead?</string>
     <string name="upload_sync_conflict">Sync conflict, please resolve manually</string>
     <string name="upload_unknown_error">Unknown error</string>
@@ -738,6 +756,8 @@
     <string name="uploader_top_message">Choose upload folder</string>
     <string name="uploader_upload_failed_content_single">Could not upload %1$s</string>
     <string name="uploader_upload_failed_credentials_error">Upload failed, log in again</string>
+    <string name="uploader_upload_failed_sync_conflict_error">File upload conflict</string>
+    <string name="uploader_upload_failed_sync_conflict_error_content">Pick which version to keep of %1$s</string>
     <string name="uploader_upload_failed_ticker">Upload failed</string>
     <string name="uploader_upload_files_behaviour">Upload option:</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Move file to %1$s folder</string>
@@ -766,6 +786,7 @@
     <string name="uploads_view_upload_status_failed_localfile_error">Local file not found</string>
     <string name="uploads_view_upload_status_failed_permission_error">Permission error</string>
     <string name="uploads_view_upload_status_failed_ssl_certificate_not_trusted">Untrusted server certificate</string>
+    <string name="uploads_view_upload_status_fetching_server_version">Fetching server version…</string>
     <string name="uploads_view_upload_status_service_interrupted">App terminated</string>
     <string name="uploads_view_upload_status_succeeded">Completed</string>
     <string name="uploads_view_upload_status_unknown_fail">Unknown error</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index b90487cc11..96cc813071 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -100,7 +100,7 @@
     <string name="common_cancel">Ezeztatu</string>
     <string name="common_cancel_sync">Sinkronizazioa eten</string>
     <string name="common_choose_account">Hautatu kontua</string>
-    <string name="common_delete">Borratu</string>
+    <string name="common_delete">Ezabatu</string>
     <string name="common_error">Errorea</string>
     <string name="common_error_out_memory">Ez dago memoria nahikorik</string>
     <string name="common_error_unknown">Errore ezezaguna</string>
@@ -137,9 +137,9 @@
     <string name="community_testing_version_text">Lagundu nahi gaituzu hurrengo bertsioa probatzen?</string>
     <string name="configure_new_media_folder_detection_notifications">Konfiguratu</string>
     <string name="confirmation_remove_file_alert">Ziur zaude %1$s ezabatu nahi duzula?</string>
-    <string name="confirmation_remove_files_alert">Hautatutako elementuak benetan borratu nahi dituzu?</string>
+    <string name="confirmation_remove_files_alert">Ziur zaude hautatutako elementuak ezabatu nahi dituzula?</string>
     <string name="confirmation_remove_folder_alert">Ziur zaude %1$s eta bere edukia ezabatu nahi duzula?</string>
-    <string name="confirmation_remove_folders_alert">Hautatutako elementuak eta bere edukiak benetan borratu nahi dituzu?</string>
+    <string name="confirmation_remove_folders_alert">Ziur zaude hautatutako elementuak eta beren edukiak ezabatu nahi dituzula?</string>
     <string name="confirmation_remove_local">Bertakoa bakarrik</string>
     <string name="conflict_keep_both">Mantendu biak</string>
     <string name="conflict_message">Zeintzuk fitxategi mantendu nahi dituzu? Bi bertsioak hautatzen badituzu, lokaleko fitxategiaren izenenari zenbaki bat atxikituko zaio.</string>
@@ -385,7 +385,7 @@
     <string name="logs_title">Erregistroak</string>
     <string name="maintenance_mode">Zerbitzaria mantentze moduan dago</string>
     <string name="manage_space_clear_data">Datuak garbitu</string>
-    <string name="manage_space_description">Ezarpenak, %1$sren datubase eta zerbitzariaren ziurtagiriak betirako borratuko dira.\n\n Jaitsitako fitxategiak ez dira ikutuko.\n\n Prozesu honek denbora behar du</string>
+    <string name="manage_space_description">%1$s(r)en ezarpenak, datu-basea eta zerbitzariaren ziurtagiriak betirako ezabatuko dira.\n\n Deskargatutako fitxategiak ez dira ukituko.\n\n Prozesu honek denbora behar du.</string>
     <string name="manage_space_title">Tokia kudeatu</string>
     <string name="media_err_invalid_progressive_playback">Media fitxategia ezin da jariotu</string>
     <string name="media_err_io">Ezin da media fitxategia irakurri</string>
@@ -465,7 +465,7 @@
     <string name="placeholder_sentence">Hau leku-marka da</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="power_save_check_dialog_message">Energia aurrezteko kontrola ezgaitzeak fitxategiak kargatzea ekar dezake bateria baxuan dagoenean!</string>
-    <string name="pref_behaviour_entries_delete_file">Borratua</string>
+    <string name="pref_behaviour_entries_delete_file">ezabatua</string>
     <string name="pref_behaviour_entries_keep_file">Karpeta originalean gorde</string>
     <string name="pref_behaviour_entries_move">Aplikazioaren karpetara mugitu</string>
     <string name="prefs_add_account">Gehitu kontua</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 45274f2e13..e8b2fa00fd 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -141,9 +141,12 @@
     <string name="confirmation_remove_folder_alert">Wil je %1$s en de inhoud ervan werkelijk verwijderen?</string>
     <string name="confirmation_remove_folders_alert">Wil je de geselecteerde objecten en hun inhoud echt verwijderen?</string>
     <string name="confirmation_remove_local">Alleen lokaal</string>
+    <string name="conflict_already_existing_file">Al bestaand bestand</string>
     <string name="conflict_keep_both">Beide bewaren</string>
     <string name="conflict_message">Welke bestanden wil je bewaren? Als je beide versies selecteert zal het lokale bestand een volgnummer aan de naam toegevoegd krijgen.</string>
+    <string name="conflict_message_description">Als je beide versies selecteerde, zal het lokale bestand een nummer aan de naam toegevoegd krijgen.</string>
     <string name="conflict_message_headline">Welke bestanden wil je bewaren?</string>
+    <string name="conflict_new_file">Nieuw bestand</string>
     <string name="conflict_title">Bestandsconflict</string>
     <string name="conflict_use_local_version">lokale versie</string>
     <string name="conflict_use_server_version">serverversie</string>
@@ -366,6 +369,7 @@
     <string name="instant_upload_existing">Upload ook bestaande bestanden</string>
     <string name="instant_upload_on_charging">Alleen uploaden bij opladen</string>
     <string name="instant_upload_path">/InstantUpload</string>
+    <string name="invalid_url">Ongeldige URL</string>
     <string name="learn_more">Meer weten</string>
     <string name="link">Link</string>
     <string name="list_layout">Lijstoverzicht</string>
@@ -571,6 +575,8 @@
     <string name="share_group_clarification">%1$s (groep)</string>
     <string name="share_internal_link">Deel interne link</string>
     <string name="share_internal_link_text">Dit werkt enkel voor gebruikers met toegang tot %1$s</string>
+    <string name="share_internal_link_to_file_text">Interne link voor delen werkt alleen voor gebruikers met toegang tot dit bestand</string>
+    <string name="share_internal_link_to_folder_text">Interne link voor delen werkt alleen voor gebruikers met toegang tot deze map</string>
     <string name="share_known_remote_clarification">%1$s ( op %2$s )</string>
     <string name="share_link_empty_password">Je moet een wachtwoord opgeven</string>
     <string name="share_link_file_error">Er trad een fout op bij je poging dit bestand of deze map te delen</string>
@@ -671,6 +677,7 @@
     <string name="sync_fail_ticker">Synchronisatie mislukt</string>
     <string name="sync_fail_ticker_unauthorized">Synchronisatie mislukt, log opnieuw in</string>
     <string name="sync_file_nothing_to_do_msg">Bestandsinhoud is al gesynchroniseerd</string>
+    <string name="sync_folder_failed_content">Synchroniseren van %1$s folder kon niet worden afgerond</string>
     <string name="sync_foreign_files_forgotten_explanation">Sinds versie 1.3.16: bestanden geüpload vanaf dit apparaat zijn gekopieerd in de lokale %1$s directory om zoekraken van bestanden te voorkomen indien een enkel bestand wordt gesynchroniseerd met meerdere accounts. \n\n Door deze verandering zijn alle bestanden geüpload met een eerdere versie van deze app gekopieerd  naar de %2$s directory.  Let wel: door een fout is deze actie niet uitgevoerd tijdens account synchronisatie. Je kunt deze bestanden laten waar ze zijn en verwijder de verwijzingen naar %3$s, of verplaats de bestanden naar de %1$s directory en behoud de verwijzing naar %4$s. \n\n Hieronder zijn de lokale bestanden weergegeven en de remote bestanden in %5$s waar ze naar verwijzen.</string>
     <string name="sync_foreign_files_forgotten_ticker">Een paar lokale bestanden werden vergeten</string>
     <string name="sync_in_progress">Meest recente versie van het bestand wordt opgehaald.</string>
@@ -692,6 +699,8 @@
     <string name="tags">Labels</string>
     <string name="test_server_button">Test server verbinding</string>
     <string name="thumbnail">Miniatuurweergave</string>
+    <string name="thumbnail_for_existing_file_description">Miniatuurafbeelding van bestaande bestand</string>
+    <string name="thumbnail_for_new_file_desc">Miniatuurafbeelding voor nieuw bestand</string>
     <string name="timeout_richDocuments">Het laden duurt erg lang...</string>
     <string name="trashbin_activity_title">Verwijderde bestanden</string>
     <string name="trashbin_empty_headline">Geen verwijderde bestanden</string>