Merge pull request #3930 from owncloud/enhancement/camera_uploads_label

Update label in camera uploads to avoid confussions

changelog/unreleased/3930

@@ -0,0 +1,6 @@
+Enhancement: Update label on Camera Uploads
+
+Update label on camera uploads to avoid confusions with the behavior of original files.
+Now, it is clear that original files will be removed.
+
+https://github.com/owncloud/android/pull/3930

owncloudApp/src/main/java/com/owncloud/android/presentation/settings/autouploads/SettingsPictureUploadsFragment.kt

@@ -96,7 +96,7 @@ class SettingsPictureUploadsFragment : PreferenceFragmentCompat() {
         prefPictureUploadsSourcePath = findPreference(PREF__CAMERA_PICTURE_UPLOADS_SOURCE)
         prefPictureUploadsLastSync = findPreference(PREF__CAMERA_PICTURE_UPLOADS_LAST_SYNC)
         prefPictureUploadsBehaviour = findPreference<ListPreference>(PREF__CAMERA_PICTURE_UPLOADS_BEHAVIOUR)?.apply {
-            entries = listOf(getString(R.string.pref_behaviour_entries_keep_file), getString(R.string.pref_behaviour_entries_move)).toTypedArray()
+            entries = listOf(getString(R.string.pref_behaviour_entries_keep_file), getString(R.string.pref_behaviour_entries_remove_original_file)).toTypedArray()
             entryValues = listOf(UploadBehavior.COPY.name, UploadBehavior.MOVE.name).toTypedArray()
         }
         prefPictureUploadsAccount = findPreference<ListPreference>(PREF__CAMERA_PICTURE_UPLOADS_ACCOUNT_NAME)?.apply {

owncloudApp/src/main/java/com/owncloud/android/presentation/settings/autouploads/SettingsVideoUploadsFragment.kt

@@ -96,7 +96,7 @@ class SettingsVideoUploadsFragment : PreferenceFragmentCompat() {
         prefVideoUploadsSourcePath = findPreference(PREF__CAMERA_VIDEO_UPLOADS_SOURCE)
         prefVideoUploadsLastSync = findPreference(PreferenceManager.PREF__CAMERA_VIDEO_UPLOADS_LAST_SYNC)
         prefVideoUploadsBehaviour = findPreference<ListPreference>(PREF__CAMERA_VIDEO_UPLOADS_BEHAVIOUR)?.apply {
-            entries = listOf(getString(R.string.pref_behaviour_entries_keep_file), getString(R.string.pref_behaviour_entries_move)).toTypedArray()
+            entries = listOf(getString(R.string.pref_behaviour_entries_keep_file), getString(R.string.pref_behaviour_entries_remove_original_file)).toTypedArray()
             entryValues = listOf(UploadBehavior.COPY.name, UploadBehavior.MOVE.name).toTypedArray()
         }
         prefVideoUploadsAccount = findPreference<ListPreference>(PREF__CAMERA_VIDEO_UPLOADS_ACCOUNT_NAME)?.apply {

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

@@ -437,8 +437,7 @@
   <string name="upload_copy_files">نسخ الملف</string>
   <string name="upload_move_files">نقل الملف</string>
   <string name="pref_behaviour_entries_keep_file">سيظل في المجلد الأصلي</string>
-  <string name="pref_behaviour_entries_move">نُقِل إلى مجلد التطبيق</string>
-  <string name="share_dialog_title">مشاركة</string>
+    <string name="share_dialog_title">مشاركة</string>
   <string name="share_file">مشاركة %1$s</string>
   <string name="share_with_user_section_title">المستخدمون والمجموعات</string>
   <string name="share_no_users">لم تتم مشاركة أي بيانات مع المستخدمين بعد</string>

owncloudApp/src/main/res/values-ast/strings.xml

@@ -328,8 +328,7 @@
   <string name="upload_copy_files">Copiar ficheru</string>
   <string name="upload_move_files">Mover ficheru</string>
   <string name="pref_behaviour_entries_keep_file">guardáu en carpeta orixinal</string>
-  <string name="pref_behaviour_entries_move">movíu a la carpeta d\'aplicaciones</string>
-  <string name="share_dialog_title">Compartir</string>
+    <string name="share_dialog_title">Compartir</string>
   <string name="share_file">Compartir %1$s</string>
   <string name="share_no_users">Entá nun se compartieron datos con usuarios</string>
   <string name="share_add_user_or_group">Amestar usuariu o grupu</string>

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

@@ -491,8 +491,7 @@
   <string name="upload_copy_files">Копиране на файл</string>
   <string name="upload_move_files">Преместване на файл</string>
   <string name="pref_behaviour_entries_keep_file">се съхранява в оригинална папка</string>
-  <string name="pref_behaviour_entries_move">преместено в папката с приложения</string>
-  <string name="share_dialog_title">Споделяне</string>
+    <string name="share_dialog_title">Споделяне</string>
   <string name="share_file">Споделяне на %1$s</string>
   <string name="share_with_user_section_title">Потребители и групи</string>
   <string name="share_no_users">Все още няма споделени данни с потребители </string>

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

@@ -428,8 +428,7 @@
   <string name="upload_copy_files">Copiar fitxer</string>
   <string name="upload_move_files">Moure fitxer</string>
   <string name="pref_behaviour_entries_keep_file">conserva\'t en la carpeta original</string>
-  <string name="pref_behaviour_entries_move">mogut a la carpeta de l\'aplicació</string>
-  <string name="share_dialog_title">Compartir</string>
+    <string name="share_dialog_title">Compartir</string>
   <string name="share_file">Comparteix %1$s</string>
   <string name="share_with_user_section_title">Usuaris i Grups</string>
   <string name="share_no_users">No s\'han compartit dades amb usuaris encara</string>

owncloudApp/src/main/res/values-cs-rCZ/strings.xml

@@ -486,8 +486,7 @@ správce systému.</string>
   <string name="upload_copy_files">Zkopírovat soubor</string>
   <string name="upload_move_files">Přesunout soubor</string>
   <string name="pref_behaviour_entries_keep_file">ponechán ve výchozím adresáři</string>
-  <string name="pref_behaviour_entries_move">přesunut do adresáře aplikace</string>
-  <string name="share_dialog_title">Sdílet</string>
+    <string name="share_dialog_title">Sdílet</string>
   <string name="share_file">Sdílet %1$s</string>
   <string name="share_with_user_section_title">Uživatelé a skupiny</string>
   <string name="share_no_users">Zatím nebyla s uživateli sdílena žádná data</string>

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

@@ -392,8 +392,7 @@
   <string name="upload_copy_files">Kopier fil</string>
   <string name="upload_move_files">Flyt fil</string>
   <string name="pref_behaviour_entries_keep_file">opbevares i den oprindelige mappe</string>
-  <string name="pref_behaviour_entries_move">flyttet til app-mappe</string>
-  <string name="share_dialog_title">Del</string>
+    <string name="share_dialog_title">Del</string>
   <string name="share_file">Del %1$s</string>
   <string name="share_with_user_section_title">Brugere og Grupper</string>
   <string name="share_no_users">Intet data delt med brugere endnu</string>

owncloudApp/src/main/res/values-de-rCH/strings.xml

@@ -439,8 +439,7 @@
   <string name="upload_copy_files">kopiere Datei</string>
   <string name="upload_move_files">verschiebe Datei</string>
   <string name="pref_behaviour_entries_keep_file">im Originalordner behalten</string>
-  <string name="pref_behaviour_entries_move">in den App-Ordner verschoben</string>
-  <string name="share_dialog_title">Teilen</string>
+    <string name="share_dialog_title">Teilen</string>
   <string name="share_file">Teile %1$s</string>
   <string name="share_with_user_section_title">Nutzer und Gruppen</string>
   <string name="share_no_users">Es wurden noch keine Dateien mit Benutzern geteilt</string>

owncloudApp/src/main/res/values-de-rDE/strings.xml

@@ -506,8 +506,7 @@
   <string name="upload_copy_files">Datei kopieren</string>
   <string name="upload_move_files">Datei verschieben</string>
   <string name="pref_behaviour_entries_keep_file">im Originalordner behalten</string>
-  <string name="pref_behaviour_entries_move">in den App-Ordner verschoben</string>
-  <string name="share_dialog_title">Teilen</string>
+    <string name="share_dialog_title">Teilen</string>
   <string name="share_file">%1$s teilen</string>
   <string name="share_with_user_section_title">Nutzer und Gruppen</string>
   <string name="share_no_users">Sie haben noch keine Dateien mit anderen geteilt.</string>

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

@@ -506,8 +506,7 @@
   <string name="upload_copy_files">kopiere Datei</string>
   <string name="upload_move_files">verschiebe Datei</string>
   <string name="pref_behaviour_entries_keep_file">im Originalordner behalten</string>
-  <string name="pref_behaviour_entries_move">in den App-Ordner verschoben</string>
-  <string name="share_dialog_title">Teilen</string>
+    <string name="share_dialog_title">Teilen</string>
   <string name="share_file">Teile %1$s</string>
   <string name="share_with_user_section_title">Nutzer und Gruppen</string>
   <string name="share_no_users">Es wurden noch keine Dateien mit Benutzern geteilt</string>

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

@@ -440,8 +440,7 @@
   <string name="upload_copy_files">Αντιγραφή αρχείου</string>
   <string name="upload_move_files">Μετακίνηση αρχείου</string>
   <string name="pref_behaviour_entries_keep_file">διατηρήθηκε στον αρχικό φάκελο</string>
-  <string name="pref_behaviour_entries_move">μετακινήθηκε στον φάκελο εφαρμογών</string>
-  <string name="share_dialog_title">Διαμοιρασμός</string>
+    <string name="share_dialog_title">Διαμοιρασμός</string>
   <string name="share_file">Διαμοιρασμός %1$s</string>
   <string name="share_with_user_section_title">Χρήστες και Ομάδες</string>
   <string name="share_no_users">Δεν έχουν διαμοιραστεί ακόμα δεδομένα με τους χρήστες</string>

owncloudApp/src/main/res/values-en-rGB/strings.xml

@@ -438,8 +438,7 @@
   <string name="upload_copy_files">Copy file</string>
   <string name="upload_move_files">Move file</string>
   <string name="pref_behaviour_entries_keep_file">kept in original folder</string>
-  <string name="pref_behaviour_entries_move">moved to app folder</string>
-  <string name="share_dialog_title">Share</string>
+    <string name="share_dialog_title">Share</string>
   <string name="share_file">Share %1$s</string>
   <string name="share_with_user_section_title">Users and Groups</string>
   <string name="share_no_users">No data shared with users yet</string>

owncloudApp/src/main/res/values-eo/strings.xml

@@ -234,8 +234,7 @@
   <string name="upload_copy_files">Kopii dosieron</string>
   <string name="upload_move_files">Movi dosieron</string>
   <string name="pref_behaviour_entries_keep_file">konservita en origina dosierujo</string>
-  <string name="pref_behaviour_entries_move">movita al aplikaĵa dosierujo</string>
-  <string name="share_dialog_title">Kunhavigi</string>
+    <string name="share_dialog_title">Kunhavigi</string>
   <string name="share_no_users">Nenio da datumoj kunhaviĝis kun uzantoj ankoraŭ</string>
   <string name="share_add_user_or_group">Aldoni uzanton aŭ grupon</string>
   <string name="share_cancel_public_link_button">Nuligi</string>

owncloudApp/src/main/res/values-es-rAR/strings.xml

@@ -432,8 +432,7 @@
   <string name="upload_copy_files">Copiar archivo</string>
   <string name="upload_move_files">Mover archivo</string>
   <string name="pref_behaviour_entries_keep_file">mantener en su carpeta original</string>
-  <string name="pref_behaviour_entries_move">movido a la carpeta de la aplicación</string>
-  <string name="share_dialog_title">Compartir</string>
+    <string name="share_dialog_title">Compartir</string>
   <string name="share_file">Compartir %1$s</string>
   <string name="share_with_user_section_title">Usuarios y Grupos</string>
   <string name="share_no_users">Aún no se ha compartido información con usuarios</string>

owncloudApp/src/main/res/values-es-rMX/strings.xml

@@ -404,8 +404,7 @@
   <string name="upload_copy_files">Copiar archivo</string>
   <string name="upload_move_files">Mover archivo</string>
   <string name="pref_behaviour_entries_keep_file">dejado en la carpeta original</string>
-  <string name="pref_behaviour_entries_move">movido a la carpeta apps</string>
-  <string name="share_dialog_title">Compartir</string>
+    <string name="share_dialog_title">Compartir</string>
   <string name="share_file">Compartir %1$s</string>
   <string name="share_with_user_section_title">Usuarios y Grupos</string>
   <string name="share_no_users">Aún no se ha compartido con ningún usuario.</string>

owncloudApp/src/main/res/values-es/strings.xml

@@ -506,8 +506,7 @@
   <string name="upload_copy_files">Copiar archivo</string>
   <string name="upload_move_files">Mover archivo</string>
   <string name="pref_behaviour_entries_keep_file">dejado en la carpeta original</string>
-  <string name="pref_behaviour_entries_move">movido a la carpeta apps</string>
-  <string name="share_dialog_title">Compartir</string>
+    <string name="share_dialog_title">Compartir</string>
   <string name="share_file">Compartir %1$s</string>
   <string name="share_with_user_section_title">Usuarios y Grupos</string>
   <string name="share_no_users">Aún no se ha compartido con ningún usuario.</string>

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

@@ -506,8 +506,7 @@
   <string name="upload_copy_files">Kopeeri fail</string>
   <string name="upload_move_files">Liiguta fail</string>
   <string name="pref_behaviour_entries_keep_file">hoitakse algses kaustas</string>
-  <string name="pref_behaviour_entries_move">liigutatakse rakenduse kausta</string>
-  <string name="share_dialog_title">Jaga</string>
+    <string name="share_dialog_title">Jaga</string>
   <string name="share_file">Jaga %1$s</string>
   <string name="share_with_user_section_title">Kasutajad ja grupid</string>
   <string name="share_no_users">Kasutajatega pole veel midagi jagatud</string>

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

@@ -377,8 +377,7 @@
   <string name="upload_copy_files">Kopioi tiedosto</string>
   <string name="upload_move_files">Siirrä tiedosto</string>
   <string name="pref_behaviour_entries_keep_file">pidetään alkuperäisessä kansiossa</string>
-  <string name="pref_behaviour_entries_move">siirretään sovelluskansioon</string>
-  <string name="share_dialog_title">Jaa</string>
+    <string name="share_dialog_title">Jaa</string>
   <string name="share_file">Jaa %1$s</string>
   <string name="share_with_user_section_title">Käyttäjät ja ryhmät</string>
   <string name="share_no_users">Ei dataa jaettuna käyttäjien kanssa vielä</string>

owncloudApp/src/main/res/values-fr-rFR/strings.xml

@@ -467,8 +467,7 @@ Téléchargez-le ici : %2$s</string>
   <string name="upload_copy_files">Copier fichier</string>
   <string name="upload_move_files">Déplacer fichier</string>
   <string name="pref_behaviour_entries_keep_file">conserver dans le dossier original</string>
-  <string name="pref_behaviour_entries_move">déplacer vers le dossier de l\'application</string>
-  <string name="share_dialog_title">Partager</string>
+    <string name="share_dialog_title">Partager</string>
   <string name="share_file">Partager %1$s</string>
   <string name="share_with_user_section_title">Utilisateurs et Groupes</string>
   <string name="share_no_users">Aucunes données partagées avec les utilisateurs</string>

owncloudApp/src/main/res/values-fr/strings.xml

@@ -464,8 +464,7 @@ Téléchargez-le ici : %2$s</string>
   <string name="upload_copy_files">Copier le fichier</string>
   <string name="upload_move_files">Déplacer le fichier</string>
   <string name="pref_behaviour_entries_keep_file">gardé dans le dossier original</string>
-  <string name="pref_behaviour_entries_move">déplacé vers le dossier de l\'application</string>
-  <string name="share_dialog_title">Partager</string>
+    <string name="share_dialog_title">Partager</string>
   <string name="share_file">Partager %1$s</string>
   <string name="share_with_user_section_title">Utilisateurs et Groupes</string>
   <string name="share_no_users">Aucune donnée partagée avec des utilisateurs pour le moment</string>

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

@@ -445,8 +445,7 @@ Descárgueo de aquí: %2$s</string>
   <string name="upload_copy_files">Copiar ficheiro</string>
   <string name="upload_move_files">Mover ficheiro</string>
   <string name="pref_behaviour_entries_keep_file">mantense no cartafol orixinal</string>
-  <string name="pref_behaviour_entries_move">movido cara ao cartafol da aplicación</string>
-  <string name="share_dialog_title">Compartir</string>
+    <string name="share_dialog_title">Compartir</string>
   <string name="share_file">Compartir %1$s</string>
   <string name="share_with_user_section_title">Usuarios e grupos</string>
   <string name="share_no_users">Aínda non hai datos compartidos con usuarios</string>

owncloudApp/src/main/res/values-he/strings.xml

@@ -438,8 +438,7 @@
   <string name="upload_copy_files">העתקת קובץ</string>
   <string name="upload_move_files">העברת קובץ</string>
   <string name="pref_behaviour_entries_keep_file">נשמר בתיקייה מקורית</string>
-  <string name="pref_behaviour_entries_move">הועבר לתיקיית ישומים</string>
-  <string name="share_dialog_title">שיתוף</string>
+    <string name="share_dialog_title">שיתוף</string>
   <string name="share_file">שיתוף %1$s</string>
   <string name="share_with_user_section_title">משתמשים וקבוצות</string>
   <string name="share_no_users">עדיין לא שותף מידע עם משתמשים</string>

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

@@ -450,8 +450,7 @@
   <string name="upload_copy_files">Fájl másolása</string>
   <string name="upload_move_files">Fájl mozgatása</string>
   <string name="pref_behaviour_entries_keep_file">eredeti mappában tárolva</string>
-  <string name="pref_behaviour_entries_move">áthelyezve az alkalmazás mappájába</string>
-  <string name="share_dialog_title">Megosztás</string>
+    <string name="share_dialog_title">Megosztás</string>
   <string name="share_file">Megosztás %1$s</string>
   <string name="share_with_user_section_title">Felhasználók és csoportok</string>
   <string name="share_no_users">Nincs még semmi megosztva a felhasználókkal</string>

owncloudApp/src/main/res/values-id/strings.xml

@@ -428,8 +428,7 @@
   <string name="upload_copy_files">Salin file</string>
   <string name="upload_move_files">Pindahkan file</string>
   <string name="pref_behaviour_entries_keep_file">Disimpan dalam folder asli</string>
-  <string name="pref_behaviour_entries_move">Pindah ke folder aplikasi</string>
-  <string name="share_dialog_title">Bagikan</string>
+    <string name="share_dialog_title">Bagikan</string>
   <string name="share_file">Bagikan %1$s</string>
   <string name="share_with_user_section_title">Pengguna dan Kelompok</string>
   <string name="share_no_users">Tidak ada data yang dibagikan dengan pengguna</string>

owncloudApp/src/main/res/values-is/strings.xml

@@ -400,8 +400,7 @@
   <string name="upload_copy_files">Afrita skrá</string>
   <string name="upload_move_files">Færa skrá</string>
   <string name="pref_behaviour_entries_keep_file">áfram í upprunalegri möppu</string>
-  <string name="pref_behaviour_entries_move">færð í forritsmöppu</string>
-  <string name="share_dialog_title">Deila</string>
+    <string name="share_dialog_title">Deila</string>
   <string name="share_file">Deila %1$s</string>
   <string name="share_with_user_section_title">Notendur og hópar</string>
   <string name="share_no_users">Engum gögnum ennþá deilt með notendum</string>

owncloudApp/src/main/res/values-it/strings.xml

@@ -484,8 +484,7 @@
   <string name="upload_copy_files">Copia file</string>
   <string name="upload_move_files">Sposta file</string>
   <string name="pref_behaviour_entries_keep_file">lasciato nella cartella originale</string>
-  <string name="pref_behaviour_entries_move">spostato nella cartella dell\'applicazione</string>
-  <string name="share_dialog_title">Condividi</string>
+    <string name="share_dialog_title">Condividi</string>
   <string name="share_file">Condividi %1$s</string>
   <string name="share_with_user_section_title">Utenti e Gruppi</string>
   <string name="share_no_users">Ancora nessun dato condiviso con gli utenti </string>

owncloudApp/src/main/res/values-ja-rJP/strings.xml

@@ -394,8 +394,7 @@
   <string name="upload_copy_files">ファイルをコピー</string>
   <string name="upload_move_files">ファイルを移動</string>
   <string name="pref_behaviour_entries_keep_file">元のフォルダーに保持</string>
-  <string name="pref_behaviour_entries_move">アプリフォルダーに移動</string>
-  <string name="share_dialog_title">共有</string>
+    <string name="share_dialog_title">共有</string>
   <string name="share_file">%1$s を共有</string>
   <string name="share_with_user_section_title">ユーザーとグループ</string>
   <string name="share_no_users">ユーザーと共有されているデータはありません</string>

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

@@ -410,8 +410,7 @@
   <string name="upload_copy_files">파일 복사</string>
   <string name="upload_move_files">파일 이동</string>
   <string name="pref_behaviour_entries_keep_file">원래 폴더에 유지됨</string>
-  <string name="pref_behaviour_entries_move">앱 폴더로 이동함</string>
-  <string name="share_dialog_title">공유</string>
+    <string name="share_dialog_title">공유</string>
   <string name="share_file">%1$s 공유</string>
   <string name="share_with_user_section_title">사용자 및 그룹</string>
   <string name="share_no_users">사용자와 공유한 데이터 없음</string>