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

This commit is contained in:
Tobias Kaminsky 2024-05-31 02:31:22 +02:00
commit f64024b541
13 changed files with 46 additions and 3 deletions

View file

@ -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);
}

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>