From fb76df17b893dd6bf146c9f26c42ce842dea9c29 Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Thu, 25 Jul 2024 02:41:46 +0000
Subject: [PATCH 1/3] Fix(l10n): Update translations from Transifex

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

diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 46629fad80..67dfeed708 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -48,7 +48,13 @@
     <string name="assistant_screen_no_task_available_for_all_task_filter_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_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>
@@ -82,6 +88,7 @@
     <string name="auth_unknown_host_title">ホストを見つけられませんでした。</string>
     <string name="auth_unsupported_multiaccount">%1$s は複数アカウントをサポートしていません</string>
     <string name="auth_wrong_connection_title">接続を確立できませんでした</string>
+    <string name="authenticator_activity_cancel_login">ログインをキャンセル</string>
     <string name="auto_upload_file_behaviour_kept_in_folder">読み取り専用のため元のフォルダに残しました</string>
     <string name="auto_upload_on_wifi">定額制 Wi-Fi でのみアップロード</string>
     <string name="auto_upload_path">/AutoUpload</string>
@@ -244,6 +251,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_home">ホーム</string>
@@ -260,6 +268,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>

From be1c15c5f7f1fdbfab32008c18ee46de9f66a4cd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 24 Jul 2024 21:53:01 +0000
Subject: [PATCH 2/3] fix(deps): update dependency
 androidx.fragment:fragment-ktx to v1.8.2

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 app/build.gradle                 | 2 +-
 gradle/verification-metadata.xml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6827d878e5..0e951e9cdc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -291,7 +291,7 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-service:2.8.3"
     implementation "androidx.work:work-runtime:$workRuntime"
     implementation "androidx.work:work-runtime-ktx:$workRuntime"
-    implementation "androidx.fragment:fragment-ktx:1.8.1"
+    implementation "androidx.fragment:fragment-ktx:1.8.2"
     implementation 'com.github.albfernandez:juniversalchardet:2.0.3' // need this version for Android <7
     compileOnly 'com.google.code.findbugs:annotations:3.0.1u2'
     implementation 'commons-io:commons-io:2.16.1'
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 285072be00..19cf7992c8 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -1706,6 +1706,11 @@
             <sha256 value="81526b28c3e4b513760174ee26142c1372c9e13d1c8bf3a220830307aca1971f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.fragment" name="fragment" version="1.8.2">
+         <artifact name="fragment-1.8.2.aar">
+            <sha256 value="c14786bdad6e7b12289a70de7d4f6b68dc7920278044d8dbdefeb3c3a7172d3e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.fragment" name="fragment-ktx" version="1.3.2">
          <artifact name="fragment-ktx-1.3.2.aar">
             <sha256 value="29af1e9ee0e93b5fc638600c230705584aecc49205c363f0923ba1e5be675533" origin="Generated by Gradle" reason="Artifact is not signed"/>

From c819990e036d2352e2a3c8fabd6ee5b9ab53723b Mon Sep 17 00:00:00 2001
From: nextcloud-android-bot <android@nextcloud.com>
Date: Thu, 25 Jul 2024 13:49:12 +0000
Subject: [PATCH 3/3] =?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/codeql.yml    | 4 ++--
 .github/workflows/scorecard.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 31c5462472..226e472869 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -39,7 +39,7 @@ jobs:
         with:
           swap-size-gb: 10
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
+        uses: github/codeql-action/init@5cf07d8b700b67e235fbb65cbc84f69c0cf10464 # v3.25.14
         with:
           languages: ${{ matrix.language }}
       - name: Set up JDK 17
@@ -53,4 +53,4 @@ jobs:
           echo "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
           ./gradlew assembleDebug
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
+        uses: github/codeql-action/analyze@5cf07d8b700b67e235fbb65cbc84f69c0cf10464 # v3.25.14
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 7cdef17eb3..e7c64bf613 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -42,6 +42,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
+        uses: github/codeql-action/upload-sarif@5cf07d8b700b67e235fbb65cbc84f69c0cf10464 # v3.25.14
         with:
           sarif_file: results.sarif