From b2d08c401efd7c1bda8ea8d94a466dfbdfb08228 Mon Sep 17 00:00:00 2001 From: darthpaul Date: Mon, 11 Apr 2022 16:23:14 +0100 Subject: [PATCH] restore from recycle bin SDK 30+ - when file is on the root of Internal Storage or SD Card, change the destination to the /Pictures folder, we cannot write to the root of any volume on SDK 30+ - call handleSAFDialogSdk30, so users are prompted to allow SAF when restoring, if not previously allowed - if there are conflicts, handle it as though it's a CONFLICT_KEEP_BOTH by appending some characters to the destination name - add new string restore_to_path shown when restoring to /Pictures folder on SDK 30+ instead of the root folder --- .../gallery/pro/extensions/Activity.kt | 29 +++++++++++++++++-- app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-az/strings.xml | 1 + app/src/main/res/values-bn/strings.xml | 1 + app/src/main/res/values-ca/strings.xml | 4 +-- app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 3 +- app/src/main/res/values-el/strings.xml | 2 +- app/src/main/res/values-eo/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-et/strings.xml | 1 + app/src/main/res/values-eu/strings.xml | 1 + app/src/main/res/values-fa/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 3 +- app/src/main/res/values-gl/strings.xml | 3 +- app/src/main/res/values-hr/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-id/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 3 +- app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ko-rKR/strings.xml | 1 + app/src/main/res/values-lt/strings.xml | 1 + app/src/main/res/values-nb-rNO/strings.xml | 1 + app/src/main/res/values-ne/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 5 ++-- app/src/main/res/values-pl/strings.xml | 5 ++-- app/src/main/res/values-pt-rBR/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ro/strings.xml | 3 +- app/src/main/res/values-ru/strings.xml | 4 +-- app/src/main/res/values-sk/strings.xml | 2 +- app/src/main/res/values-sl/strings.xml | 1 + app/src/main/res/values-sr/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 3 +- app/src/main/res/values-ta/strings.xml | 3 +- app/src/main/res/values-tr/strings.xml | 4 +-- app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-vi/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 4 +-- app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 4 +-- app/src/main/res/values/strings.xml | 1 + 44 files changed, 86 insertions(+), 25 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt index 2b90ca63e..cc482f169 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt @@ -341,8 +341,23 @@ fun BaseSimpleActivity.restoreRecycleBinPath(path: String, callback: () -> Unit) fun BaseSimpleActivity.restoreRecycleBinPaths(paths: ArrayList, callback: () -> Unit) { ensureBackgroundThread { val newPaths = ArrayList() + var shownRestoringToPictures = false for (source in paths) { - val destination = source.removePrefix(recycleBinPath) + var destination = source.removePrefix(recycleBinPath) + + val destinationParent = destination.getParentPath() + val isAStorageRootFolder = isAStorageRootFolder(destinationParent) + if (isRPlus() && isAStorageRootFolder) { + // if the file is on the root of Internal Storage or SD Card, change it to Pictures + // we cannot write there on 30+ + val picturesDirectory = getPicturesDirectoryPath(destination) + destination = File(picturesDirectory, destination.getFilenameFromPath()).path + if (!shownRestoringToPictures) { + toast(getString(R.string.restore_to_path, humanizePath(picturesDirectory))) + shownRestoringToPictures = true + } + } + val lastModified = File(source).lastModified() val isShowingSAF = handleSAFDialog(destination) {} @@ -350,6 +365,16 @@ fun BaseSimpleActivity.restoreRecycleBinPaths(paths: ArrayList, callback return@ensureBackgroundThread } + val isShowingSAFSdk30 = handleSAFDialogSdk30(destination) {} + if (isShowingSAFSdk30) { + return@ensureBackgroundThread + } + + if (getDoesFilePathExist(destination)) { + val newFile = getAlternativeFile(File(destination)) + destination = newFile.path + } + var inputStream: InputStream? = null var out: OutputStream? = null try { @@ -368,7 +393,7 @@ fun BaseSimpleActivity.restoreRecycleBinPaths(paths: ArrayList, callback out?.flush() if (File(source).length() == copiedSize) { - mediaDB.updateDeleted(destination.removePrefix(recycleBinPath), 0, "$RECYCLE_BIN$destination") + mediaDB.updateDeleted(destination.removePrefix(recycleBinPath), 0, "$RECYCLE_BIN${source.removePrefix(recycleBinPath)}") } newPaths.add(destination) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index ccf734a33..1ae0c5488 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -39,6 +39,7 @@ تعيين كمجلد افتراضي إلغاء التعيين كمجلد افتراضي إعادة ترتيب المجلدات عن طريق السحب + Restoring to \'%s\' فلترة الوسائط diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 193d8abc1..1fc8564c1 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -33,6 +33,7 @@ Set as default folder Unset as default folder Reorder folders by dragging + Restoring to \'%s\' Filter media diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index df015b5ee..f3534446d 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -33,6 +33,7 @@ ডিফল্ট ফোল্ডার হিশেবে সেট করুন ডিফল্ট ফোল্ডার হিশেবে আর রাখবেন না Reorder folders by dragging + Restoring to \'%s\' মিডিয়া ফিল্টার করুন diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 1e4156e71..d9bf0822b 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -39,7 +39,7 @@ Estableix com a carpeta predeterminada Desactiva com a carpeta predeterminada Reordeneu les carpetes arrossegant-les - El sistema no permet copiar a aquesta carpeta. + Restoring to \'%s\' Filtre multimèdia Imatges @@ -373,4 +373,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 0143f7b1b..2787b5460 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -33,6 +33,7 @@ Set as default folder Unset as default folder Reorder folders by dragging + Restoring to \'%s\' Filtr médií diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index fbf944f33..8eac271ab 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -33,6 +33,7 @@ Vælg som standardmappe Fravælg som standardmappe Omorganiser mapper ved at trække + Restoring to \'%s\' Filtrer medier diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index dc06aaae2..e7ebf24b2 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -39,6 +39,7 @@ Als Standardordner festlegen Nicht mehr als Standardordner festlegen Neuordnung von Ordnern durch Ziehen + Restoring to \'%s\' Medien filtern Bilder @@ -370,4 +371,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 4ff068354..ac4679aee 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -33,7 +33,7 @@ Ορισμός ως προεπιλεγμένου φακέλου Κατάργηση ως προεπιλεγμένου φακέλου Αναδιάταξη φακέλων με μεταφορά - Το σύστημα δεν επιτρέπει την αντιγραφή σε αυτόν τον φάκελο. + Restoring to \'%s\' Φιλτράρισμα πολυμέσων diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 6ef72ba43..a136a748a 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -33,6 +33,7 @@ Set as default folder Unset as default folder Reorder folders by dragging + Restoring to \'%s\' Filter media Bildoj diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 17fbe1bf7..69872c085 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -33,6 +33,7 @@ Poner como carpeta predeterminada Quitar como carpeta predeterminada Reordenar carpetas arrastrándolas + Restoring to \'%s\' Filtro de medios diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 6abe6f3b7..352a3ce1e 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -33,6 +33,7 @@ Set as default folder Unset as default folder Reorder folders by dragging + Restoring to \'%s\' Filter media diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 63da7b83f..24d9ec05b 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -33,6 +33,7 @@ Ezarri lehenetsitako karpeta gisa Kendu karpeta lehenetsitako karpeta gisa Berrordenatu karpetak arrastatuz + Restoring to \'%s\' Iragazi multimedia diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 0c07381ba..907d1779a 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -33,6 +33,7 @@ تنظیم به عنوان شاخهٔ پیش‌گزیده برداشتن تنظیم به عنوان شاخهٔ پیش‌گزیده مرتب‌سازی مجدد شاخه‌ها با کشیدن + Restoring to \'%s\' پالایش رسانه diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 522afec47..06ef0d458 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -39,6 +39,7 @@ Aseta oletushakemistoksi Älä käytä oletushakemistona Järjestä kansiot uudelleen vetämällä + Restoring to \'%s\' Suodata media diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 509977471..0fb5b7123 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -33,6 +33,7 @@ Dossier par défaut Oublier le dossier Réordonner par glisser + Restoring to \'%s\' Filtrer les médias Images @@ -362,4 +363,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 919261eea..d7bc853e7 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -33,6 +33,7 @@ Set as default folder Unset as default folder Reorder folders by dragging + Restoring to \'%s\' Filtrar medios Imaxes @@ -419,4 +420,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index ed620986c..26e8238e9 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -33,6 +33,7 @@ Set as default folder Unset as default folder Reorder folders by dragging + Restoring to \'%s\' Filtriranje medija Slike diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 551af46a6..32ee9955f 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -39,6 +39,7 @@ Beállítás alapértelmezett mappaként Eltávolítás mint alapértelmezett mappa Mappák átrendezése húzással + Restoring to \'%s\' Médiafájlok szűrése diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index ef5eb54da..143567ffa 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -33,6 +33,7 @@ Set as default folder Unset as default folder Reorder folders by dragging + Restoring to \'%s\' Filter media diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 509096c0c..1393b0836 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -33,6 +33,7 @@ Imposta come cartella predefinita Non impostare come cartella predefinita Riordina cartelle trascinandole + Restoring to \'%s\' Filtra i file Immagini @@ -419,4 +420,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index df84ed5a3..6c7239ac8 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -33,6 +33,7 @@ デフォルトのフォルダとして設定 デフォルトのフォルダから外す Reorder folders by dragging + Restoring to \'%s\' 表示する形式 diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index dff518238..a85d711af 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -33,6 +33,7 @@ Set as default folder Unset as default folder Reorder folders by dragging + Restoring to \'%s\' 필터 설정 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 79671dc62..794bdf676 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -33,6 +33,7 @@ Set as default folder Unset as default folder Reorder folders by dragging + Restoring to \'%s\' Filtruoti mediją diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 618c3a99b..b50c50b8a 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -33,6 +33,7 @@ Sett som standardmappe Ikke lenger sett som standardmappe Endre mapperekkefølge ved å dra + Restoring to \'%s\' Filtrer media diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index 3f1185114..76940f19d 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -33,6 +33,7 @@ Set as default folder Unset as default folder Reorder folders by dragging + Restoring to \'%s\' Filter media diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index b0262e495..efa15c489 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -35,7 +35,8 @@ Als standaardmap instellen Standaardmap herstellen Volgorde mappen bepalen met sleepgebaren - Het systeem staat het kopiëren naar deze map niet toe. + Restoring to \'%s\' + Media filteren Afbeeldingen @@ -425,4 +426,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index f7ff55ad0..3ce5debe6 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -39,7 +39,8 @@ Ustaw jako folder domyślny Anuluj ustawienie folderu domyślnego Przeorganizuj foldery przeciągając - System nie pozwala na kopiowanie do tego folderu + Restoring to \'%s\' + Filtruj multimedia Obrazy @@ -424,4 +425,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 4842c3ad9..cc15ed6ad 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -39,6 +39,7 @@ Definir como pasta padrão Indefinir como pasta padrão Reordenar as pastas ao arrastar + Restoring to \'%s\' Filtrar mídia diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 0379d0c3f..1503e62b1 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -39,6 +39,7 @@ Utilizar como pasta padrão Deixar de utilizar como pasta padrão Organizar pasta por arrasto + Restoring to \'%s\' Filtrar multimédia diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index b02b78ed0..a65bca966 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -33,6 +33,7 @@ Setază ca dosar implicit Dezactivează ca dosar implicit Reordonează dosarele prin tragere + Restoring to \'%s\' Filtrează elementele media Imagini @@ -419,4 +420,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index a0cf1b15b..b37683a3c 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -33,7 +33,7 @@ Установить как папку по умолчанию Отключить как папку по умолчанию Менять порядок папок перетаскиванием - Система не разрешает копирование в эту папку. + Restoring to \'%s\' Фильтр медиа Изображения @@ -422,4 +422,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 83459c8e8..a4656a528 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -33,7 +33,7 @@ Nastaviť ako predvolený priečinok Odobrať predvolený priečinok Zmeniť poradie priečinkov presunutím - Systém nepovoľuje kopírovanie do tohto priečinka. + Restoring to \'%s\' Filter médií diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 48de3381c..63e958f6d 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -33,6 +33,7 @@ Set as default folder Unset as default folder Reorder folders by dragging + Restoring to \'%s\' Filtriranje datotek diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 402a55197..6b3ac7027 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -33,6 +33,7 @@ Set as default folder Unset as default folder Reorder folders by dragging + Restoring to \'%s\' Филтрирај медију diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 36263301c..cc55f8533 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -33,6 +33,7 @@ Set as default folder Unset as default folder Reorder folders by dragging + Restoring to \'%s\' Filtrera media Bilder @@ -419,4 +420,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 7fc7338d9..76bf3feab 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -39,6 +39,7 @@ இயல்புநிலை அடைவாக அமை இயல்புநிலை அடைவாக அமைக்காதே பிடித்திழுத்து அடைவுகளை மறுசீரமை + Restoring to \'%s\' ஊடகத்தை வடிகட்டு படங்கள் @@ -427,4 +428,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 24b177fa7..4a1b258b9 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -39,7 +39,7 @@ Öntanımlı klasör olarak ayarla Öntanımlı klasör ayarını kaldır Sürükleyerek klasörleri yeniden sırala - Sistem bu klasöre kopyalamaya izin vermiyor. + Restoring to \'%s\' Medyayı filtrele Resimler @@ -372,4 +372,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 5564782e1..91ae73eae 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -33,6 +33,7 @@ Встановити теку за замовчуванням Відмінити встановлення теки за замовчуванням Сортувати папки шляхом переміщення + Restoring to \'%s\' Фільтр мультимедійних файлів diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 744272def..8f2b049ac 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -33,6 +33,7 @@ Set as default folder Unset as default folder Reorder folders by dragging + Restoring to \'%s\' Lọc diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 2b4ac8b35..c6156af17 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -39,7 +39,7 @@ 设置为默认文件夹 取消设置为默认文件夹 通过拖动重新排序文件夹 - 此系统不允许复制到这个文件夹。 + Restoring to \'%s\' 筛选媒体文件 图片 @@ -428,4 +428,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 92f076531..562af6963 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -33,6 +33,7 @@ Set as default folder Unset as default folder Reorder folders by dragging + Restoring to \'%s\' 篩選媒體檔案 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 9c90c5ed2..b5581e9e7 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -33,7 +33,7 @@ 設為預設資料夾 取消設為預設資料夾 透過拖曳來重新排序資料夾 - 系統不允許複製至此資料夾。 + Restoring to \'%s\' 篩選媒體檔案 圖片 @@ -421,4 +421,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 351dea3f9..dd4cbe808 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -33,6 +33,7 @@ Set as default folder Unset as default folder Reorder folders by dragging + Restoring to \'%s\' Filter media