diff --git a/src/main/res/values-b+en+001/strings.xml b/src/main/res/values-b+en+001/strings.xml
index 74b6b99b9b..cc1b19e633 100644
--- a/src/main/res/values-b+en+001/strings.xml
+++ b/src/main/res/values-b+en+001/strings.xml
@@ -27,11 +27,15 @@
     <string name="actionbar_sort">Sort</string>
     <string name="active_user">Active user</string>
     <string name="activities_no_results_headline">No activity yet</string>
+    <string name="activities_no_results_message">No events like additions, changes and shares yet.</string>
     <string name="activity_chooser_send_file_title">Send</string>
     <string name="activity_chooser_title">Send link to…</string>
     <string name="activity_icon">Activity</string>
+    <string name="add_another_public_share_link">Add another link</string>
+    <string name="add_new_public_share">Add new public share link</string>
     <string name="add_to_cloud">Add to %1$s</string>
     <string name="allow_editing">Allow editing</string>
+    <string name="appbar_search_in">Search in %s</string>
     <string name="associated_account_not_found">Associated account not found!</string>
     <string name="auth_access_failed">Access failed: %1$s</string>
     <string name="auth_account_does_not_exist">The account is not added on this device yet</string>
@@ -39,6 +43,7 @@
     <string name="auth_account_not_the_same">The entered user does not match the user of this account</string>
     <string name="auth_bad_oc_version_title">Unrecognised server version</string>
     <string name="auth_connection_established">Connection established</string>
+    <string name="auth_fail_get_user_name">Your server is not returning a correct user ID, please contact an admin.</string>
     <string name="auth_host_address">Server address</string>
     <string name="auth_host_url">Server address https://…</string>
     <string name="auth_incorrect_address_title">Wrong address format for server</string>
@@ -103,12 +108,15 @@
     <string name="common_save">Save</string>
     <string name="common_send">Send</string>
     <string name="common_share">Share</string>
+    <string name="common_switch_account">Switch account</string>
+    <string name="common_switch_to_account">Switch to account</string>
     <string name="common_unknown">unknown</string>
     <string name="common_yes">Yes</string>
     <string name="community_beta_headline">Test the dev version</string>
     <string name="community_beta_text">This includes all upcoming features and it is on the very bleeding edge. Bugs/errors can occur, if and when they do, please report of your findings.</string>
     <string name="community_contribute_forum_forum">forum</string>
     <string name="community_contribute_forum_text">Help others on the</string>
+    <string name="community_contribute_github_text">Review, amend and write code, see %1$s for details.</string>
     <string name="community_contribute_headline">Actively Contribute</string>
     <string name="community_contribute_irc_text">Join the chat on IRC:</string>
     <string name="community_contribute_translate_text">the app</string>
@@ -152,6 +160,7 @@
     <string name="copy_file_error">An error occurred while trying to copy this file or folder</string>
     <string name="copy_file_invalid_into_descendent">It is not possible to copy a folder into one of its own underlying folders</string>
     <string name="copy_file_invalid_overwrite">The file is already present in the destination folder</string>
+    <string name="copy_file_not_found">Unable to copy. Please check whether the file exists.</string>
     <string name="copy_link">Copy link</string>
     <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>
@@ -210,6 +219,7 @@
     <string name="drawer_quota">%1$s of %2$s used</string>
     <string name="drawer_quota_unlimited">%1$s used</string>
     <string name="drawer_synced_folders">Auto upload</string>
+    <string name="edit_label">Change name</string>
     <string name="edit_permission_label">edit</string>
     <string name="edit_rich_workspace">edit folder info</string>
     <string name="encrypted">Set as encrypted</string>
@@ -249,8 +259,12 @@
     <string name="etm_background_jobs">Background jobs</string>
     <string name="etm_background_jobs_cancel_all">Cancel all jobs</string>
     <string name="etm_background_jobs_prune">Prune inactive jobs</string>
+    <string name="etm_background_jobs_schedule_test_job">Schedule test job</string>
     <string name="etm_background_jobs_start_test_job">Start test job</string>
     <string name="etm_background_jobs_stop_test_job">Stop test job</string>
+    <string name="etm_download_enqueue_test_download">Enqueue test download</string>
+    <string name="etm_download_path">Remote path</string>
+    <string name="etm_downloader">Downloader</string>
     <string name="etm_migrations">Migrations (app upgrade)</string>
     <string name="etm_preferences">Preferences</string>
     <string name="etm_title">Engineering Test Mode</string>
