Merge branch 'parallelise-uploads' of github.com:k0raph/nextcloud-android into parallelise-uploads

Author: k0raph

app/src/main/res/values-pt-rBR/strings.xml

@@ -963,6 +963,9 @@
     <string name="suggest">Sugerir </string>
     <string name="sync">Sincronizar</string>
     <string name="sync_anyway">Sincronizar mesmo assim</string>
+    <string name="sync_conflict_notification_action_title">Resolver conflitos</string>
+    <string name="sync_conflict_notification_description">Conflitos de upload detectados. Abra os uploads para resolver.</string>
+    <string name="sync_conflict_notification_title">Conflitos de upload de arquivos</string>
     <string name="sync_conflicts_in_favourites_ticker">Conflitos encontrados</string>
     <string name="sync_current_folder_was_removed">A pasta %1$s não existe mais</string>
     <string name="sync_duplication">Duplicação de sincronização</string>

app/src/main/res/values-th-rTH/strings.xml

@@ -351,6 +351,7 @@
     <string name="instant_upload_existing">อัปโหลดไฟล์ที่มีอยู่เดิมด้วย</string>
     <string name="instant_upload_on_charging">อัปโหลดขณะชาร์จเท่านั้น</string>
     <string name="instant_upload_path">/อัพโหลดทันที</string>
+    <string name="internal_shares">การแชร์ภายใน</string>
     <string name="invalid_url">URL ไม่ถูกต้อง</string>
     <string name="invisible">มองไม่เห็น</string>
     <string name="label_empty">ป้ายกำกับไม่สามารถเว้นว่างได้</string>

gradle/libs.versions.toml

@@ -84,7 +84,7 @@ spotless = "8.1.0"
 stateless4jVersion = "2.6.0"
 webkitVersion = "1.15.0"
 workRuntime = "2.11.0"
-foundationVersion = "1.10.0"
+foundationVersion = "1.10.1"
 
 [libraries]
 # Crypto

gradle/verification-metadata.xml

@@ -20004,17 +20004,14 @@
             <sha256 value="8ffe3452987103329c09723e440cc70784a1e87a754da92f8db77025b2cc6b65" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-       <component group="com.github.nextcloud" name="android-library"
-           version="839366c261c52437425cde740c9e5a4ab8c8bace">
-           <artifact name="android-library-839366c261c52437425cde740c9e5a4ab8c8bace.aar">
-               <sha256 value="c082789596462fd14095dd191fe75884f366c01dd5dd68c9aeac3b867972a907"
-                   origin="Generated by Gradle" reason="Artifact is not signed" />
-           </artifact>
-           <artifact name="android-library-839366c261c52437425cde740c9e5a4ab8c8bace.module">
-               <sha256 value="d52aea880fbf27f6ef86e0d757dfc5c3b2af695b23ee05b1c0a78fa74b6fc4e4"
-                   origin="Generated by Gradle" reason="Artifact is not signed" />
-           </artifact>
-       </component>
+      <component group="com.github.nextcloud" name="android-library" version="839366c261c52437425cde740c9e5a4ab8c8bace">
+         <artifact name="android-library-839366c261c52437425cde740c9e5a4ab8c8bace.aar">
+            <sha256 value="c082789596462fd14095dd191fe75884f366c01dd5dd68c9aeac3b867972a907" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-839366c261c52437425cde740c9e5a4ab8c8bace.module">
+            <sha256 value="d52aea880fbf27f6ef86e0d757dfc5c3b2af695b23ee05b1c0a78fa74b6fc4e4" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="84711877b4703f8df3d638a016419b4aa731db2b">
          <artifact name="android-library-84711877b4703f8df3d638a016419b4aa731db2b.aar">
             <sha256 value="d801b368fc7d4d5d2d2852765442ccbf7df21f0a9198d369181637a8142914cc" origin="Generated by Gradle" reason="Artifact is not signed"/>