diff --git a/build.gradle b/build.gradle index 4fd5195fe..b4cab7a87 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { propMinSdkVersion = 21 propTargetSdkVersion = propCompileSdkVersion propVersionCode = 1 - propVersionName = '5.15.5' + propVersionName = '5.15.15' kotlin_version = '1.3.41' } diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSplashActivity.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSplashActivity.kt index 3afef5fc1..5394c5ad7 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSplashActivity.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSplashActivity.kt @@ -2,29 +2,18 @@ package com.simplemobiletools.commons.activities import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import com.simplemobiletools.commons.R -import com.simplemobiletools.commons.extensions.baseConfig -import com.simplemobiletools.commons.extensions.getSharedTheme -import com.simplemobiletools.commons.extensions.isThankYouInstalled -import com.simplemobiletools.commons.extensions.showSideloadingDialog -import com.simplemobiletools.commons.helpers.SIDELOADING_FALSE +import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.SIDELOADING_TRUE import com.simplemobiletools.commons.helpers.SIDELOADING_UNCHECKED abstract class BaseSplashActivity : AppCompatActivity() { abstract fun initActivity() - abstract fun getAppPackageName(): String - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) if (baseConfig.appSideloadingStatus == SIDELOADING_UNCHECKED) { - val isSideloaded = isAppSideloaded() - baseConfig.appSideloadingStatus = if (isSideloaded) SIDELOADING_TRUE else SIDELOADING_FALSE - if (isSideloaded) { - baseConfig.appId = getAppPackageName() - showSideloadingDialog() + if (checkAppSideloading()) { return } } else if (baseConfig.appSideloadingStatus == SIDELOADING_TRUE) { @@ -53,13 +42,4 @@ abstract class BaseSplashActivity : AppCompatActivity() { initActivity() } } - - private fun isAppSideloaded(): Boolean { - return try { - getDrawable(R.drawable.ic_camera) - false - } catch (e: Exception) { - true - } - } } diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/activities/CustomizationActivity.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/activities/CustomizationActivity.kt index 533eb1ec0..3fb7168cc 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/activities/CustomizationActivity.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/activities/CustomizationActivity.kt @@ -171,7 +171,6 @@ class CustomizationActivity : BaseSimpleActivity() { private fun updateColorTheme(themeId: Int, useStored: Boolean = false) { curSelectedThemeId = themeId customization_theme.text = getThemeText() - curNavigationBarColor = baseConfig.navigationBarColor resources.apply { if (curSelectedThemeId == THEME_CUSTOM) { @@ -415,10 +414,9 @@ class CustomizationActivity : BaseSimpleActivity() { updateNavigationBarColor(it) }, callback = { wasPositivePressed, color -> if (wasPositivePressed) { - if (hasColorChanged(curNavigationBarColor, color)) { - setCurrentNavigationBarColor(color) - colorChanged() - } + setCurrentNavigationBarColor(color) + colorChanged() + updateColorTheme(getUpdatedTheme()) } else { updateNavigationBarColor(curNavigationBarColor) } diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/MyRecyclerViewAdapter.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/MyRecyclerViewAdapter.kt index bd62fc13d..27e2f14a7 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/MyRecyclerViewAdapter.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/MyRecyclerViewAdapter.kt @@ -26,7 +26,7 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc protected var textColor = baseConfig.textColor protected var backgroundColor = baseConfig.backgroundColor protected var actModeCallback: MyActionModeCallback - protected var selectedKeys = HashSet() + protected var selectedKeys = LinkedHashSet() protected var positionOffset = 0 private var actMode: ActionMode? = null diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/asynctasks/CopyMoveTask.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/asynctasks/CopyMoveTask.kt index 46d82c247..9b0e016af 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/asynctasks/CopyMoveTask.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/asynctasks/CopyMoveTask.kt @@ -229,6 +229,8 @@ class CopyMoveTask(val activity: BaseSimpleActivity, val copyOnly: Boolean = fal bytes = inputStream.read(buffer) } + out?.flush() + if (source.size == copiedSize && File(destination.path).exists()) { mTransferredFiles.add(source) if (activity.baseConfig.keepLastModified) { diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/AppSideloadedDialog.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/AppSideloadedDialog.kt index 4f513413b..3105adc2e 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/AppSideloadedDialog.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/AppSideloadedDialog.kt @@ -5,14 +5,14 @@ import android.text.Html import android.text.method.LinkMovementMethod import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.R -import com.simplemobiletools.commons.extensions.baseConfig +import com.simplemobiletools.commons.extensions.getStringsPackageName import com.simplemobiletools.commons.extensions.launchViewIntent import com.simplemobiletools.commons.extensions.setupDialogStuff import kotlinx.android.synthetic.main.dialog_textview.view.* class AppSideloadedDialog(val activity: Activity, val callback: () -> Unit) { - var dialog: AlertDialog - val url = "https://play.google.com/store/apps/details?id=${activity.baseConfig.appId.removeSuffix(".debug")}" + private var dialog: AlertDialog + private val url = "https://play.google.com/store/apps/details?id=${activity.getStringsPackageName()}" init { val view = activity.layoutInflater.inflate(R.layout.dialog_textview, null).apply { diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ColorPickerDialog.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ColorPickerDialog.kt index b6c0381c5..5a284bd6c 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ColorPickerDialog.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ColorPickerDialog.kt @@ -12,12 +12,11 @@ import android.widget.ImageView import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.R import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.INVALID_NAVIGATION_BAR_COLOR import com.simplemobiletools.commons.views.ColorPickerSquare import kotlinx.android.synthetic.main.dialog_color_picker.view.* // forked from https://github.com/yukuku/ambilwarna -class ColorPickerDialog(val activity: Activity, color: Int, val removeDimmedBackground: Boolean = false, val showUseDefaultButton: Boolean = false, +class ColorPickerDialog(val activity: Activity, color: Int, val removeDimmedBackground: Boolean = false, showUseDefaultButton: Boolean = false, val currentColorCallback: ((color: Int) -> Unit)? = null, val callback: (wasPositivePressed: Boolean, color: Int) -> Unit) { lateinit var viewHue: View lateinit var viewSatVal: ColorPickerSquare diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt index 7380aa8a1..a1bfd053c 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt @@ -899,6 +899,30 @@ fun BaseSimpleActivity.getAlarmSounds(type: Int, callback: (ArrayList true + SIDELOADING_FALSE -> false + else -> isAppSideloaded() + } + + baseConfig.appSideloadingStatus = if (isSideloaded) SIDELOADING_TRUE else SIDELOADING_FALSE + if (isSideloaded) { + showSideloadingDialog() + } + + return isSideloaded +} + +fun AppCompatActivity.isAppSideloaded(): Boolean { + return try { + getDrawable(R.drawable.ic_camera) + false + } catch (e: Exception) { + true + } +} + fun AppCompatActivity.showSideloadingDialog() { AppSideloadedDialog(this) { finish() diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context-storage.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context-storage.kt index abf5925f5..5b0fb96fb 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context-storage.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context-storage.kt @@ -215,13 +215,16 @@ fun Context.getDocumentFile(path: String): DocumentFile? { relativePath = relativePath.substring(1) } - var document = DocumentFile.fromTreeUri(applicationContext, Uri.parse(if (isOTG) baseConfig.OTGTreeUri else baseConfig.treeUri)) - val parts = relativePath.split("/").filter { it.isNotEmpty() } - for (part in parts) { - document = document?.findFile(part) + return try { + var document = DocumentFile.fromTreeUri(applicationContext, Uri.parse(if (isOTG) baseConfig.OTGTreeUri else baseConfig.treeUri)) + val parts = relativePath.split("/").filter { it.isNotEmpty() } + for (part in parts) { + document = document?.findFile(part) + } + return document + } catch (ignored: Exception) { + null } - - return document } fun Context.getSomeDocumentFile(path: String) = getFastDocumentFile(path) ?: getDocumentFile(path) diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context.kt index e1e4f9d5d..f03a24c59 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context.kt @@ -656,3 +656,5 @@ fun Context.getVideoResolution(path: String): Point? { return point } + +fun Context.getStringsPackageName() = getString(R.string.package_name) diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/File.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/File.kt index 8cd93eb42..257973d8d 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/File.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/File.kt @@ -1,9 +1,6 @@ package com.simplemobiletools.commons.extensions -import com.simplemobiletools.commons.helpers.audioExtensions -import com.simplemobiletools.commons.helpers.photoExtensions -import com.simplemobiletools.commons.helpers.rawExtensions -import com.simplemobiletools.commons.helpers.videoExtensions +import com.simplemobiletools.commons.helpers.* import com.simplemobiletools.commons.models.FileDirItem import java.io.File @@ -77,3 +74,19 @@ private fun getDirectoryFileCount(dir: File, countHiddenItems: Boolean): Int { fun File.getDirectChildrenCount(countHiddenItems: Boolean) = listFiles()?.filter { if (countHiddenItems) true else !it.isHidden }?.size ?: 0 fun File.toFileDirItem() = FileDirItem(absolutePath, name, File(absolutePath).isDirectory, 0, length(), lastModified()) + +fun File.containsNoMedia() = isDirectory && File(this, NOMEDIA).exists() + +fun File.doesThisOrParentHaveNoMedia(): Boolean { + var curFile = this + while (true) { + if (curFile.containsNoMedia()) { + return true + } + curFile = curFile.parentFile ?: break + if (curFile.absolutePath == "/") { + break + } + } + return false +} diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/String.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/String.kt index e7b4378f8..58b990f60 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/String.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/String.kt @@ -77,6 +77,10 @@ fun String.getGenericMimeType(): String { fun String.getParentPath() = removeSuffix("/${getFilenameFromPath()}") +fun String.containsNoMedia() = File(this).containsNoMedia() + +fun String.doesThisOrParentHaveNoMedia() = File(this).doesThisOrParentHaveNoMedia() + fun String.getDuration() = getFileDurationSeconds()?.getFormattedDuration() fun String.getFileDurationSeconds(): Int? { diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt index 87d5a125b..fa434a25b 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt @@ -17,6 +17,7 @@ const val IS_FROM_GALLERY = "is_from_gallery" const val BROADCAST_REFRESH_MEDIA = "com.simplemobiletools.REFRESH_MEDIA" const val REFRESH_PATH = "refresh_path" const val IS_CUSTOMIZING_COLORS = "is_customizing_colors" +const val NOMEDIA = ".nomedia" const val ALARM_SOUND_TYPE_ALARM = 1 const val ALARM_SOUND_TYPE_NOTIFICATION = 2 const val YOUR_ALARM_SOUNDS_MIN_ID = 1000 diff --git a/commons/src/main/res/values-ar/strings.xml b/commons/src/main/res/values-ar/strings.xml index 8da3c1753..a8540b5d5 100644 --- a/commons/src/main/res/values-ar/strings.xml +++ b/commons/src/main/res/values-ar/strings.xml @@ -64,6 +64,9 @@ ملف المصدر %s غير موجود Prepend filenames Append filenames + Simple renaming + Pattern + String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second diff --git a/commons/src/main/res/values-az/strings.xml b/commons/src/main/res/values-az/strings.xml index 314887e25..8d92ca556 100644 --- a/commons/src/main/res/values-az/strings.xml +++ b/commons/src/main/res/values-az/strings.xml @@ -64,6 +64,9 @@ Kök faylı %s yoxdur Prepend filenames Append filenames + Simple renaming + Pattern + String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second diff --git a/commons/src/main/res/values-br/strings.xml b/commons/src/main/res/values-br/strings.xml index 49425579b..117f45535 100644 --- a/commons/src/main/res/values-br/strings.xml +++ b/commons/src/main/res/values-br/strings.xml @@ -64,6 +64,9 @@ Source file %s doesn\'t exist Prepend filenames Append filenames + Simple renaming + Pattern + String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second diff --git a/commons/src/main/res/values-ca/strings.xml b/commons/src/main/res/values-ca/strings.xml index dd4c7ba00..d83de9fc5 100644 --- a/commons/src/main/res/values-ca/strings.xml +++ b/commons/src/main/res/values-ca/strings.xml @@ -64,6 +64,9 @@ El fitxer %s no existeix Posar abans noms de fitxer Afegeix noms de fitxer + Simple renaming + Pattern + String to add %Y - any\n%M - mes\n%D - dia\n%h - hora\n%m - minut\n%s - segon @@ -176,8 +179,8 @@ Color de la icona d\'aplicació Color de la barra de navegació inferior Valors per defecte - Use default - Default + Utilitzar per defecte + Per defecte Canviar de color Tema Canviar un color farà que canvii a tema personalitzat diff --git a/commons/src/main/res/values-cs/strings.xml b/commons/src/main/res/values-cs/strings.xml index 2bb339a95..68d278617 100644 --- a/commons/src/main/res/values-cs/strings.xml +++ b/commons/src/main/res/values-cs/strings.xml @@ -64,6 +64,9 @@ Zdrojový soubor %s neexistuje Přidat před názvy souborů Přidat za názvy souborů + Simple renaming + Pattern + String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second diff --git a/commons/src/main/res/values-cy/strings.xml b/commons/src/main/res/values-cy/strings.xml index 0f916dd14..9bfd67341 100644 --- a/commons/src/main/res/values-cy/strings.xml +++ b/commons/src/main/res/values-cy/strings.xml @@ -64,6 +64,9 @@ Dyw\'r ffeil tarddiad %s ddim yn bodoli Rhagddodi enwau ffeiliau Ôl-ddodi enwau ffeiliau + Simple renaming + Pattern + String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second diff --git a/commons/src/main/res/values-da/strings.xml b/commons/src/main/res/values-da/strings.xml index 199c37dda..7c4d05421 100644 --- a/commons/src/main/res/values-da/strings.xml +++ b/commons/src/main/res/values-da/strings.xml @@ -64,6 +64,9 @@ Kildefilen %s eksisterer ikke Tilføj forrest til filnavne Tilføj bagerst til filnavne + Simple renaming + Pattern + String to add %Y - år\n%M - måned\n%D - dag\n%h - time\n%m - minut\n%s - sekund @@ -176,8 +179,8 @@ Farve til appens ikon Farve på nederste navigationslinje Gendan standarder - Use default - Default + Anvend standard + Standard Skift farve Udseende Ændring af farve vil også medføre skift til tilpasset udseende diff --git a/commons/src/main/res/values-de/strings.xml b/commons/src/main/res/values-de/strings.xml index a601536fa..5b97add49 100644 --- a/commons/src/main/res/values-de/strings.xml +++ b/commons/src/main/res/values-de/strings.xml @@ -64,6 +64,9 @@ Quelldatei %s existiert nicht Dateinamen voranstellen Dateinamen anhängen + Simple renaming + Pattern + String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second diff --git a/commons/src/main/res/values-el/strings.xml b/commons/src/main/res/values-el/strings.xml index bb2ddb462..4b0490839 100644 --- a/commons/src/main/res/values-el/strings.xml +++ b/commons/src/main/res/values-el/strings.xml @@ -64,6 +64,9 @@ To αρχείο προέλευσης %s δεν υπάρχει Προεπιλεγμένα ονόματα αρχείων Προσθέστε ονόματα αρχείων + Απλή μετονομασία + Μοτίβο + Συμβολοσειρά για προσθήκη %Y - έτος\n%M - μήνας\n%D - ημέρα\n%h - ώρα\n%m - λεπτό\n%s - δευτ/το diff --git a/commons/src/main/res/values-es/strings.xml b/commons/src/main/res/values-es/strings.xml index f21dcdfbe..520de1d3a 100644 --- a/commons/src/main/res/values-es/strings.xml +++ b/commons/src/main/res/values-es/strings.xml @@ -64,6 +64,9 @@ El archivo %s no existe Preponer los nombres de archivo Adjuntar nombres de archivos + Simple renaming + Pattern + String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second @@ -176,8 +179,8 @@ Color del icono de la aplicación Color de la barra de navegación inferior Valores por defecto - Use default - Default + Usar por defecto + Por defecto Cambiar de color Tema Cambiar un color hará que cambie a tema personalizado diff --git a/commons/src/main/res/values-fi/strings.xml b/commons/src/main/res/values-fi/strings.xml index 189d62197..7aaadee9b 100644 --- a/commons/src/main/res/values-fi/strings.xml +++ b/commons/src/main/res/values-fi/strings.xml @@ -64,6 +64,9 @@ Lähdetiedostoa %s ei löydy Prepend filenames Append filenames + Simple renaming + Pattern + String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second diff --git a/commons/src/main/res/values-fr/strings.xml b/commons/src/main/res/values-fr/strings.xml index ff5099af3..5dbe90107 100644 --- a/commons/src/main/res/values-fr/strings.xml +++ b/commons/src/main/res/values-fr/strings.xml @@ -64,6 +64,9 @@ Le fichier source %s n\'existe pas Ajouter un préfixe aux noms de fichiers Ajouter un suffixe aux noms de fichiers + Simple renaming + Pattern + String to add %Y - année\n%M - mois\n%D - jour\n%h - heure\n%m - minute\n%s - seconde diff --git a/commons/src/main/res/values-gl/strings.xml b/commons/src/main/res/values-gl/strings.xml index 7a998a555..ab89a9c22 100644 --- a/commons/src/main/res/values-gl/strings.xml +++ b/commons/src/main/res/values-gl/strings.xml @@ -64,6 +64,9 @@ El archivo %s no existe Prepend filenames Append filenames + Simple renaming + Pattern + String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second diff --git a/commons/src/main/res/values-hi-rIN/strings.xml b/commons/src/main/res/values-hi-rIN/strings.xml index ba196119b..6ec56b769 100644 --- a/commons/src/main/res/values-hi-rIN/strings.xml +++ b/commons/src/main/res/values-hi-rIN/strings.xml @@ -64,6 +64,9 @@ Source file %s doesn\'t exist Prepend filenames Append filenames + Simple renaming + Pattern + String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second diff --git a/commons/src/main/res/values-hr/strings.xml b/commons/src/main/res/values-hr/strings.xml index ca90b7942..d009dbecf 100644 --- a/commons/src/main/res/values-hr/strings.xml +++ b/commons/src/main/res/values-hr/strings.xml @@ -64,6 +64,9 @@ Izvorišna datoteka %s ne postoji Dodavanje na početak imena datoteke Dodavanje naziva datoteka + Simple renaming + Pattern + String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second diff --git a/commons/src/main/res/values-hu/strings.xml b/commons/src/main/res/values-hu/strings.xml index f0dcf8db7..7527cf20f 100644 --- a/commons/src/main/res/values-hu/strings.xml +++ b/commons/src/main/res/values-hu/strings.xml @@ -64,6 +64,9 @@ A forrás fájl %s nem létezik Fájlnevek megadása Fájlnevek csatolása + Simple renaming + Pattern + String to add %É - év\\n%H - hónap\\n%N - nap\\n%ó - óra\\n%p - perc\\n%mp - másodperc diff --git a/commons/src/main/res/values-id/strings.xml b/commons/src/main/res/values-id/strings.xml index 7809b2c42..cb109d498 100644 --- a/commons/src/main/res/values-id/strings.xml +++ b/commons/src/main/res/values-id/strings.xml @@ -64,6 +64,9 @@ Berkas sumber %s tidak ada Tambah akhiran nama berkas Tambah awalan nama berkas + Simple renaming + Pattern + String to add %Y - tahun\n%M - bulan\n%D - hari\n%h - jam\n%m - menit\n%s - detik diff --git a/commons/src/main/res/values-in/strings.xml b/commons/src/main/res/values-in/strings.xml index 7809b2c42..cb109d498 100644 --- a/commons/src/main/res/values-in/strings.xml +++ b/commons/src/main/res/values-in/strings.xml @@ -64,6 +64,9 @@ Berkas sumber %s tidak ada Tambah akhiran nama berkas Tambah awalan nama berkas + Simple renaming + Pattern + String to add %Y - tahun\n%M - bulan\n%D - hari\n%h - jam\n%m - menit\n%s - detik diff --git a/commons/src/main/res/values-it/strings.xml b/commons/src/main/res/values-it/strings.xml index 44a15caa9..70bbd272e 100644 --- a/commons/src/main/res/values-it/strings.xml +++ b/commons/src/main/res/values-it/strings.xml @@ -64,6 +64,9 @@ Il file di origine %s non esiste Anteponi i nomi dei file Aggiungi i nomi dei file + Simple renaming + Pattern + String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second diff --git a/commons/src/main/res/values-iw/strings.xml b/commons/src/main/res/values-iw/strings.xml index 1b636579f..ad58941bf 100644 --- a/commons/src/main/res/values-iw/strings.xml +++ b/commons/src/main/res/values-iw/strings.xml @@ -64,6 +64,9 @@ Source file %s doesn\'t exist Prepend filenames Append filenames + Simple renaming + Pattern + String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second diff --git a/commons/src/main/res/values-ja/strings.xml b/commons/src/main/res/values-ja/strings.xml index 74d235cad..3cebbb30c 100644 --- a/commons/src/main/res/values-ja/strings.xml +++ b/commons/src/main/res/values-ja/strings.xml @@ -64,6 +64,9 @@ ソースファイル %s が存在しません ファイル名の前に追加 ファイル名の後に追加 + Simple renaming + Pattern + String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second diff --git a/commons/src/main/res/values-ko-rKR/strings.xml b/commons/src/main/res/values-ko-rKR/strings.xml index c21cb716c..764b71603 100644 --- a/commons/src/main/res/values-ko-rKR/strings.xml +++ b/commons/src/main/res/values-ko-rKR/strings.xml @@ -64,6 +64,9 @@ Source file %s doesn\'t exist Prepend filenames Append filenames + Simple renaming + Pattern + String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second diff --git a/commons/src/main/res/values-lt/strings.xml b/commons/src/main/res/values-lt/strings.xml index 552f667c5..ee8438a21 100644 --- a/commons/src/main/res/values-lt/strings.xml +++ b/commons/src/main/res/values-lt/strings.xml @@ -64,6 +64,9 @@ Šaltinio byla %s neegzistuoja Prepend filenames Append filenames + Simple renaming + Pattern + String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second diff --git a/commons/src/main/res/values-nb/strings.xml b/commons/src/main/res/values-nb/strings.xml index 4e8e84458..6080a52a0 100644 --- a/commons/src/main/res/values-nb/strings.xml +++ b/commons/src/main/res/values-nb/strings.xml @@ -64,6 +64,9 @@ Source file %s doesn\'t exist Prepend filenames Append filenames + Simple renaming + Pattern + String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second @@ -91,7 +94,7 @@ Lagrer… Kunne ikke opprette mappen %s Kunne ikke opprette filen %s - No new items have been found + Ingen nye elementer er funnet Opprett ny @@ -165,8 +168,8 @@ Kamera EXIF Sangtittel - GPS coordinates - Altitude + GPS-koordinater + Høyde Bakgrunnsfarge @@ -174,10 +177,10 @@ Primærfarge Forgrunnsfarge Farge for app-ikon - Bottom navigation bar color + Farge på nedre navigeringslinje Gjenopprett standard - Use default - Default + Bruk standard + Standard Endre farge Tema Endring av farge vil gjøre at det skiftes til Tilpasset tema @@ -227,7 +230,7 @@ Angre Annuler angre Skriv ut - Create shortcut + Opprett snarvei Sorter etter diff --git a/commons/src/main/res/values-nl/strings.xml b/commons/src/main/res/values-nl/strings.xml index 67bea925e..940626ebd 100644 --- a/commons/src/main/res/values-nl/strings.xml +++ b/commons/src/main/res/values-nl/strings.xml @@ -64,6 +64,9 @@ Bronbestand %s bestaat niet Voor bestandsnaam Na bestandsnaam + Simple renaming + Pattern + String to add %Y - jaar\n%M - maand\n%D - dag\n%h - uur\n%m - minuut\n%s - seconde diff --git a/commons/src/main/res/values-no/strings.xml b/commons/src/main/res/values-no/strings.xml index 5dea12a12..23f124937 100644 --- a/commons/src/main/res/values-no/strings.xml +++ b/commons/src/main/res/values-no/strings.xml @@ -64,6 +64,9 @@ Source file %s doesn\'t exist Prepend filenames Append filenames + Simple renaming + Pattern + String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second diff --git a/commons/src/main/res/values-pl/strings.xml b/commons/src/main/res/values-pl/strings.xml index 55fd9d4d6..cfbd3c63c 100644 --- a/commons/src/main/res/values-pl/strings.xml +++ b/commons/src/main/res/values-pl/strings.xml @@ -64,6 +64,9 @@    Plik źródłowy nie istnieje Poprzedzaj nazwy plików Dołączaj nazwy plików + Simple renaming + Pattern + String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second diff --git a/commons/src/main/res/values-pt-rBR/strings.xml b/commons/src/main/res/values-pt-rBR/strings.xml index 0e60953f8..19eebce8a 100644 --- a/commons/src/main/res/values-pt-rBR/strings.xml +++ b/commons/src/main/res/values-pt-rBR/strings.xml @@ -64,6 +64,9 @@ Arquivo de origem %s não existe Adicionar ao início dos nomes Adicionar ao fim dos nomes + Simple renaming + Pattern + String to add %Y - ano\n%M - mês\n%D - dia\n%h - hora\n%m - minuto\n%s - segundo diff --git a/commons/src/main/res/values-pt/strings.xml b/commons/src/main/res/values-pt/strings.xml index 474c5bcbd..a528b2068 100644 --- a/commons/src/main/res/values-pt/strings.xml +++ b/commons/src/main/res/values-pt/strings.xml @@ -64,6 +64,9 @@ O ficheiro de origem %s não existe Introduzir antes do nome do ficheiro Introduzir depois do nome do ficheiro + Simple renaming + Pattern + String to add %Y - ano\n%M - mês\n%D - dia\n%h - horas\n%m - minutos\n%s - segundos diff --git a/commons/src/main/res/values-ru/strings.xml b/commons/src/main/res/values-ru/strings.xml index cca81c008..20c11c139 100644 --- a/commons/src/main/res/values-ru/strings.xml +++ b/commons/src/main/res/values-ru/strings.xml @@ -64,6 +64,9 @@ Исходный файл \"%s\" не существует Перед именем файла После имени файла + Simple renaming + Pattern + String to add %Y - год\n%M - месяц\n%D - день\n%h - час\n%m - минута\n%s - секунда diff --git a/commons/src/main/res/values-sk/strings.xml b/commons/src/main/res/values-sk/strings.xml index 686d3ea08..18082ef73 100644 --- a/commons/src/main/res/values-sk/strings.xml +++ b/commons/src/main/res/values-sk/strings.xml @@ -64,6 +64,9 @@ Zdrojový súbor %s neexistuje Pridať pred názvy súborov Pridať za názvy súborov + Jednoduché premenovanie + Vzor + Reťazec na pridanie %Y - rok\n%M - mesiac\n%D - deň\n%h - hodina\n%m - minúta\n%s - sekunda diff --git a/commons/src/main/res/values-sl/strings.xml b/commons/src/main/res/values-sl/strings.xml index 64dba16a8..fd8b55422 100644 --- a/commons/src/main/res/values-sl/strings.xml +++ b/commons/src/main/res/values-sl/strings.xml @@ -64,6 +64,9 @@ Datoteka %s ne obstaja Pripravi mena datotek Dodaj imena datotek + Simple renaming + Pattern + String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second diff --git a/commons/src/main/res/values-sr/strings.xml b/commons/src/main/res/values-sr/strings.xml index 8ae7cbbb6..364b53bc7 100644 --- a/commons/src/main/res/values-sr/strings.xml +++ b/commons/src/main/res/values-sr/strings.xml @@ -64,6 +64,9 @@ Изворни код датотеке %s не постоји Додај префикс именима датотека Додај суфикс именима датотека + Simple renaming + Pattern + String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second diff --git a/commons/src/main/res/values-sv/strings.xml b/commons/src/main/res/values-sv/strings.xml index 466d99194..012ceb83a 100644 --- a/commons/src/main/res/values-sv/strings.xml +++ b/commons/src/main/res/values-sv/strings.xml @@ -64,6 +64,9 @@ Källfilen %s finns inte Lägg till före filnamnen Lägg till efter filnamnen + Simple renaming + Pattern + String to add %Y - år\n%M - månad\n%D - dag\n%h - timme\n%m - minut\n%s - sekund @@ -165,8 +168,8 @@ Kamera EXIF Låttitel - GPS coordinates - Altitude + GPS-koordinater + Höjd över havet Bakgrundsfärg @@ -176,8 +179,8 @@ Appikonens färg Navigeringsfältets färg Återställ standardfärger - Use default - Default + Använd standard + Standard Ändra färg Tema Om du ändrar en färg, ändras temat till anpassat tema @@ -565,11 +568,11 @@ Sön - This version of the app is no longer maintained. Please upgrade to the Pro version. - It is free till: %s. If you download it till then, you will be able to use it for free forever. - More info - Upgrade - You have to migrate locally stored events manually via exporting in an .ics file, then importing. You can find both export/import buttons at the main screen menu. + Den här versionen av appen underhålls inte längre. Uppgradera till Pro-versionen. + Den är gratis fram till: %s. Om du hämtar den innan dess, kan du använda den kostnadsfritt för all framtid. + Mer information + Uppgradera + Lokalt sparade händelser kan bara migreras manuellt genom att exportera och importera dem till och från en .ics-fil. Du hittar knappar för både export och import i huvudvymenyn. Om @@ -587,7 +590,7 @@ Donera Följ oss v %1$s\nCopyright © Simple Mobile Tools %2$d - Ytterligare info + Ytterligare information Appversion: %s Enhetens operativsystem: %s diff --git a/commons/src/main/res/values-tr/strings.xml b/commons/src/main/res/values-tr/strings.xml index 435e00cda..69860d881 100644 --- a/commons/src/main/res/values-tr/strings.xml +++ b/commons/src/main/res/values-tr/strings.xml @@ -64,6 +64,9 @@ %s kaynak dosyası mevcut değil Ön dosya adları Dosya adlarını ekle + Simple renaming + Pattern + String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second diff --git a/commons/src/main/res/values-uk/strings.xml b/commons/src/main/res/values-uk/strings.xml index f4767d4eb..64174bcc1 100644 --- a/commons/src/main/res/values-uk/strings.xml +++ b/commons/src/main/res/values-uk/strings.xml @@ -64,6 +64,9 @@ Вихідний файл %s не існує Префікс імен файлів Суфікс імен файлів + Simple renaming + Pattern + String to add %Y - рік\n%M - місяць\n%D - день\n%h - година\n%m - хвилина\n%s - секунда diff --git a/commons/src/main/res/values-zh-rCN/strings.xml b/commons/src/main/res/values-zh-rCN/strings.xml index bad7110c3..4b6efc4a5 100644 --- a/commons/src/main/res/values-zh-rCN/strings.xml +++ b/commons/src/main/res/values-zh-rCN/strings.xml @@ -64,6 +64,9 @@ 原文件 %s 不存在 文件名前缀 文件名后缀 + Simple renaming + Pattern + String to add %Y - 年\n%M - 月\n%D - 日\n%h - 时\n%m - 分\n%s - 秒 diff --git a/commons/src/main/res/values-zh-rTW/strings.xml b/commons/src/main/res/values-zh-rTW/strings.xml index 26aaa16fa..4fcf448f6 100644 --- a/commons/src/main/res/values-zh-rTW/strings.xml +++ b/commons/src/main/res/values-zh-rTW/strings.xml @@ -64,6 +64,9 @@ 原始檔案 %s 不存在 檔名前綴 附加檔名 + Simple renaming + Pattern + String to add %Y - 年\n%M - 月\n%D - 日\n%h - 小時\n%m - 分鐘\n%s - 秒鐘 @@ -173,8 +176,8 @@ 應用程式圖標顏色 底部導航列顏色 恢復預設 - Use default - Default + 使用預設 + 預設 改變顏色 主題 改變顏色將切換成[自訂]主題 diff --git a/commons/src/main/res/values/donottranslate.xml b/commons/src/main/res/values/donottranslate.xml index 599d93e9c..cfd5ae4d7 100644 --- a/commons/src/main/res/values/donottranslate.xml +++ b/commons/src/main/res/values/donottranslate.xml @@ -1,4 +1,5 @@ + com.simplemobiletools.commons Simple Commons %1$s / %2$s https://simplemobiletools.com/donate diff --git a/commons/src/main/res/values/strings.xml b/commons/src/main/res/values/strings.xml index 2cc788cc9..94365b430 100644 --- a/commons/src/main/res/values/strings.xml +++ b/commons/src/main/res/values/strings.xml @@ -64,6 +64,9 @@ Source file %s doesn\'t exist Prepend filenames Append filenames + Simple renaming + Pattern + String to add %Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second