Merge branch 'master' into newAppBar

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 3.11.1 (April, 23, 2020)
+
+- Crash while browsing files
+- auto upload:
+ - fix wrong conflict detection on custom folder
+ - allow to choose default conflict strategy @fodinabor
+ - fix hanging UI after saving
+- open office files online if no local app installed
+
+For a full list, please see https://github.com/nextcloud/android/milestone/47
+
 ## 3.11.0 (March, 26, 2020)
 
 - not enough space dialog @Shagequi

build.gradle

@@ -311,7 +311,7 @@ dependencies {
     implementation 'org.greenrobot:eventbus:3.2.0'
     implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.6'
     implementation 'org.lukhnos:nnio:0.2'
-    implementation 'com.madgag.spongycastle:pkix:1.54.0.0'
+    implementation 'org.bouncycastle:bcpkix-jdk15on:1.65'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.afollestad:sectioned-recyclerview:0.5.0'
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'

lint.xml

@@ -7,7 +7,7 @@
     <issue id="InvalidPackage">
         <ignore path="**/freemarker-2.*.*.jar" />
         <ignore path="**/nnio-0.2.jar"/>
-        <ignore path="**/pkix-1.54.0.0.jar"/>
+        <ignore path="**/bcpkix-jdk15on-1.65.jar" />
     </issue>
 
     <issue id="UnusedResources">
@@ -44,4 +44,8 @@
         <ignore path="**/values-**/strings.xml" />
     </issue>
 
+    <issue id="TrustAllX509TrustManager">
+        <ignore path="**/bouncycastle/est/jcajce/*.class" />
+    </issue>
+
 </lint>

src/main/java/com/owncloud/android/utils/CsrHelper.java

@@ -1,21 +1,21 @@
 package com.owncloud.android.utils;
 
-import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.spongycastle.asn1.x500.X500Name;
-import org.spongycastle.asn1.x509.AlgorithmIdentifier;
-import org.spongycastle.asn1.x509.BasicConstraints;
-import org.spongycastle.asn1.x509.Extension;
-import org.spongycastle.asn1.x509.ExtensionsGenerator;
-import org.spongycastle.crypto.params.AsymmetricKeyParameter;
-import org.spongycastle.crypto.util.PrivateKeyFactory;
-import org.spongycastle.operator.ContentSigner;
-import org.spongycastle.operator.DefaultDigestAlgorithmIdentifierFinder;
-import org.spongycastle.operator.DefaultSignatureAlgorithmIdentifierFinder;
-import org.spongycastle.operator.OperatorCreationException;
-import org.spongycastle.operator.bc.BcRSAContentSignerBuilder;
-import org.spongycastle.pkcs.PKCS10CertificationRequest;
-import org.spongycastle.pkcs.PKCS10CertificationRequestBuilder;
-import org.spongycastle.pkcs.jcajce.JcaPKCS10CertificationRequestBuilder;
+import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.bouncycastle.asn1.x500.X500Name;
+import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
+import org.bouncycastle.asn1.x509.BasicConstraints;
+import org.bouncycastle.asn1.x509.Extension;
+import org.bouncycastle.asn1.x509.ExtensionsGenerator;
+import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
+import org.bouncycastle.crypto.util.PrivateKeyFactory;
+import org.bouncycastle.operator.ContentSigner;
+import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder;
+import org.bouncycastle.operator.DefaultSignatureAlgorithmIdentifierFinder;
+import org.bouncycastle.operator.OperatorCreationException;
+import org.bouncycastle.operator.bc.BcRSAContentSignerBuilder;
+import org.bouncycastle.pkcs.PKCS10CertificationRequest;
+import org.bouncycastle.pkcs.PKCS10CertificationRequestBuilder;
+import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequestBuilder;
 
 import java.io.IOException;
 import java.security.KeyPair;
@@ -25,7 +25,7 @@ import java.security.KeyPair;
  * https://github.com/awslabs/aws-sdk-android-samples/blob/master/CreateIotCertWithCSR/src/com/amazonaws/demo/csrcert/CsrHelper.java
  * accessed at 31.08.17
  * Original parts are licensed under the Apache License, Version 2.0: http://aws.amazon.com/apache2.0
- * Own parts are licensed unter GPLv3+.
+ * Own parts are licensed under GPLv3+.
  */
 
 public final class CsrHelper {
@@ -50,7 +50,7 @@ public final class CsrHelper {
         return "-----BEGIN CERTIFICATE REQUEST-----\n" + android.util.Base64.encodeToString(derCSR,
                 android.util.Base64.NO_WRAP) + "\n-----END CERTIFICATE REQUEST-----";
     }
-    
+
     /**
      * Create the certificate signing request (CSR) from private and public keys
      *
@@ -69,7 +69,7 @@ public final class CsrHelper {
         ContentSigner signer = new BcRSAContentSignerBuilder(signatureAlgorithm, digestAlgorithm).build(privateKey);
 
         PKCS10CertificationRequestBuilder csrBuilder = new JcaPKCS10CertificationRequestBuilder(new X500Name(principal),
-                keyPair.getPublic());
+                                                                                                keyPair.getPublic());
         ExtensionsGenerator extensionsGenerator = new ExtensionsGenerator();
         extensionsGenerator.addExtension(Extension.basicConstraints, true, new BasicConstraints(true));
         csrBuilder.addAttribute(PKCSObjectIdentifiers.pkcs_9_at_extensionRequest, extensionsGenerator.generate());

src/main/res/values-bg-rBG/strings.xml

@@ -141,6 +141,7 @@
     <string name="confirmation_remove_folders_alert">Наистина ли желаете избраните елементи и съдържанието им да бъдат премахнати?</string>
     <string name="confirmation_remove_local">Само локално</string>
     <string name="conflict_already_existing_file">Файла вече съществува</string>
+    <string name="conflict_dialog_error">Грешка при създаване на диалог за конфликт!</string>
     <string name="conflict_message_description">Ако изберете и двете версии, ще бъде добавен номер към името на локалния файл.</string>
     <string name="conflict_message_headline">Кои файлове желете да запазите?</string>
     <string name="conflict_new_file">Нов файл</string>
@@ -190,6 +191,7 @@
     <string name="disable_new_media_folder_detection_notifications">Изключване</string>
     <string name="dismiss">Отхвърляне</string>
     <string name="dismiss_notification_description">Спри известията</string>
+    <string name="download_latest_dev_version">Сваляне на най-новата dev версия</string>
     <string name="downloader_download_failed_content">%1$sне може да бъде изтеглен</string>
     <string name="downloader_download_failed_credentials_error">Неуспешно качване, нужно е да се впишете отново</string>
     <string name="downloader_download_failed_ticker">Изтеглянето е неуспешно.</string>
@@ -200,6 +202,7 @@
     <string name="downloader_download_succeeded_ticker">Изтеглено</string>
     <string name="downloader_not_downloaded_yet">Все още не е изтеглен</string>
     <string name="drawer_close">Затвори страничното меню</string>
+    <string name="drawer_community">Общност</string>
     <string name="drawer_current_account">Текущ профил</string>
     <string name="drawer_end_account">Последен профил</string>
     <string name="drawer_item_activities">Активност</string>
@@ -225,11 +228,21 @@
     <string name="edit_permission_label">редактиране</string>
     <string name="edit_rich_workspace">редактирай информацията за папката</string>
     <string name="encrypted">Включване на криптиране</string>
+    <string name="end_to_end_encryption_confirm_button">Настройки за криптиране</string>
+    <string name="end_to_end_encryption_decrypting">Декриптиране...</string>
     <string name="end_to_end_encryption_dialog_close">Затваряне</string>
+    <string name="end_to_end_encryption_enter_password">Моля въведете парола за декриптиране на личния ключ.</string>
     <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_not_supported">Криптирането работи само на KitKat(4.4) или по-висока версия.</string>
     <string name="end_to_end_encryption_password">Парола…</string>
+    <string name="end_to_end_encryption_retrieving_keys">Извличане на ключове...</string>
     <string name="end_to_end_encryption_storing_keys">Записване на ключовете</string>
+    <string name="end_to_end_encryption_title">Настройки за криптиране</string>
+    <string name="end_to_end_encryption_unsuccessful">Ключовете не могат да бъдат запазени, моля опитайте отново.</string>
+    <string name="end_to_end_encryption_wrong_password">Грешка при декриптиране. Грешна парола?</string>
     <string name="enter_filename">Въведете име на файла</string>
     <string name="error__upload__local_file_not_copied">%1$s не може да бъде копиран в локалната папка %2$s</string>
     <string name="error_cant_bind_to_operations_service">Критична грешка: операциите не могат да бъдат изпълнени</string>

src/main/res/values-ca/strings.xml

@@ -141,7 +141,11 @@
     <string name="confirmation_remove_folder_alert">Esteu segur que voleu suprimir %1$s i els seus continguts?</string>
     <string name="confirmation_remove_folders_alert">Esteu segur que voleu suprimir els elements seleccionats i el seu contingut?</string>
     <string name="confirmation_remove_local">Només local</string>
+    <string name="conflict_already_existing_file">Aquest fitxer ja existeix</string>
+    <string name="conflict_dialog_error">Error creant diàleg de conflicte!</string>
+    <string name="conflict_message_description">Si seleccioneu ambdues versions, s\'afegirà un numero al nom de la versió local.</string>
     <string name="conflict_message_headline">Quins fitxers voleu conservar?</string>
+    <string name="conflict_new_file">Nou fitxer</string>
     <string name="contaclist_restore_selected">Restaura els contactes seleccionats</string>
     <string name="contactlist_account_chooser_title">Escolliu un compte per a importar</string>
     <string name="contactlist_item_icon">Icona d\'usuari per a la llista de contactes</string>
@@ -165,11 +169,15 @@
     <string name="copy_move_to_encrypted_folder_not_supported">No hi ha suport actualment per copiar o moure a una carpeta xifrada.</string>
     <string name="copy_to">Copia a…</string>
     <string name="could_not_download_image">No s\'ha pogut descarregar la imatge completa</string>
+    <string name="could_not_retrieve_url">No s\'ha pogut recuperar la URL</string>
     <string name="create_dir_fail_msg">No s\'ha pogut crear la carpeta</string>
+    <string name="create_new">Crear nou</string>
     <string name="create_new_document">Crea un nou document</string>
     <string name="create_new_folder">Crea una nova carpeta</string>
     <string name="create_new_presentation">Crea una nova presentació</string>
     <string name="create_new_spreadsheet">Crea un nou full de càlcul</string>
+    <string name="create_rich_workspace">Afegir informació de carpeta</string>
+    <string name="creates_rich_workspace">crea informació de carpeta</string>
     <string name="credentials_disabled">Credencials desactivades</string>
     <string name="date_unknown">Desconegut</string>
     <string name="default_credentials_wrong">Credencials incorrectes</string>
@@ -220,6 +228,7 @@
     <string name="drawer_quota_unlimited">%1$s utilitzat</string>
     <string name="drawer_synced_folders">Càrrega automàtica</string>
     <string name="edit_permission_label">edita</string>
+    <string name="edit_rich_workspace">modificar informació de carpeta</string>
     <string name="encrypted">Activa el xifrat</string>
     <string name="end_to_end_encryption_confirm_button">Arranja el xifrat</string>
     <string name="end_to_end_encryption_decrypting">S\'està desxifrant…</string>
@@ -248,13 +257,24 @@
     <string name="error_retrieving_templates">S\'ha produït un error recuperant les plantilles</string>
     <string name="error_starting_direct_camera_upload">S\'ha produït un error iniciant la càmera</string>
     <string name="etm_accounts">Comptes</string>
+    <string name="etm_background_job_name">Nom de la tasca</string>
     <string name="etm_background_job_progress">Progrés</string>
+    <string name="etm_background_job_started">Iniciat</string>
+    <string name="etm_background_job_state">Estat</string>
+    <string name="etm_background_job_user">Usuari</string>
+    <string name="etm_background_job_uuid">UUID</string>
     <string name="etm_background_jobs">Tasques en segon pla</string>
+    <string name="etm_background_jobs_cancel_all">Cancel·lar totes les tasques</string>
+    <string name="etm_background_jobs_prune">Tallar les tasques inactives</string>
+    <string name="etm_background_jobs_start_test_job">Iniciar tasca de prova</string>
+    <string name="etm_background_jobs_stop_test_job">Aturar tasca de prova</string>
+    <string name="etm_migrations">Migracions (actualització d\'aplicació)</string>
     <string name="etm_preferences">Preferències</string>
     <string name="etm_title">Mode de proves d\'enginyeria</string>
     <string name="fab_label">Afegeix o carrega</string>
     <string name="failed_to_download">Ha fallat el lliurament del fitxer al gestor de descàrregues</string>
     <string name="failed_to_print">Ha fallat imprimir el fitxer</string>
+    <string name="failed_to_start_editor">Ha fallat l\'arrancada de l\'editor</string>
     <string name="fallback_weblogin_back">Enrere</string>
     <string name="fallback_weblogin_text">Revertiu l\'antic mètode d\'inici de sessió</string>
     <string name="favorite">Afegix a preferits</string>
@@ -352,8 +372,10 @@
     <string name="hint_password">Contrasenya</string>
     <string name="host_not_available">Els servidor no està disponible</string>
     <string name="host_your_own_server">Allotgeu el vostre propi servidor</string>
+    <string name="instant_upload_existing">També pujar fitxers existents</string>
     <string name="instant_upload_on_charging">Carrega només durant la càrrega de bateria</string>
     <string name="instant_upload_path">/CàrregaInstantània</string>
+    <string name="invalid_url">URL no vàlida</string>
     <string name="learn_more">Més informació</string>
     <string name="link">Enllaç</string>
     <string name="list_layout">Disposició llistada</string>
@@ -456,6 +478,11 @@
     <string name="pref_behaviour_entries_delete_file">suprimit</string>
     <string name="pref_behaviour_entries_keep_file">mantingut a la carpeta original</string>
     <string name="pref_behaviour_entries_move">mogut a la carpeta de l\'aplicació</string>
+    <string name="pref_instant_name_collision_policy_dialogTitle">Què s\'ha de fer si el fitxer ja existeix?</string>
+    <string name="pref_instant_name_collision_policy_entries_always_ask">Pregunta\'m cada cop</string>
+    <string name="pref_instant_name_collision_policy_entries_overwrite">Sobreescriure la versió remota</string>
+    <string name="pref_instant_name_collision_policy_entries_rename">Reanomenar la nova versió</string>
+    <string name="pref_instant_name_collision_policy_title">Què s\'ha de fer si el fitxer ja existeix?</string>
     <string name="prefs_add_account">Afegeix compte</string>
     <string name="prefs_calendar_contacts">Sincronitza el calendari i els contactes</string>
     <string name="prefs_calendar_contacts_address_resolve_error">L\'adreça del servidor per al compte no s\'ha pogut resoldre per DAVx5 (conegut anteriorment com a DAVdroid)</string>
@@ -497,6 +524,7 @@
     <string name="prefs_theme_title">Tema</string>
     <string name="prefs_value_theme_dark">Fosc</string>
     <string name="prefs_value_theme_light">Clar</string>
+    <string name="prefs_value_theme_system">Seguir al sistema</string>
     <string name="preview_image_description">Visualització prèvia d\'imatge</string>
     <string name="preview_image_error_no_local_file">No hi ha cap fitxer local per fer una vista prèvia</string>
     <string name="preview_image_error_unknown_format">No es pot mostrar la imatge</string>
@@ -528,6 +556,7 @@
     <string name="saml_authentication_wrong_pass">Contrasenya incorrecta</string>
     <string name="scanQR_description">Inicia la sessió via un codi QR</string>
     <string name="screenshot_01_gridView_heading">Protegint les vostres dades </string>
+    <string name="screenshot_01_gridView_subline">productivitat auto-hostatjada </string>
     <string name="screenshot_02_listView_heading">Explorar i compartir</string>
     <string name="screenshot_02_listView_subline">totes les accions als vostres dits</string>
     <string name="screenshot_03_drawer_heading">Activitat, comparticions, …</string>
@@ -556,6 +585,8 @@
     <string name="share_get_public_link_button">Obtén l\'enllaç</string>
     <string name="share_group_clarification">%1$s (grup)</string>
     <string name="share_internal_link">Compartir l\'enllaç intern</string>
+    <string name="share_internal_link_to_file_text">L\'enllaç de compartició intern només funciona per a usuaris amb permís d\'accés a aquest fitxer</string>
+    <string name="share_internal_link_to_folder_text">L\'enllaç de compartició intern només funciona per a usuaris amb permís d\'accés a aquesta carpeta</string>
     <string name="share_known_remote_clarification">%1$s (a %2$s)</string>
     <string name="share_link_empty_password">Heu d\'escriure una contrasenya</string>
     <string name="share_link_file_error">S\'ha produït un error mentre s\'intentava compartir aquest fitxer o carpeta</string>
@@ -656,15 +687,21 @@
     <string name="sync_fail_ticker">La sincronització ha fallat</string>
     <string name="sync_fail_ticker_unauthorized">La Sincronització ha fallat, torneu a iniciar la sessió</string>
     <string name="sync_file_nothing_to_do_msg">Contingut del fitxer ja sincronitzat</string>
+    <string name="sync_folder_failed_content">La sincronització de la carpeta %1$s podria no ser completa</string>
     <string name="sync_foreign_files_forgotten_explanation">A partir de la versió 1.3.16, els fitxers carregats des d\'un dispositiu es copien a la carpeta local %1$s per evitar la pèrdua de dades quan un únic fitxer es sincronitza entre múltiples comptes.\n\nA causa d\'aquest canvi, tots els fitxers carregats amb versions anteriors d\'aquesta aplicació s\'han copiat a la carpeta %2$s. Tot i així, un error ha impedit completar aquesta operació durant la sincronització de comptes. Podeu deixar el(s) fitxer(s) tal com està(n) i suprimir l\'enllaç a %3$s, o moure\'l(s) a la carpeta %1$s i conservar l\'enllaç cap a %4$s.\n\nA continuació es mostren el(s) fitxer(s) local(s) i el(s) remot(s) a %5$s, on hi estaven enllaçats.</string>
     <string name="sync_foreign_files_forgotten_ticker">S\'han oblidat alguns fitxers locals</string>
     <string name="sync_in_progress">S\'està obtenint la versió més recent del fitxer.</string>
+    <string name="sync_not_enough_space_dialog_action_choose">Escollir què sincronitzar</string>
+    <string name="sync_not_enough_space_dialog_action_free_space">Alliberar espai</string>
+    <string name="sync_not_enough_space_dialog_placeholder">%1$s és %2$s, però només hi ha %3$s disponible al dispositiu.</string>
+    <string name="sync_not_enough_space_dialog_title">No hi ha suficient espai</string>
     <string name="sync_status_button">Botó de l\'estat de la sincronització</string>
     <string name="sync_string_files">Fitxers</string>
     <string name="synced_folder_settings_button">Botó de paràmetres</string>
     <string name="synced_folders_configure_folders">Configureu les carpetes</string>
     <string name="synced_folders_loading_folders">S\'està carregant les carpetes…</string>
     <string name="synced_folders_new_info">La càrrega instantània s\'ha renovat completament. Torneu a configurar la vostra càrrega automàtica des de dins del menú principal.\n\nGaudiu de la nova càrrega automàtica amb més funcionalitats.</string>
+    <string name="synced_folders_no_results">No s\'han trobat carpetes multimèdia </string>
     <string name="synced_folders_preferences">Preferències de la càrrega automàtica</string>
     <string name="synced_folders_preferences_folder_path">Per %1$s</string>
     <string name="synced_folders_type">Tipus</string>
@@ -672,6 +709,8 @@
     <string name="tags">Etiquetes</string>
     <string name="test_server_button">Proveu la connexió amb el servidor</string>
     <string name="thumbnail">Miniatura</string>
+    <string name="thumbnail_for_existing_file_description">Miniatura pel fitxer existent</string>
+    <string name="thumbnail_for_new_file_desc">Miniatura pel nou fitxer</string>
     <string name="timeout_richDocuments">La càrrega triga molt…</string>
     <string name="trashbin_activity_title">Fitxers suprimits</string>
     <string name="trashbin_empty_headline">No hi ha cap fitxer suprimit</string>
@@ -707,9 +746,11 @@
     <string name="upload_list_delete">Eliminar</string>
     <string name="upload_list_empty_headline">No hi ha càrregues disponibles</string>
     <string name="upload_list_empty_text_auto_upload">Carregueu algun contingut o activeu la càrrega automàtica.</string>
+    <string name="upload_list_resolve_conflict">Resoldre conflicte</string>
     <string name="upload_local_storage_full">L\'emmagatzematge local és ple</string>
     <string name="upload_local_storage_not_copied">El fitxer no es pot copiar a l\'emmagatzematge local</string>
     <string name="upload_lock_failed">Ha fallat el blocatge de la carpeta</string>
+    <string name="upload_old_android">El xifratge només és possible amb &gt;= Android 5.0</string>
     <string name="upload_query_move_foreign_files">L\'espai insuficient evita la còpia dels fitxers seleccionats a la carpeta %1$s. Els hi voleu moure?</string>
     <string name="upload_sync_conflict">Conflicte de sincronització. Si us plau, resoleu manualment.</string>
     <string name="upload_unknown_error">Error desconegut</string>
@@ -725,6 +766,8 @@
     <string name="uploader_top_message">Escolliu la carpeta de càrrega</string>
     <string name="uploader_upload_failed_content_single">No s\'ha pogut pujar %1$s</string>
     <string name="uploader_upload_failed_credentials_error">La càrrega ha fallat, torneu a iniciar la sessió</string>
+    <string name="uploader_upload_failed_sync_conflict_error">Conflicte en pujar fitxer</string>
+    <string name="uploader_upload_failed_sync_conflict_error_content">Escollir quina versió conservar de %1$s</string>
     <string name="uploader_upload_failed_ticker">Ha fallat la pujada</string>
     <string name="uploader_upload_files_behaviour">Opció de càrrega:</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Mou al fitxer a la carpeta %1$s</string>
@@ -753,6 +796,7 @@
     <string name="uploads_view_upload_status_failed_localfile_error">No s\'ha trobat el fitxer local</string>
     <string name="uploads_view_upload_status_failed_permission_error">Error de permisos</string>
     <string name="uploads_view_upload_status_failed_ssl_certificate_not_trusted">Certificat de servidor no fiable</string>
+    <string name="uploads_view_upload_status_fetching_server_version">Obtenint la versió del servidor...</string>
     <string name="uploads_view_upload_status_service_interrupted">L\'aplicació s\'ha tancat</string>
     <string name="uploads_view_upload_status_succeeded">Completat</string>
     <string name="uploads_view_upload_status_unknown_fail">Error desconegut</string>

src/main/res/values-da/strings.xml

@@ -478,6 +478,11 @@
     <string name="pref_behaviour_entries_delete_file">Slettet</string>
     <string name="pref_behaviour_entries_keep_file">forblevet i oprindelig mappe</string>
     <string name="pref_behaviour_entries_move">Overført til app mappe</string>
+    <string name="pref_instant_name_collision_policy_dialogTitle">Hvad skal ske, hvis filen allerede findes?</string>
+    <string name="pref_instant_name_collision_policy_entries_always_ask">Spørg mig altid</string>
+    <string name="pref_instant_name_collision_policy_entries_overwrite">Overskriv fjerntliggende version</string>
+    <string name="pref_instant_name_collision_policy_entries_rename">Omdøb ny version</string>
+    <string name="pref_instant_name_collision_policy_title">Hvad skal ske, hvis filen allerede findes?</string>
     <string name="prefs_add_account">Tilføj konto</string>
     <string name="prefs_calendar_contacts">Synkroniser kalender &amp; kontakter</string>
     <string name="prefs_calendar_contacts_address_resolve_error">Server adressen for kontoen kunne ikke findes for DAVx5 (før kendt som DAVdroid)</string>

src/main/res/values-fa/strings.xml

@@ -142,6 +142,7 @@
     <string name="confirmation_remove_folders_alert">آیا واقعاً می خواهید موارد انتخاب شده و محتوای آنها حذف شود؟</string>
     <string name="confirmation_remove_local">فقط محلی</string>
     <string name="conflict_message_headline">کدام فایل ها را می خواهید نگه دارید ؟</string>
+    <string name="conflict_new_file">فایل جدید</string>
     <string name="contaclist_restore_selected">بازیابی مخاطبین انتخاب شده</string>
     <string name="contactlist_account_chooser_title">حساب را برای وارد کردن انتخاب کنید</string>
     <string name="contactlist_item_icon">آیکون کاربر برای لیست تماس</string>
@@ -253,6 +254,8 @@
     <string name="error_starting_direct_camera_upload">خطا در شروع دوربین</string>
     <string name="etm_accounts">حساب‌ها</string>
     <string name="etm_background_job_progress">پیش رفتن</string>
+    <string name="etm_background_job_state">وضعیت</string>
+    <string name="etm_background_job_user">کاربر</string>
     <string name="etm_background_jobs">کارهای پس زمینه</string>
     <string name="etm_preferences">اولویت ها</string>
     <string name="etm_title">حالت تست مهندسی</string>
@@ -359,6 +362,7 @@
     <string name="host_your_own_server">میزبان سرور خود</string>
     <string name="instant_upload_on_charging">فقط هنگامی که گوشی شارژ می شود آپلود کنید</string>
     <string name="instant_upload_path">آپلود فوری</string>
+    <string name="invalid_url">آدرس اینترنتی اشتباه</string>
     <string name="learn_more">بیشتر بدانید</string>
     <string name="link">Link</string>
     <string name="list_layout">Listed layout</string>

src/main/res/values-hu-rHU/strings.xml

@@ -478,6 +478,11 @@
     <string name="pref_behaviour_entries_delete_file">törölt</string>
     <string name="pref_behaviour_entries_keep_file">megtartva az eredeti mappában</string>
     <string name="pref_behaviour_entries_move">áthelyezve az alkalmazásmappába</string>
+    <string name="pref_instant_name_collision_policy_dialogTitle">Mit tegyen, ha a fájl már létezik?</string>
+    <string name="pref_instant_name_collision_policy_entries_always_ask">Kérdezzen rá mindig</string>
+    <string name="pref_instant_name_collision_policy_entries_overwrite">Távoli verzió felülírása</string>
+    <string name="pref_instant_name_collision_policy_entries_rename">Új verzió átnevezése</string>
+    <string name="pref_instant_name_collision_policy_title">Mit tegyen, ha a fájl már létezik?</string>
     <string name="prefs_add_account">Fiók hozzáadása</string>
     <string name="prefs_calendar_contacts">Naptár és névjegyek szinkronizálása</string>
     <string name="prefs_calendar_contacts_address_resolve_error">A fiók kiszolgálócíme nem oldható fel a DAVx5 (régi nevén DAVdroid) számára</string>

src/main/res/values-lt-rLT/strings.xml

@@ -385,7 +385,7 @@
     <string name="notification_icon">Pranešimo piktograma</string>
     <string name="notifications_loading_activity">Įkeliami pranešimai…</string>
     <string name="notifications_no_results_headline">Pranešimų nėra</string>
-    <string name="notifications_no_results_message">Prašome patikrinti vėliau</string>
+    <string name="notifications_no_results_message">Prašome patikrinti vėliau.</string>
     <string name="offline_mode">Nėra interneto ryšio</string>
     <string name="overflow_menu">Daugiau meniu</string>
     <string name="pass_code_configure_your_pass_code">Įveskite užraktą</string>

src/main/res/values-lv/strings.xml

@@ -43,6 +43,7 @@
     <string name="auth_check_server">Pārbaudīt serveri</string>
     <string name="auth_connection_established">Savienojums ir izveidots</string>
     <string name="auth_expired_basic_auth_toast">Lūdzu, ievadiet pašreizējo paroli</string>
+    <string name="auth_fail_get_user_name">Jūsu serveris neatgriež pareizu lietotāja ID, lūdzu, sazinieties ar administratoru</string>
     <string name="auth_host_address">Servera adrese</string>
     <string name="auth_host_url">Servera adrese https://…</string>
     <string name="auth_illegal_login_used">Nepareizs pierakstīšanās datu URL izmantots</string>
@@ -71,13 +72,22 @@
     <string name="auth_username">Lietotājvārds</string>
     <string name="auth_wrong_connection_title">Neizdevās izveidot savienojumu</string>
     <string name="auth_wtf_reenter_URL">Neparedzēts stāvoklis, lūdzu ievadiet servera adresi no jauna</string>
+    <string name="auto_upload_file_behaviour_kept_in_folder">glabāts oriģinālajā mapē, jo tā ir tikai lasāma</string>
     <string name="auto_upload_on_wifi">Augšupielādēt tikai neirobežotā Wi-Fi</string>
+    <string name="autoupload_configure">Konfigurē</string>
+    <string name="autoupload_create_new_custom_folder">Izveidot jaunu pielāgotu mapes iestatījumu</string>
+    <string name="autoupload_custom_folder">Pielāgotas mapes iestatīšana</string>
+    <string name="autoupload_disable_power_save_check">Atspējot enerģijas taupīšanas pārbaudi</string>
+    <string name="autoupload_hide_folder">Paslēpt mapi</string>
     <string name="avatar">Profila attēls</string>
     <string name="battery_optimization_close">Aizvērt</string>
     <string name="battery_optimization_disable">Deaktivēt</string>
+    <string name="battery_optimization_message">Jūsu ierīcē ir iespējota akumulatora optimizācija. Auto augšupielāde pareizi darbosies tikai tad, kad jūs lietotni izņemsiet no šīs opcijas.</string>
+    <string name="battery_optimization_title">Akumulatora optimizācija</string>
     <string name="certificate_load_problem">Radusies problēma, ielādējot sertifikātu.</string>
     <string name="choose_local_folder">Izvēlies lokālo mapi…</string>
     <string name="choose_remote_folder">Izvēlies attālināto mapi…</string>
+    <string name="clear_notifications_failed">Neizdevās notīrīt paziņojumus.</string>
     <string name="clipboard_label">Teksts kopēts no %1$s</string>
     <string name="clipboard_no_text_to_copy">Nav teksta, ko saglabāt starpliktuvē</string>
     <string name="clipboard_text_copied">Saite nokopēta</string>
@@ -116,14 +126,19 @@
     <string name="community_testing_headline">Palīdzi testējot</string>
     <string name="community_testing_report_text">Ziņojiet par problēmu Github</string>
     <string name="community_testing_version_text">Interesēts mums palīdzēt izmēģinot jauno testēšanas versiju?</string>
+    <string name="configure_new_media_folder_detection_notifications">Konfigurēt</string>
     <string name="confirmation_remove_file_alert">Vai tiešām vēlaties izdzēst %1$s?</string>
     <string name="confirmation_remove_files_alert">Vai tiešām vēlies dzēst izvēlētos objektus?</string>
     <string name="confirmation_remove_folder_alert">Vai tiešām vēlaties izdzēst %1$s un tā saturu?</string>
     <string name="confirmation_remove_folders_alert">Vai tiešām vēlies dzēst izvēlētos objektus un to saturu?</string>
     <string name="confirmation_remove_local">Tikai lokālos</string>
+    <string name="conflict_already_existing_file">Jau esošs fails</string>
+    <string name="conflict_dialog_error">Kļūda veidojot konfliktu dialogu!</string>
     <string name="conflict_message_headline">Kuras datnes vēlies paturēt?</string>
+    <string name="conflict_new_file">Jauns fails</string>
     <string name="contaclist_restore_selected">Atjaunot izvēlētos kontaktus</string>
     <string name="contactlist_account_chooser_title">Izvēlieties kontu importēšanai</string>
+    <string name="contactlist_item_icon">Lietotāja ikona kontaktpersonu sarakstam</string>
     <string name="contactlist_no_permission">Nav dota atļauja, importēšana neizdevās</string>
     <string name="contacts_automatic_backup">Automātiskā dublēšana</string>
     <string name="contacts_backup_button">Dublēt tagad</string>
@@ -133,23 +148,37 @@
     <string name="contacts_preferences_no_file_found">Datne nav atrasta</string>
     <string name="contacts_preferences_something_strange_happened">Nevarēja atrast pēdējo dublējumu!</string>
     <string name="contacts_read_permission">Vajadzīga atļauja lasīt kontaktu sarakstu</string>
+    <string name="copied_to_clipboard">Nokopēts starpliktuvē</string>
     <string name="copy_file_error">Radās kļūda, mēģinot kopēt šo datni vai mapi</string>
     <string name="copy_file_invalid_into_descendent">Nav iespējams kopēt mapi tās apakšmapē</string>
     <string name="copy_file_invalid_overwrite">Datne jau pastāv mērķa mapē</string>
     <string name="copy_file_not_found">Nevar nokopēt. Lūdzu, pārbaudiet, vai datne pastāv</string>
     <string name="copy_link">Kopēt saiti</string>
     <string name="copy_to">Kopēt uz…</string>
+    <string name="could_not_download_image">Nevarēja lejupielādēt pilnu attēlu</string>
+    <string name="could_not_retrieve_url">Neizdevās iegūt URL </string>
     <string name="create_dir_fail_msg">Nevarēja izveidot mapi</string>
+    <string name="create_new">Izveidot jaunu</string>
+    <string name="create_new_document">Izveidot jaunu dokumentu </string>
     <string name="create_new_folder">Izveidot jaunu mapi</string>
+    <string name="create_new_presentation">Izveidot jaunu prezentāciju</string>
+    <string name="create_new_spreadsheet">Izveidot jaunu izklājlapu</string>
+    <string name="create_rich_workspace">Pievienot mapes informāciju</string>
+    <string name="creates_rich_workspace">pievieno mapes informāciju</string>
     <string name="credentials_disabled">Akreditācijas dati atspējoti</string>
     <string name="date_unknown">Nezināms</string>
     <string name="default_credentials_wrong">Nepareizi akreditācijas dati</string>
     <string name="delete_account">Noņemt kontu</string>
     <string name="delete_account_warning">Noņemt kontu %s un izdzēst visas vietēji saglabātās datnes?\n\nDzēšanu nevar atsaukt.</string>
+    <string name="delete_entries">Dzēst ierakstus</string>
     <string name="deselect_all">Atcelt atzīmi</string>
+    <string name="dev_version_new_version_available">Pieejama jauna versija  </string>
+    <string name="dev_version_no_information_available">Informācija nav pieejama.</string>
+    <string name="dev_version_no_new_version_available">Jauna versija nav pieejama.</string>
     <string name="digest_algorithm_not_available">Šis algoritms nav pieejams jūsu tālrunī.</string>
     <string name="disable_new_media_folder_detection_notifications">Deaktivēt</string>
     <string name="dismiss">Atmest</string>
+    <string name="dismiss_notification_description">Noraidīt paziņojumu</string>
     <string name="downloader_download_failed_content">Nevarēja lejupielādēt %1$s</string>
     <string name="downloader_download_failed_credentials_error">Lejupielāde neizdevās, piesakieties vēlreiz.</string>
     <string name="downloader_download_failed_ticker">Neizdevās lejupielādēt</string>
@@ -160,6 +189,7 @@
     <string name="downloader_download_succeeded_ticker">Lejupielādēts</string>
     <string name="downloader_not_downloaded_yet">Vēl nav lejupielādēts</string>
     <string name="drawer_close">Aizvērt malu</string>
+    <string name="drawer_community">Kopiena</string>
     <string name="drawer_current_account">Pašreizējais konts</string>
     <string name="drawer_end_account">Pēdējais konts</string>
     <string name="drawer_item_activities">Darbības</string>

src/main/res/values-nl/strings.xml

@@ -142,8 +142,8 @@
     <string name="confirmation_remove_folders_alert">Wil je de geselecteerde objecten en hun inhoud echt verwijderen?</string>
     <string name="confirmation_remove_local">Alleen lokaal</string>
     <string name="conflict_already_existing_file">Al bestaand bestand</string>
-    <string name="conflict_dialog_error">Fout bij het maken van conflict dialoog!</string>
-    <string name="conflict_message_description">Als je beide versies selecteerde, zal het lokale bestand een nummer aan de naam toegevoegd krijgen.</string>
+    <string name="conflict_dialog_error">Fout bij het maken van conflictdialoog!</string>
+    <string name="conflict_message_description">Als je beide versies selecteert, zal het lokale bestand een nummer aan de naam toegevoegd krijgen.</string>
     <string name="conflict_message_headline">Welke bestanden wil je bewaren?</string>
     <string name="conflict_new_file">Nieuw bestand</string>
     <string name="contaclist_restore_selected">Herstel de geselecteerde contactpersonen</string>
@@ -171,13 +171,13 @@
     <string name="could_not_download_image">Kan de volledige afbeelding niet downloaden</string>
     <string name="could_not_retrieve_url">Kon URL niet ophalen</string>
     <string name="create_dir_fail_msg">Kan map niet aanmaken</string>
-    <string name="create_new">Creëer nieuw</string>
+    <string name="create_new">Maak nieuw</string>
     <string name="create_new_document">Creëer nieuw document</string>
     <string name="create_new_folder">Nieuwe map aanmaken</string>
     <string name="create_new_presentation">Creëer nieuwe presentatie</string>
     <string name="create_new_spreadsheet">Creëren nieuw werkblad</string>
     <string name="create_rich_workspace">Toevoegen mapinfo</string>
-    <string name="creates_rich_workspace">creëert mapinfo</string>
+    <string name="creates_rich_workspace">maakt mapinfo</string>
     <string name="credentials_disabled">Inloggegevens uitgeschakeld</string>
     <string name="date_unknown">Onbekend</string>
     <string name="default_credentials_wrong">Ongeldige inloggegevens</string>
@@ -257,17 +257,17 @@
     <string name="error_retrieving_templates">Fout bij ophalen sjablonen</string>
     <string name="error_starting_direct_camera_upload">Fout bij starten camera</string>
     <string name="etm_accounts">Accounts</string>
-    <string name="etm_background_job_name">Job naam</string>
+    <string name="etm_background_job_name">Taaknaam</string>
     <string name="etm_background_job_progress">Voortgang</string>
     <string name="etm_background_job_started">Gestart</string>
-    <string name="etm_background_job_state">Staat</string>
+    <string name="etm_background_job_state">Status</string>
     <string name="etm_background_job_user">Gebruiker</string>
     <string name="etm_background_job_uuid">UUID</string>
     <string name="etm_background_jobs">Achtergrondtaken</string>
-    <string name="etm_background_jobs_cancel_all">Annuleer alle jobs</string>
+    <string name="etm_background_jobs_cancel_all">Annuleer alle taken</string>
     <string name="etm_background_jobs_prune">Inactieve taken opruimen</string>
-    <string name="etm_background_jobs_start_test_job">Start Test Job</string>
-    <string name="etm_background_jobs_stop_test_job">Stop Test Job</string>
+    <string name="etm_background_jobs_start_test_job">Start testtaak</string>
+    <string name="etm_background_jobs_stop_test_job">Stop testtaak</string>
     <string name="etm_migrations">Migratie (app upgrade)</string>
     <string name="etm_preferences">Voorkeuren</string>
     <string name="etm_title">Engineering Testmodus</string>
@@ -478,6 +478,11 @@
     <string name="pref_behaviour_entries_delete_file">verwijderd worden</string>
     <string name="pref_behaviour_entries_keep_file">bewaard worden in originele map</string>
     <string name="pref_behaviour_entries_move">verplaatst worden naar app-map</string>
+    <string name="pref_instant_name_collision_policy_dialogTitle">Wat als het bestand al bestaat?</string>
+    <string name="pref_instant_name_collision_policy_entries_always_ask">Vraag me elke keer</string>
+    <string name="pref_instant_name_collision_policy_entries_overwrite">Overschrijven </string>
+    <string name="pref_instant_name_collision_policy_entries_rename">Hernoem nieuwe versie</string>
+    <string name="pref_instant_name_collision_policy_title">Wat als het bestand al bestaat?</string>
     <string name="prefs_add_account">Account toevoegen</string>
     <string name="prefs_calendar_contacts">Synchroniseren agenda &amp; contactpersonen</string>
     <string name="prefs_calendar_contacts_address_resolve_error">Serveradres voor deze account kon nicht gevonden worden voor DAVx5 (vroeger bekend als DAVdroid)</string>
@@ -551,7 +556,7 @@
     <string name="saml_authentication_wrong_pass">Onjuist wachtwoord</string>
     <string name="scanQR_description">Inloggen via QR code</string>
     <string name="screenshot_01_gridView_heading">Beschermt jouw gegevens</string>
-    <string name="screenshot_01_gridView_subline">eigen-hosting productiviteit</string>
+    <string name="screenshot_01_gridView_subline">self-hosting productiviteit</string>
     <string name="screenshot_02_listView_heading">Blader en deel</string>
     <string name="screenshot_02_listView_subline">alle taken onder je vindertoppen</string>
     <string name="screenshot_03_drawer_heading">Activiteiten, delen, ...</string>

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

@@ -285,6 +285,7 @@
     <string name="file_list_empty_headline_server_search_photos">Жодного фото</string>
     <string name="file_list_empty_headline_server_search_videos">Жодного відеофайлу</string>
     <string name="file_list_empty_moving">Нічого немає. Ви можете додати теку.</string>
+    <string name="file_list_empty_recently_added">Не знайдено нещодавно доданих файлів</string>
     <string name="file_list_empty_recently_added_filter">Нещодавно додані файли відсутні</string>
     <string name="file_list_empty_recently_modified">Відсутні зміни серед файлів за останні 7 днів</string>
     <string name="file_list_empty_recently_modified_filter">Жодного зміненого файлу за останні 7 днів.</string>
@@ -293,21 +294,37 @@
     <string name="file_list_empty_shared_headline">Жодного спільного файлу</string>
     <string name="file_list_empty_text_photos">Завантажити фотографії чи активувати автозавантаження</string>
     <string name="file_list_empty_text_photos_filter">Немає фотографій.</string>
+    <string name="file_list_empty_text_videos">Додайте файли з відео або увімкніть автоматичне завантаження.</string>
     <string name="file_list_empty_text_videos_filter">Немає відеозаписів.</string>
     <string name="file_list_folder">тека</string>
     <string name="file_list_loading">Завантаження…</string>
     <string name="file_list_no_app_for_file_type">Відсутній застосунок для відкриття файлу такого типу.</string>
     <string name="file_list_seconds_ago">секунди тому</string>
+    <string name="file_migration_checking_destination">Перевірка місця призначення...</string>
     <string name="file_migration_cleaning">Очищення...</string>
+    <string name="file_migration_dialog_title">Оновлення місця збереження</string>
+    <string name="file_migration_directory_already_exists">Тека з даними вже існує. Виберіть одну з таких:</string>
+    <string name="file_migration_failed_dir_already_exists">Тека Nextcloud вже існує</string>
     <string name="file_migration_failed_not_enough_space">Потрібно більше місця</string>
+    <string name="file_migration_failed_not_readable">Неможливо прочитати вихідний файл</string>
+    <string name="file_migration_failed_not_writable">Неможливо записати до файлу призначення</string>
+    <string name="file_migration_failed_while_coping">Помилка під час міграції</string>
+    <string name="file_migration_failed_while_updating_index">Неможливо оновити індекс</string>
     <string name="file_migration_migrating">Переміщення даних…</string>
     <string name="file_migration_ok_finished">Завершено</string>
     <string name="file_migration_override_data_folder">Замінити</string>
+    <string name="file_migration_preparing">Підготовка до міграції</string>
+    <string name="file_migration_restoring_accounts_configuration">Відновлення налаштувань облікового запису...</string>
+    <string name="file_migration_saving_accounts_configuration">Збереження налаштувань облікового запису...</string>
+    <string name="file_migration_source_not_readable_title">Неможливо прочитати вихідну теку!</string>
     <string name="file_migration_updating_index">Оновлення індексу...</string>
     <string name="file_migration_use_data_folder">Використовувати</string>
     <string name="file_migration_waiting_for_unfinished_sync">Очікування повної синхронізації…</string>
     <string name="file_not_found">Файл не знайдено</string>
+    <string name="file_not_synced">Неможливо синхронізувати файл. Буде показано останню доступну версію.</string>
     <string name="file_rename">Перейменувати</string>
+    <string name="file_version_restored_error">Помилка під час відновлення версії файлу!</string>
+    <string name="file_version_restored_successfully">Успішно відновлено версію файлу.</string>
     <string name="filedetails_download">Завантажити</string>
     <string name="filedetails_renamed_in_upload_msg">Під час завантаження назву файлу було змінено %1$s</string>
     <string name="filedetails_sync_file">Синхронізація</string>
@@ -336,6 +353,8 @@
     <string name="host_not_available">Сервер недоступний</string>
     <string name="instant_upload_on_charging">Завантаження тільки під час заряджання</string>
     <string name="instant_upload_path">/InstantUpload</string>
+    <string name="invalid_url">Неправильний URL</string>
+    <string name="learn_more">Дізнатися більше</string>
     <string name="link">Посилання</string>
     <string name="local_file_list_empty">В цій теці немає файлів.</string>
     <string name="local_folder_list_empty">Тут відсутні інші каталоги.</string>
@@ -344,10 +363,13 @@
     <string name="logs_menu_refresh">Оновити</string>
     <string name="logs_status_loading">Завантаження…</string>
     <string name="logs_title">Журнали</string>
+    <string name="maintenance_mode">Сервер у режимі обслуговування</string>
     <string name="manage_space_clear_data">Очистити дані</string>
     <string name="manage_space_title">Керувати простором</string>
+    <string name="media_err_invalid_progressive_playback">Неможливо транслювати мультимедійний файл</string>
     <string name="media_err_io">Неможливо відкрити мультимедійний файл</string>
     <string name="media_err_malformed">Мультимедійний файл має неправильно кодування</string>
+    <string name="media_err_timeout">Час на відтворення файлу вичерпано</string>
     <string name="media_err_unsupported">Кодек не підтримується</string>
     <string name="media_forward_description">Перемотка вперед</string>
     <string name="media_notif_ticker">%1$s музичний програвач</string>