diff --git a/.gitignore b/.gitignore index 4cd1c5eed..d94d37b66 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ /captures keystore.jks keystore.properties +/app/src/proprietary/assets/pesdk_license +/app/src/proprietary/assets/vesdk_license diff --git a/app/build.gradle b/app/build.gradle index f234f2bf7..fe52e34f8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,7 +77,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.31.29' + implementation 'com.simplemobiletools:commons:5.32.4' implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0' implementation 'it.sephiroth.android.exif:library:1.0.1' implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19' @@ -106,24 +106,38 @@ if (is_proprietary) { apply plugin: 'ly.img.android.sdk' imglyConfig { + vesdk { + enabled true + licencePath 'vesdk_license' + } + pesdk { enabled true licencePath 'pesdk_license' } modules { + include 'ui:video-trim' include 'ui:core' include 'ui:text' include 'ui:focus' include 'ui:brush' include 'ui:filter' + include 'ui:sticker' + include 'ui:overlay' include 'ui:transform' include 'ui:adjustment' include 'backend:serializer' + include 'backend:sticker-smart' + include 'backend:sticker-animated' include 'assets:font-basic' include 'assets:filter-basic' + include 'assets:overlay-basic' + include 'assets:sticker-shapes' + include 'assets:sticker-emoticons' + include 'assets:sticker-animated' } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt index 90d71645a..9234794c1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt @@ -66,6 +66,7 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { private var mWasProtectionHandled = false private var mShouldStopFetching = false private var mIsSearchOpen = false + private var mWasDefaultFolderChecked = false private var mLatestMediaId = 0L private var mLatestMediaDateId = 0L private var mCurrentPathPrefix = "" // used at "Group direct subfolders" for navigation @@ -92,8 +93,6 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { appLaunched(BuildConfig.APPLICATION_ID) if (savedInstanceState == null) { - openDefaultFolder() - config.temporarilyShowHidden = false config.tempSkipDeleteConfirmation = false removeTempFolder() @@ -436,6 +435,11 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { private fun tryLoadGallery() { handlePermission(PERMISSION_WRITE_STORAGE) { if (it) { + if (!mWasDefaultFolderChecked) { + openDefaultFolder() + mWasDefaultFolderChecked = true + } + if (!config.wasUpgradedFromFreeShown && isPackageInstalled("com.simplemobiletools.gallery")) { ConfirmationDialog(this, "", R.string.upgraded_from_free, R.string.ok, 0) {} config.wasUpgradedFromFreeShown = true diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt index 232c07f5b..93380634b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt @@ -87,9 +87,11 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View private var mIgnoredPaths = ArrayList() override fun onCreate(savedInstanceState: Bundle?) { + useDynamicTheme = false super.onCreate(savedInstanceState) setContentView(R.layout.activity_medium) + window.decorView.setBackgroundColor(config.backgroundColor) top_shadow.layoutParams.height = statusBarHeight + actionBarHeight checkNotchSupport() (MediaActivity.mMedia.clone() as ArrayList).filter { it is Medium }.mapTo(mMediaFiles) { it as Medium } @@ -132,7 +134,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View supportActionBar?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) val filename = getCurrentMedium()?.name ?: mPath.getFilenameFromPath() - supportActionBar?.title = Html.fromHtml("$filename") + supportActionBar?.title = filename window.statusBarColor = Color.TRANSPARENT } 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 6f3155ab7..5a0057a91 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 @@ -105,7 +105,8 @@ fun SimpleActivity.launchAbout() { FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons), FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons), FAQItem(R.string.faq_7_title_commons, R.string.faq_7_text_commons), - FAQItem(R.string.faq_9_title_commons, R.string.faq_9_text_commons)) + FAQItem(R.string.faq_9_title_commons, R.string.faq_9_text_commons), + FAQItem(R.string.faq_10_title_commons, R.string.faq_10_text_commons)) startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true) } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt index bd229721d..4c4daa180 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt @@ -455,10 +455,14 @@ class MediaFetcher(val context: Context) { } } - val dateTakenValues = if (folder == FAVORITES) { - context.dateTakensDB.getAllDateTakens() - } else { - context.dateTakensDB.getDateTakensFromPath(folder) + val dateTakenValues = try { + if (folder == FAVORITES) { + context.dateTakensDB.getAllDateTakens() + } else { + context.dateTakensDB.getDateTakensFromPath(folder) + } + } catch (e: Exception) { + return dateTakens } dateTakenValues.forEach { diff --git a/app/src/main/res/layout/activity_new_edit.xml b/app/src/main/res/layout/activity_new_photo_edit.xml similarity index 55% rename from app/src/main/res/layout/activity_new_edit.xml rename to app/src/main/res/layout/activity_new_photo_edit.xml index 3985d5cdb..aae3460c7 100644 --- a/app/src/main/res/layout/activity_new_edit.xml +++ b/app/src/main/res/layout/activity_new_photo_edit.xml @@ -1,7 +1,6 @@ - diff --git a/app/src/main/res/layout/activity_new_video_edit.xml b/app/src/main/res/layout/activity_new_video_edit.xml new file mode 100644 index 000000000..aae3460c7 --- /dev/null +++ b/app/src/main/res/layout/activity_new_video_edit.xml @@ -0,0 +1,6 @@ + + diff --git a/app/src/main/res/layout/directory_item_grid_square.xml b/app/src/main/res/layout/directory_item_grid_square.xml index 216398756..f2a796539 100644 --- a/app/src/main/res/layout/directory_item_grid_square.xml +++ b/app/src/main/res/layout/directory_item_grid_square.xml @@ -35,7 +35,7 @@ android:layout_alignEnd="@+id/dir_shadow_holder" android:layout_alignParentTop="true" android:layout_alignParentEnd="true" - android:layout_margin="@dimen/small_margin" + android:layout_margin="@dimen/medium_margin" android:background="@drawable/circle_background" android:contentDescription="@null" android:padding="@dimen/tiny_margin" diff --git a/app/src/main/res/layout/photo_video_item_grid.xml b/app/src/main/res/layout/photo_video_item_grid.xml index 5df66e5e3..64dbbf88f 100644 --- a/app/src/main/res/layout/photo_video_item_grid.xml +++ b/app/src/main/res/layout/photo_video_item_grid.xml @@ -1,6 +1,5 @@ - + android:layout_height="match_parent" /> + android:visibility="gone" /> + tools:text="02:34" /> + android:visibility="gone" /> + tools:text="My photo" /> diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 20430c299..4252008f4 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -77,11 +77,18 @@ تعديل تدوير مسار الصورة غير صحيح + Invalid video path فشل تعديل الصورة + Video editing failed تم إلغاء تعديل الصورة + Video editing cancelled تم تعديل الملف بنجاح + Image edited successfully + Video edited successfully تعديل الصورة باستخدام: - لم يتم العثور على أي محرر للصور + Edit video with: + لم يتم العثور على أي محرر للصور + No video editor found موقع الملف غير معروف لا يمكن إستبدال الملف الأصل تدوير لليسار @@ -254,14 +261,45 @@ لون الفرشاة المحرر هل تريد إغلاق المحرر؟ - هل تريد فعلاً تجاهل الصورة؟ + Do you really want to discard the changes? نعم لا إلغاء موافق حفظ - جارٍ تصدير الصورة… - جارٍ تصدير الصورة %s. + Exporting… + Exporting %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage أنعكاس أفقي أنعكاس رأسي تراجع @@ -284,6 +322,7 @@ أخضر زبرجد Pipettable لون + Trim كيف يمكنني جعل تطبيق الاستديو معرض الجهاز الإفتراضي ؟ diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index b9d2ce4e7..5be3581d8 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -77,11 +77,18 @@ Editor Rotate Invalid image path + Invalid video path Image editing failed + Video editing failed Image editing cancelled + Video editing cancelled File edited successfully + Image edited successfully + Video edited successfully Edit image with: - No image editor found + Edit video with: + No image editor found + No video editor found Unknown file location Could not overwrite the source file Rotate left @@ -254,14 +261,45 @@ Brush Color Editor Close Editor? - Do you really want to discard the image? + Do you really want to discard the changes? Yes No Cancel Accept Save - Exporting image… - Exporting image %s. + Exporting… + Exporting %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage Flip H Flip V Undo @@ -284,6 +322,7 @@ Green Aquamarin Pipettable color + Trim How can I make Simple Gallery the default device gallery? diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 9080d3659..2a2a66d67 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -77,11 +77,18 @@ Editor Rotar Ruta de imatge no vàlida + Invalid video path Ha fallat la edició de la imatge + Video editing failed S\'ha cancel·lat l\'edició de la imatge + Video editing cancelled Fitxer editar satisfactoriament + Image edited successfully + Video edited successfully Editar imatge utilitzant: - No s’ha trobat cap editor d’imatges + Edit video with: + No s’ha trobat cap editor d’imatges + No video editor found Ubicació de l’arxiu desconeguda No s’ha pogut sobreescriure l’arxiu d’origen Rotar a l’esquerra @@ -254,14 +261,45 @@ de pinzellColor Editor Tancar Editor? - Vols realment descartar la imatge? + Do you really want to discard the changes? Si No Cancel·lar Acceptar Desar - Exportar imatge… - Exportant imatge %s. + Exportar… + Exportant %s. + Adhesiu + Color d\'adhesiu + Opcions d’adhesius + Afegeix + Color + Suprimeix + Al capdavant + Estirar + Substitueix + Opacitat + Contrast + Saturació + Brillantor + Brillantor + Superposició + Normal + Enfosquir + Pantalla + Superposició + Lighten + Multiplicar + Color cremat + Llum suau + Llum dura + Cap + Daurat + Fuga de llum 1 + Mosaic + Paper + Pluja + Vintage Voltejar H Voltejar V Desfer @@ -284,6 +322,7 @@ Verd Aiguamarina Pipetejat de color + Trim Com puc fer que Simple Gallery sigui la galeria de dispositius predeterminada? diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index e6b223492..f2c196cee 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -77,11 +77,18 @@ Editor Otočit Neplatná cesta + Invalid video path Úprava souboru selhala + Video editing failed Image editing cancelled + Video editing cancelled Soubor byl úspěšně upraven + Image edited successfully + Video edited successfully Upravit soubor pomocí: - Nebyl nalezen žádný editor + Edit video with: + Nebyl nalezen žádný editor + No video editor found Neznámé umístění souboru Nepodařilo se přepsat zdrojový soubor Otočit doleva @@ -254,14 +261,45 @@ Barva štětce Editor Zavřít editor? - Opravdu chcete zahodit úpravy obrázku? + Opravdu chcete zahodit úpravy? Ano Ne Zrušit Potvrdit Uložit - Exportuje se obrázek… - Export obrázku %s. + Exportuje se… + Export %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage Překlopit H Překlopit V Vrátit @@ -284,6 +322,7 @@ Zelená Akvamarín Pipetovatelná barva + Trim Jak nastavím Jednoduchou galerii jako výchozí galerii? diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 3c04f3b1b..227bd429c 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -77,11 +77,18 @@ Editor Roter Ugyldig sti til billede + Invalid video path Redigering af billede mislykkedes + Video editing failed Billede redigering annulleret + Video editing cancelled Fil redigeret med succes + Image edited successfully + Video edited successfully Rediger billede med: - Der blev ikke fundet en editor til billedbehandling + Edit video with: + Der blev ikke fundet en editor til billedbehandling + No video editor found Ukendt filplacering Kunne ikke overskrive kildefilen Roter mod venstre @@ -254,14 +261,45 @@ Brush Color Editor Close Editor? - Do you really want to discard the image? + Do you really want to discard the changes? Yes No Cancel Accept Save - Exporting image… - Exporting image %s. + Exporting… + Exporting %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage Flip H Flip V Undo @@ -284,6 +322,7 @@ Green Aquamarin Pipettable color + Trim Hvordan kan jeg gøre Simple Gallery til min enheds standardgalleri? diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 81dff8518..53c0ef761 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -77,11 +77,18 @@ Editor Drehen Ungültiger Dateipfad + Invalid video path Bildbearbeitung fehlgeschlagen + Video editing failed Bildbearbeitung abgebrochen + Video editing cancelled Datei erfolgreich bearbeitet + Image edited successfully + Video edited successfully Bild bearbeiten mit: - Keine Bildeditor-App gefunden + Edit video with: + Keine Bildeditor-App gefunden + No video editor found Unbekannter Dateipfad Konnte Quelldatei nicht überschreiben Nach links drehen @@ -254,14 +261,45 @@ Pinselfarbe Editor Editor schließen? - Möchtest du das Bild wirklich verwerfen? + Do you really want to discard the changes? Ja Nein Abbrechen Akzeptieren Speichern - Bild wird exportiert… - Bild %s wird exportiert. + Exporting… + Exporting %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage H spiegeln V spiegeln Rückgängig @@ -284,6 +322,7 @@ Grün Aquamarin Pipettierbare Farbe + Trim Wie kann ich Schlichte Galerie als Standardanwendung auswählen? diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 8a861ef75..230ffea25 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -30,8 +30,8 @@ Διαμοιρασμός έκδοσης με αλλαγμένο μέγεθος Γειά σας,\n\nΦαίνεται πως αναβαθμίσατε από την παλιά δωρεάν εφαρμογή. Τώρα θα πρέπει να απεγκαταστήσετε την παλιά έκδοση, απο το πλήκτρο \"Αναβάθμιση σε Pro\" στο επάνω των ρυθμίσεων της εφαρμογής.\n\nΘα πρέπει να διαγράψετε μόνο τα αντικείμενα του Κάδου, πρέπει να επαναφέρετε τα αγαπημένα στοιχεία που δεν έχουν επισημανθεί καθώς και τις ρυθμίσεις της εφαρμογής σας.\n\nΣας ευχαριστώ! Εναλλαγή αναζήτησης αρχείων σε όλους τους ορατούς φακέλους - Set as default folder - Unset as default folder + Ορισμός ως προεπιλεγμένου φακέλου + Κατάργηση ως προεπιλεγμένου φακέλου Φιλτράρισμα πολυμέσων @@ -76,12 +76,19 @@ Επεξεργαστής Περιστροφή - Μη έγκυρη διαδρομή εικόνας + Άκυρη διαδρομή εικόνας + Άκυρη διαδρομή βίντεο Η επεξεργασία εικόνας απέτυχε + Η επεξεργασία βίντεο απέτυχε Η επεξεργασία εικόνας ακυρώθηκε + Η επεξεργασία βίντεο ακυρώθηκε Επιτυχής επεξεργασία αρχείου + Επιτυχής επεξεργασία εικόνας + Επιτυχής επεξεργασία βίντεο Επεξεργασία εικόνας με: - Δεν βρέθηκε επεργαστής εικόνων + Επεξεργασία βίντεο με: + Δεν βρέθηκε επεργαστής εικόνων + Δεν βρέθηκε επεργαστής βίντεο Άγνωστη τοποθεσία αρχείου Δεν ήταν δυνατή η αντικατάσταση του αρχείου πηγής Περιστροφή αριστερά @@ -90,7 +97,7 @@ Περιστροφή Οριζόντια περιστροφή Κατακόρυφη περιστροφή - Ελεύθερο + Προσαρμογή Άλλο @@ -185,13 +192,13 @@ Αποφυγή εμφάνισης μη έγκυρων αρχείων Εμφάνιση τύπου αρχείου εικόνας Επιτρέπει την μεγέθυνση βίντεο με διπλό πάτημα - Folder thumbnail style - Show file count on a separate line - Show file count in brackets - Do not show file count - Limit long folder titles to 1 line - Square - Rounded corners + Στυλ μικρογραφίας φακέλου + Εμφάνιση πλήθους αρχείων σε ξεχωριστή γραμμή + Εμφάνιση πλήθους αρχείων σε αγκύλες + Χωρίς εμφάνιση μέτρησης αρχείων + Περιορισμό μεγάλων τίτλων φακέλων σε 1 γραμμή + Τετράγωνο + Στρογγυλεμένες γωνίες Εικονίδια @@ -254,14 +261,45 @@ Χρώμα Βούρτσας Επεξεργαστής Κλείσιμο Επεξεργαστή? - Θέλετε να απορρίψετε την εικόνα; + Θέλετε πραγματικά να απορρίψετε τις αλλαγές; Ναί Όχι Ακύρωση Αποδοχή Αποθήκευση - Εξαγωγή εικόνας… - Εξαγωγή εικόνας %s. + Εξαγωγή… + Εξαγωγή %s. + Αυτοκόλλητο + Χρώμα Αυτοκόλλητου + Επιλογές Αυτοκόλλητου + Προσθήκη + Χρώμα + Διαγραφή + Εμπρός + Ίσιωμα + Αντικατάσταση + Αδιαφάνεια + Αντίθεση + Κορεσμός + Φωτεινότητα + Μεταφορτώσεις + Επικάλειψη + Κανονικό + Σκούρο + Οθόνη + Overlay + Ξάνοιγμα + Πολλαπ/σμός + Κάψιμο χρώματος + Απαλό φως + Σκληρό φως + Χωρίς + Χρυσό + Φωτεινή διαρροή 1 + Μωσαϊκό + Χαρτί + Βροχή + Αντικέ Αναστροφή Ο Αναστροφή Κ Αναίρεση @@ -284,7 +322,7 @@ Πράσινο Γαλαζοπράσινο Χρώμα πίνακα Pipet - + Κόψιμο Πώς μπορώ να κάνω την Απλή Συλλογή προεπιλεγμένη εφαρμογή συλλογής πολυμέσων; diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 49190cfe6..72e819957 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -30,8 +30,8 @@ Comparte una versión redimensionada Oye,\n\nParece que actualizaste de la aplicación gratuita vieja. Ahora puedes desinstalar la versión vieja, que tiene un botón \'Actualizar a Pro\' en la aprte superior de los ajustes de la app.\n\nSolo tendrás los elementos de la Papelera de Reciclaje eliminados, favoritos desmarcados y también tendrás que reiniciar los ajustes de la app.\n\n¡Gracias! Cambiar a la búsqueda de archivos en todas las carpetas visibles - Set as default folder - Unset as default folder + Poner como carpeta predeterminada + Quitar como carpeta predeterminada Filtro de medios @@ -76,12 +76,19 @@ Editor Rotar - Ruta de imagen no válida - Falló la edición de imagen + Ruta de imagen inválida + Ruta de video inválida + Edición de imagen fallida + Edición de video fallida Edición de imagen cancelada - Fichero editado satisfactoriamente - Editar imagen usando: - No se encontró editor de imágenes + Edición de video cancelada + Archivo editado con éxito + Imagen editada con éxito + Video editado con éxito + Editar imagen con: + Editar video con: + No se encontró editor de imágenes + No se encontró editor de video Ubicación del archivo desconocida No se ha podido sobrescribir el archivo de origen Rotar a la izquierda @@ -91,7 +98,7 @@ Horizontalmente Verticalmente Libre - Otros + Otro Fondos de pantalla Simple Gallery @@ -254,14 +261,45 @@ Color del pincel Editor ¿Cerrar editor? - ¿Realmente quieres descartar la imagen? + ¿Realmente queires descartar los cambios? Sí No Cancelar Aceptar Guardar - Exportando imagen… - Exportando imagen %s. + Exportando… + Exportando %s. + Sticker + Color de Sticker + Opciones de Sticker + Añadir + Color + Eliminar + Al Frente + Enderezar + Remplazar + Opacidad + Contraste + Saturación + Brillo + Subidas + Modo de fusión + Normal + Más obscuro + Pantalla + Superpuesto + Más claro + Multiplicar + Quemadura de color + Luz suave + Luz fuerte + Ninguno + Dorado + Falta de luz 1 + Mosaico + Papel + Lluvia + Vintage Girar Hor Girar Vert Deshacer @@ -284,6 +322,7 @@ Verde Aguamarina Color pipetable + Recortar ¿Cómo puedo hacer que Simple Gallery sea la galería de dispositivos predeterminada? diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 2e18d6c7a..836a4c0c0 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -77,11 +77,18 @@ Editori Käännä Kuvan polkua ei ole + Invalid video path Kuvan muokkaus epäonnistui + Video editing failed Image editing cancelled + Video editing cancelled File edited successfully + Image edited successfully + Video edited successfully Muokkaa kuvaa: - Kuvamuokkainta ei löytynyt + Edit video with: + Kuvamuokkainta ei löytynyt + No video editor found Tuntematon tiedostosijainti Lähdetiedoston ylikirjoitus epäonnistui Käännä vasemmalle @@ -254,14 +261,45 @@ Brush Color Editor Close Editor? - Do you really want to discard the image? + Do you really want to discard the changes? Yes No Cancel Accept Save - Exporting image… - Exporting image %s. + Exporting… + Exporting %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage Flip H Flip V Undo @@ -284,6 +322,7 @@ Green Aquamarin Pipettable color + Trim Miten voin tehdä Simple Gallerystä oletusgalleriasovelluksen? diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 4ada4fbdc..0dfe42f3b 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -30,8 +30,8 @@ Partager une version redimensionnée Hé,\n\nvous avez apparemment fait une mise à niveau à partir de l\'ancienne application gratuite. Vous pouvez maintenant désinstaller l\'ancienne version avec le bouton \'Mettre à niveau vers Pro\' en haut des paramètres de l\'application.\n\nVos éléments de la corbeille seront supprimés, les éléments favoris seront non marqués et vous devrez également restaurer les paramètres de votre application.\n\nMerci ! Basculer vers la recherche de fichiers - Définir comme dossier par défaut - Ne plus définir comme dossier par défaut + Définir comme défaut + Oublier le dossier Filtrer les médias @@ -76,12 +76,19 @@ Éditeur Pivoter - Emplacement invalide + Emplacement d\'image invalide + Emplacement de vidéo invalide L\'édition de l\'image a échoué + L\'édition de la vidéo a échoué L\'édition de l\'image a été annulée - L\'image a été éditée avec succès + L\'édition de la vidéo a été annulée + Le fichier a été éditée avec succès + L\'image a été éditée avec succès + La vidéo a été éditée avec succès Modifier l\'image avec : - Aucun éditeur d\'image trouvé + Modifier la vidéo avec : + Aucun éditeur d\'image trouvé + Aucun éditeur de vidéo trouvé Emplacement du fichier inconnu Impossible de remplacer le fichier source Pivoter à gauche @@ -140,7 +147,7 @@ \'Grouper par\' et \'Trier par\' sont 2 modes indépendants - Dossier affiché sur le widget : + Dossier affiché dans le widget : Afficher le nom du dossier @@ -254,14 +261,45 @@ Couleur du pinceau Éditeur Fermer l\'éditeur ? - Voulez-vous vraiment annuler l\'édition ? + Voulez-vous vraiment abandonner les modifications ? Oui Non Annuler Accepter Enregistrer - Exportation de l\'image… - Exportation de l\'image %s + Exportation… + Exportation %s + Sticker + Couleur de Sticker + Options de Sticker + Ajouter + Couleur + Supprimer + Devant + Redresser + Remplacer + Transparence + Contraste + Saturation + Luminosité + Téléchargements + Superposition + Normal + Assombrir + Écran + Recouvrir + Alléger + Dupliquer + Brûlure de couleur + Lumière douce + Lumière forte + Aucune + Doré + Fuite légère 1 + Mosaïque + Papier + Pluie + Vintage Symétrie H Symétrie V Annuler @@ -284,6 +322,7 @@ Vert Aquamarin Couleur de la pipette + Trim Comment faire de Simple Gallery ma galerie par défaut ? @@ -317,7 +356,7 @@ - Simple Gallery Pro - Photo Manager & Editor + Simple Gallery Pro - Photo Manager & Editeur Browse your memories without any interruptions with this photo and video gallery diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index c3cdab397..8dede9d61 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -77,11 +77,18 @@ Editor Rotar Ruta á imaxe non válida + Invalid video path Fallo na edición da imaxe + Video editing failed Cancelouse a edición da imaxe + Video editing cancelled Ficheiro editado correctamente + Image edited successfully + Video edited successfully Editar imaxe con: - Non se atopou ningún editor + Edit video with: + Non se atopou ningún editor + No video editor found Localización do ficheiro descoñecida Non se puido sobrescribir o ficheiro Rotar a esquerda @@ -254,14 +261,45 @@ Cor do Pincel Editor Pechar o Editor? - Tes a certeza de desbotar a imaxe? + Do you really want to discard the changes? Si Non Cancelar Aceptar Gardar - Exportando imaxe… - Exportando imaxe %s. + Exportando… + Exportando %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage Volteo H Volteo V Desfacer @@ -284,6 +322,7 @@ Verde Augamariña Escoller coa pipeta + Trim Como podo facer que Simple Gallery sexa a galería por defecto no meu dispositivo? diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 2405d0d7b..ba760dffe 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -77,11 +77,18 @@ Uređivač Rotiraj Neispravna putanja slike + Invalid video path Uređivanje slika nije uspjelo + Video editing failed Image editing cancelled + Video editing cancelled File edited successfully + Image edited successfully + Video edited successfully Uredi sliku pomoću: - Nije pronađen uređivač slika + Edit video with: + Nije pronađen uređivač slika + No video editor found Nepoznata lokacija datoteke Nije moguće presnimiti izvornu datoteku Rotiraj ulijevo @@ -254,14 +261,45 @@ Brush Color Editor Close Editor? - Do you really want to discard the image? + Do you really want to discard the changes? Yes No Cancel Accept Save - Exporting image… - Exporting image %s. + Exporting… + Exporting %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage Flip H Flip V Undo @@ -284,6 +322,7 @@ Green Aquamarin Pipettable color + Trim Kako mogu postaviti Jednostavnu galeriju kao zadanu galeriju uređaja? diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 871200eea..a9bf048fe 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -77,11 +77,18 @@ Szerkesztő Forgatás Érvénytelen kép elérési útvonal + Invalid video path Sikertelen kép szerkesztés + Video editing failed A képszerkesztés megszakítva + Video editing cancelled A fájl szerkesztése sikerült + Image edited successfully + Video edited successfully Kép szerkesztés ezzel: - Nem található kép szerkesztő + Edit video with: + Nem található kép szerkesztő + No video editor found Ismeretlen fájl hely Nem lehet felülírni a forrás fájlt Forgatás balra @@ -254,14 +261,45 @@ Ecset színe Szerkesztő Bezárja a szerkesztőt? - Valóban el akarja dobni a képet? + Valóban el akarja dobni a változtatásokat? Igen Nem Mégsem Elfogad Mentés - Kép exportálása... - %s kép exportálása + Exportálás… + %s exportálása. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage Tükrözés vízszintesen Tükrözés függőlegesen Visszavonás @@ -284,6 +322,7 @@ Zöld Aquamarin Pipetta szín + Trim Hogyan tudom beállítani a Simple Gallery-t alapértelmezett galériának? diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index eb489537e..813b690a4 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -77,11 +77,18 @@ Penyunting Rotasi Jalur gambar tidak valid + Invalid video path Gagal menyunting gambar + Video editing failed Image editing cancelled + Video editing cancelled File edited successfully + Image edited successfully + Video edited successfully Sunting gambar dengan: - Tidak ditemukan aplikasi penyunting gambar + Edit video with: + Tidak ditemukan aplikasi penyunting gambar + No video editor found Lokasi berkas tidak diketahui Tidak bisa mengganti berkas sumber Putar ke kiri @@ -254,14 +261,45 @@ Warna Kuas Editor Tutup Editor? - Buang perubahan pada gambar? + Do you really want to discard the changes? Ya Tidak Batal Terima Simpan - Mengekspor gambar… - Mengekspor gambar %s. + Mengekspor… + Mengekspor %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage Balik H Balik V Urungkan @@ -284,6 +322,7 @@ Hijau Aquamarin Warna pipet + Trim Bagaimana cara menjadikan Simple Gallery sebagai aplikasi galeri default? diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 1656193e4..de85d8122 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -77,11 +77,18 @@ Penyunting Rotasi Jalur gambar tidak valid + Invalid video path Gagal menyunting gambar + Video editing failed Image editing cancelled + Video editing cancelled File edited successfully + Image edited successfully + Video edited successfully Sunting gambar dengan: - Tidak ditemukan aplikasi penyunting gambar + Edit video with: + Tidak ditemukan aplikasi penyunting gambar + No video editor found Lokasi berkas tidak diketahui Tidak bisa mengganti berkas sumber Putar ke kiri @@ -254,14 +261,45 @@ Brush Color Editor Close Editor? - Do you really want to discard the image? + Do you really want to discard the changes? Yes No Cancel Accept Save - Exporting image… - Exporting image %s. + Exporting… + Exporting %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage Flip H Flip V Undo @@ -284,6 +322,7 @@ Green Aquamarin Pipettable color + Trim Bagaimana cara menjadikan Simple Gallery sebagai aplikasi galeri default? diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index dbba51205..17beb2909 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -77,11 +77,18 @@ Editor Ruota Percorso dell\'immagine non valido + Invalid video path Modifica dell\'immagine fallita + Video editing failed Modifica immagine annullata + Video editing cancelled File modificato correttamente + Image edited successfully + Video edited successfully Modifica immagine con: - Editor delle immagini non trovato + Edit video with: + Editor delle immagini non trovato + No video editor found Posizione del file sconosciuta Impossibile sovrascrivere il file originale Ruota a sinistra @@ -254,14 +261,45 @@ Colore pennello Editor Chiudere l\'editor? - Vuoi veramente scartare l\'immagine? + Do you really want to discard the changes? Sì No Annulla Accetta Salva - Esportazione immagine… - Esportazione immagine %s. + Esportazione… + Esportazione %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage Capovolgi O Capovolgi V Annulla @@ -284,6 +322,7 @@ Verde Acquamarina Colore pipettabile + Trim Come posso impostare Semplice Galleria come la galleria predefinita del dispositivo? diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index e3a7f2291..f0b3b3f33 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -26,12 +26,12 @@ 撮影日の値を修正 修正中… 撮影日が正常に修正されました - No Date Taken values have been found + 撮影日が見つかりません リサイズした画像を共有 - あなたは無料版からアップグレードしたと思われます。\"Upgrade to Pro\"というボタンが設定の上部にある無料版はアンインストールすることができます。\n\nごみ箱の中身は削除され、お気に入りもアプリの設定もリセットされることになります。\n\nありがとう! + あなたは無料版からアップグレードしたと思われます。\"Pro版にアップグレード\"というボタンが設定の上部にある無料版はアンインストールすることができます。\n\nごみ箱の中身は削除され、お気に入りもアプリの設定もリセットされることになります。\n\nありがとう! 表示されているすべてのフォルダで検索 に切り替え - Set as default folder - Unset as default folder + デフォルトのフォルダとして設定 + デフォルトのフォルダから外す 表示する形式 @@ -63,7 +63,7 @@ 追加フォルダの管理 フォルダを追加 メディア入りのフォルダがアプリで認識されない場合は手動で追加します。 - No media files have been found. You can solve it by adding the folders containing media files manually. + メディアファイルが見つかりません。メディアファイルを手動で追加することにより解決できます。 リサイズ @@ -77,11 +77,18 @@ 画像編集 回転 無効な画像パス + 無効な動画パス 画像の編集に失敗しました - Image editing cancelled + 動画の編集に失敗しました + 画像の編集がキャンセルされました + 動画の編集がキャンセルされました ファイルの編集に成功しました + 画像の編集に成功しました + 動画の編集に成功しました 画像を編集: - 画像エディターが見つかりません + 動画を編集: + 画像エディターが見つかりません + 動画エディターが見つかりません ファイルの場所が不明です 元のファイルを上書きできません 左に回転 @@ -137,7 +144,7 @@ 撮影日時 (毎月) ファイル形式 拡張子 - Please note that grouping and sorting are 2 independent fields + グループ化とソートはそれぞれ違ったフィールドであることに注意してください ウィジェットに表示するフォルダ: @@ -176,22 +183,22 @@ ごみ箱をメイン画面の最後に表示 フルスクリーン表示を下にスワイプするジェスチャーで閉じる ダブルタップして 1:1 ズームする - Always open videos on a separate screen with new horizontal gestures - Show a notch if available + 常に新しい左右のジェスチャーで動画を開く + 利用可能なノッチを表示 ジェスチャーで画像を回転する - File loading priority - Speed - Compromise - Avoid showing invalid files - Show image file types - Allow zooming videos with double tapping them - Folder thumbnail style - Show file count on a separate line - Show file count in brackets - Do not show file count - Limit long folder titles to 1 line - Square - Rounded corners + ファイルの優先ローディング + スピード + コンプロマイズ + 無効なファイルを非表示 + 画像ファイルの種類を表示 + ダブルタップで動画ズームを設定 + フォルダサムネイルのスタイル + ファイル数を別の行に表示 + ファイル数を括弧内に表示 + ファイル数を非表示 + 長いフォルダ名を1行に制限 + 四角 + 丸コーナー サムネイル設定 @@ -254,129 +261,173 @@ ブラシの色 エディター エディターを閉じますか? - 画像を破棄して閉じますか? + 本当に変更を破棄しますか？ はい いいえ キャンセル 了解 保存 - 画像を保存中…… - 画像を保存中 %s. + エクスポート中… + エクスポート%s + ステッカー + ステッカーの色 + ステッカーオプション + 追加 + 色 + 削除 + 前面へ + まっすぐにする + 置き換え + 不透明度 + コントラスト + 彩度 + 明るさ + アップロード済 + オーバーレイ + ノーマル + 暗め + 画面 + オーバーレイ + 明るめ + 複写 + 焼き込みカラー + ソフトライト + ハードライト + なし + ゴールデン + 光漏れ 1 + モザイク + ペーパー + 雨 + ビンテージ 水平方向に反転 垂直方向に反転 元に戻す やり直し カラーピッカー 透明 - White - Gray - Black - Light blue - Blue - Purple - Orchid - Pink - Red - Orange - Gold - Yellow - Olive - Green - Aquamarin - Pipettable color + ホワイト + グレー + ブラック + ライトブルー + ブルー + パープル + オーキッド + ピンク + レッド + オレンジ + ゴールド + イエロー + オリーブ + グリーン + アクアマリン + ピペッティング可能な色 + トリム - How can I make Simple Gallery the default device gallery? - First you have to find the currently default gallery in the Apps section of your device settings, look for a button that says something like \"Open by default\", click on it, then select \"Clear defaults\". - The next time you will try opening an image or video you should see an app picker, where you can select Simple Gallery and make it the default app. - I locked the app with a password, but I forgot it. What can I do? - You can solve it in 2 ways. You can either reinstall the app, or find the app in your device settings and select \"Clear data\". It will reset all your settings, it will not remove any media files. - How can I make an album always appear at the top? - You can long press the desired album and select the Pin icon at the actions menu, that will pin it to the top. You can pin multiple folders too, pinned items will be sorted by the default sorting method. + どうすればSimpleギャラリーをデバイスのデフォルトギャラリーに出来ますか？ + まずデバイスの設定内のアプリセクションで現在のデフォルトのギャラリーを探し、\"デフォルトで開く\"のようなボタンを探してクリックし、そして\"デフォルトを消去\"を選択します。 + 次に画像や動画を開こうとした時に、アプリ選択が表示されるのでSimpleギャラリーを通常のアプリとして選択します。 + アプリをパスワードでロックしましたが、パスワードを忘れてしまいました。どうすればいいですか？ + 解決策は2つあります。アプリを再インストールするか、デバイス設定からアプリを見つけて\"データを消去\"を選択するかです。そうすると設定がリセットされますが、メディアファイルは削除されません。 + 常にアルバムが一番上に表示されるようにするにはどうすればいいですか？ + アルバムを長押しで選択し、アクションメニューからピンアイコンを選択すれば一番上に固定されます。複数のフォルダをピン留めできます。ピン留めされた項目は、デフォルトのソート方法でソートされます。 動画を早送りするにはどうすればよいですか？ - You can do it by double tapping the side of the screen, or tapping the current or max duration texts near the seekbar. If you enable opening videos on a separate screen in the app settings, you can use horizontal gestures too. - What is the difference between hiding and excluding a folder? - Exclude prevents displaying the folder only in Simple Gallery, while Hide works system-wise and it hides the folder from other galleries too. It works by creating an empty \".nomedia\" file in the given folder, which you can then remove with any file manager too. Note that some devices do not allow hiding folders like Camera, Screenshots and Downloads. - Why do folders with music cover art or stickers show up? - It can happen that you will see some unusual albums show up. You can easily exclude them by long pressing them and selecting Exclude. In the next dialog you can then select the parent folder, chances are it will prevent the other related albums showing up too. - A folder with images isn\'t showing up, or it doesn\'t show all items. What can I do? - That can have multiple reasons, but solving it is easy. Just go in Settings -> Manage Included Folders, select Plus and navigate to the required folder. - What if I want just a few particular folders visible? - Adding a folder at the Included Folders doesn\'t automatically exclude anything. What you can do is go in Settings -> Manage Excluded Folders, exclude the root folder \"/\", then add the desired folders at Settings -> Manage Included Folders. - That will make only the selected folders visible, as both excluding and including are recursive and if a folder is both excluded and included, it will show up. - Can I crop images with this app? - Yes, you can crop images in the editor, by dragging the image corners. You can get to the editor either by long pressing an image thumbnail and selecting Edit, or selecting Edit from the fullscreen view. - Can I somehow group media file thumbnails? - Sure, just use the \"Group by\" menu item while at the thumbnails view. You can group files by multiple criteria, including Date Taken. If you use the \"Show all folders content\" function you can group them by folders too. - Sorting by Date Taken doesn\'t seem to work properly, how can I fix it? - It is most likely caused by the files being copied from somewhere. You can fix it by selecting the file thumbnails and selecting \"Fix Date Taken value\". - I see some color banding on the images. How can I improve the quality? - The current solution for displaying images works fine in the vast majority of cases, but if you want even better image quality, you can enable the \"Show images in the highest possible quality\" at the app settings, in the \"Deep zoomable images\" section. - I have hidden a file/folder. How can I unhide it? - You can either press the \"Temporarily show hidden items\" menu item at the main screen, or toggle \"Show hidden items\" in the app settings to see the hidden item. If you want to unhide it, just long press it and select \"Unhide\". Folders are hidden by adding a hidden \".nomedia\" file into them, you can delete the file with any file manager too. - Why does the app take up so much space? - App cache can take up to 250MB, it ensures quicker image loading. If the app is taking up even more space, it is most likely caused by you having items in the Recycle Bin. Those files count to the app size. You can clear the Recycle bin by opening it and deleting all files, or from the app settings. Every file in the Bin is deleted automatically after 30 days. + 画面の横をダブルタップするか、検索バーの近くにある現在もしくは最大数のテキストをタップすれば可能です。別画面動画を開くことをアプリ設定で有効にしている場合、左右ジェスチャーも使用できます。 + フォルダの非表示と除外の違いは何ですか？ + 除外はSimpleギャラリーでのみフォルダを非表示にし、非表示はシステム上で動作するので他のギャラリーからもフォルダを非表示にします。指定されたフォルダに空の\".nomedia\"ファイルを作成することにより動作し、任意のファイルマネージャーで削除することも出来ます。一部のデバイスでは、カメラ、スクリーンショット、ダウンロードのようなフォルダを非表示に出来ないことはご留意ください。 + 音楽のカバーアートやステッカーのフォルダが表示されるのはなぜですか？ + 通常ではないアルバムが表示されることがあります。長押しして除外を選択することで簡単に除くことができます。次のダイアログで親フォルダを選択すると、他の関連アルバムも表示されなくなります。 + 画像フォルダが表示されなかったり、全てのアイテムが表示されなかったりします。どうしたらいいですか？ + 理由はいくつかありますが、解決は簡単です。設定→含まれているフォルダの管理に移動し、Plusを選択し、必要なフォルダに移動します。 + 特定のフォルダのみ表示にしたい場合はどうすればいいですか？ + 含まれているフォルダにフォルダを追加しても、自動的に除外されるわけではありません。設定→除外されたフォルダの管理に移動し、ルートフォルダを除外し、設定→含まれているフォルダの管理で目的のフォルダを追加すれば可能です。 + 除外と包含は両方再帰的なので、フォルダが含まれており除外もされている場合、選択したフォルダのみ表示されるのです。 + このアプリで画像のトリミングは出来ますか？ + はい、編集で画像をトリミング出来ます。画像の隅をドラッグしてください。画像のサムネイルを長押しし編集を選択するか、フルスクリーンで編集を選択することにより編集できます。 + どうすればメディアファイルのサムネイルをグループ化できますか？ + サムネイル表示中に\"グループ分け\"メニューを使用してください。撮影日を含めた、複数の条件でグループ化することが出来ます。\"すべてを表示\"機能を使えば、フォルダごとにグループ化することも出来ます。 + 撮影日でソートがうまく機能しないようです。どうすれば直せますか？ + おそらく、ファイルがコピーされたものであることが原因でしょう。ファイルサムネイルを選択し、\"撮影日の値を修正\"を選択することにより直せます。 + 画像にバンディングが見られます。どうすれば質を変えられますか？ + 現在の表示方法は大抵の場合問題は見られませんが、より高画質で表示したい場合はアプリ設定の\"画像のズームを深くする\"セクションで\"可能な限り高品質で画像を表示\"を有効にすると良いでしょう。 + 非表示にしているファイルやフォルダがあります。もう一度表示するにはどうすればいいですか？ + メイン画面で\"非表示の項目を一時的に表示\"を押すか、 アプリの設定で\"非表示のアイテムを表示する\"を切り替えると非表示にしている項目を見ることができます。表示したい場合は\"再表示\"を長押ししてください。フォルダは非表示の\".nomedia\"ファイルを追加して非表示にしているので、ファイルマネージャーで削除することもできます。 + アプリが容量を沢山使用するのはなぜですか？ + アプリのキャッシュがは画像の素早いローディングのため最大250MB使用します。もしそれ以上にアプリが容量を取るようであれば、ゴミ箱内のアイテムが原因となっているはずです。ゴミ箱内のファイルもアプリ容量として加算されます。ゴミ箱を開くか、アプリの設定から全てのファイルを削除できます。ゴミ箱内のアイテムは30日を過ぎると自動的に削除されます。 - Simple Gallery Pro - Photo Manager & Editor + シンプルギャラリープロ-写真とビデオの管理と編集 - Browse your memories without any interruptions with this photo and video gallery + お気に入りのフォトアルバム。スマートギャラリーで写真の切り取りや編集。 - Simple Gallery Pro is a highly customizable offline gallery. Organize & edit your photos, recover deleted files with the recycle bin, protect & hide files and view a huge variety of different photo & video formats including RAW, SVG and much more. - - The app contains no ads and unnecessary permissions. As the app doesn’t require internet access either, your privacy is protected. + シンプルギャラリーは、高度にカスタマイズ可能なオフラインのphoto vaultおよびファイル整理アプリです。ユーザー体験で世界中で何百万人もの人々に愛されています。 フォトギャラリーを使用して、写真の編集、削除した写真の復元、写真の保護と非表示、秘密のフォトアルバムの作成、写真のトリミングを簡単に行います。またRAW、SVG、GIF、パノラマなど、さまざまな写真やビデオ形式を表示することができます。 今すぐフォトギャラリーをダウンロードして、アルバムを好きなように管理してください！ ------------------------------------------------- - SIMPLE GALLERY PRO – FEATURES + シンプルギャラリー-写真および動画の管理と編集 ------------------------------------------------- - • Offline gallery with no ads or popups - • Simple gallery photo editor – crop, rotate, resize, draw, filters & more - • No internet access needed, giving you more privacy and security - • No unnecessary permissions required - • Quickly search images, videos & files - • Open & view many different photo and video types (RAW, SVG, panoramic etc) - • A variety of intuitive gestures to easily edit & organize files - • Lots of ways to filter, group & sort files - • Customize the appearance of Simple Gallery Pro - • Available in 32 languages - • Mark files as favorites for quick access - • Protect your photos & videos with a pattern, pin or fingerprint - • Use pin, pattern & fingerprint to protect the app launch or specific functions too - • Recover deleted photos & videos from the recycle bin - • Toggle visibility of files to hide photos & videos - • Create a customizable slideshow of your files - • View detailed information of your files (resolution, EXIF values etc) - • Simple Gallery Pro is open source - … and much much more! + 削除されたビデオを復元し、広告なしで写真をトリミングするオプションを備えた美しいモダンなフォトアルバム - PHOTO GALLERY EDITOR - Simple Gallery Pro makes it easy to edit your pictures on the fly. Crop, flip, rotate and resize your pictures. If you’re feeling a little more creative you can add filters and draw on your pictures! + 高度な写真編集–写真のトリミング、写真の編集、画像の検索。 削除されたビデオを復元できる快適で使いやすいphoto vault - SUPPORT FOR MANY FILE TYPES - Unlike some other gallery viewers & photo organizers, Simple Gallery Pro supports a huge range of different file types including JPEG, PNG, MP4, MKV, RAW, SVG, Panoramic photos, Panoramic videos and many more. + インターネットにアクセスする必要がないため、プライバシー、セキュリティ、安定性が向上-オフラインの秘密の写真アルバム - HIGHLY CUSTOMIZABLE GALLERY MANAGER - From the UI to the function buttons on the bottom toolbar, Simple Gallery Pro is highly customizable and works the way you want it to. No other gallery manager has this kind of flexibility! Thanks to being open source, we’re also available in 32 languages! + 画像をすばやく検索、写真の非表示、編集、削除された写真・ビデオ・GIF・その他のファイルを復元 - RECOVER DELETED PHOTOS & VIDEOS - Accidentally deleted a precious photo or video? Don’t worry! Simple Gallery Pro features a handy recycle bin where you can recover deleted photos & videos easily. + さまざまな種類の写真やビデオ（RAW、SVG、パノラマ、GIFなど）を開いて表示 - PROTECT & HIDE PHOTOS, VIDEOS & FILES - Using pin, pattern or your device’s fingerprint scanner you can protect and hide photos, videos & entire albums. You can protect the app itself or place locks on specific functions of the app. For example, you can’t delete a file without a fingerprint scan, helping to protect your files from accidental deletion. + 写真管理で写真を簡単に編集・整理するための使いやすいジェスチャーが多数 - Check out the full suite of Simple Tools here: - https://www.simplemobiletools.com - - Standalone website of Simple Gallery Pro: - https://www.simplemobiletools.com/gallery + ファイルをフィルタリング、グループ化、およびソートする多くの機能 - Facebook: - https://www.facebook.com/simplemobiletools + パターンロック、PIN、指紋を使用して写真とビデオを保護・編集 - Reddit: - https://www.reddit.com/r/SimpleMobileTools + PIN、パターンロック、指紋を使用して、アプリの起動や特定の機能も保護 + + ゴミ箱からビデオを復元 + + photo vaultを使用してファイルの表示の切り替え、写真とビデオの非表示、写真のトリミングが可能 + + フォトギャラリー内の多数のオプションを使用して、ファイルのカスタマイズショーを作成 + + •画像検索、写真編集、高品質は写真・ビデオ・GIFを指を使って簡単にズーム + + ビデオを見やすくするために、水平・垂直方向を簡単に変更 + + ファイル整理-シンプルなモバイルフォトギャラリーでは、画像・ビデオ・GIFの名前変更、コピー/移動、表示/非表示、削除が可能 + + 手間をかけずに画像を壁紙に設定 + + 高度な写真編集 + シンプルなギャラリーファイルの整理とフォトアルバムにより、簡単すぐに写真を編集することができます。 画像の切り抜き、反転、回転、サイズ変更、または必要なフィルターの適用などがお使いいただけます。 + + 様々なファイルタイプをサポート + シンプルギャラリーは、JPEG、PNG、MP4、MKV、RAW、SVG、GIF、パノラマ写真、ビデオなど、さまざまな種類のファイルをサポートしています。 + + カスタマイズ可能なファイル管理 + シンプルギャラリーはUIから下部のツールバーの機能ボタンまで、高度にカスタマイズ可能なファイル整理機能を備えています。 + + 削除された写真と動画の復元 + 大切な写真やビデオをフォトアルバムから誤って削除したことはありませんか？シンプルなモバイルフォトギャラリーには、photo vaultアプリのおかげで削除された写真をすべて復元できる便利なオプションがあります。 + + 写真、動画、ファイルを保護して非表示に + PIN、パターンロック、またはデバイスの指紋認証を使用して、写真の保護と編集、削除されたビデオの復元、写真の切り抜き、画像の検索を行うことができます。 ファイルオーガナイザー自体を保護したり、アプリの特定の機能をロックしたりすることができます。 たとえば、指紋認証をしないとファイルの削除ができません。 + + 広告や不要な権限はありません。 完全にオープンソースで、カラーもカスタマイズ可能。 + + シンプルツールの完全なリストはこちらからご確認ください： + https://www.simplemobiletools.com + + シンプルギャラリープロのwebサイト： + https://www.simplemobiletools.com/gallery + + Facebook： + https://www.facebook.com/simplemobiletools + + Reddit： + https://www.reddit.com/r/SimpleMobileTools How can I make Simple Gallery the default device gallery? diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index d4770cad3..fcc53f487 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -77,11 +77,18 @@ Redaktorius Sukti Netinkamas atvaizdo kelias + Invalid video path Atvaizdo redagavimas nepavyko + Video editing failed Image editing cancelled + Video editing cancelled File edited successfully + Image edited successfully + Video edited successfully Redaguoti atvaizdą su: - Nerasta atvaizdų redagavimo programėlės + Edit video with: + Nerasta atvaizdų redagavimo programėlės + No video editor found Nežinoma bylos vieta Negalima perrašyti šaltinio bylos Sukti į kairę @@ -254,14 +261,45 @@ Brush Color Editor Close Editor? - Do you really want to discard the image? + Do you really want to discard the changes? Yes No Cancel Accept Save - Exporting image… - Exporting image %s. + Exporting… + Exporting %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage Flip H Flip V Undo @@ -284,6 +322,7 @@ Green Aquamarin Pipettable color + Trim Kaip galiu padaryti paprastą galeriją kaip numatytąją įrenginio galeriją? diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index b59f659f4..87bbc384b 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -30,8 +30,8 @@ Del versjon med endret størrelse Hey,\n\nseems like you upgraded from the old free app. You can now uninstall the old version, which has an \'Upgrade to Pro\' button at the top of the app settings.\n\nYou will only have the Recycle bin items deleted, favorite items unmarked and you will also have to reset your app settings.\n\nThanks! Skift til filsøk i alle synlige mapper - Set as default folder - Unset as default folder + Sett som standardmappe + Ikke lenger sett som standardmappe Filtrer media @@ -77,11 +77,18 @@ Redigering Roter Ugyldig bildebane + Invalid video path Bilderedigering feilet + Video editing failed Bilderedigering avbrutt + Video editing cancelled Fil vellykket redigert + Image edited successfully + Video edited successfully Rediger bilde med: - Ingen bilderedigeringsapp funnet + Edit video with: + Ingen bilderedigeringsapp funnet + No video editor found Ukjent filplassering Kunne ikke overskrive kildefilen Roter til venstre @@ -189,7 +196,7 @@ Vis antall filer på en separat linje Vis antall filer i parentes Ikke vis antall filer - Limit long folder titles to 1 line + Begrens lange mappetitler til 1 linje Firkantet Avrundede hjørner @@ -254,14 +261,45 @@ Penselfarge Redigering Lukke Redigering? - Vil du forkaste bildet? + Do you really want to discard the changes? Ja Nei Avbryt Aksepter Lagre - Eksporterer bilde… - Eksporterer bilde %s. + Eksporterer… + Eksporterer %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage Speilvend H Speilvend V Angre @@ -284,6 +322,7 @@ Grønn Akvamarin Pipettefarge + Trim How can I make Simple Gallery the default device gallery? diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index ebd246443..a3f89bca0 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -77,11 +77,18 @@ सम्पादक घुमाउने Invalid image path + Invalid video path Image editing failed + Video editing failed Image editing cancelled + Video editing cancelled File edited successfully + Image edited successfully + Video edited successfully Edit image with: - No image editor found + Edit video with: + No image editor found + No video editor found Unknown file location Could not overwrite the source file Rotate left @@ -254,14 +261,45 @@ Brush Color सम्पादक Close Editor? - Do you really want to discard the image? + Do you really want to discard the changes? Yes No रद्द स्विकार बचत - Exporting image… - Exporting image %s. + Exporting… + Exporting %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage Flip H Flip V Undo @@ -284,6 +322,7 @@ हरियो Aquamarin Pipettable color + Trim How can I make Simple Gallery the default device gallery? diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index fcfc8d35b..6d8d36991 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -77,11 +77,18 @@ Bewerken Draaien Ongeldig pad naar afbeelding + Invalid video path Fout bij bewerken van afbeelding + Video editing failed Afbeelding bewerken is geannuleerd + Video editing cancelled Wijzigingen zijn opgeslagen + Image edited successfully + Video edited successfully Afbeelding bewerken met: - Geen app gevonden voor fotobewerking + Edit video with: + Geen app gevonden voor fotobewerking + No video editor found Onbekende bestandslocatie Bronbestand kan niet worden overschreven Linksom draaien @@ -254,14 +261,45 @@ Penseelkleur Bewerken Afsluiten - Sluiten zonder de wijzigingen op te slaan? + Do you really want to discard the changes? Ja Nee Annuleren Accepteren Opslaan - Afbeelding exporteren… - Afbeelding %s exporteren. + Exporteren… + %s exporteren. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage Spiegelen H Spiegelen V Ongedaan maken @@ -284,6 +322,7 @@ Groen Aquamarijn Met pipet kiezen + Trim Hoe kan ik Eenvoudige Galerij instellen als standaard-app voor foto’s en video’s? diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index f446e499b..b7fe9a05e 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -77,11 +77,18 @@ Edycja Obróć Nieprawidłowa ścieżka + Invalid video path Edycja obrazu nie powiodła się + Video editing failed Anulowano edycję obrazu + Video editing cancelled Plik wyedytowany + Image edited successfully + Video edited successfully Edytuj obraz w: - Nie znalazłem edytora zdjęć + Edit video with: + Nie znalazłem edytora zdjęć + No video editor found Nieznana lokalizacja pliku Nie udało się zastąpić pliku Obróć w lewo @@ -254,14 +261,45 @@ Kolor pędzla Edytor Zamknąć edytor? - Odrzucić zmiany w obrazie? + Do you really want to discard the changes? Tak Nie Anuluj Zaakceptuj Zapisz - Eksport obrazu… - Wyeksportowano obraz %s. + Eksport… + Wyeksportowano %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage Odbij w poziomie Odbij w pionie Cofnij @@ -284,6 +322,7 @@ Zielony Akwamaryna Kolor pipety + Trim Jak mogę ustawić tą aplikację jako domyślną aplikację galerii? diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 6d48286ff..c63e3e126 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -77,11 +77,18 @@ Editor Girar Caminho inválido + Invalid video path Falha na edição da imagem + Video editing failed Edição de imagem cancelada + Video editing cancelled Arquivo editado com sucesso + Image edited successfully + Video edited successfully Editar imagem com: - Nenhum editor de imagem encontrado + Edit video with: + Nenhum editor de imagem encontrado + No video editor found Localização de arquivo desconhecida Não foi possível substituir o arquivo original Girar para a esquerda @@ -254,14 +261,45 @@ Cor do pincel Editor Fechar Editor? - Deseja realmente descartar a imagem? + Do you really want to discard the changes? Sim Não Cancelar Aceitar Salvar - Exportando imagem… - Exportando imagem %s. + Exportando… + Exportando %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage Giro H Giro V Desfazer @@ -284,6 +322,7 @@ Verde Azul marinho Cor pipetável + Trim Como posso fazer do Simple Galeria a galeria padrão do dispositivo? diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 342526c67..68f0b68e9 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -30,8 +30,8 @@ Partilhar foto redimensionada Olá,\n\nparece que você utilizou a opção de atualização existente na versão antiga. Agora já pode desinstalar essa versão antiga.\n\nApenas perderá os itens existentes na reciclagem e os favoritos não assinalados mas também terá que repor as predefinições da aplicação.\n\nObrigado! Trocar para pesquisa de ficheiros em todas as pastas visíveis - Set as default folder - Unset as default folder + Utilizar como pasta padrão + Deixar de utilizar como pasta padrão Filtrar multimédia @@ -77,11 +77,18 @@ Editor Rodar Caminho inválido + Invalid video path Falha na edição da imagem + Video editing failed Edição de imagem cancelada + Video editing cancelled Imagem editada com sucesso + Image edited successfully + Video edited successfully Editar imagem com: - Editor não encontrado + Edit video with: + Editor não encontrado + No video editor found Localização desconhecida Não foi possível substituir o ficheiro original Rodar à esquerda @@ -185,13 +192,13 @@ Não mostrar ficheiros inválidos Mostrar o tipo de imagem Permitir ampliação de vídeos com dois toques - Folder thumbnail style - Show file count on a separate line - Show file count in brackets - Do not show file count - Limit long folder titles to 1 line - Square - Rounded corners + Estilo de miniatura das pastas + Mostrar número de ficherios em linha distinta + Mostrar número de ficheiros em chavetas + não mostrar número de ficheiros + Restringir título das pastas a 1 linha + Quadrado + Cantos arredondados Miniaturas @@ -254,14 +261,45 @@ Cor do pincel Editor Fechar editor? - Tem a certeza de que deseja descartar as alterações? + Do you really want to discard the changes? Sim Não Cancelar Aceitar Guardar - A exportar imagem… - A exportar imagem %s. + A exportar… + A exportar %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage Inversão horizontal Inversão vertical Desfazer @@ -284,6 +322,7 @@ Verde Aquamarino Pipeta de cores + Trim How can I make Simple Gallery the default device gallery? diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 15e3ceeab..7befdc8e4 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -77,11 +77,18 @@ Редактор Поворот Недопустимый путь изображения + Invalid video path Редактирование изображения не выполнено + Video editing failed Редактирование изображения отменено + Video editing cancelled Файл успешно отредактирован + Image edited successfully + Video edited successfully Редактировать изображение в: - Не найдено ни одного редактора изображений + Edit video with: + Не найдено ни одного редактора изображений + No video editor found Неизвестное местоположение файла Не удалось перезаписать исходный файл Повернуть влево @@ -254,14 +261,45 @@ Цвет кисти Редактор Закрыть редактор? - Вы действительно хотите отказаться от сделанных изменений изображения? + Do you really want to discard the changes? Да Нет Отмена Принять Сохранить - Сохранение… - Сохранение изображения %s + Exporting… + Exporting %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage Г-поворот В-поворот Отмена @@ -284,6 +322,7 @@ Зелёный Аквамарин Цвет заливки + Trim Как сделать Simple Gallery галереей по умолчанию? diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 6a06dae60..25278cbc6 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -76,12 +76,19 @@ Editor Otočiť - Neplatná cesta - Úprava súboru zlyhala - Úprava súboru bola zrušená + Neplatná cesta obrázka + Neplatná cesta videa + Úprava obrázka zlyhala + Úprava videa zlyhala + Úprava obrázka bola zrušená + Úprava videa bola zrušená Súbor bol úspešne upravený - Upraviť súbor s: - Nebol nájdený žiadny editor + Obrázok bol úspešne upravený + Video bolo úspešne upravené + Upraviť obrázok s: + Upraviť video s: + Nebol nájdený žiadny editor obrázkov + Nebol nájdený žiadny editor videí Neznáme umiestnenie súboru Nepodarilo sa prepísať zdrojový súbor Otočiť vľavo @@ -254,14 +261,45 @@ Farba štetca Editor Zavrieť editor? - Ozaj chcete zahodiť úpravy obrázka? + Ozaj chcete zahodiť úpravy? Áno Nie Zrušiť Prijať Uložiť - Exportuje sa obrázok… - Exportovanie obrázka %s. + Exportuje sa… + Exportovanie %s. + Nálepky + Farba nálepky + Možnosti nálepiek + Pridať + Farba + Odstrániť + Presunúť do popredia + Vyrovnať + Nahradiť + Nepriehľadnosť + Kontrast + Sýtosť + Jas + Nahrávky + Prekrytie + Žiadne + Stmavenie + Screen + Prekrytie + Osvetlenie + Znásobenie + Vypálenie farby + Jemné svetlo + Tvrdé svetlo + Žiadne + Zlaté + Únik svetla + Mozaika + Papier + Dážď + Vintage Preklopiť H Preklopiť V Späť @@ -284,6 +322,7 @@ Zelená Aquamarin Pipetovateľná farba + Obrezať Ako viem spraviť Jednoduchú Galériu predvolenou galériou zariadenia? diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index ea17ef500..3a9355789 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -77,11 +77,18 @@ Urejevalnik Zavrti Napačna pot + Invalid video path Urejanje slike ni uspelo + Video editing failed Image editing cancelled + Video editing cancelled File edited successfully + Image edited successfully + Video edited successfully Uredi sliko z: - Ne najdem urejevalnika slik + Edit video with: + Ne najdem urejevalnika slik + No video editor found Neznana lokacija datoteke Ne morem prepisati izvorne datoteke Zavrti levo @@ -254,14 +261,45 @@ Brush Color Editor Close Editor? - Do you really want to discard the image? + Do you really want to discard the changes? Yes No Cancel Accept Save - Exporting image… - Exporting image %s. + Exporting… + Exporting %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage Flip H Flip V Undo @@ -284,6 +322,7 @@ Green Aquamarin Pipettable color + Trim Kako naredim Simple galerijo za privzeto aplikacijo na napravi? diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 2672b86ae..deec05678 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -77,11 +77,18 @@ Едитор Ротирај Неисправна стаза слике + Invalid video path Измена слике неуспешна + Video editing failed Image editing cancelled + Video editing cancelled File edited successfully + Image edited successfully + Video edited successfully Измени слику са: - Није пронађен едитор слика + Edit video with: + Није пронађен едитор слика + No video editor found Непозната локација датотеке Не могу да препишем изворну датотеку Ротирај лево @@ -254,14 +261,45 @@ Brush Color Editor Close Editor? - Do you really want to discard the image? + Do you really want to discard the changes? Yes No Cancel Accept Save - Exporting image… - Exporting image %s. + Exporting… + Exporting %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage Flip H Flip V Undo @@ -284,6 +322,7 @@ Green Aquamarin Pipettable color + Trim Како да подесим Једноставну галерију да буде главна галерија уређаја? diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 0dee6fc8c..9715dd2a9 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -77,11 +77,18 @@ Redigerare Rotera Ogiltig bildsökväg + Invalid video path Bilden kunde inte redigeras + Video editing failed Image editing cancelled + Video editing cancelled File edited successfully + Image edited successfully + Video edited successfully Redigera bilden med: - Ingen bildredigerare hittades + Edit video with: + Ingen bildredigerare hittades + No video editor found Okänd filplats Det gick inte att skriva över källfilen Rotera åt vänster @@ -254,14 +261,45 @@ Brush Color Editor Close Editor? - Do you really want to discard the image? + Do you really want to discard the changes? Yes No Cancel Accept Save - Exporting image… - Exporting image %s. + Exporting… + Exporting %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage Flip H Flip V Undo @@ -284,6 +322,7 @@ Green Aquamarin Pipettable color + Trim How can I make Simple Gallery the default device gallery? diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 174308f18..f27c71691 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -77,11 +77,18 @@ Düzenleyici Döndür Geçersiz resim yolu + Geçersiz video yolu Resim düzenleme başarısız + Video düzenleme başarısız Resim düzenleme iptal edildi + Video düzenleme iptal edildi Dosya başarıyla düzenlendi + Resim başarıyla düzenlendi + Video başarıyla düzenlendi Resmi şununla düzenle: - Resim düzenleyici bulunamadı + Videoyu şununla düzenle: + Resim düzenleyici bulunamadı + Video düzenleyici bulunamadı Bilinmeyen dosya konumu Kaynak dosyanın üzerine yazılamadı Sola döndür @@ -254,14 +261,45 @@ Fırça Rengi Editör Editör kapatılsın mı? - Değişiklikler kaydedilmeden çıkılsın mı? + Değişiklikleri gerçekten atmak istiyor musunuz? Evet Hayır İptal Kabul Et Kaydet - Resim dışa aktarılıyor… - Resim dışa aktarılıyor %s. + Dışa aktarılıyor… + %s dışa aktarılıyor. + Etiket + Sticker Color + Etiket Seçenekleri + Ekle + Color + Sil + Öne + Straighten + Değiştir + Opaklık + Contrast + Saturation + Brightness + Uploads + Kaplama + Normal + Karartma + Örtme + Kaplama + Aydınlatma + Çarpma + Renk Yanması + Hafif Aydınlık + Şiddetli Aydınlık + Hiçbiri + Altın + Hafif Sızıntı 1 + Mozaik + Kağıt + Yağmur + Nostaljik Yatay Çevir Dikey Çevir Geri Al @@ -284,6 +322,7 @@ Yeşil Akuamarin Pipetlenebilir renk + Kırp Basit Galeri\'yi nasıl varsayılan cihaz galerisi yapabilirim? diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 7573baf48..44aab35eb 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -77,11 +77,18 @@ Редактор Обернути Неприпустимий шлях до зображення + Invalid video path Не вдалося редагувати зображення + Video editing failed Image editing cancelled + Video editing cancelled File edited successfully + Image edited successfully + Video edited successfully Редагувати зображення за допомогою: - Не знайдено редакторів зображень + Edit video with: + Не знайдено редакторів зображень + No video editor found Невідоме розташування файлу Не вдалося перезаписати вихідний файл Обернути ліворуч @@ -254,14 +261,45 @@ Brush Color Editor Close Editor? - Do you really want to discard the image? + Do you really want to discard the changes? Yes No Cancel Accept Save - Exporting image… - Exporting image %s. + Exporting… + Exporting %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage Flip H Flip V Undo @@ -284,6 +322,7 @@ Green Aquamarin Pipettable color + Trim Як зробити Simple Gallery галереєю за-замовчуванням? diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index d1fe7eee1..fb42e97c3 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -77,11 +77,18 @@ Trình biên tập Xoay Đường dẫn hình ảnh không hợp lệ + Invalid video path Thất bại + Video editing failed Image editing cancelled + Video editing cancelled Tập tin được chỉnh sửa thành công + Image edited successfully + Video edited successfully Chỉnh sửa hình ảnh với: - Không tìm thấy trình chỉnh sửa hình ảnh + Edit video with: + Không tìm thấy trình chỉnh sửa hình ảnh + No video editor found Vị trí tệp không xác định Không thể ghi đè tệp nguồn Xoay trái @@ -254,14 +261,45 @@ Màu cọ Trình biên tập Đóng trình biên tập? - Bạn có thực sự muốn loại bỏ hình ảnh? + Do you really want to discard the changes? Có Không Hủy bỏ Chấp nhận Lưu - Xuất hình ảnh… - Xuất hình ảnh %s. + Exporting… + Exporting %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage Lật H Lật V Hoàn tác @@ -284,6 +322,7 @@ Xanh lá Xanh ngọc nước biển Màu sắc dễ thương + Trim Làm thế nào để đặt Simple Gallery thành thư viện mặc định? diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index efe12b12b..7f47ea8b0 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -30,8 +30,8 @@ 调整尺寸并分享 嘿，\n\n您似乎已经从旧的免费版应用升级。您现在可以卸载旧版本，在该版本的应用设置顶部有一个“升级到专业版”按钮。\n\n此操作会删除回收站项目，取消标记收藏项目，并重置应用设置。\n\n谢谢！ 切换文件搜索范围为所有可见的文件夹 - Set as default folder - Unset as default folder + 设置为默认文件夹 + 取消设置为默认文件夹 筛选媒体文件 @@ -77,11 +77,18 @@ 编辑器 旋转 无效的图片路径 + 无效的视频路径 图片编辑失败 + 视频编辑失败 取消图片编辑 + 取消视频编辑 文件编辑成功 + 图片编辑成功 + 视频编辑成功 编辑方式： - 没有找到图片编辑器 + 编辑方式: + 没有找到任何图片编辑器 + 没有找到任何视频编辑器 未知文件位置 无法覆盖源文件 向左旋转 @@ -185,13 +192,13 @@ 避免显示无效的文件 显示图片文件类型 允许双击来放大视频 - Folder thumbnail style - Show file count on a separate line - Show file count in brackets - Do not show file count - Limit long folder titles to 1 line - Square - Rounded corners + 文件夹缩略图样式 + 在单独一行中显示计数 + 在括号中显示计数 + 不显示计数 + 将较长的文件夹标题字符限制为1行 + 方形 + 圆角 缩略图 @@ -254,14 +261,45 @@ 笔刷颜色 编辑器 关闭编辑器? - 您确定要放弃编辑吗? + 你确定要放弃更改吗? 是 否 取消 接受 保存 - 图片导出中… - 图片%s导出中。 + 正在导出… + 正在导出 %s. + 贴纸 + 贴纸颜色 + 贴纸选项 + 添加 + 颜色 + 删除 + 置顶 + 拉伸 + 替换 + 不透明度 + 对比度 + 饱和度 + 亮度 + 上传 + 叠加层 + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage 水平翻转 垂直翻转 复原 @@ -284,6 +322,7 @@ 绿色 碧绿 取色器 + 剪辑 如何把简易图库设置为设备的默认图库？ diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 20ee3edef..0e723cc72 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -81,11 +81,18 @@ 編輯器 旋轉 無效的圖片路徑 + Invalid video path 圖片編輯失敗 + Video editing failed Image editing cancelled + Video editing cancelled File edited successfully + Image edited successfully + Video edited successfully 編輯圖片: - 找不到圖片編輯器 + Edit video with: + 找不到圖片編輯器 + No video editor found 未知的檔案位置 無法誤蓋原始檔案 向左轉 @@ -261,14 +268,45 @@ Brush Color Editor Close Editor? - Do you really want to discard the image? + Do you really want to discard the changes? Yes No Cancel Accept Save - Exporting image… - Exporting image %s. + Exporting… + Exporting %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage Flip H Flip V Undo @@ -291,6 +329,7 @@ Green Aquamarin Pipettable color + Trim 我如何將簡易相簿設為預設相簿? diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 1d2620c34..ec87ab5af 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -77,11 +77,18 @@ 編輯器 旋轉 無效的圖片路徑 + Invalid video path 圖片編輯失敗 + Video editing failed 圖片編輯取消 + Video editing cancelled 檔案編輯成功 + Image edited successfully + Video edited successfully 編輯圖片: - 找不到圖片編輯器 + Edit video with: + 找不到圖片編輯器 + No video editor found 未知的檔案位置 無法誤蓋原始檔案 向左轉 @@ -254,14 +261,45 @@ 筆刷顏色 編輯器 關閉編輯器? - 你確定要捨棄圖片嗎? + Do you really want to discard the changes? 是 否 取消 接受 儲存 - 圖片匯出中… - 圖片%s匯出中。 + Exporting… + Exporting %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage 水平翻轉 垂直翻轉 復原 @@ -284,6 +322,7 @@ 綠色 藍綠 顏色吸取器 + Trim 我如何將簡易相簿設為預設相簿? diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 333de6c76..5c5c48d5f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -77,11 +77,18 @@ Editor Rotate Invalid image path + Invalid video path Image editing failed + Video editing failed Image editing cancelled + Video editing cancelled File edited successfully + Image edited successfully + Video edited successfully Edit image with: - No image editor found + Edit video with: + No image editor found + No video editor found Unknown file location Could not overwrite the source file Rotate left @@ -254,14 +261,45 @@ Brush Color Editor Close Editor? - Do you really want to discard the image? + Do you really want to discard the changes? Yes No Cancel Accept Save - Exporting image… - Exporting image %s. + Exporting… + Exporting %s. + Sticker + Sticker Color + Sticker Options + Add + Color + Delete + To Front + Straighten + Replace + Opacity + Contrast + Saturation + Brightness + Uploads + Overlay + Normal + Darken + Screen + Overlay + Lighten + Multiply + Color Burn + Soft Light + Hard Light + None + Golden + Lightleak 1 + Mosaic + Paper + Rain + Vintage Flip H Flip V Undo @@ -284,6 +322,7 @@ Green Aquamarin Pipettable color + Trim How can I make Simple Gallery the default device gallery? diff --git a/app/src/proprietary/AndroidManifest.xml b/app/src/proprietary/AndroidManifest.xml index 3e08b8072..0677f74f9 100644 --- a/app/src/proprietary/AndroidManifest.xml +++ b/app/src/proprietary/AndroidManifest.xml @@ -6,7 +6,8 @@ android:installLocation="auto"> + android:name=".App" + android:theme="@style/AppTheme"> @@ -24,7 +25,7 @@ @@ -35,5 +36,18 @@ + + + + + + + + + + + diff --git a/app/src/proprietary/assets/pesdk_license b/app/src/proprietary/assets/pesdk_license deleted file mode 100644 index 764680c1d..000000000 --- a/app/src/proprietary/assets/pesdk_license +++ /dev/null @@ -1 +0,0 @@ -{"api_token":"aulo3T5M9uyXgeJauoiJjw","app_identifiers":["com.simplemobiletools.gallery.pro"],"available_actions":[],"domains":["https://api.photoeditorsdk.com"],"enterprise_license":false,"expires_at":null,"features":["camera","library","export","customassets","whitelabel","adjustment","brush","filter","focus","text","textdesign","transform"],"issued_at":1576163964,"minimum_sdk_version":"1.0","owner":"Tikap s.r.o.","platform":"Android","products":["pesdk"],"version":"2.4","signature":"JvD7pjiy3iomgGW7XgEaHCs7aWxTIRl/PN7dp1muFSpE6S+IVmKDfSR5+enE2Tdh2EFC/3lyVuG7S5FcyOyxeXtyfKW/+H2y8Oem6VQzgTlYus8Eacz3/mk+GShUq+C+xQvbp5cWB/prScOZHPOaiZCu531rFYOGfwgaThtpawtG4B6wxvRWfjJor8fbsIHzEQnUnsEKsQR4UhwAUQvpDnCE0JtuP0CAxFyP03XfLlwIGhbUiCbaHh/kcG3IVzeQxSjjjsefu3rCtjYbm0eZKLbgsCvbNoVv2p011P2XN1pAu1uTMFscD74FbAFAgO12vYHfJ4iQE6cmZBiVSIJftJw3Gawj91NsiJbnLmPSqwSuUApatE5pMAff443s7ML32rHj+gD2IQ3oAHowGtbyofC0LrLPxaIMZEcd9Ttfk3ujn001rvekVXk6Uj/l3P3RpyLs6FHpMMSHo5nAk7ab7MYeR6PZfWDE+ggM1sqWV5fd4rh9qd36ioJgGaL6OnYCh/2t1xeMrFG2aw55hhjZPjxw3yfTvbJrOs1p0G503nkPCzRn4TCvPefkFDquAFCQaVmIJuFi51j4HA34o2E4Twru2SkI0od5ewHE5+hAR+9JalOaZWN/kLi59B9VrAEfskYmfVszqIpekpAyloMPYrpBseUDlWVCqbJIlyQt564="} \ No newline at end of file diff --git a/app/src/proprietary/assets/vesdk_license b/app/src/proprietary/assets/vesdk_license new file mode 100644 index 000000000..ea65fec16 --- /dev/null +++ b/app/src/proprietary/assets/vesdk_license @@ -0,0 +1 @@ +{"api_token":"8mq68_8PExmT5EixFLi8Ng","app_identifiers":["com.simplemobiletools.gallery.pro"],"available_actions":[],"domains":["https://api.photoeditorsdk.com"],"enterprise_license":false,"expires_at":1577836800,"features":["camera","library","export","whitelabel","customassets","adjustment","brush","filter","focus","overlay","sticker","text","textdesign","transform","trim"],"issued_at":1606584014,"minimum_sdk_version":"1.0","owner":"Tikap s.r.o.","platform":"Android","products":["vesdk"],"version":"2.4","signature":"Rr1ocNzO1ZVhN0fo/mfXnd1WGot4psPhlM4i7koo0Bd4zIF9MAkDL6EREOeDisNMMQD4zVtuXRPxM+miDMmZY/2PchwdF2hYssNqD76XAEEIwF3HXNouGCWfFScU2XkOKw9evrlfWgTlfO3H2rDgujo22qhSebDeAGP2satWBcvxkPrF6YJ5GYZUZHyCZ0/INQKyU6zAntfw2er8c46iBMiz00Evp0bYdXFpSk8KQCtgZ9koJYTyKVEFLz1BjOoJkkt8rLyHX2l9VVlRinY+0ss+N2oI5PQVwLqftvWIEL7pOGBrXY5EJFRITeXaVWlPZd7AAzxt54nK3G/5k/RwLoBDbN/q2Kv5fD3kZ7XqOklXgrBogEGm2KEu031Si7yMaOpG+mDJsyKuSh8TRwpsRYUdO+4m0uYqjo/WEmmStNVzCMau4Z9PRcsXmux3UKZHv6yHXxtGK0ZalfOwqCEN27KgTgyLIxEOYyt37cRN/iRUsHqpTG44qNwLPPUPE1VRkhV+XThi8ohJMl2vJeIvggabauuXOg+Hnmty4dZ61k5DGBPZhOxHGEEgKxzqBF5iwDKcnUVx/zhfDfmZo5OD8E2E3gC0MODov0M+cbDXBBE9rkV67zPRz5pUPN4G+gaNryndwRm6sa9xnq8TDaWaHsQtDRgXFQj8PV/XSJQfqTQ="} \ No newline at end of file diff --git a/app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt b/app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewPhotoEditActivity.kt similarity index 91% rename from app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt rename to app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewPhotoEditActivity.kt index 97a0bc72d..00e9ed203 100644 --- a/app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt +++ b/app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewPhotoEditActivity.kt @@ -22,6 +22,10 @@ import com.simplemobiletools.gallery.pro.extensions.tryDeleteFileDirItem import ly.img.android.pesdk.PhotoEditorSettingsList import ly.img.android.pesdk.assets.filter.basic.FilterPackBasic import ly.img.android.pesdk.assets.font.basic.FontPackBasic +import ly.img.android.pesdk.assets.overlay.basic.OverlayPackBasic +import ly.img.android.pesdk.assets.sticker.animated.StickerPackAnimated +import ly.img.android.pesdk.assets.sticker.emoticons.StickerPackEmoticons +import ly.img.android.pesdk.assets.sticker.shapes.StickerPackShapes import ly.img.android.pesdk.backend.model.config.CropAspectAsset import ly.img.android.pesdk.backend.model.constant.ImageExportFormat import ly.img.android.pesdk.backend.model.constant.OutputMode @@ -32,13 +36,13 @@ import ly.img.android.pesdk.backend.model.state.manager.SettingsList import ly.img.android.pesdk.ui.activity.PhotoEditorBuilder import ly.img.android.pesdk.ui.model.state.* import ly.img.android.pesdk.ui.panels.item.CropAspectItem +import ly.img.android.pesdk.ui.panels.item.PersonalStickerAddItem import ly.img.android.pesdk.ui.panels.item.ToggleAspectItem -import ly.img.android.pesdk.ui.panels.item.ToolItem import java.io.File import java.io.InputStream import java.io.OutputStream -class NewEditActivity : SimpleActivity() { +class NewPhotoEditActivity : SimpleActivity() { private val PESDK_EDIT_IMAGE = 1 private val SETTINGS_LIST = "SETTINGS_LIST" private val SOURCE_URI = "SOURCE_URI" @@ -51,7 +55,7 @@ class NewEditActivity : SimpleActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_new_edit) + setContentView(R.layout.activity_new_photo_edit) if (checkAppSideloading()) { return @@ -201,7 +205,7 @@ class NewEditActivity : SimpleActivity() { } } - // in case the user wants to overwrite the original file and it is on an SD card, delete it manually. Else the system just appends (1) + // In case the user wants to overwrite the original file and it is on an SD card, delete it manually first. Else the system just appends (1) private fun handleFileOverwriting(path: String, callback: () -> Unit) { if (getDoesFilePathExist(path) && isPathOnSD(path)) { val fileDirItem = FileDirItem(path, path.getFilenameFromPath()) @@ -269,21 +273,18 @@ class NewEditActivity : SimpleActivity() { brushSize = applicationContext.config.editorBrushSize } - // do not use Text Design, it takes up too much space - val tools = getSettingsModel(UiConfigMainMenu::class.java).toolList - val newTools = tools.filterNot { - it.name!!.isEmpty() - }.toMutableList() as ArrayList - - // move Focus at the end, as it is the least used - // on some devices it is not obvious that the toolbar can be scrolled horizontally, so move the best ones at the beginning to make them visible - val focus = newTools.firstOrNull { it.name == getString(R.string.pesdk_focus_title_name) } - if (focus != null) { - newTools.remove(focus) - newTools.add(focus) + configure { + it.setOverlayList(OverlayPackBasic.getOverlayPack()) } - getSettingsModel(UiConfigMainMenu::class.java).setToolList(newTools) + configure { + it.setStickerLists( + PersonalStickerAddItem(), + StickerPackEmoticons.getStickerCategory(), + StickerPackShapes.getStickerCategory(), + StickerPackAnimated.getStickerCategory() + ) + } getSettingsModel(UiConfigTheme::class.java).theme = R.style.Imgly_Theme_NoFullscreen diff --git a/app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewVideoEditActivity.kt b/app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewVideoEditActivity.kt new file mode 100644 index 000000000..017e0b7fc --- /dev/null +++ b/app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewVideoEditActivity.kt @@ -0,0 +1,298 @@ +package com.simplemobiletools.gallery.pro.activities + +import android.annotation.TargetApi +import android.app.Activity +import android.content.Intent +import android.media.ExifInterface +import android.net.Uri +import android.os.Build +import android.os.Bundle +import android.provider.MediaStore +import com.simplemobiletools.commons.extensions.* +import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE +import com.simplemobiletools.commons.helpers.REAL_FILE_PATH +import com.simplemobiletools.commons.helpers.ensureBackgroundThread +import com.simplemobiletools.commons.helpers.isNougatPlus +import com.simplemobiletools.commons.models.FileDirItem +import com.simplemobiletools.gallery.pro.R +import com.simplemobiletools.gallery.pro.dialogs.SaveAsDialog +import com.simplemobiletools.gallery.pro.extensions.config +import com.simplemobiletools.gallery.pro.extensions.fixDateTaken +import com.simplemobiletools.gallery.pro.extensions.tryDeleteFileDirItem +import ly.img.android.pesdk.VideoEditorSettingsList +import ly.img.android.pesdk.assets.filter.basic.FilterPackBasic +import ly.img.android.pesdk.assets.font.basic.FontPackBasic +import ly.img.android.pesdk.assets.overlay.basic.OverlayPackBasic +import ly.img.android.pesdk.assets.sticker.animated.StickerPackAnimated +import ly.img.android.pesdk.assets.sticker.emoticons.StickerPackEmoticons +import ly.img.android.pesdk.assets.sticker.shapes.StickerPackShapes +import ly.img.android.pesdk.backend.model.config.CropAspectAsset +import ly.img.android.pesdk.backend.model.constant.OutputMode +import ly.img.android.pesdk.backend.model.state.BrushSettings +import ly.img.android.pesdk.backend.model.state.LoadSettings +import ly.img.android.pesdk.backend.model.state.VideoEditorSaveSettings +import ly.img.android.pesdk.backend.model.state.manager.SettingsList +import ly.img.android.pesdk.ui.activity.VideoEditorBuilder +import ly.img.android.pesdk.ui.model.state.* +import ly.img.android.pesdk.ui.panels.item.CropAspectItem +import ly.img.android.pesdk.ui.panels.item.PersonalStickerAddItem +import ly.img.android.pesdk.ui.panels.item.ToggleAspectItem +import java.io.File +import java.io.InputStream +import java.io.OutputStream + +class NewVideoEditActivity : SimpleActivity() { + private val VESDK_EDIT_VIDEO = 1 + private val SETTINGS_LIST = "SETTINGS_LIST" + private val SOURCE_URI = "SOURCE_URI" + private val RESULT_URI = "RESULT_URI" + private var sourceFileLastModified = 0L + private var oldExif: ExifInterface? = null + + private lateinit var uri: Uri + private lateinit var saveUri: Uri + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_new_video_edit) + + if (checkAppSideloading()) { + return + } + + handlePermission(PERMISSION_WRITE_STORAGE) { + if (it) { + initEditActivity() + } else { + toast(R.string.no_storage_permissions) + finish() + } + } + } + + private fun initEditActivity() { + if (intent.data == null) { + toast(R.string.invalid_video_path) + finish() + return + } + + uri = intent.data!! + if (uri.scheme != "file" && uri.scheme != "content") { + toast(R.string.unknown_file_location) + finish() + return + } + + if (intent.extras?.containsKey(REAL_FILE_PATH) == true) { + val realPath = intent.extras!!.getString(REAL_FILE_PATH) + uri = when { + isPathOnOTG(realPath!!) -> uri + realPath.startsWith("file:/") -> Uri.parse(realPath) + else -> Uri.fromFile(File(realPath)) + } + } else { + (getRealPathFromURI(uri))?.apply { + uri = Uri.fromFile(File(this)) + } + } + + saveUri = when { + intent.extras?.containsKey(MediaStore.EXTRA_OUTPUT) == true -> intent.extras!!.get(MediaStore.EXTRA_OUTPUT) as Uri + else -> uri + } + + openEditor(uri) + } + + override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) { + if (requestCode == VESDK_EDIT_VIDEO) { + val extras = resultData?.extras + val resultPath = extras?.get(RESULT_URI)?.toString() ?: "" + val sourcePath = Uri.decode(extras?.get(SOURCE_URI)?.toString() ?: "") + val settings = extras?.getParcelable(SETTINGS_LIST) + if (settings != null) { + val brush = settings.getSettingsModel(BrushSettings::class.java) + config.editorBrushColor = brush.brushColor + config.editorBrushHardness = brush.brushHardness + config.editorBrushSize = brush.brushSize + } + + if (resultCode != Activity.RESULT_OK || resultPath.isEmpty()) { + toast(R.string.video_editing_cancelled) + finish() + } else { + val source = if (sourcePath.isEmpty() || sourcePath.startsWith("content")) { + internalStoragePath + } else { + sourcePath.substringAfter("file://") + } + + SaveAsDialog(this, source, true, cancelCallback = { + toast(R.string.video_editing_failed) + finish() + }, callback = { + val destinationFilePath = it + handleSAFDialog(destinationFilePath) { + if (it) { + ensureBackgroundThread { + storeOldExif(source) + sourceFileLastModified = File(source).lastModified() + + handleFileOverwriting(destinationFilePath) { + var inputStream: InputStream? = null + var outputStream: OutputStream? = null + try { + inputStream = contentResolver.openInputStream(Uri.parse(resultPath)) + outputStream = getFileOutputStreamSync(destinationFilePath, destinationFilePath.getMimeType()) + inputStream!!.copyTo(outputStream!!) + outputStream.flush() + inputStream.close() + outputStream.close() + + try { + if (isNougatPlus()) { + val newExif = ExifInterface(destinationFilePath) + oldExif?.copyTo(newExif, false) + } + } catch (ignored: Exception) { + } + + if (config.keepLastModified) { + // add 1 s to the last modified time to properly update the thumbnail + updateLastModified(destinationFilePath, sourceFileLastModified + 1000) + } + + val paths = arrayListOf(destinationFilePath) + rescanPaths(arrayListOf(destinationFilePath)) { + fixDateTaken(paths, false) + } + + setResult(Activity.RESULT_OK, intent) + toast(R.string.file_edited_successfully) + finish() + } catch (e: Exception) { + showErrorToast(e) + } finally { + inputStream?.close() + outputStream?.close() + } + } + } + } else { + toast(R.string.video_editing_failed) + finish() + } + } + }) + } + } + super.onActivityResult(requestCode, resultCode, resultData) + } + + @TargetApi(Build.VERSION_CODES.N) + private fun storeOldExif(sourcePath: String) { + var inputStream: InputStream? = null + try { + if (isNougatPlus()) { + inputStream = contentResolver.openInputStream(Uri.fromFile(File(sourcePath))) + oldExif = ExifInterface(inputStream!!) + } + } catch (ignored: Exception) { + } finally { + inputStream?.close() + } + } + + // In case the user wants to overwrite the original file and it is on an SD card, delete it manually first. Else the system just appends (1) + private fun handleFileOverwriting(path: String, callback: () -> Unit) { + if (getDoesFilePathExist(path) && isPathOnSD(path)) { + val fileDirItem = FileDirItem(path, path.getFilenameFromPath()) + tryDeleteFileDirItem(fileDirItem, false, true) { success -> + if (success) { + callback() + } else { + toast(R.string.unknown_error_occurred) + finish() + } + } + } else { + callback() + } + } + + private fun openEditor(inputVideo: Uri) { + val settingsList = createPesdkSettingsList() + + settingsList.configure { + it.source = inputVideo + } + + settingsList[LoadSettings::class].source = inputVideo + + VideoEditorBuilder(this) + .setSettingsList(settingsList) + .startActivityForResult(this, VESDK_EDIT_VIDEO) + } + + private fun createPesdkSettingsList(): VideoEditorSettingsList { + val settingsList = VideoEditorSettingsList().apply { + configure { + it.setFilterList(FilterPackBasic.getFilterPack()) + } + + configure { + it.setFontList(FontPackBasic.getFontPack()) + } + + config.getAssetMap(CropAspectAsset::class.java).apply { + add(CropAspectAsset("my_crop_1_2", 1, 2, false)) + add(CropAspectAsset("my_crop_2_1", 2, 1, false)) + add(CropAspectAsset("my_crop_19_9", 19, 9, false)) + add(CropAspectAsset("my_crop_9_19", 9, 19, false)) + add(CropAspectAsset("my_crop_5_4", 5, 4, false)) + add(CropAspectAsset("my_crop_4_5", 4, 5, false)) + add(CropAspectAsset("my_crop_37_18", 37, 18, false)) + add(CropAspectAsset("my_crop_18_37", 18, 37, false)) + add(CropAspectAsset("my_crop_16_10", 16, 10, false)) + add(CropAspectAsset("my_crop_10_16", 10, 16, false)) + } + + getSettingsModel(UiConfigAspect::class.java).aspectList.apply { + add(ToggleAspectItem(CropAspectItem("my_crop_2_1"), CropAspectItem("my_crop_1_2"))) + add(ToggleAspectItem(CropAspectItem("my_crop_19_9"), CropAspectItem("my_crop_9_19"))) + add(ToggleAspectItem(CropAspectItem("my_crop_5_4"), CropAspectItem("my_crop_4_5"))) + add(ToggleAspectItem(CropAspectItem("my_crop_37_18"), CropAspectItem("my_crop_18_37"))) + add(ToggleAspectItem(CropAspectItem("my_crop_16_10"), CropAspectItem("my_crop_10_16"))) + } + + getSettingsModel(BrushSettings::class.java).apply { + brushColor = applicationContext.config.editorBrushColor + brushHardness = applicationContext.config.editorBrushHardness + brushSize = applicationContext.config.editorBrushSize + } + + configure { + it.setOverlayList(OverlayPackBasic.getOverlayPack()) + } + + configure { + it.setStickerLists( + PersonalStickerAddItem(), + StickerPackEmoticons.getStickerCategory(), + StickerPackShapes.getStickerCategory(), + StickerPackAnimated.getStickerCategory() + ) + } + + getSettingsModel(UiConfigTheme::class.java).theme = R.style.Imgly_Theme_NoFullscreen + + configure { + it.setOutputToTemp() + it.outputMode = OutputMode.EXPORT_IF_NECESSARY + } + } + + return settingsList + } +} diff --git a/build.gradle b/build.gradle index 82b889196..8183c6bd7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.4.10' + ext.kotlin_version = '1.4.20' ext.is_proprietary = gradle.startParameter.taskNames.any { task -> task.contains("Proprietary") } repositories { @@ -13,10 +13,10 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:4.1.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" if (is_proprietary) { - classpath 'ly.img.android.pesdk:plugin:8.0.3' + classpath 'ly.img.android.pesdk:plugin:8.0.5' } // NOTE: Do not place your application dependencies here; they belong