Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
tobiasKaminsky committed Dec 2, 2022
2 parents 980bb73 + cf2f86a commit 132db0a
Show file tree
Hide file tree
Showing 13 changed files with 64 additions and 2 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
## 3.23.0 (December 1, 2022)

- File actions menu redesign
- Allow adding shortcuts to Home screen (@newhinton)
- Many bugfixes and performance optimizations

Minimum: NC 16 Server, Android 6.0 Marshmallow

For a full list, please see https://github.com/nextcloud/android/milestone/74

## 3.22.3 (November 3, 2022)

- Bug fixes
Expand Down
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ android {

defaultConfig {
minSdkVersion 23
targetSdkVersion 32
targetSdkVersion 31

buildConfigField 'boolean', 'CI', ciBuild.toString()
buildConfigField 'boolean', 'RUNTIME_PERF_ANALYSIS', perfAnalysis.toString()
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@
<string name="end_to_end_encryption_folder_not_empty">هذا المجلد غير فارغ.</string>
<string name="end_to_end_encryption_generating_keys">جار توليد مفاتيح جديدة…</string>
<string name="end_to_end_encryption_keywords_description">12 كلمة سويةً تكون رقم سري قوّي جداً، تجعلك أنت فقط ترى وتستخدم ملفاتك المشفرة. أرجو كتابتها والإحتفاظ بها في مكانٍّ آمن.</string>
<string name="end_to_end_encryption_not_enabled">التشفير من طرف إلى طرف آخر معطل من الخادم.</string>
<string name="end_to_end_encryption_passphrase_title">إحفظ الـ12 كلمة السرية للتشفير</string>
<string name="end_to_end_encryption_password">كلمة السر…</string>
<string name="end_to_end_encryption_retrieving_keys">جارٍ جلب المفاتيح…</string>
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/values-b+en+001/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,7 @@
<string name="prefs_category_general">General</string>
<string name="prefs_category_more">More</string>
<string name="prefs_daily_backup_summary">Daily backup of your calendar &amp; contacts</string>
<string name="prefs_e2e_active">End-to-end encryption is set up!</string>
<string name="prefs_e2e_mnemonic">E2E mnemonic</string>
<string name="prefs_e2e_no_device_credentials">To show mnemonic please enable device credentials.</string>
<string name="prefs_enable_media_scan_notifications">Show media scan notifications</string>
Expand All @@ -562,6 +563,7 @@
<string name="prefs_instant_behaviour_title">Original file will be…</string>
<string name="prefs_instant_upload_path_use_subfolders_summary">Store in subfolders based on year and month</string>
<string name="prefs_instant_upload_path_use_subfolders_title">Use subfolders</string>
<string name="prefs_keys_exist">Add end-to-end encryption to this client</string>
<string name="prefs_license">License</string>
<string name="prefs_lock">App passcode</string>
<string name="prefs_lock_device_credentials_enabled">Device credentials enabled</string>
Expand All @@ -573,6 +575,7 @@
<string name="prefs_manage_accounts">Manage accounts</string>
<string name="prefs_recommend">Recommend to a friend</string>
<string name="prefs_remove_e2e">Remove encryption locally</string>
<string name="prefs_setup_e2e">Set up end-to-end encryption</string>
<string name="prefs_show_hidden_files">Show hidden files</string>
<string name="prefs_sourcecode">Get source code</string>
<string name="prefs_storage_path">Data storage folder</string>
Expand Down Expand Up @@ -600,6 +603,8 @@
<string name="reload">Reload</string>
<string name="remote">(remote)</string>
<string name="remote_file_fetch_failed">Failed to find file!</string>
<string name="remove_e2e">You can remove end-to-end encryption locally on this client</string>
<string name="remove_e2e_message">You can remove end-to-end encryption locally on this client. The encrypted files will remain on server, but will not be synced to this computer any longer.</string>
<string name="remove_fail_msg">Deletion failed</string>
<string name="remove_notification_failed">Failed to remove notification.</string>
<string name="remove_push_notification">Remove</string>
Expand Down Expand Up @@ -643,6 +648,7 @@
<string name="set_picture_as">Use picture as</string>
<string name="set_status">Set status</string>
<string name="set_status_message">Set status message</string>
<string name="setup_e2e">During setup of end-to-end encryption, you will receive a random 12 word mnemonic, which you will need to open your files on other devices. This will only be stored on this device, and can be shown again in this screen. Please note it down in a secure place!</string>
<string name="share">Share</string>
<string name="share_copy_link">Share &amp; Copy Link</string>
<string name="share_dialog_title">Sharing</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-bg-rBG/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@
<string name="end_to_end_encryption_folder_not_empty">Папката не е празна.</string>
<string name="end_to_end_encryption_generating_keys">Генериране на нови ключове...</string>
<string name="end_to_end_encryption_keywords_description">Всички 12 думи заедно правят много силна парола, позволявайки само Вие да преглеждате и използвате вашите криптирани файлове. Моля запишете я и я пазете на сигурно място.</string>
<string name="end_to_end_encryption_not_enabled">Криптиране End-to-end е забранено на сървъра.</string>
<string name="end_to_end_encryption_passphrase_title">Запишете паролата си за криптиране от 12 думи</string>
<string name="end_to_end_encryption_password">Парола…</string>
<string name="end_to_end_encryption_retrieving_keys">Извличане на ключове...</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-br/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@
<string name="end_to_end_encryption_folder_not_empty">N\'eo ket goullo an teuliad.</string>
<string name="end_to_end_encryption_generating_keys">O krouiñ un alc\'hwez nevez...</string>
<string name="end_to_end_encryption_keywords_description">Assamblez e vez krouet ur ger-tremen krev gant an 12 ger, aotrea ac\'hanoc\'h nemet ken da gwelet ha implij ar rouadennoù ha restroù sifret. Mar-plij, skrivit ha gouarnit anezha en ul lec\'h sur.</string>
<string name="end_to_end_encryption_not_enabled">Ar sifradur penn-kil-ha-troad disaotret war ar servijour.</string>
<string name="end_to_end_encryption_passphrase_title">Notennit ho frazenn-guzh sifrañ a 12 ger</string>
<string name="end_to_end_encryption_password">Ger-tremen</string>
<string name="end_to_end_encryption_retrieving_keys">O adtapout an alc\'hwaz...</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-ca/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@
<string name="end_to_end_encryption_folder_not_empty">Aquesta carpeta no és buida.</string>
<string name="end_to_end_encryption_generating_keys">S\'estan generant claus noves…</string>
<string name="end_to_end_encryption_keywords_description">Les 12 paraules juntes fan una contrasenya molt dificil, fent que només vos ho pugueu veure i fer servir els fitxers xifrats. Anoteu-la i deseu-la en un lloc segur.</string>
<string name="end_to_end_encryption_not_enabled">El xifrat de punta a punta està desactivat al servidor.</string>
<string name="end_to_end_encryption_passphrase_title">Anoteu la vostra contrasenya de 12 paraules</string>
<string name="end_to_end_encryption_password">Contrasenya…</string>
<string name="end_to_end_encryption_retrieving_keys">S\'estan recuperant les claus…</string>
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/values-cs-rCZ/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,7 @@
<string name="prefs_category_general">Obecné</string>
<string name="prefs_category_more">Více</string>
<string name="prefs_daily_backup_summary">Každodenní záloha vašeho kalendáře a kontaktů</string>
<string name="prefs_e2e_active">Šifrování mezi koncovými body je nastaveno!</string>
<string name="prefs_e2e_mnemonic">E2E mnemotechnické</string>
<string name="prefs_e2e_no_device_credentials">Pro zobrazení mnemotechnické, zapněte přihlašovací údaje zařízení.</string>
<string name="prefs_enable_media_scan_notifications">Zobrazit upozornění ze skenování médií</string>
Expand All @@ -562,6 +563,7 @@
<string name="prefs_instant_behaviour_title">Původní soubor bude…</string>
<string name="prefs_instant_upload_path_use_subfolders_summary">Ukládat v podsložkách podle roku a měsíce</string>
<string name="prefs_instant_upload_path_use_subfolders_title">Používat podsložky</string>
<string name="prefs_keys_exist">Přidat do tohoto klienta šifrování mezi koncovými body</string>
<string name="prefs_license">Licence</string>
<string name="prefs_lock">Přístupový kód aplikace</string>
<string name="prefs_lock_device_credentials_enabled">Přihlašovací údaje zařízení zapnuté</string>
Expand All @@ -573,6 +575,7 @@
<string name="prefs_manage_accounts">Spravovat účty</string>
<string name="prefs_recommend">Doporučit kamarádovi</string>
<string name="prefs_remove_e2e">Odebrat šifrování lokálně</string>
<string name="prefs_setup_e2e">Nastavit šifrování mezi koncovými body</string>
<string name="prefs_show_hidden_files">Zobrazit skryté soubory</string>
<string name="prefs_sourcecode">Získat zdrojové kódy</string>
<string name="prefs_storage_path">Složka úložiště</string>
Expand Down Expand Up @@ -600,6 +603,8 @@
<string name="reload">Načíst znovu</string>
<string name="remote">(vzdálené)</string>
<string name="remote_file_fetch_failed">Nepodařilo se najít soubor!</string>
<string name="remove_e2e">Na tomto klientovi je možné šifrování mezi koncovými body odebrat lokálně</string>
<string name="remove_e2e_message">Na tomto klientovi je možné odebrat šifrování mezi koncovými body. Šifrované soubory zůstanou na serveru, ale už nadále nebudou synchronizovány s tímto počítačem.</string>
<string name="remove_fail_msg">Odstranění se nezdařilo</string>
<string name="remove_notification_failed">Upozornění se nepodařilo odebrat.</string>
<string name="remove_push_notification">Odebrat</string>
Expand Down Expand Up @@ -643,6 +648,7 @@
<string name="set_picture_as">Použít obrázek jako</string>
<string name="set_status">Nastavit stav</string>
<string name="set_status_message">Nastavit stavovou zprávu</string>
<string name="setup_e2e">V průběhu nastavování šifrování mezi koncovými body obdržíte 12 slovnou mnemotechnickou frázi, které bude zapotřebí pro otevírání souborů na ostatních zařízeních. Ta bude uložena pouze na tomto zařízení a je možné ji na této obrazovce znovu zobrazit. Prosím poznamenejte si jí na bezpečné místo!</string>
<string name="share">Sdílet</string>
<string name="share_copy_link">Sdílet a zkopírovat odkaz</string>
<string name="share_dialog_title">Sdílení</string>
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,7 @@
<string name="prefs_category_general">Allgemein</string>
<string name="prefs_category_more">Mehr</string>
<string name="prefs_daily_backup_summary">Tägliche Sicherung Ihrer Kalender &amp; Kontakte</string>
<string name="prefs_e2e_active">Ende-zu-Ende-Verschlüsselung ist eingerichtet!</string>
<string name="prefs_e2e_mnemonic">E2E-Gedächtnisstütze</string>
<string name="prefs_e2e_no_device_credentials">Um die Gedächtnisstütze anzuzeigen, aktivieren Sie bitte Geräte-Zugangsdaten</string>
<string name="prefs_enable_media_scan_notifications">Benachrichtigungen der Mediensuche anzeigen</string>
Expand All @@ -562,6 +563,7 @@
<string name="prefs_instant_behaviour_title">Originaldatei wird…</string>
<string name="prefs_instant_upload_path_use_subfolders_summary">In Unterordnern speichern, basierend auf Jahr und Monat</string>
<string name="prefs_instant_upload_path_use_subfolders_title">Unterordner benutzen</string>
<string name="prefs_keys_exist">Diesem Client Ende-zu-Ende-Verschlüsselung hinzufügen</string>
<string name="prefs_license">Lizenz</string>
<string name="prefs_lock">App-PIN</string>
<string name="prefs_lock_device_credentials_enabled">Geräte-Anmeldedaten aktiviert</string>
Expand All @@ -573,6 +575,7 @@
<string name="prefs_manage_accounts">Konten verwalten</string>
<string name="prefs_recommend">Einem Freund empfehlen</string>
<string name="prefs_remove_e2e">Verschlüsselung lokal entfernen</string>
<string name="prefs_setup_e2e">Ende-zu-Ende-Verschlüsselung einrichten</string>
<string name="prefs_show_hidden_files">Versteckte Dateien anzeigen</string>
<string name="prefs_sourcecode">Zum Programmcode</string>
<string name="prefs_storage_path">Speicherordner</string>
Expand Down Expand Up @@ -600,6 +603,8 @@
<string name="reload">Neu laden</string>
<string name="remote">(entfernt)</string>
<string name="remote_file_fetch_failed">Datei nicht gefunden!</string>
<string name="remove_e2e">Sie können die Ende-zu-Ende-Verschlüsselung lokal auf diesem Client entfernen</string>
<string name="remove_e2e_message">Sie können die Ende-zu-Ende-Verschlüsselung lokal auf diesem Client entfernen. Die verschlüsselten Dateien bleiben auf dem Server, werden aber nicht mehr mit diesem Computer synchronisiert.</string>
<string name="remove_fail_msg">Löschung fehlgeschlagen</string>
<string name="remove_notification_failed">Entfernen der Benachrichtigungen fehlgeschlagen.</string>
<string name="remove_push_notification">Entfernen</string>
Expand Down Expand Up @@ -643,6 +648,7 @@
<string name="set_picture_as">Nutze Bild als</string>
<string name="set_status">Status setzen</string>
<string name="set_status_message">Statusnachricht setzen</string>
<string name="setup_e2e">Während der Einrichtung der Ende-zu-Ende-Verschlüsselung erhalten Sie eine zufällige 12-Wörter-Gedächtnisstütze, die Sie benötigen, um Ihre Dateien auf anderen Geräten zu öffnen. Diese wird nur auf diesem Gerät gespeichert und kann in diesem Bildschirm erneut angezeigt werden. Bitte notieren Sie es an einem sicheren Ort!</string>
<string name="share">Teilen</string>
<string name="share_copy_link">Teilen &amp; Link kopieren</string>
<string name="share_dialog_title">Teilen</string>
Expand Down
8 changes: 7 additions & 1 deletion app/src/main/res/values-hu-rHU/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@
<string name="end_to_end_encryption_folder_not_empty">Ez a mappa nem üres.</string>
<string name="end_to_end_encryption_generating_keys">Új kulcsok előállítása…</string>
<string name="end_to_end_encryption_keywords_description">A 12 szó együtt nagyon erős jelszót alkot, amivel megtekintheti és használhatja a titkosított fájljait. Kérjük írja le, és őrizze biztonságos helyen.</string>
<string name="end_to_end_encryption_not_enabled">A végpontok közötti titkosítás ki van kapcsolva a kiszolgálón.</string>
<string name="end_to_end_encryption_not_enabled">A végpontok közti titkosítás ki van kapcsolva a kiszolgálón.</string>
<string name="end_to_end_encryption_passphrase_title">Jegyezze fel a 12 szavas titkosítási kulcsát</string>
<string name="end_to_end_encryption_password">Jelszó…</string>
<string name="end_to_end_encryption_retrieving_keys">Kulcsok begyűjtése…</string>
Expand Down Expand Up @@ -551,6 +551,7 @@
<string name="prefs_category_general">Általános</string>
<string name="prefs_category_more">Több</string>
<string name="prefs_daily_backup_summary">Napi biztonsági mentés a naptáráról és a névjegyeiről</string>
<string name="prefs_e2e_active">A végpontok közti titkosítás beállítva!</string>
<string name="prefs_e2e_mnemonic">E2E mnemonikus kód</string>
<string name="prefs_e2e_no_device_credentials">A mnenomikus kód megjelenítéséhez engedélyezze az eszköz hitelesítését.</string>
<string name="prefs_enable_media_scan_notifications">Média keresési értesítések megjelenítése</string>
Expand All @@ -562,6 +563,7 @@
<string name="prefs_instant_behaviour_title">Az eredeti fájl…</string>
<string name="prefs_instant_upload_path_use_subfolders_summary">Tárolás év és hónap szerinti almappákban</string>
<string name="prefs_instant_upload_path_use_subfolders_title">Almappák használata</string>
<string name="prefs_keys_exist">Végpontok közti titkosítás hozzáadása ehhez a klienshez</string>
<string name="prefs_license">Licenc</string>
<string name="prefs_lock">Alkalmazás számkód</string>
<string name="prefs_lock_device_credentials_enabled">Eszközhitelesítő-adatok engedélyezve</string>
Expand All @@ -573,6 +575,7 @@
<string name="prefs_manage_accounts">Fiókok kezelése</string>
<string name="prefs_recommend">Ajánlás egy barátnak</string>
<string name="prefs_remove_e2e">Titkosítás eltávolítása helyileg</string>
<string name="prefs_setup_e2e">Végpontok közti titkosítás beállítása</string>
<string name="prefs_show_hidden_files">Rejtett fájlok megjelenítése</string>
<string name="prefs_sourcecode">Forráskód beszerzése</string>
<string name="prefs_storage_path">Adattároló mappa</string>
Expand Down Expand Up @@ -600,6 +603,8 @@
<string name="reload">Újratöltés</string>
<string name="remote">(távoli)</string>
<string name="remote_file_fetch_failed">A fájl nem található.</string>
<string name="remove_e2e">Helyileg eltávolíthatja a végpontok közti titkosítást ennél a kliensnél</string>
<string name="remove_e2e_message">Helyileg eltávolíthatja a végpontok közti titkosítást ennél a kliensnél. A titkosított fájlok továbbra is a kiszolgálón maradnak, de már nem lesznek szinkronizálva erre a számítógépre.</string>
<string name="remove_fail_msg">Törlés sikertelen</string>
<string name="remove_notification_failed">Az értesítés eltávolítása sikertelen.</string>
<string name="remove_push_notification">Eltávolítás</string>
Expand Down Expand Up @@ -643,6 +648,7 @@
<string name="set_picture_as">Kép használata mint</string>
<string name="set_status">Állapot beállítása</string>
<string name="set_status_message">Állapotüzenet beállítása</string>
<string name="setup_e2e">A végpontok közti titkosítás beállítása során kap egy 12 véletlenszerű szóból álló mnemonikus kódot, amelyre akkor lesz szüksége, ha más eszközökön akarja megnyitni a fájlokat. Ez csak ezen az eszközön lesz tárolva, és újra megjeleníthető ezen a képernyőn. Jegyezze le, és tárolja biztonságos helyen!</string>
<string name="share">Megosztás</string>
<string name="share_copy_link">Megosztás és hivatkozás másolása</string>
<string name="share_dialog_title">Megosztás</string>
Expand Down
Loading

0 comments on commit 132db0a

Please sign in to comment.