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

.github/workflows/autoApproveDependabot.yml

@@ -1,35 +0,0 @@
-# synced from @nextcloud/android-config
-
-# SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
-# SPDX-FileCopyrightText: 2023 Álvaro Brey <alvaro@alvarobrey.com>
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-name: Auto approve dependabot
-
-on:
-  pull_request_target:
-    branches:
-      - main
-      - master
-      - stable-*
-
-permissions:
-  contents: read
-
-concurrency:
-  group: dependabot-approve-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  auto-approve:
-    name: Auto approve dependabot
-    runs-on: ubuntu-latest
-    if: github.actor == 'dependabot[bot]'
-    permissions:
-      # needed to approve the PR
-      pull-requests: write
-
-    steps:
-      - uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/renovate-approve-merge.yml

@@ -1,7 +1,10 @@
-# SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH and Nextcloud contributors
+# This workflow is provided via the organization template repository
-# SPDX-FileCopyrightText: 2023 Álvaro Brey <alvaro@alvarobrey.com>
+#
-# SPDX-FileCopyrightText: 2023 Andy Scherzinger <info@andy-scherzinger.de>
+# https://github.com/nextcloud/.github
-# SPDX-License-Identifier: GPL-3.0-or-later
+# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+#
+# SPDX-FileCopyrightText: Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
 
 name: Auto approve renovate PRs
 
@@ -30,6 +33,12 @@ jobs:
       contents: write
 
     steps:
+      - name: Disabled on forks
+        if: ${{ github.event.pull_request.head.repo.full_name != github.repository }}
+        run: |
+          echo 'Can not approve PRs from forks'
+          exit 1
+
       - uses: mdecoleman/pr-branch-name@55795d86b4566d300d237883103f052125cc7508 # v3.0.0
         id: branchname
         with:

.github/workflows/screenShotTest.yml

@@ -99,7 +99,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@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
+                uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
                 if: ${{ always() }}
                 with:
                     name: Report-${{ matrix.color }}-${{ matrix.scheme }}

.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@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
+                uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
                 with:
                     name: test-results
                     path: app/build/reports/tests/testGplayDebugUnitTest/

app/build.gradle

@@ -16,7 +16,7 @@ import org.gradle.internal.jvm.Jvm
 buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:$androidPluginVersion"
-        classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.20'
+        classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.21'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.6"
         classpath "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2

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

@@ -409,7 +409,7 @@
     <string name="file_migration_updating_index">Aktualisiere Index…</string>
     <string name="file_migration_use_data_folder">Verwende bestehenden</string>
     <string name="file_migration_waiting_for_unfinished_sync">Warte auf die Fertigstellung aller Synchronisierungen …</string>
-    <string name="file_name_validator_current_path_is_invalid">Der aktuelle Ordnername ist ungültig. Bitte benennen Sie den Ordner um. Weiterleitung zum Stammverzeichnis</string>
+    <string name="file_name_validator_current_path_is_invalid">Der aktuelle Ordnername ist unzulässig. Bitte benennen Sie den Ordner um. Weiterleitung zum Stammverzeichnis</string>
     <string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">Der Ordnerpfad enthält reservierte Namen oder ungültige Zeichen</string>
     <string name="file_name_validator_error_ends_with_space_period">Der Name endet mit einem Leerzeichen oder einem Punkt</string>
     <string name="file_name_validator_error_forbidden_file_extensions">.%s ist eine unzulässige Dateierweiterung</string>

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

@@ -193,7 +193,7 @@
     <string name="contacts_preferences_import_scheduled">A importación está programada e comezará en breve</string>
     <string name="contacts_preferences_no_file_found">Non se atopou ningún ficheiro</string>
     <string name="contacts_preferences_something_strange_happened">Non foi posíbel atopar a súa última copia de seguranza!</string>
-    <string name="copied_to_clipboard">Copiado no portapapeis.</string>
+    <string name="copied_to_clipboard">Copiado no portapapeis</string>
     <string name="copy_file_error">Produciuse un erro ao tentar copiar este ficheiro ou cartafol.</string>
     <string name="copy_file_invalid_into_descendent">Non é posíbel copiar un cartafol nun dos seus propios subcartafoles</string>
     <string name="copy_file_invalid_overwrite">Este ficheiro xa existe no cartafol de destino</string>

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

@@ -480,6 +480,7 @@
     <string name="in_folder">в каталозі %1$s</string>
     <string name="instant_upload_existing">Також завантажити існуючі файли</string>
     <string name="instant_upload_on_charging">Завантаження тільки під час заряджання</string>
+    <string name="internal_two_way_sync">Внутрішня двостороння синхронізація</string>
     <string name="internal_two_way_sync_not_yet">Поки не впроваджено</string>
     <string name="invalid_url">Неправильний URL</string>
     <string name="invisible">Приховано</string>

gradle/verification-metadata.xml

@@ -10574,6 +10574,11 @@
             <sha256 value="64f96ea8e7b9896731052241ffd3a265f8274d761e5fe9dc088ac45b31718341" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.0.20">
+         <artifact name="kotlin-stdlib-2.0.20.module">
+            <sha256 value="dc051dc04c6a196f2d06d0d3c9af33b9f12bc9b4fe139ae1290140508236b67b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.4.32">
          <artifact name="kotlin-stdlib-common-1.4.32.jar">
             <sha256 value="e1ff6f55ee9e7591dcc633f7757bac25a7edb1cc7f738b37ec652f10f66a4145" origin="Generated by Gradle"/>
@@ -10655,6 +10660,11 @@
             <sha256 value="2335187440c51d0d69e1b906fefc31f6169691c8598177b0e610c9b9a92ce6b5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="2.0.20">
+         <artifact name="kotlin-stdlib-common-2.0.20.module">
+            <sha256 value="b597b705efd4e2d827142090c36054265548ed51b4f52377f2bf89c4594d536f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.3.72">
          <artifact name="kotlin-stdlib-jdk7-1.3.72.pom">
             <sha256 value="9d5a13d9abc33445e1366d258af0a77e42f01945acef7c0917b9d539854e2fce" origin="Generated by Gradle"/>