From 1d39fcfc68b8775ee7cb2cde918afd56859c1280 Mon Sep 17 00:00:00 2001
From: Jonas Mayer <jonas.a.mayer@gmx.net>
Date: Tue, 28 May 2024 16:44:57 +0200
Subject: [PATCH 1/3] replace broken icon with old one

Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
---
 .../android/ui/activity/UploadListActivity.java |  4 ++--
 app/src/main/res/drawable/ic_global_pause.xml   | 17 +++++++++++++++++
 app/src/main/res/drawable/ic_global_resume.xml  | 17 +++++++++++++++++
 app/src/main/res/menu/activity_upload_list.xml  |  2 +-
 4 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_global_pause.xml
 create mode 100644 app/src/main/res/drawable/ic_global_resume.xml

diff --git a/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
index 61768bb459..f489309772 100755
--- a/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
@@ -267,10 +267,10 @@ public class UploadListActivity extends FileActivity {
         int iconId;
         String title;
         if (preferences.isGlobalUploadPaused()) {
-            iconId = R.drawable.ic_play;
+            iconId = R.drawable.ic_global_resume;
             title = getString(R.string.upload_action_global_upload_resume);
         } else {
-            iconId = R.drawable.ic_pause;
+            iconId = R.drawable.ic_global_pause;
             title = getString(R.string.upload_action_global_upload_pause);
         }
 
diff --git a/app/src/main/res/drawable/ic_global_pause.xml b/app/src/main/res/drawable/ic_global_pause.xml
new file mode 100644
index 0000000000..41ac950958
--- /dev/null
+++ b/app/src/main/res/drawable/ic_global_pause.xml
@@ -0,0 +1,17 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2024 Jonas Mayer
+  ~ SPDX-FileCopyrightText: 2024 Nextcloud GmbH
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@color/foreground_highlight"
+        android:pathData="M560,760L560,200L720,200L720,760L560,760ZM240,760L240,200L400,200L400,760L240,760Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_global_resume.xml b/app/src/main/res/drawable/ic_global_resume.xml
new file mode 100644
index 0000000000..b370eac95b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_global_resume.xml
@@ -0,0 +1,17 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2023 Alper Ozturk <alper_ozturk@proton.me>
+  ~ SPDX-FileCopyrightText: 2023 Nextcloud GmbH
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@color/foreground_highlight"
+        android:pathData="M320,760v-560l440,280 -440,280Z"/>
+</vector>
diff --git a/app/src/main/res/menu/activity_upload_list.xml b/app/src/main/res/menu/activity_upload_list.xml
index 44a6d7287c..e118af71c1 100644
--- a/app/src/main/res/menu/activity_upload_list.xml
+++ b/app/src/main/res/menu/activity_upload_list.xml
@@ -14,7 +14,7 @@
 
         <item
             android:id="@+id/action_toggle_global_pause"
-            android:icon="@android:drawable/ic_media_pause"
+            android:icon="@drawable/ic_global_pause"
             android:title="@string/upload_action_global_upload_pause"
             app:showAsAction="always" />
     </group>

From 0e8ce86f76df934e4c52b739d4dad9b7c5698579 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Tue, 28 May 2024 16:33:04 +0000
Subject: [PATCH 2/3] Analysis: update lint results to reflect reduced
 error/warning count

Signed-off-by: github-actions <github-actions@github.com>
---
 scripts/analysis/lint-results.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt
index 9531ef5b26..e53927d3c7 100644
--- a/scripts/analysis/lint-results.txt
+++ b/scripts/analysis/lint-results.txt
@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 3 errors and 71 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 3 errors and 70 warnings</span>

From d6d36a7fdab636882f96f9d5482b5f16a6c0fd42 Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Thu, 30 May 2024 02:39:17 +0000
Subject: [PATCH 3/3] Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
---
 app/src/main/res/values-es-rMX/strings.xml | 1 +
 app/src/main/res/values-es-rSV/strings.xml | 1 +
 app/src/main/res/values-es/strings.xml     | 1 +
 app/src/main/res/values-et-rEE/strings.xml | 1 +
 app/src/main/res/values-eu/strings.xml     | 1 +
 app/src/main/res/values-fa/strings.xml     | 1 +
 app/src/main/res/values-fi-rFI/strings.xml | 1 +
 app/src/main/res/values-fr/strings.xml     | 1 +
 app/src/main/res/values-pt-rBR/strings.xml | 1 +
 9 files changed, 9 insertions(+)

diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
index c041dc0d27..88b17eda0b 100644
--- a/app/src/main/res/values-es-rMX/strings.xml
+++ b/app/src/main/res/values-es-rMX/strings.xml
@@ -200,6 +200,7 @@
     <string name="create">Crear</string>
     <string name="create_dir_fail_msg">No fue posible crear la carpeta</string>
     <string name="create_new">Nuevo</string>
+    <string name="create_new_folder">Carpeta nueva </string>
     <string name="create_rich_workspace">Añadir descripción de carpeta</string>
     <string name="credentials_disabled">Credenciales deshabilitadas</string>
     <string name="daily_backup">Respaldo diario</string>
diff --git a/app/src/main/res/values-es-rSV/strings.xml b/app/src/main/res/values-es-rSV/strings.xml
index 47f33c5b75..ef72d68604 100644
--- a/app/src/main/res/values-es-rSV/strings.xml
+++ b/app/src/main/res/values-es-rSV/strings.xml
@@ -128,6 +128,7 @@
     <string name="create">Crear</string>
     <string name="create_dir_fail_msg">No fue posible crear la carpeta</string>
     <string name="create_new">Nuevo</string>
+    <string name="create_new_folder">Carpeta nueva </string>
     <string name="delete_account">Cerrar sesión</string>
     <string name="deselect_all">Deseleccionar todo</string>
     <string name="dev_version_new_version_available">Nueva versión disponible</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 2fda068f84..428818d49f 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -210,6 +210,7 @@
     <string name="create_new_presentation">Nueva presentación</string>
     <string name="create_new_spreadsheet">Nueva hoja de cálculo</string>
     <string name="create_rich_workspace">Añadir descripción a carpeta</string>
+    <string name="creates_rich_workspace">Añade una descripción a la carpeta</string>
     <string name="credentials_disabled">Credenciales desactivadas</string>
     <string name="daily_backup">Copia de seguridad diaria</string>
     <string name="data_to_back_up">Datos a respaldar</string>
diff --git a/app/src/main/res/values-et-rEE/strings.xml b/app/src/main/res/values-et-rEE/strings.xml
index cb4d0acc2b..1b0a1f5d3c 100644
--- a/app/src/main/res/values-et-rEE/strings.xml
+++ b/app/src/main/res/values-et-rEE/strings.xml
@@ -158,6 +158,7 @@
     <string name="create_dir_fail_msg">Ei suuda kausta luua</string>
     <string name="create_new">Uus</string>
     <string name="create_new_document">Uus dokument</string>
+    <string name="create_new_folder">Uus kaust</string>
     <string name="create_new_presentation">Uus esitlus</string>
     <string name="create_new_spreadsheet">Uus arvutustabel</string>
     <string name="daily_backup">Igapäevane varundus</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 7636a36358..d0734f2605 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -206,6 +206,7 @@
     <string name="create_dir_fail_msg">Ezin izan da karpeta sortu</string>
     <string name="create_new">Berria</string>
     <string name="create_new_document">Dokumentu berria</string>
+    <string name="create_new_folder">Karpeta berria</string>
     <string name="create_new_presentation">Aurkezpen berria</string>
     <string name="create_new_spreadsheet">Kalkulu-orri berria</string>
     <string name="create_rich_workspace">Gehitu karpetaren deskribapena</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 963a5a904e..4811fba7ef 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -186,6 +186,7 @@
     <string name="create_dir_fail_msg">امکان ساخت پوشه وجود ندارد</string>
     <string name="create_new">جدید</string>
     <string name="create_new_document">سند جدید</string>
+    <string name="create_new_folder">پوشه جدید</string>
     <string name="create_new_presentation">ارائه جدید</string>
     <string name="create_new_spreadsheet">صفحهٔ گستردهٔ جدید</string>
     <string name="credentials_disabled">اعتبارنامه غیرفعال است</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index c2d6cf1199..6539589d2d 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -184,6 +184,7 @@
     <string name="create_dir_fail_msg">Kansion luominen ei onnistunut</string>
     <string name="create_new">Uusi</string>
     <string name="create_new_document">Uusi dokumentti</string>
+    <string name="create_new_folder">Uusi kansio</string>
     <string name="create_new_presentation">Uusi esitys</string>
     <string name="create_new_spreadsheet">Uusi laskentataulukko</string>
     <string name="create_rich_workspace">Lisään kansion kuvaus</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index f6170d5095..284c546ef6 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -206,6 +206,7 @@
     <string name="create_dir_fail_msg">Le dossier n\'a pas pu être créé</string>
     <string name="create_new">Nouveau</string>
     <string name="create_new_document">Nouveau document</string>
+    <string name="create_new_folder">Nouveau dossier</string>
     <string name="create_new_presentation">Nouvelle présentation</string>
     <string name="create_new_spreadsheet">Nouvelle feuille de calcul</string>
     <string name="create_rich_workspace">Ajouter la description du dossier</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 2547f61f4b..4d694bb0a3 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -210,6 +210,7 @@
     <string name="create_new_presentation">Nova apresentação</string>
     <string name="create_new_spreadsheet">Nova planilha</string>
     <string name="create_rich_workspace">Adicionar descrição da pasta</string>
+    <string name="creates_rich_workspace">Adiciona descrição da pasta</string>
     <string name="credentials_disabled">Credenciais desabilitadas</string>
     <string name="daily_backup">Backup diário </string>
     <string name="data_to_back_up">Dados para backup </string>