Merge branch 'master' into folder-content-visibility-in-ReceiveExternalFilesActivity

8 files changed, 34 insertions, 2 deletions

diff --git a/app/src/main/res/values-b+en+001/strings.xml b/app/src/main/res/values-b+en+001/strings.xml
index d100dace2f..470cbf1b72 100644
--- a/app/src/main/res/values-b+en+001/strings.xml
+++ b/app/src/main/res/values-b+en+001/strings.xml
@@ -35,6 +35,7 @@
     <string name="add_to_cloud">Add to %1$s</string>
     <string name="advanced_settings">Advanced Settings</string>
     <string name="allow_resharing">Allow resharing</string>
+    <string name="app_widget_description">Shows one widget from dashboard</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>
@@ -87,12 +88,14 @@
     <string name="calendars">Calendars</string>
     <string name="certificate_load_problem">There is a problem loading the certificate.</string>
     <string name="changelog_dev_version">Changelog dev version</string>
+    <string name="check_back_later_or_reload">Check back later or reload.</string>
     <string name="checkbox">Checkbox</string>
     <string name="choose_local_folder">Choose local folder…</string>
     <string name="choose_location">Choose location</string>
     <string name="choose_remote_folder">Choose remote folder…</string>
     <string name="choose_template_helper_text">Please choose a template and enter a file name.</string>
     <string name="choose_which_file">Choose which file to keep!</string>
+    <string name="choose_widget">Choose widget</string>
     <string name="clear_notifications_failed">Failed to clear notifications.</string>
     <string name="clear_status_message">Clear status message</string>
     <string name="clear_status_message_after">Clear status message after</string>
@@ -233,6 +236,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="e2e_not_yet_setup">E2E not yet setup</string>
     <string name="encrypted">Set as encrypted</string>
     <string name="end_to_end_encryption_confirm_button">Set up encryption</string>
     <string name="end_to_end_encryption_decrypting">Decrypting…</string>
@@ -386,6 +390,9 @@
     <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="icon_for_empty_list">Icon for empty list</string>
+    <string name="icon_of_dashboard_widget">Icon of dashboard widget</string>
+    <string name="icon_of_widget_entry">Icon of widget entry</string>
     <string name="in_folder">in folder %1$s</string>
     <string name="instant_upload_existing">Also upload existing files</string>
     <string name="instant_upload_on_charging">Only upload when charging</string>
@@ -464,6 +471,7 @@
     <string name="no_browser_available">No app available to handle links</string>
     <string name="no_calendar_exists">No calendar exists</string>
     <string name="no_email_app_available">No App available to handle mail address</string>
+    <string name="no_items">No items</string>
     <string name="no_mutliple_accounts_allowed">Only one account allowed</string>
     <string name="no_pdf_app_available">No App available to handle PDF</string>
     <string name="no_send_app">No app available for sending the selected files</string>
@@ -580,6 +588,7 @@
     <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>
+    <string name="refresh_content">Refresh content</string>
     <string name="reload">Reload</string>
     <string name="remote">(remote)</string>
     <string name="remote_file_fetch_failed">Failed to find file!</string>
@@ -871,6 +880,7 @@
     <string name="userinfo_no_info_text">Add name, picture and contact details on your profile page.</string>
     <string name="username">Username</string>
     <string name="version_dev_download">Download</string>
+    <string name="video_overlay_icon">Video overlay icon</string>
     <string name="wait_a_moment">Wait a moment…</string>
     <string name="wait_checking_credentials">Checking stored credentials</string>
     <string name="wait_for_tmp_copy_from_private_storage">Copying file from private storage</string>
@@ -878,6 +888,8 @@
     <string name="whats_new_skip">Skip</string>
     <string name="whats_new_title">New in %1$s</string>
     <string name="whats_your_status">What is your status?</string>
