From b7f0cab77e703612fd75b07e7a24285fdf9dd3b0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 18 Apr 2024 10:23:49 +0000
Subject: [PATCH 1/8] fix(deps): update dependency
 androidx.compose.ui:ui-tooling to v1.6.6

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index c837baa7c4..419d0737be 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -276,7 +276,7 @@ dependencies {
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.material3:material3")
     implementation("androidx.compose.ui:ui-tooling-preview:1.6.6")
-    debugImplementation 'androidx.compose.ui:ui-tooling:1.6.5'
+    debugImplementation 'androidx.compose.ui:ui-tooling:1.6.6'
 
     compileOnly 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2'
     // remove after entire switch to lib v2

From 09f98b8b6d64e9e49bfc6612286b362ba36b7e9c Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Thu, 18 Apr 2024 16:50:36 +0000
Subject: [PATCH 2/8] Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
---
 app/src/main/res/values-ar/strings.xml       | 1 -
 app/src/main/res/values-b+en+001/strings.xml | 1 -
 app/src/main/res/values-cs-rCZ/strings.xml   | 1 +
 app/src/main/res/values-de/strings.xml       | 1 -
 app/src/main/res/values-es-rMX/strings.xml   | 2 ++
 app/src/main/res/values-uk/strings.xml       | 1 -
 app/src/main/res/values-zh-rHK/strings.xml   | 1 -
 app/src/main/res/values-zh-rTW/strings.xml   | 1 -
 8 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 889e5db283..317d4f3a5b 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -172,7 +172,6 @@
     <string name="confirmation_remove_folder_alert">هل توَدُّ حقاً حذف %1$s وما يحتويه؟</string>
     <string name="confirmation_remove_folders_alert">هل توَدُّ حقاً حذف العناصر المختارة وما يحتوّه؟</string>
     <string name="confirmation_remove_local">محلياً فقط</string>
-    <string name="conflict_dialog_error">تعذّر إنشاء نافذة حوار لحل التعارضات</string>
     <string name="conflict_file_headline">ملف متضارب %1$s </string>
     <string name="conflict_local_file">ملف محلي</string>
     <string name="conflict_message_description">إذا قمت باختيار كلا الاصدارين, الملف المحلي سيحتوي على رقم ملحق باسم الملف.</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 5ad648a14d..34545c31d1 100644
--- a/app/src/main/res/values-b+en+001/strings.xml
+++ b/app/src/main/res/values-b+en+001/strings.xml
@@ -172,7 +172,6 @@
     <string name="confirmation_remove_folder_alert">Do you really want to delete %1$s and its content?</string>
     <string name="confirmation_remove_folders_alert">Do you really want to delete the selected items and their contents?</string>
     <string name="confirmation_remove_local">Local only</string>
-    <string name="conflict_dialog_error">Conflict resolver dialogue cannot be created</string>
     <string name="conflict_file_headline">Conflicting file %1$s</string>
     <string name="conflict_local_file">Local file</string>
     <string name="conflict_message_description">If you select both versions, the local file will have a number appended to its name.</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 68c1ac6925..0341e01844 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -42,6 +42,7 @@
     <string name="assistant_screen_successful_task_text">Dokončeno</string>
     <string name="assistant_screen_task_delete_success_message">Úloha úspěšně smazána</string>
     <string name="assistant_screen_unknown_task_status_text">Neznámé</string>
+    <string name="assistant_task_detail_screen_input_button_title">Vstup</string>
     <string name="assistant_task_detail_screen_output_button_title">Výstup</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>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5761430919..91c7eab694 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -172,7 +172,6 @@
     <string name="confirmation_remove_folder_alert">Wollen Sie %1$s und deren Inhalte wirklich löschen?</string>
     <string name="confirmation_remove_folders_alert">Möchten Sie die ausgewählten Elemente und deren inhalt wirklich löschen?</string>
     <string name="confirmation_remove_local">Nur lokal</string>
-    <string name="conflict_dialog_error">Konfliktlösungsdialog konnte nicht erstellt werden</string>
     <string name="conflict_file_headline">Konflikt-Datei %1$s</string>
     <string name="conflict_local_file">Lokale Datei</string>
     <string name="conflict_message_description">Falls beide Versionen gewählt werden, wird bei der lokalen Datei eine Zahl am Ende des Dateinamens hinzugefügt.</string>
diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
index 607f89aa83..85b55c381b 100644
--- a/app/src/main/res/values-es-rMX/strings.xml
+++ b/app/src/main/res/values-es-rMX/strings.xml
@@ -56,6 +56,8 @@
     <string name="assistant_screen_task_types_error_state_message">No se pudieron obtener los tipos de tareas, por favor, revise su conexión a internet.</string>
     <string name="assistant_screen_top_bar_title">Asistente</string>
     <string name="assistant_screen_unknown_task_status_text">Desconocido</string>
+    <string name="assistant_task_detail_screen_input_button_title">Entrada</string>
+    <string name="assistant_task_detail_screen_output_button_title">Salida</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>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index ad6569fdd9..37eaac6a93 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -172,7 +172,6 @@
     <string name="confirmation_remove_folder_alert">Ви справді бажаєте вилучити %1$s та його вміст?</string>
     <string name="confirmation_remove_folders_alert">Дійсно вилучити вибрані об\'єкти та їхній вміст?</string>
     <string name="confirmation_remove_local">Лише на пристрої</string>
-    <string name="conflict_dialog_error">Неможливо ініціювати діалог розв\'язання конфлікту</string>
     <string name="conflict_file_headline">Конфліктний файл %1$s</string>
     <string name="conflict_local_file">Файл на пристрої</string>
     <string name="conflict_message_description">Якщо ви виберете обидві версії, то до назви локального файлу буде додано порядковий номер.</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 58e1d0b3cc..032e3562df 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -172,7 +172,6 @@
     <string name="confirmation_remove_folder_alert">你真的想要刪除 %1$s 與裡面的檔案？</string>
     <string name="confirmation_remove_folders_alert">您真的想要刪除所選項目和裡面的內容嗎？</string>
     <string name="confirmation_remove_local">只有近端</string>
-    <string name="conflict_dialog_error">無法創建衝突解決程序對話框</string>
     <string name="conflict_file_headline">檔案 %1$s 抵觸</string>
     <string name="conflict_local_file">近端檔案</string>
     <string name="conflict_message_description">若您同時選擇兩個版本，近端的檔案會在檔名後附加編號。</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 5ff6296423..5d2475f444 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -172,7 +172,6 @@
     <string name="confirmation_remove_folder_alert">你真的想要刪除 %1$s 與裡面的檔案？</string>
     <string name="confirmation_remove_folders_alert">您真的想要刪除所選項目和裡面的內容嗎？</string>
     <string name="confirmation_remove_local">僅本機</string>
-    <string name="conflict_dialog_error">無法建立衝突解決對話方塊</string>
     <string name="conflict_file_headline">檔案 %1$s 衝突</string>
     <string name="conflict_local_file">本機檔案</string>
     <string name="conflict_message_description">若您同時選擇兩個版本，本機的檔案會在檔名後附加編號。</string>

From 9bc5d3ff4abaed446287552583f773375c7bd211 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 18 Apr 2024 19:40:24 +0000
Subject: [PATCH 3/8] chore(deps): update actions/upload-artifact action to
 v4.3.2

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/screenShotTest.yml | 2 +-
 .github/workflows/unit-tests.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/screenShotTest.yml b/.github/workflows/screenShotTest.yml
index 72b5229a58..3cfc292a5a 100644
--- a/.github/workflows/screenShotTest.yml
+++ b/.github/workflows/screenShotTest.yml
@@ -93,7 +93,7 @@ jobs:
                     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                 run: scripts/uploadReport.sh "${{ secrets.LOG_USERNAME }}" "${{ secrets.LOG_PASSWORD }}" ${{github.event.number}} "${{ matrix.color }}-${{ matrix.scheme }}" "Screenshot" ${{github.event.number}}
             -   name: Archive Espresso results
-                uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+                uses: actions/upload-artifact@1746f4ab65b179e0ea60a494b83293b640dd5bba # v4.3.2
                 if: ${{ always() }}
                 with:
                     name: Report-${{ matrix.color }}-${{ matrix.scheme }}
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 0820761ac1..ff07b97b39 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -49,7 +49,7 @@ jobs:
                     fail_ci_if_error: true
             -   name: Upload jacoco artifacts
                 if: ${{ failure() }}
-                uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+                uses: actions/upload-artifact@1746f4ab65b179e0ea60a494b83293b640dd5bba # v4.3.2
                 with:
                     name: test-results
                     path: app/build/reports/tests/testGplayDebugUnitTest/

From a70fadeb63dceadfe98dbd55f26aef83ac018cc8 Mon Sep 17 00:00:00 2001
From: nextcloud-android-bot <android@nextcloud.com>
Date: Fri, 19 Apr 2024 02:22:53 +0000
Subject: [PATCH 4/8] =?UTF-8?q?=F0=9F=94=84=20synced=20local=20'.github/wo?=
 =?UTF-8?q?rkflows/'=20with=20remote=20'config/workflows/'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index e6f8faa74c..9c6e46f63c 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -26,4 +26,4 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-            - uses: gradle/wrapper-validation-action@460a3ca55fc5d559238a0efc7fa9f7465df8585d # v3.3.0
+            - uses: gradle/wrapper-validation-action@5188e9b5527a0a094cee21e2fe9a8ca44b4629af # v3.3.1

From 9604995dc7e5a21ac26d3942d99bdbcb51929a79 Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Fri, 19 Apr 2024 02:44:25 +0000
Subject: [PATCH 5/8] Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
---
 app/src/main/res/values-ar/strings.xml       |  1 +
 app/src/main/res/values-b+en+001/strings.xml |  1 +
 app/src/main/res/values-de/strings.xml       |  1 +
 app/src/main/res/values-zh-rHK/strings.xml   | 63 ++++++++++----------
 app/src/main/res/values-zh-rTW/strings.xml   |  1 +
 5 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 317d4f3a5b..bc83e43023 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -172,6 +172,7 @@
     <string name="confirmation_remove_folder_alert">هل توَدُّ حقاً حذف %1$s وما يحتويه؟</string>
     <string name="confirmation_remove_folders_alert">هل توَدُّ حقاً حذف العناصر المختارة وما يحتوّه؟</string>
     <string name="confirmation_remove_local">محلياً فقط</string>
+    <string name="conflict_dialog_error">تعذّر إنشاء نافذة حوار حل التعارضات</string>
     <string name="conflict_file_headline">ملف متضارب %1$s </string>
     <string name="conflict_local_file">ملف محلي</string>
     <string name="conflict_message_description">إذا قمت باختيار كلا الاصدارين, الملف المحلي سيحتوي على رقم ملحق باسم الملف.</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 34545c31d1..27c89263b5 100644
--- a/app/src/main/res/values-b+en+001/strings.xml
+++ b/app/src/main/res/values-b+en+001/strings.xml
@@ -172,6 +172,7 @@
     <string name="confirmation_remove_folder_alert">Do you really want to delete %1$s and its content?</string>
     <string name="confirmation_remove_folders_alert">Do you really want to delete the selected items and their contents?</string>
     <string name="confirmation_remove_local">Local only</string>
+    <string name="conflict_dialog_error">Conflict resolver dialog cannot be created</string>
     <string name="conflict_file_headline">Conflicting file %1$s</string>
     <string name="conflict_local_file">Local file</string>
     <string name="conflict_message_description">If you select both versions, the local file will have a number appended to its name.</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 91c7eab694..5761430919 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -172,6 +172,7 @@
     <string name="confirmation_remove_folder_alert">Wollen Sie %1$s und deren Inhalte wirklich löschen?</string>
     <string name="confirmation_remove_folders_alert">Möchten Sie die ausgewählten Elemente und deren inhalt wirklich löschen?</string>
     <string name="confirmation_remove_local">Nur lokal</string>
+    <string name="conflict_dialog_error">Konfliktlösungsdialog konnte nicht erstellt werden</string>
     <string name="conflict_file_headline">Konflikt-Datei %1$s</string>
     <string name="conflict_local_file">Lokale Datei</string>
     <string name="conflict_message_description">Falls beide Versionen gewählt werden, wird bei der lokalen Datei eine Zahl am Ende des Dateinamens hinzugefügt.</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 032e3562df..da4ab7bc48 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -4,9 +4,9 @@
     <string name="about_title">關於</string>
     <string name="about_version">版本 %1$s</string>
     <string name="about_version_with_build">版本 %1$s，組建 #%2$s</string>
-    <string name="account_creation_failed">建立賬戶失敗</string>
-    <string name="account_icon">賬戶圖示</string>
-    <string name="account_not_found">沒有找到任何賬戶</string>
+    <string name="account_creation_failed">建立帳戶失敗</string>
+    <string name="account_icon">帳戶圖示</string>
+    <string name="account_not_found">沒有找到任何帳戶</string>
     <string name="action_edit">編輯</string>
     <string name="action_empty_notifications">清除所有通知訊息</string>
     <string name="action_empty_trashbin">清空回收桶</string>
@@ -58,11 +58,11 @@
     <string name="assistant_screen_unknown_task_status_text">不詳</string>
     <string name="assistant_task_detail_screen_input_button_title">輸入</string>
     <string name="assistant_task_detail_screen_output_button_title">輸出</string>
-    <string name="associated_account_not_found">無法找到連結賬戶</string>
+    <string name="associated_account_not_found">無法找到連結帳戶</string>
     <string name="auth_access_failed">存取失敗：%1$s</string>
-    <string name="auth_account_does_not_exist">此賬戶尚未加入到這個裝置</string>
-    <string name="auth_account_not_new">此裝置上已經存在同樣伺服器與用戶賬戶</string>
-    <string name="auth_account_not_the_same">輸入的用戶與此賬戶的用戶不一致</string>
+    <string name="auth_account_does_not_exist">此帳戶尚未加入到這個裝置</string>
+    <string name="auth_account_not_new">此裝置上已經存在同樣伺服器與用戶帳戶</string>
+    <string name="auth_account_not_the_same">輸入的用戶與此帳戶的用戶不一致</string>
     <string name="auth_bad_oc_version_title">無法辨識的伺服器版本</string>
     <string name="auth_connection_established">連線已建立</string>
     <string name="auth_fail_get_user_name">您的伺服器並未回傳正確的用戶名稱，請您聯絡相關管理人員。</string>
@@ -86,7 +86,7 @@
     <string name="auth_unknown_error_http_title">發生未知的HTTP錯誤！</string>
     <string name="auth_unknown_error_title">發生了不詳的錯誤！</string>
     <string name="auth_unknown_host_title">無法找到主機</string>
-    <string name="auth_unsupported_multiaccount">%1$s 不支援多個賬戶</string>
+    <string name="auth_unsupported_multiaccount">%1$s 不支援多個帳戶</string>
     <string name="auth_wrong_connection_title">無法建立連線</string>
     <string name="auto_upload_file_behaviour_kept_in_folder">以唯讀模式保留在原本的資料夾</string>
     <string name="auto_upload_on_wifi">僅在未計量的Wi-Fi上傳</string>
@@ -127,7 +127,7 @@
     <string name="common_back">返回</string>
     <string name="common_cancel">取消</string>
     <string name="common_cancel_sync">取消同步</string>
-    <string name="common_choose_account">選擇賬戶</string>
+    <string name="common_choose_account">選擇帳戶</string>
     <string name="common_confirm">確認</string>
     <string name="common_copy">複製</string>
     <string name="common_delete">刪除</string>
@@ -145,8 +145,8 @@
     <string name="common_send">傳送</string>
     <string name="common_share">分享</string>
     <string name="common_skip">略過</string>
-    <string name="common_switch_account">切換賬戶</string>
-    <string name="common_switch_to_account">切換到賬戶</string>
+    <string name="common_switch_account">切換帳戶</string>
+    <string name="common_switch_to_account">切換到帳戶</string>
     <string name="common_yes">是</string>
     <string name="community_beta_headline">測試開發版本</string>
     <string name="community_beta_text">這包含所有最新功能，預期執行上仍可能會有錯誤，若發現錯誤請舉報給我們。</string>
@@ -172,6 +172,7 @@
     <string name="confirmation_remove_folder_alert">你真的想要刪除 %1$s 與裡面的檔案？</string>
     <string name="confirmation_remove_folders_alert">您真的想要刪除所選項目和裡面的內容嗎？</string>
     <string name="confirmation_remove_local">只有近端</string>
+    <string name="conflict_dialog_error">無法創建衝突解決程序對話框</string>
     <string name="conflict_file_headline">檔案 %1$s 抵觸</string>
     <string name="conflict_local_file">近端檔案</string>
     <string name="conflict_message_description">若您同時選擇兩個版本，近端的檔案會在檔名後附加編號。</string>
@@ -209,7 +210,7 @@
     <string name="daily_backup">每日備份</string>
     <string name="data_to_back_up">要備份的數據</string>
     <string name="default_credentials_wrong">不正確的認證方式</string>
-    <string name="delete_account">刪除賬戶</string>
+    <string name="delete_account">刪除帳戶</string>
     <string name="delete_entries">刪除條目</string>
     <string name="delete_link">刪除連結</string>
     <string name="deselect_all">取消全選</string>
@@ -309,13 +310,13 @@
     <string name="error_file_actions">顯示檔案操作時出錯</string>
     <string name="error_file_lock">更改檔案上鎖狀態時出錯</string>
     <string name="error_report_issue_action">舉報</string>
-    <string name="error_report_issue_text">想舉報問題？（需要GitHub賬戶）</string>
+    <string name="error_report_issue_text">想舉報問題？（需要GitHub帳戶）</string>
     <string name="error_retrieving_file">檢索檔案時發生錯誤</string>
     <string name="error_retrieving_templates">取得範本時發生錯誤</string>
     <string name="error_showing_encryption_dialog">顯示加密設定對話方塊時發生錯誤！</string>
     <string name="error_starting_direct_camera_upload">無法啟動相機</string>
     <string name="error_starting_doc_scan">文件掃描開始時出錯</string>
-    <string name="etm_accounts">賬戶</string>
+    <string name="etm_accounts">帳戶</string>
     <string name="etm_background_execution_count">時段運行在48小時內</string>
     <string name="etm_background_job_created">創建於</string>
     <string name="etm_background_job_name">工作名稱</string>
@@ -389,8 +390,8 @@
     <string name="file_migration_ok_finished">完成</string>
     <string name="file_migration_override_data_folder">取代</string>
     <string name="file_migration_preparing">準備遷移…</string>
-    <string name="file_migration_restoring_accounts_configuration">回復賬戶設置中…</string>
-    <string name="file_migration_saving_accounts_configuration">正在儲存賬戶設置…</string>
+    <string name="file_migration_restoring_accounts_configuration">回復帳戶設置中…</string>
+    <string name="file_migration_saving_accounts_configuration">正在儲存帳戶設置…</string>
     <string name="file_migration_source_not_readable">您仍然想要變更資料儲存資料夾為 %1$s 嗎？\n\n注意：所有資料都必須再次下載。</string>
     <string name="file_migration_source_not_readable_title">來源資料夾無法讀取</string>
     <string name="file_migration_updating_index">更新索引中…</string>
@@ -539,7 +540,7 @@
     <string name="no_email_app_available">沒有可用於處理郵件地址的應用程式</string>
     <string name="no_items">沒有項目</string>
     <string name="no_map_app_availble">沒有應用程式可以處理地圖</string>
-    <string name="no_mutliple_accounts_allowed">只可使用一個賬戶</string>
+    <string name="no_mutliple_accounts_allowed">只可使用一個帳戶</string>
     <string name="no_pdf_app_available">沒有應用程式可以開啟 PDF</string>
     <string name="no_send_app">沒有可用於發送所選檔案的應用程式</string>
     <string name="no_share_permission_selected">請選取至少一個要分享的權限。</string>
@@ -601,10 +602,10 @@
     <string name="pref_instant_name_collision_policy_entries_overwrite">覆寫遠端的版本</string>
     <string name="pref_instant_name_collision_policy_entries_rename">重新命名新的版本</string>
     <string name="pref_instant_name_collision_policy_title">當檔案已經存在時我該怎麼做?</string>
-    <string name="prefs_add_account">新增賬戶</string>
+    <string name="prefs_add_account">新增帳戶</string>
     <string name="prefs_calendar_contacts">同步日曆與通訊錄</string>
     <string name="prefs_calendar_contacts_no_store_error">尚未安裝 F-Droid 或 Google Play</string>
-    <string name="prefs_calendar_contacts_summary">為目前用戶賬戶設定 DAVx5 協定（以前稱為 DAVdroid）（版本 v1.3.0 以上）</string>
+    <string name="prefs_calendar_contacts_summary">為目前用戶帳戶設定 DAVx5 協定（以前稱為 DAVdroid）（版本 v1.3.0 以上）</string>
     <string name="prefs_calendar_contacts_sync_setup_successful">日曆與通訊錄同步設定</string>
     <string name="prefs_category_about">關於</string>
     <string name="prefs_category_details">詳細資料</string>
@@ -638,7 +639,7 @@
     <string name="prefs_lock_title">使用以下工具保護 app</string>
     <string name="prefs_lock_using_device_credentials">裝置身分驗證方式</string>
     <string name="prefs_lock_using_passcode">通行碼</string>
-    <string name="prefs_manage_accounts">管理賬戶</string>
+    <string name="prefs_manage_accounts">管理帳戶</string>
     <string name="prefs_recommend">向朋友推薦</string>
     <string name="prefs_remove_e2e">移除近端加密</string>
     <string name="prefs_setup_e2e">設置端對端加密</string>
@@ -661,7 +662,7 @@
     <string name="privacy">私隱政策</string>
     <string name="public_share_name">新名稱</string>
     <string name="push_notifications_not_implemented">由於依賴專有的Google Play服務，推送通知已停用。</string>
-    <string name="push_notifications_old_login">由於登入已過期，因此沒有推送通知。請考慮重新添加您的賬戶。</string>
+    <string name="push_notifications_old_login">由於登入已過期，因此沒有推送通知。請考慮重新添加您的帳戶。</string>
     <string name="push_notifications_temp_error">推送通知目前無法使用。</string>
     <string name="qr_could_not_be_read">QR 碼無法讀取！</string>
     <string name="recommend_subject">在您的裝置上試用 %1$s！</string>
@@ -674,17 +675,17 @@
     <string name="remove_e2e">您可以在此客戶端上本地刪除端到端加密</string>
     <string name="remove_e2e_message">您可以在此客戶端上本地刪除端到端加密。加密檔案將保留在伺服器上，但不會再同步到此電腦。</string>
     <string name="remove_fail_msg">刪除失敗</string>
-    <string name="remove_local_account">移除近端賬戶</string>
-    <string name="remove_local_account_details">從裝置中刪除賬戶並刪除所有近端檔案</string>
+    <string name="remove_local_account">移除近端帳戶</string>
+    <string name="remove_local_account_details">從裝置中刪除帳戶並刪除所有近端檔案</string>
     <string name="remove_notification_failed">移除通知失敗</string>
     <string name="remove_push_notification">移除</string>
     <string name="remove_success_msg">已刪除</string>
     <string name="rename_dialog_title">輸入新名稱</string>
     <string name="rename_local_fail_msg">無法重新命名近端複本，請試用不同名稱</string>
     <string name="rename_server_fail_msg">不可重新命名，名稱已存在</string>
-    <string name="request_account_deletion">請求賬戶刪除</string>
+    <string name="request_account_deletion">請求帳戶刪除</string>
     <string name="request_account_deletion_button">請求刪除</string>
-    <string name="request_account_deletion_details">請求服務提供者永久刪除賬戶</string>
+    <string name="request_account_deletion_details">請求服務提供者永久刪除帳戶</string>
     <string name="reshare_not_allowed">不允許重新分享</string>
     <string name="resharing_is_not_allowed">不允許重新分享</string>
     <string name="resized_image_not_possible_download">沒有可用調整過的圖像，下載完整圖像？</string>
@@ -702,7 +703,7 @@
     <string name="screenshot_02_listView_subline">全在您一指之間</string>
     <string name="screenshot_03_drawer_heading">活動、分享…</string>
     <string name="screenshot_03_drawer_subline">可快速存取所有資源</string>
-    <string name="screenshot_04_accounts_heading">您所有的賬戶</string>
+    <string name="screenshot_04_accounts_heading">您所有的帳戶</string>
     <string name="screenshot_04_accounts_subline">在一個地方</string>
     <string name="screenshot_05_autoUpload_heading">自動上傳</string>
     <string name="screenshot_05_autoUpload_subline">您的照片與視像</string>
@@ -773,7 +774,7 @@
     <string name="show_images">顯示照片</string>
     <string name="show_video">顯示影片</string>
     <string name="signup_with_provider">使用第三方登入</string>
-    <string name="single_sign_on_request_token" formatted="true">允許 %1$s 存取您的 Nextcloud 賬戶 %2$s？</string>
+    <string name="single_sign_on_request_token" formatted="true">允許 %1$s 存取您的 Nextcloud 帳戶 %2$s？</string>
     <string name="sort_by">排序方式</string>
     <string name="ssl_validator_btn_details_hide">隱藏</string>
     <string name="ssl_validator_btn_details_see">細節</string>
@@ -812,7 +813,7 @@
     <string name="storage_permission_full_access">完整存取權限</string>
     <string name="storage_permission_media_read_only">僅媒體唯讀</string>
     <string name="storage_pictures">圖片</string>
-    <string name="store_full_desc">可自架且始終讓您掌控一切的生產力平台。\n功能：\n* 簡潔、現代的用戶界面，適合您伺服器的佈景主題\n* 上傳檔案到您的 Nextcloud 伺服器\n* 與其他人分享檔案\n* 讓您最愛的檔案與資料夾同步\n* 搜尋您伺服器上所有的資料夾\n* 以通知訊息保持更新\n* 多賬戶支援\n* 使用指紋或 PIN 碼安全存取您的資料\n* 與 DAVx5 整合（先前被稱為 DAVdroid），可輕易設定行事曆與聯絡人同步\n\n請至 https://github.com/nextcloud/android/issues 舉報所有問題，並於 https://help.nextcloud.com/c/clients/android 討論此應用程式\n\n您是 Nextcloud 新手嗎？Nextcloud 是一個私人的檔案同步、共享與通訊的伺服器。它是自由軟體，您可以自行架設，或是付費請專業公司協助您建置。如此，您便可完全掌控您的照片、行事曆與聯絡人資料、您的文件與其他任何東西。\n\n請造訪 https://nextcloud.com 以取得更多資訊</string>
+    <string name="store_full_desc">可自架且始終讓您掌控一切的生產力平台。\n功能：\n* 簡潔、現代的用戶界面，適合您伺服器的佈景主題\n* 上傳檔案到您的 Nextcloud 伺服器\n* 與其他人分享檔案\n* 讓您最愛的檔案與資料夾同步\n* 搜尋您伺服器上所有的資料夾\n* 以通知訊息保持更新\n* 多帳戶支援\n* 使用指紋或 PIN 碼安全存取您的資料\n* 與 DAVx5 整合（先前被稱為 DAVdroid），可輕易設定行事曆與聯絡人同步\n\n請至 https://github.com/nextcloud/android/issues 舉報所有問題，並於 https://help.nextcloud.com/c/clients/android 討論此應用程式\n\n您是 Nextcloud 新手嗎？Nextcloud 是一個私人的檔案同步、共享與通訊的伺服器。它是自由軟體，您可以自行架設，或是付費請專業公司協助您建置。如此，您便可完全掌控您的照片、行事曆與聯絡人資料、您的文件與其他任何東西。\n\n請造訪 https://nextcloud.com 以取得更多資訊</string>
     <string name="store_full_dev_desc">可自架且始終讓您掌控一切的生產力平台。\n這是官方的開發版本，每天都會提供未經測試的任何新功能的範例，可能造成不穩定或資料遺失。此應用程式適合願意測試且舉報遇到的問題的用戶。不要將其用於您的生產力工作！\n\nF-Droid 同時提供了官方的開發版本與一般版本，可同時安裝。</string>
     <string name="store_short_desc">讓你能完全掌控、自建且具生產力的平台</string>
     <string name="store_short_dev_desc">讓你能完全掌控、自建且具生產力的平台（開發者預覽版）</string>
@@ -838,7 +839,7 @@
     <string name="sync_fail_ticker_unauthorized">同步失敗，需重新登入。</string>
     <string name="sync_file_nothing_to_do_msg">檔案已同步</string>
     <string name="sync_folder_failed_content">無法完成資料夾 %1$s 的同步作業</string>
-    <string name="sync_foreign_files_forgotten_explanation">於1.3.16版本中，此裝置已上傳的檔案會複製到近端%1$s資料夾，以防止多重賬戶同步單一檔案時造成遺失。透過此應用程式更早的版本上傳的檔案則複製到%2$s資料夾。但是在同步時出現錯誤會阻礙此操作完成，你可以選擇無視此檔案並移除%3$s的連結，或者移動此檔案到%1$s資料夾並保留%4$s的連結，下面列出%5$s中近端與遠端檔案之間的連結。</string>
+    <string name="sync_foreign_files_forgotten_explanation">於1.3.16版本中，此裝置已上傳的檔案會複製到近端%1$s資料夾，以防止多重帳戶同步單一檔案時造成遺失。透過此應用程式更早的版本上傳的檔案則複製到%2$s資料夾。但是在同步時出現錯誤會阻礙此操作完成，你可以選擇無視此檔案並移除%3$s的連結，或者移動此檔案到%1$s資料夾並保留%4$s的連結，下面列出%5$s中近端與遠端檔案之間的連結。</string>
     <string name="sync_foreign_files_forgotten_ticker">有些近端端的檔案已遺失</string>
     <string name="sync_in_progress">取得檔案最近的版本</string>
     <string name="sync_not_enough_space_dialog_action_choose">選擇同步項目</string>
@@ -948,8 +949,8 @@
     <string name="uploader_upload_succeeded_content_single">%1$s 已上傳</string>
     <string name="uploader_wrn_no_account_quit_btn_text">退出</string>
     <string name="uploader_wrn_no_account_setup_btn_text">設定</string>
-    <string name="uploader_wrn_no_account_text">無 %1$s 賬戶，請先建立賬戶。</string>
-    <string name="uploader_wrn_no_account_title">找不到賬戶</string>
+    <string name="uploader_wrn_no_account_text">無 %1$s 帳戶，請先建立帳戶。</string>
+    <string name="uploader_wrn_no_account_title">找不到帳戶</string>
     <string name="uploads_view_group_current_uploads">目前</string>
     <string name="uploads_view_group_failed_uploads">失敗/等待重啟</string>
     <string name="uploads_view_group_finished_uploads">已上傳</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 5d2475f444..5ff6296423 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -172,6 +172,7 @@
     <string name="confirmation_remove_folder_alert">你真的想要刪除 %1$s 與裡面的檔案？</string>
     <string name="confirmation_remove_folders_alert">您真的想要刪除所選項目和裡面的內容嗎？</string>
     <string name="confirmation_remove_local">僅本機</string>
+    <string name="conflict_dialog_error">無法建立衝突解決對話方塊</string>
     <string name="conflict_file_headline">檔案 %1$s 衝突</string>
     <string name="conflict_local_file">本機檔案</string>
     <string name="conflict_message_description">若您同時選擇兩個版本，本機的檔案會在檔名後附加編號。</string>

From 5ca90493e4af6dd80c588b0d32782ceacb35b460 Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Sat, 20 Apr 2024 02:49:35 +0000
Subject: [PATCH 6/8] Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
---
 app/src/main/res/values-es-rMX/strings.xml |  1 +
 app/src/main/res/values-fr/strings.xml     | 15 ++++++++-------
 app/src/main/res/values-ru/strings.xml     | 21 +++++++++++++++++++++
 app/src/main/res/values-sr/strings.xml     |  1 +
 4 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
index 85b55c381b..491cc36e70 100644
--- a/app/src/main/res/values-es-rMX/strings.xml
+++ b/app/src/main/res/values-es-rMX/strings.xml
@@ -172,6 +172,7 @@
     <string name="confirmation_remove_folder_alert">¿Realmente quieres eliminar %1$s y sus contenidos? </string>
     <string name="confirmation_remove_folders_alert">¿Reamente deseas eliminar los elementos seleccionados y sus contenidos?</string>
     <string name="confirmation_remove_local">Sólo local</string>
+    <string name="conflict_dialog_error">El diálogo de resolución de conflictos no puede ser creado</string>
     <string name="conflict_file_headline">Archivo conflictivo %1$s</string>
     <string name="conflict_local_file">Archivo local</string>
     <string name="conflict_message_description">Si seleccionas ambas versiones, el archivo local tendrá un número al final del nombre.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 1370acfc6a..10a08b9134 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -13,7 +13,7 @@
     <string name="action_send_share">Envoyer / Partager</string>
     <string name="action_switch_grid_view">Affichage mosaïque</string>
     <string name="action_switch_list_view">Affichage liste</string>
-    <string name="actionbar_calendar_contacts_restore">Restaurer les contacts et l’agenda</string>
+    <string name="actionbar_calendar_contacts_restore">Restaurer les contacts et l\'agenda</string>
     <string name="actionbar_mkdir">Nouveau dossier</string>
     <string name="actionbar_move_or_copy">Déplacer ou copier</string>
     <string name="actionbar_open_with">Ouvrir avec</string>
@@ -412,7 +412,7 @@
     <string name="filename_hint">Nom du fichier</string>
     <string name="first_run_1_text">Sécurisez et contrôlez vos données</string>
     <string name="first_run_2_text">Collaboration et échange de fichiers sécurisés</string>
-    <string name="first_run_3_text">Messagerie web, agenda, contacts faciles à utiliser</string>
+    <string name="first_run_3_text">Webmail, agenda, contacts faciles à utiliser</string>
     <string name="first_run_4_text">Partage d’écran, réunions en ligne et conférences en ligne</string>
     <string name="folder_already_exists">Le dossier existe déjà</string>
     <string name="folder_confirm_create">Créer</string>
@@ -460,7 +460,7 @@
     <string name="image_preview_unit_seconds">%s s</string>
     <string name="in_folder">dans le dossier %1$s</string>
     <string name="instant_upload_existing">Téléverser aussi les fichiers existants</string>
-    <string name="instant_upload_on_charging">Téléverser uniquement si le chargeur est branché</string>
+    <string name="instant_upload_on_charging">Téléverser uniquement lors de la recharge</string>
     <string name="instant_upload_path">/InstantUpload</string>
     <string name="invalid_url">URL invalide</string>
     <string name="invisible">Invisible</string>
@@ -688,7 +688,7 @@
     <string name="resharing_is_not_allowed">Le repartage est interdit</string>
     <string name="resized_image_not_possible_download">Aucune image réduite disponible. Télécharger l\'image originale ?</string>
     <string name="restore">Restaurer le fichier</string>
-    <string name="restore_backup">Restaurer la sauvegarde</string>
+    <string name="restore_backup">Restaurer une sauvegarde</string>
     <string name="restore_button_description">Restaurer le fichier supprimé</string>
     <string name="restore_selected">Restaurer la sélection</string>
     <string name="retrieving_file">Téléchargement en cours…</string>
@@ -768,6 +768,7 @@
     <string name="shared_icon_shared_via_link">partagé par lien</string>
     <string name="shared_with_you_by">Partagé avec vous par %1$s</string>
     <string name="sharee_add_failed">L\'ajout du partage a échoué</string>
+    <string name="sharee_already_added_to_file">L\'ajout du partage a échoué. Ce fichier ou dossier a déjà été partagé avec cette personne ou ce groupe.</string>
     <string name="show_images">Afficher les photos</string>
     <string name="show_video">Afficher les vidéos</string>
     <string name="signup_with_provider">Se connecter avec un fournisseur</string>
@@ -885,7 +886,7 @@
     <string name="upload_action_cancelled_clear">Effacer les téléversements annulés</string>
     <string name="upload_action_cancelled_resume">Poursuivre les téléversements annulés</string>
     <string name="upload_action_failed_clear">Effacer les téléversements échoués</string>
-    <string name="upload_action_failed_retry">Relancer les envois en erreur</string>
+    <string name="upload_action_failed_retry">Réessayer les téléversements qui ont échoué</string>
     <string name="upload_action_file_not_exist_message">Certains fichiers n’existent pas et ne peuvent pas être relancés.</string>
     <string name="upload_action_global_upload_pause">Suspendre tous les téléversements</string>
     <string name="upload_action_global_upload_resume">Poursuivre tous les téléversements</string>
@@ -927,11 +928,11 @@
     <string name="uploader_file_not_found_message">Fichier non trouvé. Êtes-vous sûr que ce fichier existe ou qu\'un conflit précédent n\'a pas été résolu ?</string>
     <string name="uploader_file_not_found_on_server_message">Impossible de retrouver le fichier sur le serveur. Un autre utilisateur l\'a peut-être supprimé</string>
     <string name="uploader_info_dirname">Nom du dossier</string>
-    <string name="uploader_local_files_uploaded">Réessayer de téléverser les fichiers locaux ayant échoués</string>
+    <string name="uploader_local_files_uploaded">Réessayer de téléverser les fichiers locaux qui ont échoué</string>
     <string name="uploader_top_message">Sélectionnez le dossier de téléversement</string>
     <string name="uploader_upload_failed_content_single">Impossible d\'envoyer %1$s</string>
     <string name="uploader_upload_failed_credentials_error">Le téléversement a échoué, reconnectez-vous</string>
-    <string name="uploader_upload_failed_sync_conflict_error">Conflit de fichier lors de l\'envoi</string>
+    <string name="uploader_upload_failed_sync_conflict_error">Conflit de téléversement de fichiers</string>
     <string name="uploader_upload_failed_sync_conflict_error_content">Sélectionnez la version de %1$s à conserver</string>
     <string name="uploader_upload_failed_ticker">Échec du téléversement</string>
     <string name="uploader_upload_files_behaviour">Option de téléversement :</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 88ebecacc1..e0d0b13d6b 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -38,11 +38,26 @@
     <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_failed_task_text">Не удалось</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_running_task_text">Выполянется</string>
     <string name="assistant_screen_scheduled_task_status_text">Запланированное</string>
     <string name="assistant_screen_successful_task_text">Выполнено</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_top_bar_title">Помощник</string>
     <string name="assistant_screen_unknown_task_status_text">Неизвестно</string>
+    <string name="assistant_task_detail_screen_input_button_title">Ввод</string>
+    <string name="assistant_task_detail_screen_output_button_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>
@@ -157,6 +172,7 @@
     <string name="confirmation_remove_folder_alert">Действительно удалить «%1$s» и его содержимое?</string>
     <string name="confirmation_remove_folders_alert">Действительно удалить выбранные объекты и их содержимое?</string>
     <string name="confirmation_remove_local">Только локально</string>
+    <string name="conflict_dialog_error">Не удается создать диалоговое окно разрешения конфликтов</string>
     <string name="conflict_file_headline">Конфликт версий файла «%1$s»</string>
     <string name="conflict_local_file">Локальный файл</string>
     <string name="conflict_message_description">Если вы выберете обе версии, локальный файл будет иметь номер, добавленный к его имени.</string>
@@ -240,6 +256,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 +275,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">Конференции</string>
@@ -729,6 +747,7 @@
     <string name="share_link_with_label">Поделиться ссылкой (%1$s)</string>
     <string name="share_no_expiration_date_label">Установить срок действия</string>
     <string name="share_no_password_title">Задать пароль</string>
+    <string name="share_not_allowed_when_file_drop">Перенаправление запрещено во время безопасного удаления файлов</string>
     <string name="share_password_title">Защищено паролем</string>
     <string name="share_permission_can_edit">Разрешено редактировать</string>
     <string name="share_permission_file_drop">Принимать файлы</string>
@@ -752,6 +771,7 @@
     <string name="shared_icon_shared_via_link">поступ по ссылке</string>
     <string name="shared_with_you_by">С вами поделился %1$s</string>
     <string name="sharee_add_failed">Не удалось открыть общий доступ</string>
+    <string name="sharee_already_added_to_file">Не удалось добавить общий ресурс. Этому пользователю или группе уже предоставлен общий доступ к этому файлу или папке.</string>
     <string name="show_images">Показать фотографии</string>
     <string name="show_video">Показать видео</string>
     <string name="signup_with_provider">Подключиться через поставщика услуги</string>
@@ -794,6 +814,7 @@
     <string name="storage_permission_full_access">Полный доступ</string>
     <string name="storage_permission_media_read_only">Носитель только для чтения</string>
     <string name="storage_pictures">Изображения</string>
+    <string name="store_full_desc">Собственная продуктивная платформа, которая держит вас под контролем.\n\nFeatures:\n* Простой, современный интерфейс, соответствующий тематике вашего сервера\n* Загрузите файлы на свой сервер Nextcloud\n* Делитесь ими с другими\n* Синхронизируйте ваши любимые файлы и папки\n* Поиск во всех папках на вашем сервере\n* Автоматическая отправка фотографий и видео с вашего устройства\n* Будьте в курсе с уведомлениями\n* Поддержка нескольких учетных записей\n* Безопасный доступ к вашим данным с помощью отпечатка пальцев или PIN-кода\n* Интеграция с DAVx5 (ранее известный как DAVdroid) для легкой настройки синхронизации календаря и контактов\n\nПожалуйста, сообщите обо всех проблемах на https://github.com/nextcloud/android/issues и обсудите это приложение на https://help.nextcloud.com/c/clients/android\n\nНовичок в Nextcloud? Nextcloud - это частный сервер синхронизации и обмена файлами и коммуникационный сервер. Это свободное программное обеспечение, и вы можете разместить его самостоятельно или заплатить компании, чтобы сделать это за вас. Таким образом, вы управляете своими фотографиями, календарем и контактными данными, документами и всем остальным.\n\nПроверьте Nextcloud по адресу https://nextcloud.com</string>
     <string name="store_full_dev_desc">Платформа, размещаемая на собственных ресурсах и позволяющая самостоятельно управлять данными.\nЭто разрабатываемая версия официального приложения Nextcloud, содержащая новые возможности, тестирование которых не ещё завершено. Разрабатываемая версия может быть нестабильна и её использование может привести к потере данных. Это приложение предназначено для пользователей, которые хотят познакомиться с новыми возможности и сообщать об обнаруженных ошибках. Не используйте его для работы!\n\nРазрабатываемая версия может быть установлена совместно с официальным приложением Nextcloud, которое также доступно в F-Droid.</string>
     <string name="store_short_desc">Платформа, размещаемая на собственных ресурсах и позволяющая самостоятельно управлять данными</string>
     <string name="store_short_dev_desc">Платформа, размещаемая на собственных ресурсах и позволяющая самостоятельно управлять данными (разрабатываемая версия)</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 6759393306..71a19cc8f3 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -172,6 +172,7 @@
     <string name="confirmation_remove_folder_alert">Заиста желите да обришете %1$s и сав њен садржај?</string>
     <string name="confirmation_remove_folders_alert">Заиста желите да обришете означене ставке и њихов садржај?</string>
     <string name="confirmation_remove_local">Само локално</string>
+    <string name="conflict_dialog_error">Нем оже да се креира дијалог за разрешавање конфилкта</string>
     <string name="conflict_file_headline">Конфликтни фајл %1$s</string>
     <string name="conflict_local_file">Локални фајл</string>
     <string name="conflict_message_description">Ако изаберете обе верзије, локални фајл имаће број придодат свом називу.</string>

From e1499019d17281ecd79bc995a0de38dc1e124e33 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 20 Apr 2024 12:20:26 +0000
Subject: [PATCH 7/8] chore(deps): update gradle/gradle-build-action action to
 v3.3.1

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/unit-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index ff07b97b39..87ef51f729 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -33,7 +33,7 @@ jobs:
                 if: ${{ always() }}
                 run: scripts/deleteOldComments.sh "test" "Unit" ${{github.event.number}}
             -   name: Run unit tests with coverage
-                uses: gradle/gradle-build-action@8baac4c8ef753599f92eeb509c246d09d6250fa6 # v3.3.0
+                uses: gradle/gradle-build-action@e2097ccd7e8ed48671dc068ac4efa86d25745b39 # v3.3.1
                 with:
                     arguments: jacocoTestGplayDebugUnitTest
             -   name: Upload failing results

From a6d7903ac7222de4015521900975fd40080b8f2a Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Sun, 21 Apr 2024 02:45:52 +0000
Subject: [PATCH 8/8] Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
---
 app/src/main/res/values-sv/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 453b194c83..ff83cad005 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -171,6 +171,7 @@
     <string name="confirmation_remove_folder_alert">Vill du verkligen ta bort %1$s och dess innehåll?</string>
     <string name="confirmation_remove_folders_alert">Vill du verkligen radera de valda objekten och dess innehåll?</string>
     <string name="confirmation_remove_local">Endast lokalt</string>
+    <string name="conflict_dialog_error">Dialogrutan för konfliktlösning kan inte skapas</string>
     <string name="conflict_file_headline">Konfliktande fil %1$s</string>
     <string name="conflict_local_file">Lokal fil</string>
     <string name="conflict_message_description">Om du väljer båda versionerna kommer den lokala filen få ett nummer tillagt i filnamnet.</string>