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

nextcloud · Feb 11, 2024 · 0b310ad · 0b310ad
2 parents 627b14a + 308d2f3
commit 0b310ad
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 20 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
@@ -19,4 +19,4 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-            - uses: gradle/wrapper-validation-action@85cde3f5a1033b2adc2442631c24b530f1183a1a # v2.1.0
+            - uses: gradle/wrapper-validation-action@699bb18358f12c5b78b37bb0111d3a0e2276e0e2 # v2.1.1
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -905,6 +905,7 @@
     <string name="uploader_upload_files_behaviour_only_upload">Ponechat soubor ve zdrojové složce</string>
     <string name="uploader_upload_files_behaviour_upload_and_delete_from_source">Vymazat soubor ze zdrojové složky</string>
     <string name="uploader_upload_forbidden_permissions">pro nahrávání do této složky</string>
+    <string name="uploader_upload_in_progress">%1$d%% %2$s</string>
     <string name="uploader_upload_in_progress_content">%1$d%% Odesílání %2$s</string>
     <string name="uploader_upload_in_progress_ticker">Nahrávání…</string>
     <string name="uploader_upload_succeeded_content_single">%1$s nahráno</string>

diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         daggerVersion = "2.50"
         markwonVersion = "4.6.2"
         prismVersion = "2.0.0"
-        androidLibraryVersion ="a1fd7c29d742c232902de79f9ac793cae8907a92"
+        androidLibraryVersion = "a1fd7c29d742c232902de79f9ac793cae8907a92"
         mockitoVersion = "4.11.0"
         mockitoKotlinVersion = "4.1.0"
         mockkVersion = "1.13.9"

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -3064,6 +3064,14 @@
             <sha256 value="0e0d1ffe9999460fe3ce76a8044e203d37007cf226a5daeb7b35c44030ac28c9" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="a1fd7c29d742c232902de79f9ac793cae8907a92">
+         <artifact name="android-library-a1fd7c29d742c232902de79f9ac793cae8907a92.aar">
+            <sha256 value="bdc44e874f1e14338213ae5723e71710940a31416ff1c52c9eb2f282e5d3f29a" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-a1fd7c29d742c232902de79f9ac793cae8907a92.module">
+            <sha256 value="95feada9ed8a8b3fe6d68de5ede5ce0fd5d5476de880d6d3908a3ad576416e98" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="eeb9dbbb463a41695c92c4c205bd943a07858213">
          <artifact name="android-library-eeb9dbbb463a41695c92c4c205bd943a07858213.aar">
             <sha256 value="bdc44e874f1e14338213ae5723e71710940a31416ff1c52c9eb2f282e5d3f29a" origin="Generated by Gradle" reason="Artifact is not signed"/>