+    <string name="widgets_not_available">Widgets are only available on %1$s 25 or later</string>
+    <string name="widgets_not_available_title">Not available</string>
     <string name="write_email">Send email</string>
     <string name="wrong_storage_path">Data storage folder does not exist!</string>
     <string name="wrong_storage_path_desc">This might be due to a backup restore on another device. Falling back to default. Please check settings to adjust data storage folder.</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 7c76aaac56..b61e598f35 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -236,6 +236,7 @@
     <string name="drawer_quota">χρησιμοποιούνται %1$s από %2$s</string>
     <string name="drawer_quota_unlimited">%1$sσε χρήση</string>
     <string name="drawer_synced_folders">Αυτόματη μεταφόρτωση</string>
+    <string name="e2e_not_yet_setup">Το Ε2Ε δεν έχει εγκατασταθεί ακόμη</string>
     <string name="encrypted">Ορισμός ως κρυπτογραφημένου</string>
     <string name="end_to_end_encryption_confirm_button">Ρύθμιση κρυπτογράφησης</string>
     <string name="end_to_end_encryption_decrypting">Γίνεται αποκρυπτογράφηση…</string>
@@ -389,6 +390,7 @@
     <string name="hint_password">Συνθηματικό</string>
     <string name="host_not_available">Μη διαθέσιμος διακομιστής</string>
     <string name="host_your_own_server">Φιλοξενήστε το δικό σας διακομιστή</string>
+    <string name="icon_for_empty_list">Εικονίδιο για κενή λίστα</string>
     <string name="icon_of_dashboard_widget">Εικονίδιο πίνακα γραφικού στοιχείου</string>
     <string name="icon_of_widget_entry">Εικονίδιο κενού γραφικού στοιχείου</string>
     <string name="in_folder">Στον φάκελο %1$s</string>
@@ -878,6 +880,7 @@
     <string name="userinfo_no_info_text">Προσθέστε όνομα, εικόνα και λεπτομέρειες επικοινωνίας στο προφίλ σας.</string>
     <string name="username">Όνομα χρήστη</string>
     <string name="version_dev_download">Λήψη</string>
+    <string name="video_overlay_icon">Εικονίδιο επικάλυψης βίντεο</string>
     <string name="wait_a_moment">Παρακαλούμε περιμένετε…</string>
     <string name="wait_checking_credentials">Γίνεται έλεγχος αποθηκευμένων διαπιστευτηρίων</string>
     <string name="wait_for_tmp_copy_from_private_storage">Γίνεται αντιγραφή αρχείου από ιδιωτικό αποθηκευτικό χώρο</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 0d78d2e748..faab54cdee 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -35,6 +35,7 @@
     <string name="add_to_cloud">Legg til %1$s</string>
     <string name="advanced_settings">Avanserte innstillinger</string>
     <string name="allow_resharing">TIllat videre deling</string>
+    <string name="app_widget_description">Viser en widget fra dashbordet</string>
     <string name="appbar_search_in">Søk i %s</string>
     <string name="associated_account_not_found">Tilknyttet bruker ikke funnet!</string>
     <string name="auth_access_failed">Tilgang mislyktes: %1$s</string>
@@ -87,12 +88,14 @@
     <string name="calendars">Kalendere</string>
     <string name="certificate_load_problem">Det er et problem med lasting av sertifikatet.</string>
     <string name="changelog_dev_version">Endringslogg utviklingsversjon</string>
+    <string name="check_back_later_or_reload">Kom tilbake senere eller last på nytt.</string>
     <string name="checkbox">Avkryssningsboks</string>
     <string name="choose_local_folder">Velg lokal mappe…</string>
     <string name="choose_location">Velg lokasjon</string>
     <string name="choose_remote_folder">Velg mappe annensteds hen…</string>
     <string name="choose_template_helper_text">Velg en mal og oppgi filnavn</string>
     <string name="choose_which_file">Velg filen du ønsker å beholde!</string>
+    <string name="choose_widget">Velg widget</string>
     <string name="clear_notifications_failed">Kunne ikke fjerne meldinger.</string>
     <string name="clear_status_message">Fjern statusmelding</string>
     <string name="clear_status_message_after">Fjern statusmelding etter</string>
@@ -233,6 +236,7 @@
     <string name="drawer_quota">%1$s av %2$s brukt</string>
     <string name="drawer_quota_unlimited">%1$s brukt</string>
     <string name="drawer_synced_folders">Auto-opplasting</string>
