Merge remote-tracking branch 'origin/master' into dev

app/build.gradle

@@ -288,11 +288,11 @@ dependencies {
     implementation 'androidx.webkit:webkit:1.12.1'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.exifinterface:exifinterface:1.3.7'
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7"
-    implementation "androidx.lifecycle:lifecycle-service:2.8.6"
+    implementation "androidx.lifecycle:lifecycle-service:2.8.7"
     implementation "androidx.work:work-runtime:$workRuntime"
     implementation "androidx.work:work-runtime-ktx:$workRuntime"
-    implementation "androidx.fragment:fragment-ktx:1.8.4"
+    implementation "androidx.fragment:fragment-ktx:1.8.5"
     implementation 'com.github.albfernandez:juniversalchardet:2.0.3' // need this version for Android <7
     compileOnly 'com.google.code.findbugs:annotations:3.0.1u2'
     implementation 'commons-io:commons-io:2.17.0'
@@ -312,7 +312,7 @@ dependencies {
     implementation 'com.caverock:androidsvg:1.4'
     implementation 'androidx.annotation:annotation:1.9.1'
     implementation 'com.vanniktech:emoji-google:0.21.0'
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.6")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
 
     // document scanner not available on FDroid (generic) due to OpenCV binaries
     gplayImplementation project(':appscan')

app/src/main/java/com/nextcloud/ui/ChooseAccountDialogFragment.kt

@@ -18,6 +18,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.fragment.app.DialogFragment
+import androidx.lifecycle.lifecycleScope
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.nextcloud.client.account.User
 import com.nextcloud.client.account.UserAccountManager
@@ -33,10 +34,10 @@ import com.owncloud.android.ui.activity.BaseActivity
 import com.owncloud.android.ui.activity.DrawerActivity
 import com.owncloud.android.ui.adapter.UserListAdapter
 import com.owncloud.android.ui.adapter.UserListItem
-import com.owncloud.android.ui.asynctasks.RetrieveStatusAsyncTask
 import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.DisplayUtils.AvatarGenerationListener
 import com.owncloud.android.utils.theme.ViewThemeUtils
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 private const val ARG_CURRENT_USER_PARAM = "currentUser"
@@ -151,12 +152,23 @@ class ChooseAccountDialogFragment :
                 binding.statusView.visibility = View.VISIBLE
             }
 
-            RetrieveStatusAsyncTask(user, this, clientFactory).execute()
+            loadAndSetUserStatus(user)
         }
 
         themeViews()
     }
 
