diff --git a/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java b/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java
index 8160ba5c99fe..4ac5c162daaf 100644
--- a/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java
+++ b/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java
@@ -441,6 +441,7 @@ protected RemoteOperationResult run(OwnCloudClient client) {
         }
     }
 
+    // TODO REFACTOR
     @SuppressLint("AndroidLintUseSparseArrays") // gson cannot handle sparse arrays easily, therefore use hashmap
     private RemoteOperationResult encryptedUpload(OwnCloudClient client, OCFile parentFile) {
         RemoteOperationResult result = null;
@@ -489,13 +490,14 @@ private RemoteOperationResult encryptedUpload(OwnCloudClient client, OCFile pare
 //                                                   mContext);
 
             Object object = EncryptionUtils.downloadFolderMetadata(parentFile, client, mContext, user);
+            if (object instanceof DecryptedFolderMetadataFileV1 decrypted && decrypted.getMetadata() != null) {
+                metadataExists = true;
+            }
 
             if (CapabilityUtils.getCapability(mContext).getEndToEndEncryptionApiVersion().compareTo(E2EVersion.V2_0) >= 0) {
                 if (object == null) {
                     // TODO return error
                     return new RemoteOperationResult(new IllegalStateException("Metadata does not exist"));
-                } else {
-                    metadataExists = true;
                 }
             } else {
                 // v1 is allowed to be null, thus create it
@@ -507,8 +509,11 @@ private RemoteOperationResult encryptedUpload(OwnCloudClient client, OCFile pare
                 String encryptedMetadataKey = EncryptionUtils.encryptStringAsymmetric(metadataKey, publicKey);
                 metadata.getMetadata().setMetadataKey(encryptedMetadataKey);
 
+                if (object instanceof DecryptedFolderMetadataFileV1) {
+                    metadata = (DecryptedFolderMetadataFileV1) object;
+                }
+
                 object = metadata;
-                metadataExists = false;
             }
 
             // todo fail if no metadata
@@ -669,7 +674,6 @@ private RemoteOperationResult encryptedUpload(OwnCloudClient client, OCFile pare
                     data.setFilename(mFile.getDecryptedFileName());
                     data.setMimetype(mFile.getMimeType());
                     data.setKey(EncryptionUtils.encodeBytesToBase64String(key));
-
                     decryptedFile.setEncrypted(data);
                     decryptedFile.setInitializationVector(EncryptionUtils.encodeBytesToBase64String(iv));
                     decryptedFile.setAuthenticationTag(encryptedFile.getAuthenticationTag());
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
index 6d0b6983f870..90ff8ab92cd7 100755
--- a/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
@@ -174,8 +174,6 @@ public class ReceiveExternalFilesActivity extends FileActivity
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        prepareStreamsToUpload();
-
         if (savedInstanceState != null) {
             String parentPath = savedInstanceState.getString(KEY_PARENTS);
 
@@ -191,6 +189,8 @@ protected void onCreate(Bundle savedInstanceState) {
         binding = ReceiveExternalFilesBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
+        prepareStreamsToUpload();
+
         // Listen for sync messages
         IntentFilter syncIntentFilter = new IntentFilter(RefreshFolderOperation.
                                                              EVENT_SINGLE_FOLDER_CONTENTS_SYNCED);
@@ -850,16 +850,16 @@ private String generatePath(Stack<String> dirs) {
     private void prepareStreamsToUpload() {
         Intent intent = getIntent();
 
-        if (Intent.ACTION_SEND.equals(intent.getAction())) {
+        if (intent.hasExtra(Intent.EXTRA_STREAM) && Intent.ACTION_SEND.equals(intent.getAction())) {
             mStreamsToUpload = new ArrayList<>();
             mStreamsToUpload.add(IntentExtensionsKt.getParcelableArgument(intent, Intent.EXTRA_STREAM, Parcelable.class));
-        } else if (Intent.ACTION_SEND_MULTIPLE.equals(intent.getAction())) {
+        } else if (intent.hasExtra(Intent.EXTRA_STREAM) && Intent.ACTION_SEND_MULTIPLE.equals(intent.getAction())) {
             mStreamsToUpload = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
-        }
-
-        if (mStreamsToUpload == null || mStreamsToUpload.isEmpty() || mStreamsToUpload.get(0) == null) {
+        } else if (intent.hasExtra(Intent.EXTRA_TEXT) && Intent.ACTION_SEND.equals(intent.getAction())) {
             mStreamsToUpload = null;
             saveTextsFromIntent(intent);
+        } else {
+            showErrorDialog(R.string.uploader_error_message_no_file_to_upload, R.string.uploader_error_title_file_cannot_be_uploaded);
         }
     }
 
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/SharedListFragment.kt b/app/src/main/java/com/owncloud/android/ui/fragment/SharedListFragment.kt
index a2f1c28f3d50..17e8887e865d 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/SharedListFragment.kt
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/SharedListFragment.kt
@@ -73,6 +73,7 @@ class SharedListFragment : OCFileListFragment(), Injectable {
                 val fileDisplayActivity = activity as FileDisplayActivity
                 fileDisplayActivity.updateActionBarTitleAndHomeButtonByString(getString(R.string.drawer_item_shared))
                 fileDisplayActivity.setMainFabVisible(false)
+                fileDisplayActivity.initSyncBroadcastReceiver()
             }
         }
     }
diff --git a/app/src/main/java/com/owncloud/android/utils/EncryptionUtils.java b/app/src/main/java/com/owncloud/android/utils/EncryptionUtils.java
index 6eb0c6f93ad8..4b8f7c1b11ed 100644
--- a/app/src/main/java/com/owncloud/android/utils/EncryptionUtils.java
+++ b/app/src/main/java/com/owncloud/android/utils/EncryptionUtils.java
@@ -1390,6 +1390,7 @@ public static Pair<Boolean, DecryptedFolderMetadataFileV1> retrieveMetadataV1(OC
             // new metadata
             metadata = new DecryptedFolderMetadataFileV1();
             metadata.setMetadata(new DecryptedMetadata());
+            metadata.getMetadata().setVersion(Double.parseDouble(E2EVersion.V1_2.getValue()));
             metadata.getMetadata().setMetadataKeys(new HashMap<>());
             String metadataKey = EncryptionUtils.encodeBytesToBase64String(EncryptionUtils.generateKey());
             String encryptedMetadataKey = EncryptionUtils.encryptStringAsymmetric(metadataKey, publicKey);
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 88bc2c29c985..547c1d857398 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -37,6 +37,11 @@
     <string name="allow_resharing">السماح بإعادة المشاركة </string>
     <string name="app_widget_description">عرض أداة واحدة من لوحة القيادة</string>
     <string name="appbar_search_in">بحث في %s</string>
+    <string name="assistant_screen_all_task_type">الكل</string>
+    <string name="assistant_screen_create_task_alert_dialog_input_field_placeholder">أكتُب أيَّ نص</string>
+    <string name="assistant_screen_task_delete_fail_message">تمّ حذف المهمة بنجاح</string>
+    <string name="assistant_screen_task_view_show_less">عرض أقل</string>
+    <string name="assistant_screen_task_view_show_more">عرض المزيد</string>
     <string name="associated_account_not_found">الحساب المرتبط غير موجود!</string>
     <string name="auth_access_failed">فشل الوصول لـ: %1$s</string>
     <string name="auth_account_does_not_exist">هذا الحساب لم تتم إضافته في هذا الجهاز بعد</string>
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 9484d01bdf33..72680610be15 100644
--- a/app/src/main/res/values-b+en+001/strings.xml
+++ b/app/src/main/res/values-b+en+001/strings.xml
@@ -37,8 +37,11 @@
     <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="assistant_screen_all_task_type">All</string>
     <string name="assistant_screen_create_task_alert_dialog_input_field_placeholder">Type some text</string>
+    <string name="assistant_screen_task_delete_fail_message">Task successfully deleted</string>
     <string name="assistant_screen_task_view_show_less">Show less</string>
+    <string name="assistant_screen_task_view_show_more">Show more</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>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index d8ead532b71c..8a1a2eaefabf 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -35,6 +35,10 @@
     <string name="allow_resharing">Може да споделя повторно</string>
     <string name="app_widget_description">Показва един изпълним модул от таблото за управление</string>
     <string name="appbar_search_in">Търсене в %s</string>
+    <string name="assistant_screen_all_task_type">Всички</string>
+    <string name="assistant_screen_task_delete_fail_message">Задачата е успешно изтрита</string>
+    <string name="assistant_screen_task_view_show_less">Покажи по-малко</string>
+    <string name="assistant_screen_task_view_show_more">Покажи повече</string>
     <string name="associated_account_not_found">Свързания профил не е намерен!</string>
     <string name="auth_access_failed">Достъп неуспешен: %1$s</string>
     <string name="auth_account_does_not_exist">Профилът все още не съществува на устройството</string>
diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml
index 4d778d0faafa..34e990fc4c15 100644
--- a/app/src/main/res/values-br/strings.xml
+++ b/app/src/main/res/values-br/strings.xml
@@ -31,6 +31,7 @@
     <string name="add_to_cloud">Ouzhpennañ da %1$s</string>
     <string name="allow_resharing">Aotrea an adrannañ</string>
     <string name="appbar_search_in">Klask e %s</string>
+    <string name="assistant_screen_all_task_type">Pep tra</string>
     <string name="associated_account_not_found">N\'eo ket bet kavet ur c\'hont kenstaget</string>
     <string name="auth_access_failed">Aksed c\'hwitet: %1$s</string>
     <string name="auth_account_does_not_exist">Ar c\'hont n\'eo ket bet ouzhpennet war an ardivink c\'hoaz</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 1d60ca2b9b64..9327d1712d89 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -34,6 +34,10 @@
     <string name="allow_resharing">Permet compartir de nou</string>
     <string name="app_widget_description">Mostra un giny del tauler</string>
     <string name="appbar_search_in">Cerca a %s</string>
+    <string name="assistant_screen_all_task_type">Totes</string>
+    <string name="assistant_screen_create_task_alert_dialog_input_field_placeholder">Escriu una mica de text</string>
+    <string name="assistant_screen_task_view_show_less">Mostra\'n menys</string>
+    <string name="assistant_screen_task_view_show_more">Mostra\'n més</string>
     <string name="associated_account_not_found">No s\'ha trobat el compte associat!</string>
     <string name="auth_access_failed">No s\'ha tingut accés: %1$s</string>
     <string name="auth_account_does_not_exist">Encara no s\'ha afegit el compte en aquest dispositiu</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index a5d0a8f39667..cc8f6dc2de82 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -36,6 +36,11 @@
     <string name="allow_resharing">Povolit sdílet dál dalším</string>
     <string name="app_widget_description">Zobrazuje jeden ovládací prvek z nástěnky</string>
     <string name="appbar_search_in">Hledat v %s</string>
+    <string name="assistant_screen_all_task_type">Vše</string>
+    <string name="assistant_screen_create_task_alert_dialog_input_field_placeholder">Zadejte nějaký text</string>
+    <string name="assistant_screen_task_delete_fail_message">Úloha úspěšně smazána</string>
+    <string name="assistant_screen_task_view_show_less">Zobrazit méně</string>
+    <string name="assistant_screen_task_view_show_more">Zobrazit více</string>
     <string name="associated_account_not_found">Související účet nenalezen!</string>
     <string name="auth_access_failed">Přístup se nezdařil: %1$s</string>
     <string name="auth_account_does_not_exist">Účet zatím není na tomto zařízení přidán</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index ea0df8335be3..d716c60950cb 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -36,6 +36,7 @@
     <string name="allow_resharing">Tillad videredeling</string>
     <string name="app_widget_description">Viser én widget fra dashboard</string>
     <string name="appbar_search_in">Søg i %s</string>
+    <string name="assistant_screen_all_task_type">Alle</string>
     <string name="associated_account_not_found">Forbundet konto blev ikke fundet!</string>
     <string name="auth_access_failed">Adgang fejlede: %1$s</string>
     <string name="auth_account_does_not_exist">Kontoen findes endnu ikke på enheden</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 3e2f57f825e4..291af74b3c65 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -37,8 +37,23 @@
     <string name="allow_resharing">Weiterteilen erlauben</string>
     <string name="app_widget_description">Zeigt ein Widget aus dem Dashboard an</string>
     <string name="appbar_search_in">Suche in %s</string>
+    <string name="assistant_screen_all_task_type">Alle</string>
     <string name="assistant_screen_create_task_alert_dialog_input_field_placeholder">Bitte einen Text eingeben</string>
+    <string name="assistant_screen_delete_task_alert_dialog_description">Möchten Sie diese Aufgabe wirklich löschen?</string>
+    <string name="assistant_screen_delete_task_alert_dialog_title">Aufgabe löschen</string>
+    <string name="assistant_screen_loading">Aufgabenlisten werden geladen, bitte warten</string>
+    <string name="assistant_screen_no_task_available_for_all_task_filter_text">Keine Aufgabe verfügbar. Aufgabentyp auswählen, um eine neue Aufgabe zu erstellen.</string>
+    <string name="assistant_screen_no_task_available_text">Für den Aufgabentyp %s ist keine Aufgabe verfügbar. Sie können unten rechts eine neue Aufgabe erstellen.</string>
+    <string name="assistant_screen_task_create_fail_message">Fehler beim Erstellen der Aufgabe</string>
+    <string name="assistant_screen_task_create_success_message">Aufgabe erfolgreich erstellt</string>
+    <string name="assistant_screen_task_delete_fail_message">Aufgabe erfolgreich gelöscht</string>
+    <string name="assistant_screen_task_delete_success_message">Fehler beim Löschen der Aufgabe</string>
+    <string name="assistant_screen_task_list_error_state_message">Die Aufgabenliste kann nicht abgerufen werden. Bitte überprüfen Sie Ihre Internetverbindung.</string>
+    <string name="assistant_screen_task_more_actions_bottom_sheet_delete_action">Aufgabe löschen</string>
+    <string name="assistant_screen_task_types_error_state_message">Die Aufgabenliste kann nicht abgerufen werden. Bitte überprüfen Sie Ihre Internetverbindung.</string>
     <string name="assistant_screen_task_view_show_less">Weniger anzeigen</string>
+    <string name="assistant_screen_task_view_show_more">Mehr anzeigen</string>
+    <string name="assistant_screen_top_bar_title">Assistent</string>
     <string name="associated_account_not_found">Verknüpftes Konto nicht gefunden!</string>
     <string name="auth_access_failed">Zugriffsfehler: %1$s</string>
     <string name="auth_account_does_not_exist">Das Konto ist bislang auf dem Gerät nicht vorhanden</string>
@@ -237,6 +252,7 @@
     <string name="drawer_header_background">Hintergrundbild des Kopfbereiches</string>
     <string name="drawer_item_activities">Aktivitäten</string>
     <string name="drawer_item_all_files">Alle Dateien</string>
+    <string name="drawer_item_assistant">Assistent</string>
     <string name="drawer_item_favorites">Favoriten</string>
     <string name="drawer_item_gallery">Medien</string>
     <string name="drawer_item_groupfolders">Gruppenordner</string>
@@ -255,6 +271,7 @@
     <string name="drawer_synced_folders">Automatisches Hochladen</string>
     <string name="e2e_not_yet_setup">E2E bislang nicht eingerichtet</string>
     <string name="e2e_offline">Ohne Internetverbindung nicht möglich</string>
+    <string name="ecosystem_apps_display_assistant">Assistent</string>
     <string name="ecosystem_apps_display_more">Mehr</string>
     <string name="ecosystem_apps_display_notes">Notizen</string>
     <string name="ecosystem_apps_display_talk">Talk</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index d853fcf73700..466d2a1f25c6 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -34,8 +34,10 @@
     <string name="allow_resharing">Επιτρέπεται ο επαναδιαμοιρασμός</string>
     <string name="app_widget_description">Εμφάνιση ενός γραφικού στοιχείου από τον πίνακα ελέγχου</string>
     <string name="appbar_search_in">Αναζήτηση στο %s</string>
+    <string name="assistant_screen_all_task_type">\'Ολα</string>
     <string name="assistant_screen_create_task_alert_dialog_input_field_placeholder">Πληκτρολογήστε κάποιο κείμενο</string>
     <string name="assistant_screen_task_view_show_less">Εμφάνιση λιγότερων</string>
+    <string name="assistant_screen_task_view_show_more">Εμφάνιση περισσότερων</string>
     <string name="associated_account_not_found">Δεν βρέθηκε ο συνδεδεμένος λογαριασμός!</string>
     <string name="auth_access_failed">Αποτυχία πρόσβασης: %1$s</string>
     <string name="auth_account_does_not_exist">Ο λογαριασμός δεν υπάρχει ακόμα στη συσκευή</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 36263b939b2d..9e43bef0d844 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -32,7 +32,9 @@
     <string name="advanced_settings">Detalaj agordoj</string>
     <string name="allow_resharing">Permesi rekunhavigon</string>
     <string name="appbar_search_in">Serĉi en 1%s</string>
+    <string name="assistant_screen_all_task_type">Ĉiuj</string>
     <string name="assistant_screen_task_view_show_less">Montri malpli</string>
+    <string name="assistant_screen_task_view_show_more">Montri pli</string>
     <string name="auth_access_failed">Aliro malsukcesis: %1$s</string>
     <string name="auth_account_does_not_exist">La konto ankoraŭ ne aldoniĝis al tiu ĉi aparato</string>
     <string name="auth_account_not_new">Konto pri samaj uzanto kaj servilo jam ekzistas tiuaparate</string>
diff --git a/app/src/main/res/values-es-rEC/strings.xml b/app/src/main/res/values-es-rEC/strings.xml
index 79c2dcae2232..b5f76bf5ce17 100644
--- a/app/src/main/res/values-es-rEC/strings.xml
+++ b/app/src/main/res/values-es-rEC/strings.xml
@@ -35,8 +35,10 @@
     <string name="allow_resharing">Permitir volver a compartir</string>
     <string name="app_widget_description">Muestra un widget del panel de control</string>
     <string name="appbar_search_in">Compartir en %s</string>
+    <string name="assistant_screen_all_task_type">Todos</string>
     <string name="assistant_screen_task_delete_fail_message">Tarea eliminada con éxito</string>
     <string name="assistant_screen_task_view_show_less">Mostrar menos</string>
+    <string name="assistant_screen_task_view_show_more">Mostrar más</string>
     <string name="associated_account_not_found">¡Cuenta asociada no encontrada!</string>
     <string name="auth_access_failed">Acceso fallido: %1$s</string>
     <string name="auth_account_does_not_exist">La cuenta aún no ha sido agregada a este dispositivo </string>
diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
index e67bd43f53f1..800432516241 100644
--- a/app/src/main/res/values-es-rMX/strings.xml
+++ b/app/src/main/res/values-es-rMX/strings.xml
@@ -37,6 +37,23 @@
     <string name="allow_resharing">Permitir volver a compartir</string>
     <string name="app_widget_description">Muestra un widget del panel</string>
     <string name="appbar_search_in">Buscar en %s</string>
+    <string name="assistant_screen_all_task_type">Todos</string>
+    <string name="assistant_screen_create_task_alert_dialog_input_field_placeholder">Escriba algo de texto</string>
+    <string name="assistant_screen_delete_task_alert_dialog_description">¿Está seguro de eliminar esta tarea?</string>
+    <string name="assistant_screen_delete_task_alert_dialog_title">Eliminar tarea</string>
+    <string name="assistant_screen_loading">Las listas de tareas están cargando, por favor espere</string>
+    <string name="assistant_screen_no_task_available_for_all_task_filter_text">No hay tareas disponibles. Seleccione un tipo de tarea para crear una nueva.</string>
+    <string name="assistant_screen_no_task_available_text">No hay tareas disponibles para el tipo de tarea %s, puede crear una nueva tarea abajo a la derecha.</string>
+    <string name="assistant_screen_task_create_fail_message">Ocurrió un error al crear la tarea</string>
+    <string name="assistant_screen_task_create_success_message">Tarea creada exitosamente</string>
+    <string name="assistant_screen_task_delete_fail_message">Tarea eliminada exitosamente</string>
+    <string name="assistant_screen_task_delete_success_message">Ocurrió un error al eliminar la tarea</string>
+    <string name="assistant_screen_task_list_error_state_message">No se pudieron buscar los tipos de tareas, por favor, revise su conexión a internet.</string>
+    <string name="assistant_screen_task_more_actions_bottom_sheet_delete_action">Eliminar tarea</string>
+    <string name="assistant_screen_task_types_error_state_message">No se pudieron buscar los tipos de tareas, por favor, revise su conexión a internet.</string>
+    <string name="assistant_screen_task_view_show_less">Mostrar menos</string>
+    <string name="assistant_screen_task_view_show_more">Mostrar más</string>
+    <string name="assistant_screen_top_bar_title">Asistente</string>
     <string name="associated_account_not_found">¡No se encontró la cuenta asociada!</string>
     <string name="auth_access_failed">Acceso fallido:%1$s</string>
     <string name="auth_account_does_not_exist">La cuenta aún no ha sido agregada a este dispositivo </string>
@@ -235,6 +252,7 @@
     <string name="drawer_header_background">Imagen de fondo para el encabezado de la barra de navegación</string>
     <string name="drawer_item_activities">Actividades</string>
     <string name="drawer_item_all_files">Todos los archivos</string>
+    <string name="drawer_item_assistant">Asistente</string>
     <string name="drawer_item_favorites">Favoritos</string>
     <string name="drawer_item_gallery">Multimedia</string>
     <string name="drawer_item_groupfolders">Carpetas de grupo</string>
@@ -253,6 +271,7 @@
     <string name="drawer_synced_folders">Carga automática</string>
     <string name="e2e_not_yet_setup">E2E aún no configurado</string>
     <string name="e2e_offline">No es posible sin conexión a internet</string>
+    <string name="ecosystem_apps_display_assistant">Asistente</string>
     <string name="ecosystem_apps_display_more">Más</string>
     <string name="ecosystem_apps_display_notes">Notas</string>
     <string name="ecosystem_apps_display_talk">Hablar</string>
@@ -789,6 +808,8 @@
     <string name="storage_permission_full_access">Acceso completo</string>
     <string name="storage_permission_media_read_only">Sólo lectura de medios</string>
     <string name="storage_pictures">Imágenes</string>
+    <string name="store_full_desc">La plataforma de productividad auto hospedada que Ud. mantiene en control.\n\nCaracterísticas;\n* Interfaz moderna y fácil de usar adecuada al tema de su servidor\n* Cargue archivos a su servidor Nextcloud\n* Compártalos con otros\n* Mantenga sus archivos y carpetas favoritas sincronizados\n* Busque en todas las carpetas de su servidor\n* Carga automática para fotos y videos capturados en su dispositivo\n* Manténgase al día con notificaciones\n* Soporte para múltiples cuentas\n* Acceda a su información de forma segura usando su huella dactilar o PIN\n* Integración con DAVx5 (anteriormente conocido como DAVdroid) para configurar fácilmente la sincronización del calendario y contactos\n\nPor favor, reporte cualquier problema en https://github.com/nextcloud/android/issues y discuta acerca de esta aplicación en https://help.nextcloud.com/c/clients/android\n\n¿Es Ud. nuevo en Nextcloud? Nextcloud es un servidor privado para sincronizar y compartir archivos, y comunicación. Es un programa de uso libre, y lo puede hospedar Ud. mismo o pagar a una compañía para hacerlo por Ud. De esa manera, Ud. está en control de sus fotos, su calendario e información de sus contactos, sus documentos y todo lo demás.\n\nConozca Nextcloud en https://nextcloud.com</string>
+    <string name="store_full_dev_desc">La plataforma de productividad auto hospedada que Ud. mantiene en control.\n\nEsta es la versión oficial de desarrollo, presentando una muestra diaria de funcionalidad no probada, que puede provocar inestabilidad y pérdida de la información. Esta aplicación es para usuarios que deseen probar y reportar errores que puedan llegar a ocurrir. ¡No la use para su trabajo productivo!\n\nTanto la versión oficial de desarrollo como la versión regular están disponibles en F-droid, y se pueden instalar al mismo tiempo.</string>
     <string name="store_short_desc">La plataforma de productividad auto alojada que le mantiene en control</string>
     <string name="store_short_dev_desc">La plataforma de productividad auto alojada que le mantiene en control (versión preliminar para desarrolladores)</string>
     <string name="stream">Transmitir con...</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index a93726025fe4..5307826fcef4 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -14,6 +14,7 @@
     <string name="action_send_share">Enviar/Compartir</string>
     <string name="action_switch_grid_view">Vista en cuadrícula</string>
     <string name="action_switch_list_view">Vista de lista</string>
+    <string name="actionbar_calendar_contacts_restore">Restaurar los contactos y el calendario</string>
     <string name="actionbar_mkdir">Nueva carpeta</string>
     <string name="actionbar_move_or_copy">Mover o Copiar</string>
     <string name="actionbar_open_with">Abrir con</string>
@@ -36,8 +37,14 @@
     <string name="allow_resharing">Permitir que se vuelva a compartir</string>
     <string name="app_widget_description">Muestra un widget del tablero</string>
     <string name="appbar_search_in">Buscar en %s</string>
+    <string name="assistant_screen_all_task_type">Todo</string>
     <string name="assistant_screen_create_task_alert_dialog_input_field_placeholder">Escriba algo de texto</string>
+    <string name="assistant_screen_delete_task_alert_dialog_description">¿Está seguro de eliminar esta tarea?</string>
+    <string name="assistant_screen_delete_task_alert_dialog_title">Eliminar tarea</string>
+    <string name="assistant_screen_task_delete_fail_message">¡La tarea fue eliminada exitósamente!</string>
+    <string name="assistant_screen_task_more_actions_bottom_sheet_delete_action">Eliminar tarea</string>
     <string name="assistant_screen_task_view_show_less">Ver menos</string>
+    <string name="assistant_screen_task_view_show_more">Ver más</string>
     <string name="associated_account_not_found">¡Cuenta asociada no encontrada!</string>
     <string name="auth_access_failed">Acceso fallido: %1$s</string>
     <string name="auth_account_does_not_exist">La cuenta no se ha añadido aún en este dispositivo</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index d00b07103b13..cda9f530a5ee 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -39,9 +39,21 @@
     <string name="appbar_search_in">Søk i %s</string>
     <string name="assistant_screen_all_task_type">Alle</string>
     <string name="assistant_screen_create_task_alert_dialog_input_field_placeholder">Skriv inn litt tekst</string>
+    <string name="assistant_screen_delete_task_alert_dialog_description">Er du sikker på at du vil slette denne oppgaven?</string>
+    <string name="assistant_screen_delete_task_alert_dialog_title">Slett oppgave</string>
+    <string name="assistant_screen_loading">Oppgaveliste lastes inn, vennligst vent</string>
+    <string name="assistant_screen_no_task_available_for_all_task_filter_text">Ingen oppgave tilgjengelig. Velg en oppgavetype for å opprette en ny oppgave.</string>
+    <string name="assistant_screen_no_task_available_text">Ingen oppgave tilgjengelig for %s-oppgavetype, du kan opprette en ny oppgave fra nede til høyre.</string>
+    <string name="assistant_screen_task_create_fail_message">Det oppstod en feil under oppretting av oppgaven</string>
+    <string name="assistant_screen_task_create_success_message">Oppgave opprettet</string>
     <string name="assistant_screen_task_delete_fail_message">Oppgaven er slettet</string>
+    <string name="assistant_screen_task_delete_success_message">Det oppstod en feil under sletting av oppgaven</string>
+    <string name="assistant_screen_task_list_error_state_message">Kan ikke hente oppgavelisten, vennligst sjekk internettforbindelsen din.</string>
+    <string name="assistant_screen_task_more_actions_bottom_sheet_delete_action">Slett oppgave</string>
+    <string name="assistant_screen_task_types_error_state_message">Kan ikke hente oppgavetyper, vennligst sjekk internettforbindelsen din.</string>
     <string name="assistant_screen_task_view_show_less">Vis mindre</string>
     <string name="assistant_screen_task_view_show_more">Vis mer</string>
+    <string name="assistant_screen_top_bar_title">Assistent</string>
     <string name="associated_account_not_found">Tilknyttet bruker ikke funnet!</string>
     <string name="auth_access_failed">Tilgang mislyktes: %1$s</string>
     <string name="auth_account_does_not_exist">Kontoen er ikke lagt til på denne enheten enda</string>
@@ -240,6 +252,7 @@
     <string name="drawer_header_background">Bakgrunsbilde for innledning på meny</string>
     <string name="drawer_item_activities">Aktiviteter</string>
     <string name="drawer_item_all_files">Alle filer</string>
+    <string name="drawer_item_assistant">Assistent</string>
     <string name="drawer_item_favorites">Favoritter</string>
     <string name="drawer_item_gallery">Media</string>
     <string name="drawer_item_groupfolders">Gruppemappe</string>
@@ -258,6 +271,7 @@
     <string name="drawer_synced_folders">Auto-opplasting</string>
     <string name="e2e_not_yet_setup">E2E er ikke satt opp enda</string>
     <string name="e2e_offline">Ikke mulig uten internettilkobling</string>
+    <string name="ecosystem_apps_display_assistant">Assistent</string>
     <string name="ecosystem_apps_display_more">Mer</string>
     <string name="ecosystem_apps_display_notes">Notater</string>
     <string name="ecosystem_apps_display_talk">Samtale</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 2dbd67058dc8..147051f69434 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -39,9 +39,21 @@
     <string name="appbar_search_in">Pesquisar em %s</string>
     <string name="assistant_screen_all_task_type">Tudos</string>
     <string name="assistant_screen_create_task_alert_dialog_input_field_placeholder">Digite algum texto</string>
+    <string name="assistant_screen_delete_task_alert_dialog_description">Tem certeza de que deseja excluir esta tarefa?</string>
+    <string name="assistant_screen_delete_task_alert_dialog_title">Excluir tarefa</string>
+    <string name="assistant_screen_loading">A lista de tarefas está carregando, aguarde</string>
+    <string name="assistant_screen_no_task_available_for_all_task_filter_text">Nenhuma tarefa disponível. Selecione um tipo de tarefa para criar uma nova tarefa.</string>
+    <string name="assistant_screen_no_task_available_text">Nenhuma tarefa disponível para o tipo de tarefa %s. Você pode criar uma nova tarefa no canto inferior direito.</string>
+    <string name="assistant_screen_task_create_fail_message">Ocorreu um erro ao criar a tarefa</string>
+    <string name="assistant_screen_task_create_success_message">Tarefa criada com sucesso</string>
     <string name="assistant_screen_task_delete_fail_message">Tarefa excluída com sucesso</string>
+    <string name="assistant_screen_task_delete_success_message">Ocorreu um erro ao excluir a tarefa</string>
+    <string name="assistant_screen_task_list_error_state_message">Não é possível obter a lista de tarefas. Verifique sua conexão com a Internet.</string>
+    <string name="assistant_screen_task_more_actions_bottom_sheet_delete_action">Excluir tarefa</string>
+    <string name="assistant_screen_task_types_error_state_message">Não é possível buscar os tipos de tarefas. Verifique sua conexão com a Internet.</string>
     <string name="assistant_screen_task_view_show_less">Mostrar menos</string>
     <string name="assistant_screen_task_view_show_more">Mostrar mais</string>
+    <string name="assistant_screen_top_bar_title">Assistente</string>
     <string name="associated_account_not_found">Conta associada não encontrada!</string>
     <string name="auth_access_failed">O acesso falhou: %1$s</string>
     <string name="auth_account_does_not_exist">A conta ainda não está adicionada neste dispositivo</string>
@@ -240,6 +252,7 @@
     <string name="drawer_header_background">Imagem do plano de fundo do cabeçalho</string>
     <string name="drawer_item_activities">Atividades</string>
     <string name="drawer_item_all_files">Todos os arquivos</string>
+    <string name="drawer_item_assistant">Assistente</string>
     <string name="drawer_item_favorites">Favoritos</string>
     <string name="drawer_item_gallery">Mídia</string>
     <string name="drawer_item_groupfolders">Pastas de grupo</string>
@@ -258,6 +271,7 @@
     <string name="drawer_synced_folders">Autoenvio</string>
     <string name="e2e_not_yet_setup">E2E ainda não configurado</string>
     <string name="e2e_offline">Não é possível sem conexão com a internet</string>
+    <string name="ecosystem_apps_display_assistant">Assistente</string>
     <string name="ecosystem_apps_display_more">Mais</string>
     <string name="ecosystem_apps_display_notes">Notas </string>
     <string name="ecosystem_apps_display_talk">Talk</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index c747549030c6..cbd88695a39c 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -39,9 +39,21 @@
     <string name="appbar_search_in">Тражи у %s</string>
     <string name="assistant_screen_all_task_type">Све</string>
     <string name="assistant_screen_create_task_alert_dialog_input_field_placeholder">Откуцајте неки текст</string>
+    <string name="assistant_screen_delete_task_alert_dialog_description">Да ли сте сигурни да желите да обришете овај задатак?</string>
+    <string name="assistant_screen_delete_task_alert_dialog_title">Обриши задатак</string>
+    <string name="assistant_screen_loading">Листа задатака се учитава, молимо вас сачекајте</string>
+    <string name="assistant_screen_no_task_available_for_all_task_filter_text">Не постоји ниједан задатак. Да бисте креирали нови задатак, изаберите тип задатка.</string>
+    <string name="assistant_screen_no_task_available_text">Не постоји ниједан задатак типа %s, нови задатак можете да креирате доле десно.</string>
+    <string name="assistant_screen_task_create_fail_message">Дошло је до грешке током креирања задатка</string>
+    <string name="assistant_screen_task_create_success_message">Задатак је успешно креиран</string>
     <string name="assistant_screen_task_delete_fail_message">Задатак је успешно завршен</string>
+    <string name="assistant_screen_task_delete_success_message">Дошло је до грешке током брисања задатка</string>
+    <string name="assistant_screen_task_list_error_state_message">Не може да се преузме листа задатака, молимо вас да проверите везу са интернетом.</string>
+    <string name="assistant_screen_task_more_actions_bottom_sheet_delete_action">Обриши задатак</string>
+    <string name="assistant_screen_task_types_error_state_message">Не могу да се преузму типови задатака, молимо вас да проверите везу са интернетом.</string>
     <string name="assistant_screen_task_view_show_less">Прикажи мање</string>
     <string name="assistant_screen_task_view_show_more">Прикажи више</string>
+    <string name="assistant_screen_top_bar_title">Асистент</string>
     <string name="associated_account_not_found">Придружени налог није нађен!</string>
     <string name="auth_access_failed">Неуспешан приступ: %1$s</string>
     <string name="auth_account_does_not_exist">Налог још није додат на овај уређај</string>
@@ -240,6 +252,7 @@
     <string name="drawer_header_background">Позадинска слика заглавља фиоке</string>
     <string name="drawer_item_activities">Активности</string>
     <string name="drawer_item_all_files">Сви фајлови</string>
+    <string name="drawer_item_assistant">Асистент</string>
     <string name="drawer_item_favorites">Омиљено</string>
     <string name="drawer_item_gallery">Медији</string>
     <string name="drawer_item_groupfolders">Фолдери групе</string>
@@ -258,6 +271,7 @@
     <string name="drawer_synced_folders">Аутоматска отпремања</string>
     <string name="e2e_not_yet_setup">E2E још увек није подешено</string>
     <string name="e2e_offline">Није могуће без везе са интернетом</string>
+    <string name="ecosystem_apps_display_assistant">Асистент</string>
     <string name="ecosystem_apps_display_more">Више</string>
     <string name="ecosystem_apps_display_notes">Белешке</string>
     <string name="ecosystem_apps_display_talk">Разговор</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index c12664fcddd8..0e129c62e8c1 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -39,8 +39,21 @@
     <string name="appbar_search_in">Sök i %s</string>
     <string name="assistant_screen_all_task_type">Alla</string>
     <string name="assistant_screen_create_task_alert_dialog_input_field_placeholder">Skriv någon text</string>
+    <string name="assistant_screen_delete_task_alert_dialog_description">Är du säker på att du vill ta bort den här uppgiften?</string>
+    <string name="assistant_screen_delete_task_alert_dialog_title">Ta bort uppgift</string>
+    <string name="assistant_screen_loading">Uppgiftslistan laddas, vänta</string>
+    <string name="assistant_screen_no_task_available_for_all_task_filter_text">Ingen uppgift tillgänglig. Välj en uppgiftstyp för att skapa en ny uppgift.</string>
+    <string name="assistant_screen_no_task_available_text">Ingen uppgift tillgänglig för uppgiftstyp %s, du kan skapa en ny uppgift längst ner till höger.</string>
+    <string name="assistant_screen_task_create_fail_message">Ett fel uppstod när uppgiften skapades</string>
+    <string name="assistant_screen_task_create_success_message">Uppgiften har skapats</string>
+    <string name="assistant_screen_task_delete_fail_message">Uppgiften har raderats</string>
+    <string name="assistant_screen_task_delete_success_message">Ett fel uppstod när uppgiften skulle tas bort</string>
+    <string name="assistant_screen_task_list_error_state_message">Det går inte att hämta uppgiftslistan, kontrollera din internetanslutning.</string>
+    <string name="assistant_screen_task_more_actions_bottom_sheet_delete_action">Ta bort uppgift</string>
+    <string name="assistant_screen_task_types_error_state_message">Det går inte att hämta uppgiftstyper, kontrollera din internetanslutning.</string>
     <string name="assistant_screen_task_view_show_less">Visa mindre</string>
     <string name="assistant_screen_task_view_show_more">Visa mer</string>
+    <string name="assistant_screen_top_bar_title">Assistent</string>
     <string name="associated_account_not_found">Associerat konto kunde inte hittas!</string>
     <string name="auth_access_failed">Åtkomst misslyckades: %1$s</string>
     <string name="auth_account_does_not_exist">Kontot har ännu inte lagts till på den här enheten</string>
@@ -239,6 +252,7 @@
     <string name="drawer_header_background">Bakgrundsbild på appskärmsrubriken</string>
     <string name="drawer_item_activities">Aktiviteter</string>
     <string name="drawer_item_all_files">Alla filer</string>
+    <string name="drawer_item_assistant">Assistent</string>
     <string name="drawer_item_favorites">Favoriter</string>
     <string name="drawer_item_gallery">Media</string>
     <string name="drawer_item_groupfolders">Gruppmappar</string>
@@ -257,6 +271,7 @@
     <string name="drawer_synced_folders">Automatisk uppladdning</string>
     <string name="e2e_not_yet_setup">E2E ej inställt än</string>
     <string name="e2e_offline">Inte möjligt utan internetuppkoppling</string>
+    <string name="ecosystem_apps_display_assistant">Assistent</string>
     <string name="ecosystem_apps_display_more">Mer</string>
     <string name="ecosystem_apps_display_notes">Anteckning</string>
     <string name="ecosystem_apps_display_talk">Talk</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 3c0fca5490d9..eece32325afb 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -39,8 +39,21 @@
     <string name="appbar_search_in">%s內搜尋</string>
     <string name="assistant_screen_all_task_type">全部</string>
     <string name="assistant_screen_create_task_alert_dialog_input_field_placeholder">輸入一些文字</string>
+    <string name="assistant_screen_delete_task_alert_dialog_description">您確定要刪除此工作項目嗎？</string>
+    <string name="assistant_screen_delete_task_alert_dialog_title">刪除工作項目</string>
+    <string name="assistant_screen_loading">未載入工作項目清單，請稍候</string>
+    <string name="assistant_screen_no_task_available_for_all_task_filter_text">無可用的工作項目。選取工作項目類型以建立新工作項目。</string>
+    <string name="assistant_screen_no_task_available_text">沒有可用於 %s 工作項目類型的工作項目，您可以從右下角建立新工作項目。</string>
+    <string name="assistant_screen_task_create_fail_message">建立工作項目時發生錯誤</string>
+    <string name="assistant_screen_task_create_success_message">已成功建立工作項目</string>
+    <string name="assistant_screen_task_delete_fail_message">已成功刪除工作項目</string>
+    <string name="assistant_screen_task_delete_success_message">刪除工作項目時發生錯誤</string>
+    <string name="assistant_screen_task_list_error_state_message">無法擷取工作項目清單，請檢查您的網際網路連線。</string>
+    <string name="assistant_screen_task_more_actions_bottom_sheet_delete_action">刪除工作項目</string>
+    <string name="assistant_screen_task_types_error_state_message">無法擷取工作項目類型，請檢查您的網際網路連線。</string>
     <string name="assistant_screen_task_view_show_less">顯示較少</string>
     <string name="assistant_screen_task_view_show_more">顯示更多</string>
+    <string name="assistant_screen_top_bar_title">助理</string>
     <string name="associated_account_not_found">找不到相關的帳號！</string>
     <string name="auth_access_failed">存取失敗：%1$s</string>
     <string name="auth_account_does_not_exist">此帳號尚未加入到這個裝置</string>
@@ -239,6 +252,7 @@
     <string name="drawer_header_background">側滑選單背景圖片</string>
     <string name="drawer_item_activities">活動</string>
     <string name="drawer_item_all_files">所有檔案</string>
+    <string name="drawer_item_assistant">助理</string>
     <string name="drawer_item_favorites">最愛</string>
     <string name="drawer_item_gallery">多媒體</string>
     <string name="drawer_item_groupfolders">群組資料夾</string>
@@ -257,6 +271,7 @@
     <string name="drawer_synced_folders">自動上傳</string>
     <string name="e2e_not_yet_setup">尚未設定端到端加密</string>
     <string name="e2e_offline">沒有網際網路連線就無法使用</string>
+    <string name="ecosystem_apps_display_assistant">助理</string>
     <string name="ecosystem_apps_display_more">更多</string>
     <string name="ecosystem_apps_display_notes">筆記</string>
     <string name="ecosystem_apps_display_talk">Talk</string>