@@ -268,17 +282,20 @@
     <string name="file_list_empty">Upload some content or sync with your devices.</string>
     <string name="file_list_empty_favorite_headline">Nothing favorited yet</string>
     <string name="file_list_empty_favorites_filter">Your search returned no favorited files.</string>
+    <string name="file_list_empty_favorites_filter_list">Files and folders you mark as favorites will show up here.</string>
     <string name="file_list_empty_headline">No files here</string>
     <string name="file_list_empty_headline_search">No results in this folder</string>
     <string name="file_list_empty_headline_server_search">No results</string>
     <string name="file_list_empty_headline_server_search_photos">No photos</string>
     <string name="file_list_empty_headline_server_search_videos">No videos</string>
     <string name="file_list_empty_moving">Nothing in here. You can add a folder.</string>
+    <string name="file_list_empty_on_device">Downloaded files and folders will show up here.</string>
     <string name="file_list_empty_recently_added">Found no recently added files</string>
     <string name="file_list_empty_recently_added_filter">No recently added files.</string>
     <string name="file_list_empty_recently_modified">Found no files modified within the last 7 days</string>
     <string name="file_list_empty_recently_modified_filter">No files modified the last 7 days.</string>
     <string name="file_list_empty_search">Maybe it is in a different folder?</string>
+    <string name="file_list_empty_shared">Files and folders you share will show up here.</string>
     <string name="file_list_empty_shared_headline">Nothing shared yet</string>
     <string name="file_list_empty_text_photos">Upload some photos or activate auto upload.</string>
     <string name="file_list_empty_text_photos_filter">No photos.</string>
@@ -353,6 +370,7 @@
     <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="label_empty">Label cannot be empty</string>
     <string name="link">Link</string>
     <string name="list_layout">Listed layout</string>
     <string name="local_file_list_empty">There are no files in this folder.</string>
@@ -394,8 +412,12 @@
     <string name="move_file_error">An error occurred whilst trying to move this file or folder</string>
     <string name="move_file_invalid_into_descendent">It is not possible to move a folder into one of its own underlying folders</string>
     <string name="move_file_invalid_overwrite">The file is already present in the destination folder</string>
+    <string name="move_file_not_found">Unable to move file. Please check whether it exists.</string>
     <string name="move_to">Move to…</string>
+    <string name="network_error_connect_timeout_exception">An error occurred while waiting for the server. Could not complete operation.</string>
     <string name="network_error_socket_exception">An error occurred during connection to the server</string>
+    <string name="network_error_socket_timeout_exception">An error occurred while waiting for the server. Could not complete operation.</string>
+    <string name="network_host_not_available">Could not complete operation. Server unavailable.</string>
     <string name="new_comment">New comment…</string>
     <string name="new_media_folder_detected">New %1$s media folder detected.</string>
     <string name="new_media_folder_photos">photo</string>
@@ -407,6 +429,7 @@
     <string name="no_pdf_app_available">No App available to handle PDF</string>
     <string name="note_confirm">Send</string>
     <string name="note_could_not_sent">Could not send note</string>
+    <string name="note_icon_hint">Note icon</string>
     <string name="notification_action_failed">Failed to execute action.</string>
     <string name="notification_channel_download_description">Shows download progress</string>
     <string name="notification_channel_download_name">Download notification channel</string>
@@ -503,9 +526,11 @@
     <string name="preview_image_error_unknown_format">Unable to show image</string>
     <string name="preview_sorry">Sorry</string>
     <string name="privacy">Privacy</string>
+    <string name="public_share_name">New name</string>
     <string name="push_notifications_not_implemented">Push notifications disabled due to dependencies on proprietary Google Play services.</string>
     <string name="push_notifications_old_login">No push notifications due to outdated login session. Please consider re-adding your account.</string>
     <string name="push_notifications_temp_error">Push notifications currently not available.</string>
+    <string name="qr_could_not_be_read">QR Code could not be read!</string>
     <string name="recommend_subject">Try %1$s on your device!</string>
     <string name="recommend_text">I want to invite you to use %1$s on your device.\nDownload here: %2$s</string>
     <string name="recommend_urls">%1$s or %2$s</string>
@@ -555,6 +580,8 @@
     <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>
+    <string name="share_link_file_no_exist">Unable to share. Please check whether the file exists.</string>
     <string name="share_link_forbidden_permissions">to share this file</string>
     <string name="share_link_optional_password_title">Enter an optional password</string>
     <string name="share_link_password_title">Enter a password</string>