+    private fun loadAndSetUserStatus(user: User) {
+        viewLifecycleOwner.lifecycleScope.launch {
+            val status = retrieveUserStatus(user, clientFactory)
+
+            if (isAdded && !isDetached) {
+                val context = requireContext()
+                setStatus(status, context)
+            }
+        }
+    }
+
     private fun themeViews() {
         viewThemeUtils.platform.themeDialogDivider(binding.separatorLine)
         viewThemeUtils.platform.themeDialog(binding.root)

app/src/main/java/com/nextcloud/ui/RetrieveStatus.kt

@@ -0,0 +1,37 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2024 Edvard Holst <edvard.holst@gmail.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.nextcloud.ui
+
+import com.nextcloud.client.account.User
+import com.nextcloud.client.network.ClientFactory
+import com.owncloud.android.lib.resources.users.GetStatusRemoteOperation
+import com.owncloud.android.lib.resources.users.Status
+import com.owncloud.android.lib.resources.users.StatusType
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import java.io.IOException
+
+suspend fun retrieveUserStatus(user: User, clientFactory: ClientFactory): Status {
+    return withContext(Dispatchers.IO) {
+        try {
+            val client = clientFactory.createNextcloudClient(user)
+            val result = GetStatusRemoteOperation().execute(client)
+            if (result.isSuccess && result.resultData is Status) {
+                result.resultData as Status
+            } else {
+                offlineStatus()
+            }
+        } catch (e: ClientFactory.CreationException) {
+            offlineStatus()
+        } catch (e: IOException) {
+            offlineStatus()
+        }
+    }
+}
+
+private fun offlineStatus() = Status(StatusType.OFFLINE, "", "", -1)

app/src/main/java/com/owncloud/android/ui/asynctasks/RetrieveStatusAsyncTask.java

@@ -1,63 +0,0 @@
-/*
- * Nextcloud - Android Client
- *
- * SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
- * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
- */
-package com.owncloud.android.ui.asynctasks;
-
-import android.os.AsyncTask;
-
-import com.nextcloud.client.account.User;
-import com.nextcloud.client.network.ClientFactory;
-import com.nextcloud.common.NextcloudClient;
-import com.nextcloud.ui.ChooseAccountDialogFragment;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.resources.users.GetStatusRemoteOperation;
-import com.owncloud.android.lib.resources.users.Status;
-import com.owncloud.android.lib.resources.users.StatusType;
-
-import java.lang.ref.WeakReference;
-
-import androidx.lifecycle.Lifecycle;
-
-public class RetrieveStatusAsyncTask extends AsyncTask<Void, Void, Status> {
-    private final User user;
-    private final WeakReference<ChooseAccountDialogFragment> chooseAccountDialogFragment;
-    private final ClientFactory clientFactory;
-
-    public RetrieveStatusAsyncTask(User user,
-                                   ChooseAccountDialogFragment chooseAccountDialogFragment,
-                                   ClientFactory clientFactory) {
-        this.user = user;
-        this.chooseAccountDialogFragment = new WeakReference<>(chooseAccountDialogFragment);
-        this.clientFactory = clientFactory;
-    }
-
-    @Override
-    protected com.owncloud.android.lib.resources.users.Status doInBackground(Void... voids) {
-        try {
-            NextcloudClient client = clientFactory.createNextcloudClient(user);
-            RemoteOperationResult<com.owncloud.android.lib.resources.users.Status> result =
-                new GetStatusRemoteOperation().execute(client);
-
-            if (result.isSuccess()) {
-                return result.getResultData();
-            } else {
-                return new com.owncloud.android.lib.resources.users.Status(StatusType.OFFLINE, "", "", -1);
-            }
-        } catch (ClientFactory.CreationException | NullPointerException e) {
-            return new com.owncloud.android.lib.resources.users.Status(StatusType.OFFLINE, "", "", -1);
-        }
-    }
-
-    @Override
-    protected void onPostExecute(com.owncloud.android.lib.resources.users.Status status) {
-        ChooseAccountDialogFragment fragment = chooseAccountDialogFragment.get();
-
-        if (fragment != null && fragment.getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) {
-            fragment.setStatus(status, fragment.requireContext());
-        }
-    }
-}

app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java

@@ -239,7 +239,7 @@ public class FileDetailSharingFragment extends Fragment implements ShareeListAda
                 binding.searchView.setQueryHint(getResources().getString(R.string.share_search));
             }
         } else {
-            binding.searchView.setQueryHint(getResources().getString(R.string.reshare_not_allowed));
+            binding.searchView.setQueryHint(getResources().getString(R.string.resharing_is_not_allowed));
             binding.searchView.setInputType(InputType.TYPE_NULL);
             binding.pickContactEmailBtn.setVisibility(View.GONE);
             disableSearchView(binding.searchView);

app/src/main/res/values-ar/strings.xml

@@ -1093,7 +1093,7 @@
     <string name="whats_new_skip">تخطى</string>
     <string name="whats_new_title">جديد على %1$s</string>
     <string name="whats_your_status">ماهي حالتك؟</string>
-    <string name="widgets_not_available">الأدوات مُتاحة فقط في %1$s الإصدار 25 و ما بعده  </string>
+    <string name="widgets_not_available">الودجات widgets متاحة في %1$s الإصدار 25 فما أحدث فقط عندما تكون لوحة المعلومات مُفعّلة</string>
     <string name="widgets_not_available_title">غير متوفر</string>
     <string name="worker_download">جارٍ تنزيل الملفات…</string>
     <string name="write_email">إرسال بريد</string>

app/src/main/res/values-b+en+001/strings.xml

@@ -1066,7 +1066,6 @@
     <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="worker_download">Downloading files…</string>
     <string name="write_email">Send email</string>

app/src/main/res/values-bg-rBG/strings.xml

@@ -904,7 +904,6 @@
     <string name="whats_new_skip">Пропусни</string>
     <string name="whats_new_title">Ново в %1$s</string>
     <string name="whats_your_status">Какъв е вашият статус?</string>
-    <string name="widgets_not_available">Изпълнимите модули са налични само в %1$s, 25 или по-нова версия</string>
     <string name="widgets_not_available_title">Не е наличен</string>
     <string name="worker_download">Сваляне на файлове...</string>
     <string name="write_email">Изпращане на имейл</string>

app/src/main/res/values-ca/strings.xml

@@ -898,7 +898,6 @@
     <string name="whats_new_skip">Omet</string>
     <string name="whats_new_title">Nou a %1$s</string>
     <string name="whats_your_status">Quin és el vostre estat?</string>
-    <string name="widgets_not_available">Els ginys només estan disponibles a %1$s 25 o una versió posterior</string>
     <string name="widgets_not_available_title">No disponible</string>
     <string name="worker_download">S\'està descarregant fitxers…</string>
     <string name="write_email">Enviar correu</string>

app/src/main/res/values-cs-rCZ/strings.xml

@@ -696,7 +696,9 @@
     <string name="prefs_synced_folders_local_path_title">Místní složka</string>
     <string name="prefs_synced_folders_remote_path_title">Vzdálená složka</string>
     <string name="prefs_theme_title">Motiv vzhledu</string>
+    <string name="prefs_two_way_sync_interval">Interval</string>
     <string name="prefs_two_way_sync_summary">Spravovat interní složky pro dvoucestnou synchronizaci</string>
+    <string name="prefs_two_way_sync_switch_title">Zapnout obousměrnou synchronizaci</string>
     <string name="prefs_value_theme_dark">Tmavý</string>
     <string name="prefs_value_theme_light">Světlý</string>
     <string name="prefs_value_theme_system">Převzít od systému</string>
@@ -1060,12 +1062,24 @@
     <string name="whats_new_skip">Přeskočit</string>
     <string name="whats_new_title">Co je v %1$s nového</string>
     <string name="whats_your_status">Jaký je váš stav?</string>
-    <string name="widgets_not_available">Ovládací prvky jsou k dispozici pouze na %1$s 25 a novějším</string>
+    <string name="widgets_not_available">Ovládací prvky jsou k dispozici v %1$s 25 a novějším (pokud je zapnutá aplikace Nástěnka)</string>
     <string name="widgets_not_available_title">Není k dispozici</string>
     <string name="worker_download">Stahování souborů…</string>
     <string name="write_email">Odeslat e-mail</string>
     <string name="wrong_storage_path">Složka pro ukládání dat neexistuje!</string>
     <string name="wrong_storage_path_desc">Toto může být způsobeno obnovením ze zálohy na jiném zařízení. Náhradně vráceno do výchozího stavu. Zkontrolujte nastavení a upravte popis umístění složky pro ukládání dat.</string>
+    <plurals name="hours">
+        <item quantity="one">%d hodina</item>
+        <item quantity="few">%d hodiny</item>
+        <item quantity="many">%d hodin</item>
+        <item quantity="other">%d hodiny</item>
+    </plurals>
+    <plurals name="minutes">
+        <item quantity="one">%d minuta</item>
+        <item quantity="few">%d minuty</item>
+        <item quantity="many">%d minut</item>
+        <item quantity="other">%d minuty</item>
+    </plurals>
     <plurals name="sync_fail_in_favourites_content">
         <item quantity="one">Nedaří se synchronizovat %1$d soubor (konflikty: %2$d)</item>
         <item quantity="few">Nedaří se synchronizovat %1$d soubory (konflikty: %2$d)</item>

app/src/main/res/values-da/strings.xml

@@ -970,7 +970,6 @@ Enheds legitimationsoplysninger er sat op
     <string name="whats_new_skip">Spring over</string>
     <string name="whats_new_title">Nyt i %1$s</string>
     <string name="whats_your_status">Hvad er din status</string>
-    <string name="widgets_not_available">Widgets er kun tilgængelige for %1$s 25 eller senere</string>
     <string name="widgets_not_available_title">Ikke tilgængelig</string>
     <string name="worker_download">Henter filer...</string>
     <string name="write_email">Send email</string>

app/src/main/res/values-de/strings.xml

@@ -696,7 +696,9 @@
     <string name="prefs_synced_folders_local_path_title">Lokaler Ordner</string>
     <string name="prefs_synced_folders_remote_path_title">Remote-Ordner</string>
     <string name="prefs_theme_title">Design</string>
+    <string name="prefs_two_way_sync_interval">Intervall</string>
     <string name="prefs_two_way_sync_summary">Interne Ordner für 2-Wege-Synchronisierung verwalten</string>
+    <string name="prefs_two_way_sync_switch_title">2-Wege-Synchronisierung aktivieren</string>
     <string name="prefs_value_theme_dark">Dunkel</string>
     <string name="prefs_value_theme_light">Hell</string>
     <string name="prefs_value_theme_system">Systemvorgaben verwenden</string>
@@ -1064,12 +1066,20 @@
     <string name="whats_new_skip">Überspringen</string>
     <string name="whats_new_title">Neu in %1$s</string>
     <string name="whats_your_status">Wie ist Ihr Status?</string>
-    <string name="widgets_not_available">Widgets sind nur auf %1$s 25 oder neuer verfügbar</string>
+    <string name="widgets_not_available">Widgets sind nur in %1$s 25 oder neuer verfügbar, wenn die Dashboard-App aktiviert ist</string>
     <string name="widgets_not_available_title">Nicht verfügbar</string>
     <string name="worker_download">Dateien werden heruntergeladen…</string>
     <string name="write_email">E-Mail senden</string>
     <string name="wrong_storage_path">Speicherordner existiert nicht!</string>
     <string name="wrong_storage_path_desc">Ursache könnte die Wiederherstellung einer Sicherungskopie auf einem anderen Gerät sein. Der Standard-Ordner wird jetzt wieder verwendet. Bitte überprüfen Sie die Einstellungen bezüglich des Speicherortes.</string>
+    <plurals name="hours">
+        <item quantity="one">%d Stunde</item>
+        <item quantity="other">%d Stunden</item>
+    </plurals>
+    <plurals name="minutes">
+        <item quantity="one">%d Minute</item>
+        <item quantity="other">%d Minuten</item>
+    </plurals>
     <plurals name="sync_fail_in_favourites_content">
         <item quantity="one">Inhalte von %1$d Datei konnten nicht synchronisiert werden (Konflikte: %2$d)</item>
         <item quantity="other">Inhalte von %1$d Dateien konnten nicht synchronisiert werden (Konflikte: %2$d)</item>

app/src/main/res/values-el/strings.xml

@@ -911,7 +911,6 @@
     <string name="whats_new_skip">Παράλειψη</string>
     <string name="whats_new_title">Τι νέο υπάρχει στο %1$s</string>
     <string name="whats_your_status">Ποια είναι η κατάστασή σας;</string>
-    <string name="widgets_not_available">Τα γραφικά στοιχεία είναι διαθέσιμα μόνο στην %1$s 25 ή νεότερη</string>
     <string name="widgets_not_available_title">Δεν είναι διαθέσιμο</string>
     <string name="worker_download">Λήψη αρχείων…</string>
     <string name="write_email">Αποστολή email</string>

app/src/main/res/values-es-rAR/strings.xml

@@ -1023,7 +1023,6 @@
     <string name="whats_new_skip">Saltar</string>
     <string name="whats_new_title">Nuevo en %1$s</string>
     <string name="whats_your_status">¿Cuál es su estado?</string>
-    <string name="widgets_not_available">Los widgets sólo están disponibles para %1$s 25 o superior</string>
     <string name="widgets_not_available_title">No disponible</string>
     <string name="worker_download">Descargando archivos…</string>
     <string name="write_email">Enviar correo electrónico</string>

app/src/main/res/values-es-rEC/strings.xml

@@ -913,7 +913,6 @@
     <string name="whats_new_skip">Omitir</string>
     <string name="whats_new_title">Nuevo en %1$s</string>
     <string name="whats_your_status">¿Cuál es tu estado?</string>
-    <string name="widgets_not_available">Los widgets solo están disponibles en %1$s 25 o posterior</string>
     <string name="widgets_not_available_title">No disponible</string>
     <string name="worker_download">Descargando archivos…</string>
     <string name="write_email">Enviar correo electrónico</string>

app/src/main/res/values-es-rMX/strings.xml

@@ -1024,7 +1024,6 @@
     <string name="whats_new_skip">Omitir</string>
     <string name="whats_new_title">Nuevo en %1$s</string>
     <string name="whats_your_status">¿Cuál es su estado?</string>
-    <string name="widgets_not_available">Los widgets sólo están disponibles para %1$s 25 o superior</string>
     <string name="widgets_not_available_title">No disponible</string>
     <string name="worker_download">Descargando archivos…</string>
     <string name="write_email">Enviar correo electrónico</string>

app/src/main/res/values-es/strings.xml

@@ -1028,7 +1028,6 @@
     <string name="whats_new_skip">Omitir</string>
     <string name="whats_new_title">Nuevo en %1$s</string>
     <string name="whats_your_status">¿Cuál es su estado?</string>
-    <string name="widgets_not_available">Los widgets solo están disponibles para %1$s 25 o superior</string>
     <string name="widgets_not_available_title">No disponible</string>
     <string name="worker_download">Bajando archivos…</string>
     <string name="write_email">Enviar email</string>

app/src/main/res/values-eu/strings.xml

@@ -1060,7 +1060,6 @@
     <string name="whats_new_skip">Salto egin</string>
     <string name="whats_new_title">Berria %1$s-n</string>
     <string name="whats_your_status">Zein da zure egoera?</string>
-    <string name="widgets_not_available">Widgetak %1$s 25 edo geroago bakarrik daude eskuragarri</string>
     <string name="widgets_not_available_title">Ez dago erabilgarri</string>
     <string name="worker_download">Fitxategiak deskargatzen…</string>
     <string name="write_email">Bidali mezu elektronikoa</string>

app/src/main/res/values-fa/strings.xml

@@ -981,7 +981,6 @@
     <string name="whats_new_skip">رد شدن</string>
     <string name="whats_new_title">جدید در %1$s</string>
     <string name="whats_your_status">وضعیت شما چیست؟</string>
-    <string name="widgets_not_available">ویجت ها فقط در%1$s 25 یا بالاتر در دسترس هستند</string>
     <string name="widgets_not_available_title">در دسترس نیست</string>
     <string name="worker_download">در حال دریافت فایل ها...</string>
     <string name="write_email">ارسال ایمیل</string>

app/src/main/res/values-fr/strings.xml

@@ -1064,7 +1064,6 @@
     <string name="whats_new_skip">Ignorer</string>
     <string name="whats_new_title">Nouveautés dans %1$s</string>
     <string name="whats_your_status">Quel est votre statut ?</string>
-    <string name="widgets_not_available">Les widgets ne sont disponibles que sur %1$s 25 ou plus tard</string>
     <string name="widgets_not_available_title">Non disponible</string>
     <string name="worker_download">Téléchargement des fichiers…</string>
     <string name="write_email">Envoyer un e-mail</string>

app/src/main/res/values-ga/strings.xml

@@ -1066,7 +1066,6 @@
     <string name="whats_new_skip">Scipeáil</string>
     <string name="whats_new_title">Nua i %1$s</string>
     <string name="whats_your_status">Cad é do stádas?</string>
-    <string name="widgets_not_available">Níl giuirléidí ar fáil ach ar %1$s 25 nó níos déanaí</string>
     <string name="widgets_not_available_title">Níl sé ar fáil</string>
     <string name="worker_download">Comhaid á n-íoslódáil…</string>
     <string name="write_email">Seol ríomhphost</string>

app/src/main/res/values-gl/strings.xml

@@ -1067,7 +1067,7 @@
     <string name="whats_new_skip">Omitir</string>
     <string name="whats_new_title">Novo en %1$s</string>
     <string name="whats_your_status">Cal é o seu estado?</string>
-    <string name="widgets_not_available">Os trebellos só están dispoñíbeis en %1$s 25 ou posterior</string>
+    <string name="widgets_not_available">Os trebellos só están dispoñíbeis en %1$s 25 ou posterior cando a aplicación Taboleiro está activada</string>
     <string name="widgets_not_available_title">Non dispoñíbel</string>
     <string name="worker_download">Descargando ficheiros…</string>
     <string name="write_email">Enviar o correo</string>

app/src/main/res/values-hu-rHU/strings.xml

@@ -949,7 +949,6 @@
     <string name="whats_new_skip">Kihagyás</string>
     <string name="whats_new_title">Új itt: %1$s</string>
     <string name="whats_your_status">Mi az állapota?</string>
-    <string name="widgets_not_available">A modulok csak %1$s 25 vagy újabb esetén érhetők el</string>
     <string name="widgets_not_available_title">Nem érhető el</string>
     <string name="worker_download">Fájlok letöltése…</string>
     <string name="write_email">E-mail küldése</string>

app/src/main/res/values-in/strings.xml

@@ -931,7 +931,6 @@ Berikut ini adalah daftar berkas lokal, dan berkas jarak jauh di %5$s yang terhu
     <string name="whats_new_skip">Lewat</string>
     <string name="whats_new_title">Apa yang baru di %1$s</string>
     <string name="whats_your_status">Apa status Anda?</string>
-    <string name="widgets_not_available">Widget hanya tersedia di %1$s 25 atau versi yang lebih baru.</string>
     <string name="widgets_not_available_title">Tidak tersedia</string>
     <string name="worker_download">Mengunduh berkas…</string>
     <string name="write_email">Kirim surel</string>

app/src/main/res/values-is/strings.xml

@@ -914,7 +914,6 @@
     <string name="whats_new_skip">Sleppa</string>
     <string name="whats_new_title">(Nýtt í %s)</string>
     <string name="whats_your_status">Hver er staðan á þér?</string>
-    <string name="widgets_not_available">Viðmótshlutar eru einungis í boði á %1$s 25 eða nýrra</string>
     <string name="widgets_not_available_title">Not available</string>
     <string name="worker_download">Sæki skrár…</string>
     <string name="write_email">Senda tölvupóst</string>

app/src/main/res/values-it/strings.xml

@@ -971,7 +971,6 @@
     <string name="whats_new_skip">Salta</string>
     <string name="whats_new_title">Prima volta su %1$s</string>
     <string name="whats_your_status">Qual è il tuo stato?</string>
-    <string name="widgets_not_available">I widget sono disponibili solo su %1$s 25 o dopo </string>
     <string name="widgets_not_available_title">Non disponibile</string>
     <string name="worker_download">Scaricamento file in corso…</string>
     <string name="write_email">Invia email</string>

app/src/main/res/values-ja-rJP/strings.xml

@@ -985,7 +985,6 @@
     <string name="whats_new_skip">スキップ</string>
     <string name="whats_new_title">%1$sの新機能</string>
     <string name="whats_your_status">あなたのステータスは？</string>
-    <string name="widgets_not_available">ウィジェットは %1$s 25 以上でのみ利用可能です　</string>
     <string name="widgets_not_available_title">利用できません</string>
     <string name="worker_download">ファイルをダウンロード中…</string>
     <string name="write_email">メールを送信</string>

app/src/main/res/values-ka/strings.xml

@@ -940,7 +940,6 @@
     <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="worker_download">Downloading files…</string>
     <string name="write_email">Send email</string>

app/src/main/res/values-ko/strings.xml

@@ -1023,7 +1023,6 @@
     <string name="whats_new_skip">건너뛰기</string>
     <string name="whats_new_title">%1$s의 새로운 것</string>
     <string name="whats_your_status">당신의 상태는?</string>
-    <string name="widgets_not_available">위젯 기능은 %1$s 버전 25 이후부터 사용할 수 있습니다.</string>
     <string name="widgets_not_available_title">사용할 수 없음</string>
     <string name="worker_download">파일 다운로드 중…</string>
     <string name="write_email">이메일 보내기</string>

app/src/main/res/values-nb-rNO/strings.xml

@@ -1037,7 +1037,6 @@
     <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="worker_download">Laster ned filer…</string>
     <string name="write_email">Send e-post</string>

app/src/main/res/values-nl/strings.xml

@@ -1019,7 +1019,6 @@
     <string name="whats_new_skip">Overslaan</string>
     <string name="whats_new_title">Nieuw in %1$s</string>
     <string name="whats_your_status">Wat is jouw status?</string>
-    <string name="widgets_not_available">Widgets zijn alleen beschikbaar op %1$s 25 of later</string>
     <string name="widgets_not_available_title">Niet beschikbaar</string>
     <string name="worker_download">Downloaden bestanden…</string>
     <string name="write_email">Stuur e-mail</string>

app/src/main/res/values-pl/strings.xml

@@ -1034,7 +1034,6 @@
     <string name="whats_new_skip">Pomiń</string>
     <string name="whats_new_title">Co nowego w %1$s</string>
     <string name="whats_your_status">Jaki jest Twój status?</string>
-    <string name="widgets_not_available">Widżety są dostępne tylko w wersji %1$s 25 lub nowszej</string>
     <string name="widgets_not_available_title">Niedostępny</string>
     <string name="worker_download">Pobieranie plików…</string>
     <string name="write_email">Wyślij e-mail</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -1064,7 +1064,6 @@
     <string name="whats_new_skip">Saltar</string>
     <string name="whats_new_title">Novo em %1$s</string>
     <string name="whats_your_status">Qual é o seu status?</string>
-    <string name="widgets_not_available">Widgets apenas estão disponíveis em %1$s 25 ou posterior</string>
     <string name="widgets_not_available_title">Indisponível</string>
     <string name="worker_download">Baixando arquivos…</string>
     <string name="write_email">Enviar e-mail</string>

app/src/main/res/values-pt-rPT/strings.xml

@@ -909,7 +909,6 @@ Aproveite o novo e melhorado envio automático.</string>
     <string name="whats_new_skip">Passar à frente</string>
     <string name="whats_new_title">Novo em %1$s</string>
     <string name="whats_your_status">Qual é o seu estado?</string>
-    <string name="widgets_not_available">Os widgets só estão disponíveis em %1$s 25 ou posterior</string>
     <string name="widgets_not_available_title">Não disponível</string>
     <string name="worker_download">A transferir os ficheiros…</string>
     <string name="write_email">Enviar mensagem</string>

app/src/main/res/values-ro/strings.xml

@@ -199,6 +199,7 @@
     <string name="create">Crează</string>
     <string name="create_dir_fail_msg">Nu s-a putut crea directorul</string>
     <string name="create_new">Nou</string>
+    <string name="create_new_document">Document nou</string>
     <string name="create_new_folder">Director nou</string>
     <string name="credentials_disabled">Autentificare dezactivată</string>
     <string name="daily_backup">Copie de rezervă zilnică</string>
@@ -931,7 +932,6 @@
     <string name="whats_new_skip">Sari peste</string>
     <string name="whats_new_title">Nou în %1$s</string>
     <string name="whats_your_status">Care este statusul tău?</string>
-    <string name="widgets_not_available">Widgeturile sunt disponibile începând cu %1$s 25</string>
     <string name="widgets_not_available_title">Nu este disponibil</string>
     <string name="worker_download">Se descarcă fișiere…</string>
     <string name="write_email">Expediază mesajul</string>

app/src/main/res/values-ru/strings.xml

@@ -1048,7 +1048,6 @@
     <string name="whats_new_skip">Пропустить</string>
     <string name="whats_new_title">Новое в %1$s</string>
     <string name="whats_your_status">Ваш статус?</string>
-    <string name="widgets_not_available">Виджеты доступны только на%1$s25 или более</string>
     <string name="widgets_not_available_title">Не доступен</string>
     <string name="worker_download">Получение файлов…</string>
     <string name="write_email">Отправить письмо</string>

app/src/main/res/values-sk-rSK/strings.xml

@@ -1008,7 +1008,6 @@
     <string name="whats_new_skip">Preskočiť</string>
     <string name="whats_new_title">Nové v %1$s</string>
     <string name="whats_your_status">Aký je váš stav?</string>
-    <string name="widgets_not_available">Widgety sú dostupné iba na %1$s 25 alebo vyšší</string>
     <string name="widgets_not_available_title">Nie je k dispozícií</string>
     <string name="worker_download">Sťahovanie súborov…</string>
     <string name="write_email">Odoslať email</string>

app/src/main/res/values-sl/strings.xml

@@ -941,7 +941,6 @@
     <string name="whats_new_skip">Preskoči</string>
     <string name="whats_new_title">Novo v %1$s</string>
     <string name="whats_your_status">Kako želite nastaviti stanje?</string>
-    <string name="widgets_not_available">Gradniki so na voljo samo na %1$s 25 ali pozneje</string>
     <string name="widgets_not_available_title">Ni na voljo</string>
     <string name="worker_download">Poteka prejemanje datotek …</string>
     <string name="write_email">Pošlji elektronsko sporočilo</string>

app/src/main/res/values-sr/strings.xml

@@ -1064,7 +1064,6 @@
     <string name="whats_new_skip">Прескочи</string>
     <string name="whats_new_title">Ново у %1$s</string>
     <string name="whats_your_status">Који је ваш статус?</string>
-    <string name="widgets_not_available">Виџети су доступни само на %1$s 25 или новијем</string>
     <string name="widgets_not_available_title">Није доступно</string>
     <string name="worker_download">Преузимам фајлове…</string>
     <string name="write_email">Пошаљи е-пошту</string>

app/src/main/res/values-sv/strings.xml

@@ -697,7 +697,9 @@
     <string name="prefs_synced_folders_local_path_title">Lokal mapp</string>
     <string name="prefs_synced_folders_remote_path_title">Extern mapp</string>
     <string name="prefs_theme_title">Tema</string>
+    <string name="prefs_two_way_sync_interval">Intervall </string>
     <string name="prefs_two_way_sync_summary">Hantera interna mappar för tvåvägssynk</string>
+    <string name="prefs_two_way_sync_switch_title">Aktivera tvåvägssynk</string>
     <string name="prefs_value_theme_dark">Mörkt</string>
     <string name="prefs_value_theme_light">Ljust</string>
     <string name="prefs_value_theme_system">Följ systemet</string>
@@ -1065,12 +1067,19 @@
     <string name="whats_new_skip">Hoppa över</string>
     <string name="whats_new_title">Ny i %1$s</string>
     <string name="whats_your_status">Vad är din status?</string>
-    <string name="widgets_not_available">Widgets är endast tillgängliga på %1$s 25 eller senare</string>
     <string name="widgets_not_available_title">Inte tillgänglig</string>
     <string name="worker_download">Hämtar filer…</string>
     <string name="write_email">Skicka e-post</string>
     <string name="wrong_storage_path">Datalagringsmapp finns inte!</string>
     <string name="wrong_storage_path_desc">Detta kan bero på en säkerhetskopiering som återställts på en annan enhet. Kommer använda standarden. Vänligen kontrollera inställningarna för att konfigurera datalagringsmappen.</string>
+    <plurals name="hours">
+        <item quantity="one">%d timme</item>
+        <item quantity="other">%d timmar</item>
+    </plurals>
+    <plurals name="minutes">
+        <item quantity="one">%d minut</item>
+        <item quantity="other">%d minuter</item>
+    </plurals>
     <plurals name="sync_fail_in_favourites_content">
         <item quantity="one">Kunde inte synkronisera %1$d fil (konflikter: %2$d)</item>
         <item quantity="other">Kunde inte synkronisera %1$d filer (konflikter: %2$d)</item>

app/src/main/res/values-tr/strings.xml

@@ -1066,7 +1066,6 @@
     <string name="whats_new_skip">Atla</string>
     <string name="whats_new_title">%1$s yenilikleri</string>
     <string name="whats_your_status">Durumunuz nedir?</string>
-    <string name="widgets_not_available">Pano bileşenleri yalnızca %1$s 25 ve üzeri sürümlerde kullanılabilir</string>
     <string name="widgets_not_available_title">Kullanılamaz</string>
     <string name="worker_download">Dosyalar indiriliyor…</string>
     <string name="write_email">E-posta gönder</string>

app/src/main/res/values-ug/strings.xml

@@ -1064,7 +1064,6 @@
     <string name="whats_new_skip">ئاتلاش</string>
     <string name="whats_new_title">% 1 $ s دىكى يېڭى</string>
     <string name="whats_your_status">ئەھۋالىڭىز نېمە؟</string>
-    <string name="widgets_not_available">كىچىك قوراللار پەقەت% 1 $ s 25 ياكى ئۇنىڭدىن يۇقىرى نەشرىدە بولىدۇ</string>
     <string name="widgets_not_available_title">ئىشلەتكىلى بولمايدۇ</string>
     <string name="worker_download">ھۆججەتلەرنى چۈشۈرۈش…</string>
     <string name="write_email">ئېلېكترونلۇق خەت ئەۋەتىڭ</string>

app/src/main/res/values-uk/strings.xml

@@ -688,7 +688,9 @@
     <string name="prefs_synced_folders_local_path_title">Каталог на пристрої</string>
     <string name="prefs_synced_folders_remote_path_title">Віддалений каталог</string>
     <string name="prefs_theme_title">Тема</string>
+    <string name="prefs_two_way_sync_interval">Інтервал</string>
     <string name="prefs_two_way_sync_summary">Керувати внутрішніми каталогами для двосторонньої синхронізації</string>
+    <string name="prefs_two_way_sync_switch_title">Увімкнути двосторонню синхронізацію</string>
     <string name="prefs_value_theme_dark">Темна</string>
     <string name="prefs_value_theme_light">Світла</string>
     <string name="prefs_value_theme_system">Системна</string>
@@ -1053,12 +1055,24 @@
     <string name="whats_new_skip">Пропустити</string>
     <string name="whats_new_title">Нове у %1$s</string>
     <string name="whats_your_status">Який ваш статус?</string>
-    <string name="widgets_not_available">Віджети доступні тільки з версії %1$s 25 або пізніше</string>
+    <string name="widgets_not_available">Віджети доступні тільки у %1$s 25 або пізніше, коли увімкнено застосунок Dashboard</string>
     <string name="widgets_not_available_title">Не доступно</string>
     <string name="worker_download">Звантаження файлів...</string>
     <string name="write_email">Надіслати лист</string>
     <string name="wrong_storage_path">Каталог для збереження даних не існує!</string>
     <string name="wrong_storage_path_desc">Можливо, це пов’язано з відновленням резервної копії на іншому пристрої. Повернення до стандартного. Будь ласка, перевірте налаштування, щоб налаштувати каталог для збереження даних.</string>
+    <plurals name="hours">
+        <item quantity="one">%d година</item>
+        <item quantity="few">%d години</item>
+        <item quantity="many">%d годин</item>
+        <item quantity="other">%d годин</item>
+    </plurals>
+    <plurals name="minutes">
+        <item quantity="one">%d хвилина</item>
+        <item quantity="few">%d хвилини</item>
+        <item quantity="many">%d хвилин</item>
+        <item quantity="other">%d хвилин</item>
+    </plurals>
     <plurals name="sync_fail_in_favourites_content">
         <item quantity="one">Не вдалося синхронізувати %1$d файл (конфлікти: %2$d)</item>
         <item quantity="few">Не вдалося синхронізувати %1$d файлів (конфлікти: %2$d)</item>

app/src/main/res/values-zh-rCN/strings.xml

@@ -1083,7 +1083,6 @@ Nextcloud 是一个私有文件同步、共享和通信服务器。它是自由
     <string name="whats_new_skip">跳过</string>
     <string name="whats_new_title">新建%1$s</string>
     <string name="whats_your_status">你什么状态？</string>
-    <string name="widgets_not_available">小工具仅在%1$s25及更高版本中可用</string>
     <string name="widgets_not_available_title">不可用</string>
     <string name="worker_download">正在下载文件…</string>
     <string name="write_email">发送邮件</string>

app/src/main/res/values-zh-rHK/strings.xml

@@ -1066,7 +1066,6 @@
     <string name="whats_new_skip">略過</string>
     <string name="whats_new_title">新增到 %1$s </string>
     <string name="whats_your_status">您目前的狀態是什麼呢？</string>
-    <string name="widgets_not_available">小部件僅在 %1$s 25 或更新提供</string>
     <string name="widgets_not_available_title">不可用</string>
     <string name="worker_download">下載檔案中…</string>
     <string name="write_email">傳送電子郵件</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -696,7 +696,9 @@
     <string name="prefs_synced_folders_local_path_title">本機資料夾</string>
     <string name="prefs_synced_folders_remote_path_title">遠端資料夾</string>
     <string name="prefs_theme_title">佈景主題</string>
+    <string name="prefs_two_way_sync_interval">間隔</string>
     <string name="prefs_two_way_sync_summary">管理內部資料夾以進行雙向同步</string>
+    <string name="prefs_two_way_sync_switch_title">啟用雙向同步</string>
     <string name="prefs_value_theme_dark">深色</string>
     <string name="prefs_value_theme_light">淺色</string>
     <string name="prefs_value_theme_system">跟隨系統</string>
@@ -1064,12 +1066,17 @@
     <string name="whats_new_skip">略過</string>
     <string name="whats_new_title">%1$s 有什麼新功能</string>
     <string name="whats_your_status">您目前的狀態是什麼呢？</string>
-    <string name="widgets_not_available">小工具僅在 %1$s 25 或後續版本提供</string>
     <string name="widgets_not_available_title">無法使用</string>
     <string name="worker_download">正在下載檔案……</string>
     <string name="write_email">傳送電子郵件</string>
     <string name="wrong_storage_path">資料儲存資料夾不存在！</string>
     <string name="wrong_storage_path_desc">這可能是因為在另一台裝置上備份還原的關係。正在退回至預設值。請檢查設定以調整資料儲存資料夾。</string>
+    <plurals name="hours">
+        <item quantity="other">%d小時 </item>
+    </plurals>
+    <plurals name="minutes">
+        <item quantity="other">%d分鐘</item>
+    </plurals>
     <plurals name="sync_fail_in_favourites_content">
         <item quantity="other">無法同步 %1$d 個檔案（衝突：%2$d）</item>
     </plurals>

app/src/main/res/values/strings.xml

@@ -727,7 +727,7 @@
     <string name="empty" translatable="false" />
     <string name="test_server_button">Test server connection</string>
     <string name="info_separator" translatable="false">&#160;&#x2022;</string>
-    <string name="resharing_is_not_allowed">Resharing is not allowed</string>
+    <string name="resharing_is_not_allowed">Policy or permissions prevent resharing</string>
 
     <string name="foreground_service_upload">Uploading files…</string>
     <string name="worker_download">Downloading files…</string>
@@ -965,7 +965,6 @@
     <string name="storage_downloads">Downloads</string>
     <string name="shared_avatar_desc">Avatar from shared user</string>
     <string name="shared_with_you_by">Shared with you by %1$s</string>
-    <string name="reshare_not_allowed">Resharing is not allowed</string>
     <string name="retrieving_file">Retrieving file…</string>
     <string name="associated_account_not_found">Associated account not found!</string>
     <string name="logged_in_as">Logged in as %1$s</string>

gradle/verification-keyring.keys

@@ -5469,6 +5469,43 @@ wdAqGKwCen3WAJwIsFD8tHGarvnRqo0ij3FERxwR3A==
 =TljG
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    31D2D79DF7E85DD3
+uid    Markus KARG <markus@headcrashing.eu>
+
+sub    D091C8FFA534EDA2
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQGNBGTNOPIBDACjeIqMmK4jo8NBVVacAwmqnL6H2/ixU/rPg1WEJSJRQbWu0otK
+Zrs+0tOVuYsQReW5tYUwI8hclSkdO95NC8bM7rlxcO6JSixsjzf2cOXajOAvuLMj
+OlGtMPblTI88/2nPmj+k3jLClsuqdXNIPdf6DQGIrJjsNfpnCO184ialqIVv0X4y
+Z3e8aR/coToU+CcgbWXEyqqZL35RGLs/DR1o0supIm6tBEaDGGxRcrOGTkKaQEXV
+v7cZrrXQBSU1kOLko2Lz95ipUn2s7BxM66joOSzmeS6QDRqoL6B+PYMEOGqOP9AI
+ZgFdMh5T4WJdzuDGOBrX1FAD1ZLeumz5+Td7Tw/7odKH10ToFf8DIvP0CJnAC8EK
+4HGl3NYyKv0gafEmprVNSIDrGLjY7D6bvlJ0vJ70gsQAhJF/tGfa7+pBA3/zuLe7
+WD2pSyiqdsyl2mZZ/KRtMXDrhvzSk3H0nxZ4+BQhNLVBW62ty/+XYWn6QOw6tD2v
+4vZCXePrel4RhjEAEQEAAbQkTWFya3VzIEtBUkcgPG1hcmt1c0BoZWFkY3Jhc2hp
+bmcuZXU+uQGNBGTNOPIBDAD1VVbxdqn7crMimZKLrwWyNVGGu/YKzrpKyO6h40m3
+TCUYslIDECFHQL2LqfzixL9w/nXn5Oqx4rTRnlfjCZJkJUv4OnV1dIW065T+bepL
+srbZ5cNnMin2336ClJwnD0fkyjrVSAI59roS04WELHvkKyl3LeaqgbJMYEMoweH3
+LrrKXGi3fefdEBevRR80ulpw7o0AhPhjd5NWsp/1P43Xl9poNoWaL+7/7W1jKKIa
+7VYEOWbRZ/mngwLbSqLOc0lHCsH2InL8+GpdTUCeUtBrImQItKneaxkk+qn8i91d
+zL7/Mp3LI7z5ajaXhSj2Wf6/0rg8ObZV9sBJtkEVp0oq7+mFmgeF6reefyKX7g+r
+nA1gkdXgMPOBqExXFsXKNLU3mtRd1KsNgdQYDPn9enncmKzjW4ha7NcaFrSWchXE
+73Fq43dMbCOejVy4io6+BBSXXHe8M/3/ZB+4EFohRPW0kODnngxzE3E9usuvRJTR
+t4c9hhJZdMuhhPs3ry1Cql0AEQEAAYkBvAQYAQoAJhYhBB2FRp2FWcLh31+SUTHS
+15336F3TBQJkzTjyAhsMBQkDwmcAAAoJEDHS15336F3T9kMMAIJHtFRvBMfCh9p0
+UM4jf0ahE1LX+fUhF4zf/t+vlUmRsIHJNcteD04SxG1WRDc5xxO0IO9oAnX0AgC9
+NOCAZaJ11TlXPsCRk32+x8bfCe2Wf2hOLPOfZGO+vj89m74iJf0Gh/0BySMvgwcn
+K6WL/xb61EGQUxetB3jLpZU9FwQZq6LjftvZi7r6Y3ui3ogUwTmvq0HlsKCmY7GM
+1JLN6xAChZbDU+Ox2F46wyo4XWLfX7HtTe6ykr+yxDwTxx3mJUCwbBYr78Xy16Rq
+COcemMTU0U9OWFA1JghFul0moaW+gV+VtZpWR1nCFn5xJOzD2UWFFWomYWiSvL6O
+qEVfV/jQYAREDj9vpxlBcfRpTiUlrdFQf4uOQT1G/nXY1KITmq/hNqUdhpUjCoMC
+OvdyVwwfG12cTWeQiDQofGqJSptQmsUvegmfF5byUPDbgjCi4tEpWOncOeehs/Hd
+ZgMBzI+v/ingWOyKpKqhpZR/50PHA0o23zw8P1BGeQOlr4kFNA==
+=jR+6
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    347CD0EAED975C5F
 uid    Eric Vergnaud <eric.vergnaud@wanadoo.fr>
 
@@ -6791,6 +6828,22 @@ FlPU/jTn6vXQwA==
 =dKtU
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    5C504E1210E49773
+uid    Dave Brosius <dbrosius@mebigfatguy.com>
+
+sub    9344C7E75E48ADA3
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mDMEZvif2hYJKwYBBAHaRw8BAQdADgAH6bMuk4zOzywMl2kUy2IYqiQF+R/4qYUL
+KQ9Zq2i0J0RhdmUgQnJvc2l1cyA8ZGJyb3NpdXNAbWViaWdmYXRndXkuY29tPrg4
+BGb4n9oSCisGAQQBl1UBBQEBB0DPBdgnYQNLxY7c/uAopyjsC2v2xYyAPL1hxcUt
+TqubbwMBCAeIfgQYFgoAJhYhBHekV0DCOIDH+BudTVxQThIQ5JdzBQJm+J/aAhsM
+BQkFo5qAAAoJEFxQThIQ5JdzM8wA/2kla7yBkpcffOAvcBjP9vxJuAPlHLVlMY+J
+mAQzOOYVAP92fNohJLnu7JhsE+f9U9IlWpf6LunQtPiknm9q+rZVCA==
+=Op+a
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    5E1F79A7C298661E
 uid    David P. Baker <dpb@google.com>
 

scripts/analysis/analysis-wrapper.sh

@@ -18,7 +18,7 @@ ruby scripts/analysis/lint-up.rb
 lintValue=$?
 
 curl "https://www.kaminsky.me/nc-dev/$repository-findbugs/$stableBranch.xml" -o "/tmp/$stableBranch.xml"
-[[ ! -e test1 ]] && exit 1
+[[ ! -e "/tmp/$stableBranch.xml" ]] && exit 1
 
 ruby scripts/analysis/spotbugs-up.rb "$stableBranch"
 spotbugsValue=$?