+    <string name="e2e_not_yet_setup">E2E er ikke satt opp enda</string>
     <string name="encrypted">Sett som kryptert</string>
     <string name="end_to_end_encryption_confirm_button">Sett opp kryptering</string>
     <string name="end_to_end_encryption_decrypting">Dekrypterer…</string>
@@ -241,6 +245,7 @@
     <string name="end_to_end_encryption_folder_not_empty">Denne mappen er ikke tom.</string>
     <string name="end_to_end_encryption_generating_keys">Genererer nye nøkler…</string>
     <string name="end_to_end_encryption_keywords_description">Alle 12 ordene sammen utgjør et veldig sterkt passord, som lar bare deg vise og gjøre bruk av dine krypterte filer. Skriv det ned og oppbevar det på en trygg plass.</string>
+    <string name="end_to_end_encryption_not_enabled">Ende-til-ende-kryptering deaktivert på serveren.</string>
     <string name="end_to_end_encryption_passphrase_title">Merk deg dit 12-ords-krypteringspassord</string>
     <string name="end_to_end_encryption_password">Passord…</string>
     <string name="end_to_end_encryption_retrieving_keys">Henter nøkler…</string>
@@ -256,6 +261,7 @@
     <string name="error_comment_file">Feil ved kommentering av fil</string>
     <string name="error_crash_title">%1$s kræsjet</string>
     <string name="error_creating_file_from_template">Feil ved oppretting av fil fra mal</string>
+    <string name="error_file_lock">Feil ved endring av fillåsstatus</string>
     <string name="error_report_issue_action">Rapporter</string>
     <string name="error_report_issue_text">Rapporter feil? (Krever GitHub konto.)</string>
     <string name="error_retrieving_file">Oppstod feil med å få tilbake filen</string>
@@ -384,6 +390,9 @@
     <string name="hint_password">Passord</string>
     <string name="host_not_available">Server er ikke tilgjengelig</string>
     <string name="host_your_own_server">Bruk din egen server</string>
+    <string name="icon_for_empty_list">Ikon for tom liste</string>
+    <string name="icon_of_dashboard_widget">Ikon for dashbord-widget</string>
+    <string name="icon_of_widget_entry">Ikon for widgetoppføring</string>
     <string name="in_folder">i mappen %1$s</string>
     <string name="instant_upload_existing">Last også opp eksisterende filer</string>
     <string name="instant_upload_on_charging">Bare last opp under lading</string>
@@ -462,6 +471,7 @@
     <string name="no_browser_available">Ingen app tilgjengelig for å håndtere lenker</string>
     <string name="no_calendar_exists">Ingen kalender finnes</string>
     <string name="no_email_app_available">Ingen program for å behandle e-post adresse</string>
+    <string name="no_items">Ingen gjenstander</string>
     <string name="no_mutliple_accounts_allowed">Kun én konto er tillatt</string>
     <string name="no_pdf_app_available">Ingen app tilgjengelig for å håndtere PDF</string>
     <string name="no_send_app">Ingen program for å sende valgt fil</string>
@@ -578,6 +588,7 @@
     <string name="recommend_subject">Prøv %1$s på denne enheten.</string>
     <string name="recommend_text">Jeg inviterer deg til å bruke %1$s på enheten din.\nLast ned her: %2$s</string>
     <string name="recommend_urls">%1$s eller %2$s</string>
+    <string name="refresh_content">Oppdater innhold</string>
     <string name="reload">Last inn på nytt</string>
     <string name="remote">(ekstern)</string>
     <string name="remote_file_fetch_failed">Kunne ikke finne filen!</string>
@@ -869,6 +880,7 @@
     <string name="userinfo_no_info_text">Legg til navn, bilde og kontaktdetaljer på profilsiden.</string>
     <string name="username">Brukernavn</string>
     <string name="version_dev_download">Last ned</string>
+    <string name="video_overlay_icon">Videooverleggsikon</string>
     <string name="wait_a_moment">Vent et øyeblikk…</string>
     <string name="wait_checking_credentials">Sjekker lagrede påloggingsdetaljer</string>
     <string name="wait_for_tmp_copy_from_private_storage">Kopierer fil fra privat lager</string>
