diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PhotoVideoActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PhotoVideoActivity.kt index facded0d6..8898e84fc 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PhotoVideoActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PhotoVideoActivity.kt @@ -129,7 +129,7 @@ open class PhotoVideoActivity : SimpleActivity(), ViewPagerFragment.FragmentList override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.photo_video_menu, menu) - menu.findItem(R.id.menu_set_as_wallpaper).isVisible = mMedium?.isImage() == true + menu.findItem(R.id.menu_set_as).isVisible = mMedium?.isImage() == true menu.findItem(R.id.menu_edit).isVisible = mMedium?.isImage() == true return true @@ -140,7 +140,7 @@ open class PhotoVideoActivity : SimpleActivity(), ViewPagerFragment.FragmentList return true when (item.itemId) { - R.id.menu_set_as_wallpaper -> trySetAsWallpaper(File(mMedium!!.path)) + R.id.menu_set_as -> trySetAs(File(mMedium!!.path)) R.id.menu_open_with -> openWith(File(mMedium!!.path)) R.id.menu_share -> shareUri(mMedium!!, mUri) R.id.menu_edit -> openEditor(File(mMedium!!.path)) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt index 7f6ec0753..28f0bc57b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt @@ -176,7 +176,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View return true menu.apply { - findItem(R.id.menu_set_as_wallpaper).isVisible = getCurrentMedium()!!.isImage() == true + findItem(R.id.menu_set_as).isVisible = getCurrentMedium()!!.isImage() == true findItem(R.id.menu_edit).isVisible = getCurrentMedium()!!.isImage() == true findItem(R.id.menu_rotate).isVisible = getCurrentMedium()!!.isImage() == true findItem(R.id.menu_save_as).isVisible = mRotationDegrees != 0f @@ -199,7 +199,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View return true when (item.itemId) { - R.id.menu_set_as_wallpaper -> trySetAsWallpaper(getCurrentFile()) + R.id.menu_set_as -> trySetAs(getCurrentFile()) R.id.menu_copy_to -> copyMoveTo(true) R.id.menu_move_to -> copyMoveTo(false) R.id.menu_open_with -> openWith(getCurrentFile()) @@ -378,7 +378,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View mPos = -1 reloadViewPager() } - } else if (requestCode == REQUEST_SET_WALLPAPER) { + } else if (requestCode == REQUEST_SET_AS) { if (resultCode == Activity.RESULT_OK) { toast(R.string.wallpaper_set_successfully) } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/activity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/activity.kt index d761777f2..0d98d0802 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/activity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/activity.kt @@ -25,7 +25,7 @@ import com.simplemobiletools.gallery.R import com.simplemobiletools.gallery.activities.SimpleActivity import com.simplemobiletools.gallery.helpers.NOMEDIA import com.simplemobiletools.gallery.helpers.REQUEST_EDIT_IMAGE -import com.simplemobiletools.gallery.helpers.REQUEST_SET_WALLPAPER +import com.simplemobiletools.gallery.helpers.REQUEST_SET_AS import com.simplemobiletools.gallery.models.Directory import com.simplemobiletools.gallery.models.Medium import com.simplemobiletools.gallery.views.MySquareImageView @@ -71,32 +71,32 @@ fun Activity.shareMedia(media: List) { } } -fun Activity.trySetAsWallpaper(file: File) { +fun Activity.trySetAs(file: File) { try { var uri = Uri.fromFile(file) - if (!setAsWallpaper(uri, file)) { + if (!setAs(uri, file)) { uri = getFileContentUri(file) - setAsWallpaper(uri, file, false) + setAs(uri, file, false) } } catch (e: Exception) { toast(R.string.unknown_error_occurred) } } -fun Activity.setAsWallpaper(uri: Uri, file: File, showToast: Boolean = true): Boolean { +fun Activity.setAs(uri: Uri, file: File, showToast: Boolean = true): Boolean { var success = false Intent().apply { action = Intent.ACTION_ATTACH_DATA setDataAndType(uri, file.getMimeType("image/*")) addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) - val chooser = Intent.createChooser(this, getString(R.string.set_as_wallpaper_with)) + val chooser = Intent.createChooser(this, getString(R.string.set_as)) if (resolveActivity(packageManager) != null) { - startActivityForResult(chooser, REQUEST_SET_WALLPAPER) + startActivityForResult(chooser, REQUEST_SET_AS) success = true } else { if (showToast) { - toast(R.string.no_wallpaper_setter_found) + toast(R.string.no_capable_app_found) } success = false } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt index 7b0ae967a..e04df96e4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt @@ -39,7 +39,7 @@ val DIRECTORIES = "directories2" val IS_VIEW_INTENT = "is_view_intent" val REQUEST_EDIT_IMAGE = 1 -val REQUEST_SET_WALLPAPER = 2 +val REQUEST_SET_AS = 2 // show media val IMAGES_AND_VIDEOS = 0 diff --git a/app/src/main/res/menu/menu_viewpager.xml b/app/src/main/res/menu/menu_viewpager.xml index 96dd6b3c1..f5ffc6299 100644 --- a/app/src/main/res/menu/menu_viewpager.xml +++ b/app/src/main/res/menu/menu_viewpager.xml @@ -43,8 +43,8 @@ android:title="@string/move_to" app:showAsAction="never"/> Change cover image Select photo Use default + Nastavit jako Tato funkce skryje složku, včetně podsložek, přidáním souboru \'.nomedia\'. Zobrazíte je zvolením možnosti \'Zobrazit skryté složky\' v nastavení. Pokračovat? @@ -73,7 +74,7 @@ Nastavit jako tapetu Nastavení tapety selhalo Nastavit jako tapetu pomocí: - Nebyla nalezena žádná vhodná aplikace + Nebyla nalezena žádná vhodná aplikace Nastavuje se tapeta… Tapeta byla úspěšně změněna Portrait aspect ratio diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 5e8f7e578..2a16096f5 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -23,6 +23,7 @@ Change cover image Select photo Use default + Set as Diese Funktion versteckt ausgewählte Ordner (auch für andere Apps), indem dort im Dateisystem eine \'.nomedia\'-Datei abgelegt wird. Dadurch werden auch deren Unterordner versteckt. Solche Ordner werden nur gezeigt, wenn die Einstellung \'Versteckte Ordner zeigen\' aktiv ist (auch andere Apps bieten üblicherweise eine solche Option). Fortfahren? @@ -73,7 +74,7 @@ Als Hintergrund festlegen Hintergrundbild festlegen fehlgeschlagen Als Hintergrund festlegen mit: - Keine Hintergrundbild-App gefunden + Keine Hintergrundbild-App gefunden Hintergrund festlegen… Hintergrundbild erfolgreich festgelegt Hochformat diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index feea9961a..a7e18bdca 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -23,6 +23,7 @@ Change cover image Select photo Use default + Set as Esta función oculta la carpeta agregando un archivo \'.nomedia\' en ella, y ocultará también las subcarpetas. Puede mostrarlas cambiando la opción \'Mostrar carpetas ocultas\' en los Ajustes. ¿Continuar? @@ -73,7 +74,7 @@ Establecer como fondo de pantalla Error al establecer fondo de pantalla Establecer como fondo de pantalla con: - No se encontró aplicación para ello + No se encontró aplicación para ello Estableciendo fondo de pantalla… Fondo de pantalla establecido correctamente Relación de aspecto tipo retrato diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index e98176869..f41f33db5 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -23,6 +23,7 @@ Change cover image Select photo Use default + Set as Cette option masque le dossier en ajoutant un fichier \'.nomedia\' à l\'intérieur, cela masquera aussi tous les sous-dossiers. Vous pouvez les voir en modifiant l\'option \'Afficher les dossiers cachés\' dans les Paramètres. Continuer ? @@ -73,7 +74,7 @@ Définir comme fond d\'écran Échec de la définition en tant que fond d\'écran. Définir comme fond d\'écran avec : - Aucune application trouvée pour continuer cette action + Aucune application trouvée pour continuer cette action Paramètre de fond d\'écran… Fond d\'écran défini avec succès. Ratio aspect Portrait diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 709a41f0d..16687a634 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -23,6 +23,7 @@ Change cover image Select photo Use default + Set as This function hides the folder by adding a \'.nomedia\' file into it, it will hide all subfolders too. You can see them by toggling the \'Show hidden folders\' option in Settings. Continue? @@ -73,7 +74,7 @@ Set as Wallpaper Setting as Wallpaper failed Set as wallpaper with: - No app capable of it has been found + No app capable of it has been found Setting wallpaper… Wallpaper set successfully Portrait aspect ratio diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 5087d0362..df0b575ed 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -23,6 +23,7 @@ Change cover image Select photo Use default + Set as Questa funzione nasconde la cartella aggiungendo un file \'.nomedia\' all\'interno, nasconderà anche tutte le sottocartelle. Puoi vederle attivando l\'opzione \'Mostra cartelle nascoste\' nelle impostazioni. Continuare? @@ -73,7 +74,7 @@ Imposta come sfondo Impostazione sfondo non riuscita Imposta come sfondo con: - Non sono disponibili app compatibili + Non sono disponibili app compatibili Impostazione sfondo… Sfondo impostato correttamente Proporzioni ritratto diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index d14c6d20f..90ee2e333 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -23,6 +23,7 @@ Change cover image Select photo Use default + Set as This function hides the folder by adding a \'.nomedia\' file into it, it will hide all subfolders too. You can see them by toggling the \'Show hidden folders\' option in Settings. Continue? @@ -73,7 +74,7 @@ 壁紙として設定 壁紙としての設定に失敗しました 壁紙として設定: - 対応できるアプリが見つかりません + 対応できるアプリが見つかりません 壁紙の設定… 壁紙を正常に設定しました Portrait aspect ratio diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index e850a9af4..ad83169dc 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -23,6 +23,7 @@ Change cover image Select photo Use default + Set as Ta funkcja ukrywa folder dodając \'. \' Nomedia plik do niego, można tak ukryć wszystkie podfoldery. Można je zobaczyć poprzez przełączanie \'Pokaż ukryte foldery \' opcję w ustawieniach. Kontyntynuj? @@ -73,7 +74,7 @@ Ustaw jako tapeta Ustawienie tapety nie powiodło się Ustaw jako tapetę w: - Brak odpowiednich ustawień + Brak odpowiednich ustawień Ustawianie tapety… Tapeta ustawiona Portrait aspect ratio diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 13d33b588..3f43a07d2 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -23,6 +23,7 @@ Trocar imagem de capa Selecionar foto Usar padrão + Set as Esta opção oculta uma pasta com a adição de um arquivo \'.nomedia\' dentro dela, e irá ocultar todas as subpastas que estejam dentro da mesma. Você poderá rever essas pastas com a opção \'Mostrar pastas ocultas\'. Continuar? @@ -73,7 +74,7 @@ Definir como papel de parede Falha ao definir como papel de parede Definir papel de parede com: - Aplicativo não encontrado + Aplicativo não encontrado Definindo como papel de parede; Papel de parede com sucesso Retrato diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 631e2f4c5..0bb25522d 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -23,6 +23,7 @@ Alterar imagem da capa Selecionar foto Predefinição + Set as Esta opção oculta uma pasta com a adição de um ficheiro \'.nomedia\' na pasta, e irá ocultar todas as subpastas existentes. Pode ver as pastas com a opção \'Mostrar pastas ocultas\'. Continuar? @@ -73,7 +74,7 @@ Definir como fundo do ecrã Falha ao definir como fundo de ecrã Definir como fundo com: - Aplicação não encontrada + Aplicação não encontrada A definir como fundo de ecrã… Fundo definido com sucesso Proporção na vertical diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index bd5fb9684..e548d978a 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -23,6 +23,7 @@ Change cover image Select photo Use default + Set as Эта опция скрывает папку, добавляя в неё файл \'.nomedia\'; будут скрыты все подпапки. Можно показывать их, переключая \'Показать скрытые папки\' в настройках. Продолжить? @@ -73,7 +74,7 @@ Установить в качестве обоев Установить не удалось Установить в качестве обоев в: - Приложение не найдено + Приложение не найдено Установка обоев… Обои успешно установлены Формат изображения diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index cf7f93f41..50fa3a04d 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -23,6 +23,7 @@ Zmeniť obal albumu Zvoliť foto Použiť predvolený + Nastaviť ako Táto funkcia skryje priečinok pridaním súboru \'.nomedia\', skryté budú aj podpriečinky. Môžete ich vidieť zvolením možnosti \'Zobraziť skryté priečinky\' v nastaveniach. Pokračovať? @@ -73,7 +74,7 @@ Nastaviť ako tapetu Nastavovanie ako tapeta zlyhalo Nastaviť ako tapetu s: - Nenašla sa žiadna vhodná aplikácia No app capable of it has been found + Nenašla sa žiadna vhodná aplikácia Nastavuje sa tapeta… Tapeta bola úspešne zmenená Orientácia nastojato diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index a0c67d09e..f2bfb000a 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -23,6 +23,7 @@ Change cover image Select photo Use default + Set as This function hides the folder by adding a \'.nomedia\' file into it, it will hide all subfolders too. You can see them by toggling the \'Show hidden folders\' option in Settings. Continue? @@ -73,7 +74,7 @@ Ange som bakgrundsbild Det gick inte att byta bakgrundsbild Ange som bakgrundsbild med: - Hittade ingen app som klarar av detta + Hittade ingen app som klarar av detta Inställningar för bakgrundsbild… Bakgrundsbilden är ändrad Portrait aspect ratio diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 61ef91e0d..2e8be70b8 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -23,6 +23,7 @@ Change cover image Select photo Use default + Set as Bu işlev, klasöre\'.medya yok\'dosyası ekleyerek gizler; tüm alt klasörleri de gizler. Bunları Ayarlar\'da\'Gizli klasörleri göster\'seçeneğine basarak görebilirsiniz. Devam et? @@ -73,7 +74,7 @@ Duvar kağıdı olarak ayarla Duvar Kağıdı Olarak Ayarlanılamıyor İle duvar kağıdı olarak ayarla: - Mümkün olan herhangi bir uygulama bulunamadı + Mümkün olan herhangi bir uygulama bulunamadı Duvar kağıdını ayarlama… Duvar kağıdı başarıyla ayarlandı Portrait aspect ratio diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 96a8517fc..6dace54b6 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -23,6 +23,7 @@ 更改封面图片 选择图片 使用默认 + Set as 通过添加文件 \'.nomedia\' 到文件夹,可以防止文件夹及其子文件夹下的所有媒体被扫描。您可以通过设置中的 \'显示隐藏文件夹\' 选项改变设置,是否继续? @@ -73,7 +74,7 @@ 设为壁纸 壁纸设置失败 设为壁纸... - 未找到可用应用 + 未找到可用应用 正在设置壁纸… 壁纸设置成功 纵向长宽比 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index fdd431271..141edc855 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -23,6 +23,7 @@ Change cover image Select photo Use default + Set as This function hides the folder by adding a \'.nomedia\' file into it, it will hide all subfolders too. You can see them by toggling the \'Show hidden folders\' option in Settings. Continue? @@ -73,7 +74,7 @@ 設定為桌布 桌布設定失敗 用其他應用軟體設定桌布…… - 沒有可用的應用軟體 + 沒有可用的應用軟體 正在應用軟體桌布… 成功應用軟體桌布 Portrait aspect ratio diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a65e48784..8b89683e8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -23,6 +23,7 @@ Change cover image Select photo Use default + Set as This function hides the folder by adding a \'.nomedia\' file into it, it will hide all subfolders too. You can see them by toggling the \'Show hidden folders\' option in Settings. Continue? @@ -73,7 +74,7 @@ Set as Wallpaper Setting as Wallpaper failed Set as wallpaper with: - No app capable of it has been found + No app capable of it has been found Setting wallpaper… Wallpaper set successfully Portrait aspect ratio