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

app/build.gradle

@@ -320,7 +320,7 @@ dependencies {
     qaImplementation project(':appscan')
 
     spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.13.0'
-    spotbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.6.5'
+    spotbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.6.8'
 
     implementation "com.google.dagger:dagger:$daggerVersion"
     implementation "com.google.dagger:dagger-android:$daggerVersion"

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

@@ -737,6 +737,7 @@
     <string name="request_account_deletion">Iarr ar scriosadh an chuntais</string>
     <string name="request_account_deletion_button">Iarr scriosadh</string>
     <string name="request_account_deletion_details">Iarr ar sholáthraí seirbhíse scriosadh buan an chuntais</string>
+    <string name="resharing_is_not_allowed">Cuireann beartais nó ceadanna cosc ​​ar athroinnt</string>
     <string name="resized_image_not_possible_download">Níl aon íomhá athraithe ar fáil. Íoslódáil an íomhá iomlán?</string>
     <string name="restore">Athchóirigh comhad</string>
     <string name="restore_backup">Athchóirigh cúltaca</string>

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

@@ -738,6 +738,7 @@
     <string name="request_account_deletion">Solicitar a eliminación da conta </string>
     <string name="request_account_deletion_button">Solicitat a eliminación</string>
     <string name="request_account_deletion_details">Solicitar a eliminación definitiva da conta polo provedor de servizos</string>
+    <string name="resharing_is_not_allowed">A directiva ou os permisos impiden volver compartir</string>
     <string name="resized_image_not_possible_download">No se dispón da imaxe noutros tamaños. Descargala a tamaño real?</string>
     <string name="restore">Restaurar ficheiro</string>
     <string name="restore_backup">Restaurar a copia de seguranza</string>

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

@@ -694,7 +694,9 @@
     <string name="prefs_synced_folders_local_path_title">Локална фасцикла</string>
     <string name="prefs_synced_folders_remote_path_title">Удаљена фасцикла</string>
     <string name="prefs_theme_title">Тема</string>
+    <string name="prefs_two_way_sync_interval">Интервал</string>
     <string name="prefs_two_way_sync_summary">Управљање интерним фолдерима за двосмерну синхронизацију</string>
+    <string name="prefs_two_way_sync_switch_title">Укључи двосмерну синхронизацију</string>
     <string name="prefs_value_theme_dark">тамна</string>
     <string name="prefs_value_theme_light">светла</string>
     <string name="prefs_value_theme_system">системска</string>
@@ -735,6 +737,7 @@
     <string name="request_account_deletion">Захтевајте брисање налога</string>
     <string name="request_account_deletion_button">Захтев за брисање</string>
     <string name="request_account_deletion_details">Захтев пружаоцу сервиса да неповратно обрише налог</string>
+    <string name="resharing_is_not_allowed">Полиса или дозволе спречавају поновно дељење</string>
     <string name="resized_image_not_possible_download">Нема доступне умањене сличице. Скинути пуну слику?</string>
     <string name="restore">Поврати фајл</string>
     <string name="restore_backup">Обнови резервну копију</string>
@@ -1059,11 +1062,22 @@
     <string name="whats_new_skip">Прескочи</string>
     <string name="whats_new_title">Ново у %1$s</string>
     <string name="whats_your_status">Који је ваш статус?</string>
+    <string name="widgets_not_available">Виџети су доступни само на %1$s 25 или новијем када је укључена апликација Контролна табла</string>
     <string name="widgets_not_available_title">Није доступно</string>
     <string name="worker_download">Преузимам фајлове…</string>
     <string name="write_email">Пошаљи е-пошту</string>
     <string name="wrong_storage_path">Фолдер за чување података не постоји!</string>
     <string name="wrong_storage_path_desc">Ово може да се догоди када се резервна копија обнови на другом уређају. Враћа се на подразумевано подешавање. Молимо вас да проверите подешавања и исправите локацију фолдера за чување података.</string>
+    <plurals name="hours">
+        <item quantity="one">%d сат</item>
+        <item quantity="few">%d сата</item>
+        <item quantity="other">%d сати</item>
+    </plurals>
+    <plurals name="minutes">
+        <item quantity="one">%d минут</item>
+        <item quantity="few">%d минута</item>
+        <item quantity="other">%d минута</item>
+    </plurals>
     <plurals name="sync_fail_in_favourites_content">
         <item quantity="one">Не могу да синхронизујем %1$d фајл (конфликата: %2$d)</item>
         <item quantity="few">Не могу да синхронизујем %1$d фајла (конфликата: %2$d)</item>

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

@@ -730,6 +730,7 @@
     <string name="request_account_deletion">Запит на вилучення облікового запису</string>
     <string name="request_account_deletion_button">Запит на вилучення</string>
     <string name="request_account_deletion_details">Запит на вилучення облікового запису з боку постачальника послуг</string>
+    <string name="resharing_is_not_allowed">Політика або дозволи забороняють подальшу передачу у спільний доступ</string>
     <string name="resized_image_not_possible_download">Відсутнє зображення зі зменшеними розмірами. Звантажити повне зображення?</string>
     <string name="restore">Відновити файл</string>
     <string name="restore_backup">Відновити</string>

gradle/verification-metadata.xml

@@ -195,7 +195,10 @@
          <trusted-key id="7488FE3E7E31E325FFDF6F1DA0E8A2E551EE7606" group="com.thoughtworks.paranamer"/>
          <trusted-key id="7615AD56144DF2376F49D98B1669C4BB543E0445" group="com.google.errorprone"/>
          <trusted-key id="7616EB882DAF57A11477AAF559A252FB1199D873" group="com.google.code.findbugs"/>
-         <trusted-key id="77A45740C23880C7F81B9D4D5C504E1210E49773" group="com.mebigfatguy.fb-contrib" name="fb-contrib" version="7.6.5"/>
+         <trusted-key id="77A45740C23880C7F81B9D4D5C504E1210E49773">
+            <trusting group="com.mebigfatguy.fb-contrib" name="fb-contrib" version="7.6.5"/>
+            <trusting group="com.mebigfatguy.fb-contrib" name="fb-contrib" version="7.6.8"/>
+         </trusted-key>
          <trusted-key id="796737EDB7CB2E2904E2BFA447B25FE8A3702A09" group="^org[.]jbundle($|([.].*))" regex="true"/>
          <trusted-key id="7B121B76A7ED6CE6E60AD51784E913A8E3A748C0" group="org.bouncycastle"/>
          <trusted-key id="7C669810892CBD3148FA92995B05CCDE140C2876" group="org.eclipse.jgit"/>
@@ -9761,6 +9764,11 @@
             <sha256 value="43ed0e36b353f41e5eb75cd756667c9e2df97cef06eb16066967158a1d034d2a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.guava" name="guava-parent" version="33.0.0-jre">
+         <artifact name="guava-parent-33.0.0-jre.pom">
+            <sha256 value="040cc88c680b413d70ba9fc8371b36093021b10996aa3598621de767d418229a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.guava" name="listenablefuture" version="1.0">
          <artifact name="listenablefuture-1.0.jar">
             <sha256 value="e4ad7607e5c0477c6f890ef26a49cb8d1bb4dffb650bab4502afee64644e3069" origin="Generated by Gradle"/>
@@ -10150,6 +10158,14 @@
             <sha256 value="eb308c03982ff98baf9edbf071c4e8796146686eaba0f28eaf2b67516c6a0113" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
          </artifact>
       </component>
+      <component group="com.mebigfatguy.fb-contrib" name="fb-contrib" version="7.6.8">
+         <artifact name="fb-contrib-7.6.8.jar">
+            <sha256 value="02bb9ebe4c66a9fa8c3045df3efc0fb3603335653de9b88998b2e8d753495b69" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="fb-contrib-7.6.8.pom">
+            <sha256 value="3a32cd165d6e267db1db7393b60fe177980f46dab2c88e487761095e6ddd49b4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.puppycrawl.tools" name="checkstyle" version="9.3">
          <artifact name="checkstyle-9.3.jar">
             <sha256 value="0463e304980f5460b964f481ccc25a10fb253b60100c19e50fc992892895977f" origin="Generated by Gradle"/>
@@ -14809,6 +14825,9 @@
          </artifact>
       </component>
       <component group="org.junit" name="junit-bom" version="5.10.0">
+         <artifact name="junit-bom-5.10.0.module">
+            <sha256 value="eb3ee6127608010694a898056e7407d117296003aba5f5db801df430b9887fcf" origin="Generated by Gradle"/>
+         </artifact>
          <artifact name="junit-bom-5.10.0.pom">
             <sha256 value="e006dd8894f9fc7b75fc32bb12fe5ed8be65667d5b454f99e2e0b8c5bb8d30b3" origin="Generated by Gradle"/>
          </artifact>
@@ -14819,6 +14838,9 @@
          </artifact>
       </component>
       <component group="org.junit" name="junit-bom" version="5.10.2">
+         <artifact name="junit-bom-5.10.2.module">
+            <sha256 value="de23b114b3e4119a8fe6eb17bed5a3852816698bace67071579d6d927ebb080a" origin="Generated by Gradle"/>
+         </artifact>
          <artifact name="junit-bom-5.10.2.pom">
             <sha256 value="169dd904a4b0f6520cffe658cc62292bfe9f3c14a989fa92120724cde43a9968" origin="Generated by Gradle"/>
          </artifact>
@@ -14839,6 +14861,9 @@
          </artifact>
       </component>
       <component group="org.junit" name="junit-bom" version="5.9.0">
+         <artifact name="junit-bom-5.9.0.module">
+            <sha256 value="a054eaf5016b58bbcde86660444a7c0dd3e2caf84d2a1ad5fc4cb525979c19b9" origin="Generated by Gradle"/>
+         </artifact>
          <artifact name="junit-bom-5.9.0.pom">
             <sha256 value="d83e87f1676cde44191eec5cda690492392f26923b1e498148ca739dfed75295" origin="Generated by Gradle"/>
          </artifact>
@@ -14852,11 +14877,17 @@
          </artifact>
       </component>
       <component group="org.junit" name="junit-bom" version="5.9.2">
+         <artifact name="junit-bom-5.9.2.module">
+            <sha256 value="ab137ba5a8e32c9b066bf9126a1c76dd5614b724ba5c0b02549772b5e9f4cf1f" origin="Generated by Gradle"/>
+         </artifact>
          <artifact name="junit-bom-5.9.2.pom">
             <sha256 value="2ed07d65845131f5336a86476c9a4056b59d0b58b9815ab3679bb0f36f35f705" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.junit" name="junit-bom" version="5.9.3">
+         <artifact name="junit-bom-5.9.3.module">
+            <sha256 value="b401fd25901e582a524aa5343c4b39e28bc56e24961c1069bf2b4bbfcee46b93" origin="Generated by Gradle"/>
+         </artifact>
          <artifact name="junit-bom-5.9.3.pom">
             <sha256 value="4d0329cd9e72f2420e5ca15724cbfe6ffa6e5fd2888361516271190fdc342ed7" origin="Generated by Gradle"/>
          </artifact>
@@ -15409,6 +15440,9 @@
          </artifact>
       </component>
       <component group="org.springframework" name="spring-framework-bom" version="5.3.32">
+         <artifact name="spring-framework-bom-5.3.32.module">
+            <sha256 value="47a7091f697ca631185ed418f0ca2b86eef0c82aa16d1771ddec4b2c3bb7b3bd" origin="Generated by Gradle"/>
+         </artifact>
          <artifact name="spring-framework-bom-5.3.32.pom">
             <sha256 value="825af7112e3d92ea436bb0df78c19514885f5c016d0fc60c8b24d4763a015a10" origin="Generated by Gradle"/>
          </artifact>