@@ -876,6 +888,7 @@
     <string name="whats_new_skip">Hopp over</string>
     <string name="whats_new_title">Nytt i %1$s</string>
     <string name="whats_your_status">Hva er din status?</string>
+    <string name="widgets_not_available">Widgeter er bare tilgjengelige på %1$s 25 eller nyere</string>
     <string name="widgets_not_available_title">Ikke tilgjengelig</string>
     <string name="write_email">Send e-post</string>
     <string name="wrong_storage_path">Denne datalagringsmappen finnes ikke</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 28addd9a57..98e6baf57f 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -236,6 +236,7 @@
     <string name="drawer_quota">Wykorzystane: %1$s z %2$s</string>
     <string name="drawer_quota_unlimited">Wykorzystane: %1$s</string>
     <string name="drawer_synced_folders">Automatyczne wysyłanie</string>
+    <string name="e2e_not_yet_setup">E2E jeszcze nie skonfigurowane</string>
     <string name="encrypted">Ustaw jako zaszyfrowane</string>
     <string name="end_to_end_encryption_confirm_button">Włącz szyfrowanie</string>
     <string name="end_to_end_encryption_decrypting">Odszyfrowywanie…</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 26b286a4ed..bcdba8397f 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -240,6 +240,7 @@
     <string name="end_to_end_encryption_folder_not_empty">Mapa ni prazna.</string>
     <string name="end_to_end_encryption_generating_keys">Poteka ustvarjanje novih ključev…</string>
     <string name="end_to_end_encryption_keywords_description">Vseh 12 besed skupaj predstavlja izredno močno geslo, s katerim imate le vi možnost ogleda in uporabe šifriranih datotek. Geslo si zapišite in shranite nekje na varnem.</string>
+    <string name="end_to_end_encryption_not_enabled">Na strežniku je celovito šifriranje »end-to-end« onemogočeno.</string>
     <string name="end_to_end_encryption_passphrase_title">Zabeležite si vaših 12 besed gesla za šifriranje</string>
     <string name="end_to_end_encryption_password">Geslo …</string>
     <string name="end_to_end_encryption_retrieving_keys">Poteka pridobivanje ključev…</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index b93bd0a8f1..9c27da960c 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -123,7 +123,7 @@
     <string name="common_save">Зберегти</string>
     <string name="common_select">Вибрати</string>
     <string name="common_send">Надіслати</string>
-    <string name="common_share">Поділитися</string>
+    <string name="common_share">Спільний доступ</string>
     <string name="common_skip">Пропустити</string>
     <string name="common_switch_account">Перемкнути обліковий запис</string>
     <string name="common_switch_to_account">Перейти до облікового запису</string>
@@ -634,7 +634,7 @@
     <string name="set_picture_as">Використати як</string>
     <string name="set_status">Встановити статус</string>
     <string name="set_status_message">Встановити повідомлення про стан</string>
-    <string name="share">Поділитися</string>
+    <string name="share">Спільний доступ</string>
     <string name="share_copy_link">Поділитися &amp; Копіювати посилання</string>
     <string name="share_dialog_title">Спільний доступ</string>
     <string name="share_expiration_date_format">%1$s</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 9f5d8df41c..691c5cf500 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -236,6 +236,7 @@
     <string name="drawer_quota">已用 %2$s 中的 %1$s</string>
     <string name="drawer_quota_unlimited">使用了 %1$s 的存儲空間</string>
     <string name="drawer_synced_folders">自動上傳</string>
+    <string name="e2e_not_yet_setup">尚未設定端到端加密</string>
     <string name="encrypted">設為已加密的</string>
     <string name="end_to_end_encryption_confirm_button">設定加密</string>
     <string name="end_to_end_encryption_decrypting">解密中…</string>
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 72fb4a941c..895c3aee14 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -292,6 +292,7 @@ desc "Upload to play store"
 private_lane :uploadToPlaystore_Final do |options|
     upload_to_play_store(
         skip_upload_images: true,
+        skip_upload_apk: true,
         aab: "release/app-gplay-release.aab"
     )
 end