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

app/build.gradle

@@ -281,7 +281,7 @@ dependencies {
     implementation 'org.apache.jackrabbit:jackrabbit-webdav:2.13.5' // remove after entire switch to lib v2
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'com.google.android.material:material:1.12.0'
     implementation 'com.jakewharton:disklrucache:2.0.2'
     implementation "androidx.appcompat:appcompat:$appCompatVersion"
     implementation 'androidx.webkit:webkit:1.11.0'
@@ -429,7 +429,7 @@ dependencies {
 configurations.configureEach {
     resolutionStrategy {
         cacheChangingModulesFor 0, 'seconds'
-        force 'org.objenesis:objenesis:3.3'
+        force 'org.objenesis:objenesis:3.4'
         eachDependency { details ->
             if ('org.jacoco' == details.requested.group) {
                 details.useVersion "$jacoco_version"

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

@@ -321,6 +321,7 @@
     <string name="error_showing_encryption_dialog">خطأ في عرض حوار تجهيز التشفير</string>
     <string name="error_starting_direct_camera_upload">خطأ في تشغيل الكاميرا</string>
     <string name="error_starting_doc_scan">خطأ في بدء مسح المستند</string>
+    <string name="error_uploading_direct_camera_upload">تعذّر تحميل الوسائط المأخوذة</string>
     <string name="etm_accounts">الحسابات</string>
     <string name="etm_background_execution_count">أوقات التشغيل خلال 48 ساعة</string>
     <string name="etm_background_job_created">أُنشِئَ</string>
@@ -929,7 +930,10 @@
     <string name="upload_cannot_create_file">لا يمكن إنشاء ملف محلي</string>
     <string name="upload_chooser_title">الرفع من…</string>
     <string name="upload_content_from_other_apps">تحميل محتوى من تطبيقات أخرى</string>
+    <string name="upload_direct_camera_photo">الصِّوَر</string>
+    <string name="upload_direct_camera_promt">هل ترغب في التقاط صورة أو فيديو؟</string>
     <string name="upload_direct_camera_upload">حمّل مِن آلة التصوير</string>
+    <string name="upload_direct_camera_video">الفيديو</string>
     <string name="upload_file_dialog_filename">اسم الملف</string>
     <string name="upload_file_dialog_filetype">نوع الملف</string>
     <string name="upload_file_dialog_filetype_googlemap_shortcut">ملف اختصار خرائط Google (%s)</string>

app/src/main/res/values-b+en+001/strings.xml

@@ -321,6 +321,7 @@
     <string name="error_showing_encryption_dialog">Error showing encryption setup dialogue!</string>
     <string name="error_starting_direct_camera_upload">Error starting camera</string>
     <string name="error_starting_doc_scan">Error starting document scan</string>
+    <string name="error_uploading_direct_camera_upload">Failed to upload taken media</string>
     <string name="etm_accounts">Accounts</string>
     <string name="etm_background_execution_count">Times run in 48h</string>
     <string name="etm_background_job_created">Created</string>
@@ -903,11 +904,10 @@
     <string name="upload_cannot_create_file">Cannot create local file</string>
     <string name="upload_chooser_title">Upload from…</string>
     <string name="upload_content_from_other_apps">Upload content from other apps</string>
-    <string name="upload_direct_camera_upload">Upload from camera</string>
-    <string name="upload_direct_camera_promt">Do you want to take a photo or video?</string>
     <string name="upload_direct_camera_photo">Photo</string>
+    <string name="upload_direct_camera_promt">Do you want to take a photo or video?</string>
+    <string name="upload_direct_camera_upload">Upload from camera</string>
     <string name="upload_direct_camera_video">Video</string>
-    <string name="error_uploading_direct_camera_upload">Failed to upload taken media</string>
     <string name="upload_file_dialog_filename">Filename</string>
     <string name="upload_file_dialog_filetype">Filetype</string>
     <string name="upload_file_dialog_filetype_googlemap_shortcut">Google Maps shortcut file(%s)</string>

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

@@ -865,6 +865,7 @@ Enheds legitimationsoplysninger er sat op
     <string name="upload_cannot_create_file">Kan ikke oprette filen lokalt</string>
     <string name="upload_chooser_title">Sender fra...</string>
     <string name="upload_content_from_other_apps">Send indhold fra andre apps</string>
+    <string name="upload_direct_camera_photo">Foto</string>
     <string name="upload_direct_camera_upload">Send fra kamera</string>
     <string name="upload_file_dialog_filename">Filnavn</string>
     <string name="upload_file_dialog_filetype">Filtype</string>

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

@@ -321,6 +321,7 @@
     <string name="error_showing_encryption_dialog">Fehler beim Anzeigen des Setup-Dialogs für Verschlüsselung!</string>
     <string name="error_starting_direct_camera_upload">Fehler beim Starten der Kamera</string>
     <string name="error_starting_doc_scan">Start des Dokumentenscans fehlgeschlagen</string>
+    <string name="error_uploading_direct_camera_upload">Fehler beim Hochladen aufgenommener Medien</string>
     <string name="etm_accounts">Konten</string>
     <string name="etm_background_execution_count">Zeit gelaufen in 48 Stunden</string>
     <string name="etm_background_job_created">Erzeugt</string>
@@ -903,11 +904,10 @@
     <string name="upload_cannot_create_file">Datei kann lokal nicht erstellt werden</string>
     <string name="upload_chooser_title">Dateien hochladen von…</string>
     <string name="upload_content_from_other_apps">Inhalt anderer Apps hochladen</string>
-    <string name="upload_direct_camera_upload">Von Kamera hochladen</string>
-    <string name="upload_direct_camera_promt">Möchten Sie ein Foto oder Video aufnehmen?</string>
     <string name="upload_direct_camera_photo">Foto</string>
+    <string name="upload_direct_camera_promt">Möchten Sie ein Foto oder ein Video aufnehmen?</string>
+    <string name="upload_direct_camera_upload">Von Kamera hochladen</string>
     <string name="upload_direct_camera_video">Video</string>
-    <string name="error_uploading_direct_camera_upload">Hochladen von Medien fehlgeschlagen</string>
     <string name="upload_file_dialog_filename">Dateiname</string>
     <string name="upload_file_dialog_filetype">Dateityp</string>
     <string name="upload_file_dialog_filetype_googlemap_shortcut">Google Maps Abkürzungs-Datei (%s)</string>

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

@@ -809,6 +809,7 @@
     <string name="upload_cannot_create_file">Αδυναμία δημιουργίας τοπικού αρχείου</string>
     <string name="upload_chooser_title">Μεταφόρτωση από…</string>
     <string name="upload_content_from_other_apps">Μεταφόρτωση περιεχομένου από άλλες εφαρμογές</string>
+    <string name="upload_direct_camera_photo">Φωτογραφία</string>
     <string name="upload_direct_camera_upload">Μεταφόρτωση από την φωτογραφική μηχανή</string>
     <string name="upload_file_dialog_filename">Όνομα αρχείου</string>
     <string name="upload_file_dialog_filetype">Τύπος αρχείου</string>

app/src/main/res/values-es-rDO/strings.xml

@@ -474,6 +474,7 @@
     <string name="upload_action_failed_retry">Reintentar cargas fallidas</string>
     <string name="upload_chooser_title">Cargar forma…</string>
     <string name="upload_content_from_other_apps">Cargar contenido de otras aplicaciones</string>
+    <string name="upload_direct_camera_photo">Foto</string>
     <string name="upload_file_dialog_filename">Nombre de archivo</string>
     <string name="upload_file_dialog_filetype">Tipo de archivo</string>
     <string name="upload_file_dialog_filetype_googlemap_shortcut">Archivo de acceso directo a Google Maps(%s)</string>

app/src/main/res/values-es-rEC/strings.xml

@@ -814,6 +814,7 @@
     <string name="upload_cannot_create_file">No se puede crear el archivo local</string>
     <string name="upload_chooser_title">Cargar forma…</string>
     <string name="upload_content_from_other_apps">Cargar contenido de otras aplicaciones</string>
+    <string name="upload_direct_camera_photo">Foto</string>
     <string name="upload_direct_camera_upload">Cargar desde la cámara</string>
     <string name="upload_file_dialog_filename">Nombre de archivo</string>
     <string name="upload_file_dialog_filetype">Tipo de archivo</string>

app/src/main/res/values-es-rGT/strings.xml

@@ -459,6 +459,7 @@
     <string name="upload_action_failed_retry">Reintentar cargas fallidas</string>
     <string name="upload_chooser_title">Cargar forma…</string>
     <string name="upload_content_from_other_apps">Cargar contenido de otras aplicaciones</string>
+    <string name="upload_direct_camera_photo">Foto</string>
     <string name="upload_file_dialog_filename">Nombre de archivo</string>
     <string name="upload_file_dialog_filetype">Tipo de archivo</string>
     <string name="upload_file_dialog_filetype_googlemap_shortcut">Archivo de acceso directo a Google Maps(%s)</string>

app/src/main/res/values-es-rSV/strings.xml

@@ -459,6 +459,7 @@
     <string name="upload_action_failed_retry">Reintentar cargas fallidas</string>
     <string name="upload_chooser_title">Cargar forma…</string>
     <string name="upload_content_from_other_apps">Cargar contenido de otras aplicaciones</string>
+    <string name="upload_direct_camera_photo">Foto</string>
     <string name="upload_file_dialog_filename">Nombre de archivo</string>
     <string name="upload_file_dialog_filetype">Tipo de archivo</string>
     <string name="upload_file_dialog_filetype_googlemap_shortcut">Archivo de acceso directo a Google Maps(%s)</string>

app/src/main/res/values-et-rEE/strings.xml

@@ -450,6 +450,7 @@
     <string name="upload_action_failed_retry">Proovi ebaõnnestunud üleslaadimisi uuesti</string>
     <string name="upload_cannot_create_file">Kohalike faili loomine ebaõnnestus</string>
     <string name="upload_content_from_other_apps">Lae üles sisu teistest rakendustest</string>
+    <string name="upload_direct_camera_photo">Foto</string>
     <string name="upload_direct_camera_upload">Laadi üles kaamerast</string>
     <string name="upload_file_dialog_filename">Faili nimi</string>
     <string name="upload_files">Failide üleslaadimine</string>

app/src/main/res/values-fi-rFI/strings.xml

@@ -824,6 +824,7 @@ GNU yleinen lisenssi, versio 2</string>
     <string name="upload_cannot_create_file">Paikallista tiedostoa ei voi luoda</string>
     <string name="upload_chooser_title">Lähetä…</string>
     <string name="upload_content_from_other_apps">Lähetä sisältöä toisista sovelluksista</string>
+    <string name="upload_direct_camera_photo">Kuva</string>
     <string name="upload_direct_camera_upload">Lähetä kamerasta</string>
     <string name="upload_file_dialog_filename">Tiedostonimi</string>
     <string name="upload_file_dialog_filetype">Tiedostotyyppi</string>

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

@@ -321,6 +321,7 @@
     <string name="error_showing_encryption_dialog">Earráid agus dialóg socraithe criptithe á taispeáint!</string>
     <string name="error_starting_direct_camera_upload">Earráid agus ceamara á thosú</string>
     <string name="error_starting_doc_scan">Earráid agus scanadh doiciméad á thosú</string>
+    <string name="error_uploading_direct_camera_upload">Theip ar uaslódáil na meán glactha</string>
     <string name="etm_accounts">Cuntais</string>
     <string name="etm_background_execution_count">Ritheann amanna i 48h</string>
     <string name="etm_background_job_created">Cruthaithe</string>
@@ -903,7 +904,10 @@
     <string name="upload_cannot_create_file">Ní féidir comhad áitiúil a chruthú</string>
     <string name="upload_chooser_title">Uaslódáil ó…</string>
     <string name="upload_content_from_other_apps">Uaslódáil ábhar ó apps eile</string>
+    <string name="upload_direct_camera_photo">Grianghraf</string>
+    <string name="upload_direct_camera_promt">Ar mhaith leat grianghraf nó físeán a ghlacadh?</string>
     <string name="upload_direct_camera_upload">Íosluchtaigh ó ceamara</string>
+    <string name="upload_direct_camera_video">Físeán</string>
     <string name="upload_file_dialog_filename">Ainm comhaid</string>
     <string name="upload_file_dialog_filetype">Cineál comhaid</string>
     <string name="upload_file_dialog_filetype_googlemap_shortcut">Comhad aicearra Google Maps(%s)</string>

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

@@ -321,6 +321,7 @@
     <string name="error_showing_encryption_dialog">Produciuse un erro ao amosar o diálogo de configuración do cifrado!</string>
     <string name="error_starting_direct_camera_upload">Produciuse un erro ao iniciar a cámara</string>
     <string name="error_starting_doc_scan">Produciuse un erro ao iniciar o escaneamento do documento</string>
+    <string name="error_uploading_direct_camera_upload">Produciuse un fallo ao cargar os medios tomados</string>
     <string name="etm_accounts">Contas</string>
     <string name="etm_background_execution_count">Veces executado en 48h</string>
     <string name="etm_background_job_created">Creado</string>
@@ -904,7 +905,10 @@
     <string name="upload_cannot_create_file">Non é posíbel crear o ficheiro local</string>
     <string name="upload_chooser_title">Enviar dende…</string>
     <string name="upload_content_from_other_apps">Enviar contido dende outras aplicacións</string>
+    <string name="upload_direct_camera_photo">Foto</string>
+    <string name="upload_direct_camera_promt">Confirma que quere facer unha foto ou un vídeo?</string>
     <string name="upload_direct_camera_upload">Enviar dende a cámara</string>
+    <string name="upload_direct_camera_video">Vídeo</string>
     <string name="upload_file_dialog_filename">Nome de ficheiro</string>
     <string name="upload_file_dialog_filetype">Tipo de ficheiro</string>
     <string name="upload_file_dialog_filetype_googlemap_shortcut">Ficheiro(%s) de atallo a Google Maps</string>

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

@@ -768,6 +768,7 @@
     <string name="upload_cannot_create_file">Nije moguće stvoriti lokalnu datoteku</string>
     <string name="upload_chooser_title">Otpremi iz...</string>
     <string name="upload_content_from_other_apps">Otpremi sadržaj iz drugih aplikacija</string>
+    <string name="upload_direct_camera_photo">Fotografija</string>
     <string name="upload_direct_camera_upload">Otpremanje iz kamere</string>
     <string name="upload_file_dialog_filename">Naziv datoteke</string>
     <string name="upload_file_dialog_filetype">Vrsta datoteke</string>

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

@@ -689,6 +689,7 @@
     <string name="upload_cannot_create_file">לא ניתן ליצור קובץ מקומי</string>
     <string name="upload_chooser_title">העלאה מהמיקום…</string>
     <string name="upload_content_from_other_apps">העלאת תוכן מיישומונים אחרים</string>
+    <string name="upload_direct_camera_photo">תמונה</string>
     <string name="upload_direct_camera_upload">העלאה מהמצלמה</string>
     <string name="upload_file_dialog_filename">שם קובץ</string>
     <string name="upload_file_dialog_filetype">סוג קובץ</string>

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

@@ -846,7 +846,9 @@
     <string name="upload_cannot_create_file">로컬 파일을 만들 수 없음</string>
     <string name="upload_chooser_title">다음에서 업로드…</string>
     <string name="upload_content_from_other_apps">다른 앱에서 자료 업로드</string>
+    <string name="upload_direct_camera_photo">사진</string>
     <string name="upload_direct_camera_upload">카메라에서 업로드</string>
+    <string name="upload_direct_camera_video">영상</string>
     <string name="upload_file_dialog_filename">파일 이름</string>
     <string name="upload_file_dialog_filetype">파일 형식</string>
     <string name="upload_file_dialog_filetype_googlemap_shortcut">Google 지도 바로 가기 파일(%s)</string>

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

@@ -747,6 +747,7 @@
     <string name="upload_cannot_create_file">Nepavyksta sukurti vietinį failą</string>
     <string name="upload_chooser_title">Įkelti iš…</string>
     <string name="upload_content_from_other_apps">Įkelti turinį iš kitų programėlių</string>
+    <string name="upload_direct_camera_photo">Nuotrauka</string>
     <string name="upload_direct_camera_upload">Įkelti iš kameros</string>
     <string name="upload_file_dialog_filename">Failo pavadinimas</string>
     <string name="upload_file_dialog_filetype">Failo tipas</string>