@@ -670,6 +697,7 @@
     <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>
+    <string name="trashbin_empty_message">You will be able to recover deleted files from here.</string>
     <string name="trashbin_file_not_deleted">File %1$s could not be deleted!</string>
     <string name="trashbin_file_not_restored">File %1$s could not be restored!</string>
     <string name="trashbin_loading_failed">Loading trashbin failed!</string>
@@ -678,9 +706,13 @@
     <string name="unset_encrypted">Unset encryption</string>
     <string name="unset_favorite">Remove from favourites</string>
     <string name="unshare">Unshare</string>
+    <string name="unshare_link_file_error">An error occurred while trying to unshare this file or folder.</string>
+    <string name="unshare_link_file_no_exist">Unable to unshare. Please check whether the file exists.</string>
     <string name="unshare_link_forbidden_permissions">to unshare this file</string>
     <string name="unsharing_failed">Unsharing failed</string>
     <string name="untrusted_domain">Access through untrusted domain. Please see documentation for further info.</string>
+    <string name="update_link_file_error">An error occurred while trying to update the share.</string>
+    <string name="update_link_file_no_exist">Unable to update. Please check whether the file exists.</string>
     <string name="update_link_forbidden_permissions">to update this share</string>
     <string name="updating_share_failed">Updating share failed</string>
     <string name="upload_cannot_create_file">Cannot create local file</string>
diff --git a/src/main/res/values-mk/strings.xml b/src/main/res/values-mk/strings.xml
index fb3d13ef52..7457e847f7 100644
--- a/src/main/res/values-mk/strings.xml
+++ b/src/main/res/values-mk/strings.xml
@@ -158,7 +158,7 @@
     <string name="copy_link">Копирај врска</string>
     <string name="copy_move_to_encrypted_folder_not_supported">Не е поддржано копирање/преместување во папка која е шифрирана.</string>
     <string name="copy_to">Копирај во…</string>
-    <string name="could_not_download_image">Неможе да се превземе целосната слика</string>
+    <string name="could_not_download_image">Неможе да се преземе целосната слика</string>
     <string name="create_dir_fail_msg">Не множе да креира папка</string>
     <string name="create_new_document">Креирај нов документ</string>
     <string name="create_new_folder">Креирај нова папка</string>
@@ -250,7 +250,7 @@
     <string name="favorite">Додади во фаворити</string>
     <string name="favorite_icon">Омилен</string>
     <string name="file_delete">Избриши</string>
-    <string name="file_detail_activity_error">Грешка при превземањето на активностите за датотеката</string>
+    <string name="file_detail_activity_error">Грешка при преземањето на активностите за датотеката</string>
     <string name="file_details_no_content">Неуспешно вчитување на деталите</string>
     <string name="file_icon">Датотека</string>
     <string name="file_keep">Задржи</string>
@@ -264,7 +264,7 @@
     <string name="file_list_empty_headline_server_search_photos">Нема слики</string>
     <string name="file_list_empty_headline_server_search_videos">Нема видеа</string>
     <string name="file_list_empty_moving">Тука нема ништо. Можете да додадете папка!</string>
-    <string name="file_list_empty_on_device">Превземените датотеки и папки  ќе се појават тука.</string>
+    <string name="file_list_empty_on_device">Преземените датотеки и папки  ќе се појават тука.</string>
     <string name="file_list_empty_recently_added">Нема пронајдено скоро додадени датотеки</string>
     <string name="file_list_empty_recently_added_filter">Нема скоро додадени датотеки</string>
     <string name="file_list_empty_recently_modified">Нема пронајдено датотеки изменети во последните 7 дена.</string>
@@ -732,7 +732,7 @@
     <string name="uploads_view_upload_status_failed_localfile_error">Локалната датотека не е пронајдена</string>
     <string name="uploads_view_upload_status_failed_permission_error">Грешка во дозволите</string>
     <string name="uploads_view_upload_status_failed_ssl_certificate_not_trusted">Сертификатот на серверот е недоверлив</string>
-    <string name="uploads_view_upload_status_fetching_server_version">Превземање на верзијата од серверот ...</string>
+    <string name="uploads_view_upload_status_fetching_server_version">Преземање на верзијата од серверот ...</string>
     <string name="uploads_view_upload_status_service_interrupted">Апликацијата е прекината</string>
     <string name="uploads_view_upload_status_succeeded">Завршено</string>
     <string name="uploads_view_upload_status_unknown_fail">Непозната грешка</string>