Merge pull request #66 from SimpleMobileTools/master

upd
2019-07-08 22:12:18 +03:00 · 2019-07-08 22:12:18 +03:00 · 2cb7e37960
commit 2cb7e37960
parent 8e5e918e85 4b2f457e7f
52 changed files with 261 additions and 89 deletions
--- a/build.gradle
+++ b/build.gradle
@ -7,8 +7,8 @@ buildscript {
        propMinSdkVersion = 21
        propTargetSdkVersion = propCompileSdkVersion
        propVersionCode = 1
-        propVersionName = '5.14.2'
-        kotlin_version = '1.3.40'
+        propVersionName = '5.14.13'
+        kotlin_version = '1.3.41'
    }

    repositories {
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/FilepickerItemsAdapter.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/FilepickerItemsAdapter.kt
@ -11,6 +11,7 @@ import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
 import com.simplemobiletools.commons.extensions.formatSize
 import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor
+import com.simplemobiletools.commons.extensions.isGif
 import com.simplemobiletools.commons.models.FileDirItem
 import com.simplemobiletools.commons.views.MyRecyclerView
 import kotlinx.android.synthetic.main.filepicker_list_item.view.*
@ -90,7 +91,11 @@ class FilepickerItemsAdapter(activity: BaseSimpleActivity, val fileDirItems: Lis
                }

                if (!activity.isDestroyed && !activity.isFinishing) {
-                    Glide.with(activity).load(itemToLoad).transition(withCrossFade()).apply(options).into(list_item_icon)
+                    if (itemToLoad.toString().isGif()) {
+                        Glide.with(activity).asBitmap().load(itemToLoad).apply(options).into(list_item_icon)
+                    } else {
+                        Glide.with(activity).load(itemToLoad).transition(withCrossFade()).apply(options).into(list_item_icon)
+                    }
                }
            }
        }
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/FilePickerDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/FilePickerDialog.kt
@ -139,8 +139,12 @@ class FilePickerDialog(val activity: BaseSimpleActivity,

        val adapter = FilepickerItemsAdapter(activity, sortedItems, mDialogView.filepicker_list) {
            if ((it as FileDirItem).isDirectory) {
-                currPath = it.path
-                tryUpdateItems()
+                activity.handleLockedFolderOpening(it.path) { success ->
+                    if (success) {
+                        currPath = it.path
+                        tryUpdateItems()
+                    }
+                }
            } else if (pickFile) {
                currPath = it.path
                verifyPath()
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/FolderLockingNoticeDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/FolderLockingNoticeDialog.kt
@ -0,0 +1,28 @@
+package com.simplemobiletools.commons.dialogs
+
+import android.app.Activity
+import androidx.appcompat.app.AlertDialog
+import com.simplemobiletools.commons.R
+import com.simplemobiletools.commons.extensions.baseConfig
+import com.simplemobiletools.commons.extensions.setupDialogStuff
+import kotlinx.android.synthetic.main.dialog_textview.view.*
+
+class FolderLockingNoticeDialog(val activity: Activity, val callback: () -> Unit) {
+    init {
+        val view = activity.layoutInflater.inflate(R.layout.dialog_textview, null).apply {
+            text_view.text = activity.getString(R.string.lock_folder_notice)
+        }
+
+        AlertDialog.Builder(activity)
+                .setPositiveButton(R.string.ok) { dialog, which -> dialogConfirmed() }
+                .setNegativeButton(R.string.cancel, null)
+                .create().apply {
+                    activity.setupDialogStuff(view, this)
+                }
+    }
+
+    private fun dialogConfirmed() {
+        activity.baseConfig.wasFolderLockingNoticeShown = true
+        callback()
+    }
+}
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/PropertiesDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/PropertiesDialog.kt
@ -74,6 +74,21 @@ class PropertiesDialog() {
                        updateLastModified(activity, view, fileDirItem.modified)
                    }
                }
+
+                val exif = ExifInterface(fileDirItem.path)
+                val latLon = FloatArray(2)
+                if (exif.getLatLong(latLon)) {
+                    activity.runOnUiThread {
+                        addProperty(R.string.gps_coordinates, "${latLon[0]}, ${latLon[1]}")
+                    }
+                }
+
+                val altitude = exif.getAltitude(0.0)
+                if (altitude != 0.0) {
+                    activity.runOnUiThread {
+                        addProperty(R.string.altitude, "${altitude}m")
+                    }
+                }
            }
        }

--- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt
@ -726,6 +726,16 @@ fun Activity.handleDeletePasswordProtection(callback: () -> Unit) {
    }
 }

+fun Activity.handleLockedFolderOpening(path: String, callback: (success: Boolean) -> Unit) {
+    if (baseConfig.isFolderProtected(path)) {
+        SecurityDialog(this, baseConfig.getFolderProtectionHash(path), baseConfig.getFolderProtectionType(path)) { hash, type, success ->
+            callback(success)
+        }
+    } else {
+        callback(true)
+    }
+}
+
 fun BaseSimpleActivity.createDirectorySync(directory: String): Boolean {
    if (File(directory).exists()) {
        return true
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/BaseConfig.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/BaseConfig.kt
@ -142,6 +142,27 @@ open class BaseConfig(val context: Context) {
        get() = prefs.getInt(DELETE_PROTECTION_TYPE, PROTECTION_PATTERN)
        set(deleteProtectionType) = prefs.edit().putInt(DELETE_PROTECTION_TYPE, deleteProtectionType).apply()

+    // folder locking
+    fun addFolderProtection(path: String, hash: String, type: Int) {
+        prefs.edit()
+                .putString("$PROTECTED_FOLDER_HASH$path", hash)
+                .putInt("$PROTECTED_FOLDER_TYPE$path", type)
+                .apply()
+    }
+
+    fun removeFolderProtection(path: String) {
+        prefs.edit()
+                .remove("$PROTECTED_FOLDER_HASH$path")
+                .remove("$PROTECTED_FOLDER_TYPE$path")
+                .apply()
+    }
+
+    fun isFolderProtected(path: String) = getFolderProtectionType(path) != PROTECTION_NONE
+
+    fun getFolderProtectionHash(path: String) = prefs.getString("$PROTECTED_FOLDER_HASH$path", "") ?: ""
+
+    fun getFolderProtectionType(path: String) = prefs.getInt("$PROTECTED_FOLDER_TYPE$path", PROTECTION_NONE)
+
    var keepLastModified: Boolean
        get() = prefs.getBoolean(KEEP_LAST_MODIFIED, true)
        set(keepLastModified) = prefs.edit().putBoolean(KEEP_LAST_MODIFIED, keepLastModified).apply()
@ -293,7 +314,7 @@ open class BaseConfig(val context: Context) {
        set(dateFormat) = prefs.edit().putString(DATE_FORMAT, dateFormat).apply()

    private fun getDefaultDateFormat(): String {
-        val format = android.text.format.DateFormat.getDateFormat(context)
+        val format = DateFormat.getDateFormat(context)
        val pattern = (format as SimpleDateFormat).toLocalizedPattern()
        return when (pattern.toLowerCase().replace(" ", "")) {
            "dd/mm/y" -> DATE_FORMAT_TWO
@ -318,4 +339,8 @@ open class BaseConfig(val context: Context) {
    var wasSortingByNumericValueAdded: Boolean
        get() = prefs.getBoolean(WAS_SORTING_BY_NUMERIC_VALUE_ADDED, false)
        set(wasSortingByNumericValueAdded) = prefs.edit().putBoolean(WAS_SORTING_BY_NUMERIC_VALUE_ADDED, wasSortingByNumericValueAdded).apply()
+
+    var wasFolderLockingNoticeShown: Boolean
+        get() = prefs.getBoolean(WAS_FOLDER_LOCKING_NOTICE_SHOWN, false)
+        set(wasFolderLockingNoticeShown) = prefs.edit().putBoolean(WAS_FOLDER_LOCKING_NOTICE_SHOWN, wasFolderLockingNoticeShown).apply()
 }
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt
@ -66,6 +66,9 @@ const val APP_PROTECTION_TYPE = "app_protection_type"
 const val DELETE_PASSWORD_PROTECTION = "delete_password_protection"
 const val DELETE_PASSWORD_HASH = "delete_password_hash"
 const val DELETE_PROTECTION_TYPE = "delete_protection_type"
+const val PROTECTED_FOLDER_PATH = "protected_folder_path_"
+const val PROTECTED_FOLDER_HASH = "protected_folder_hash_"
+const val PROTECTED_FOLDER_TYPE = "protected_folder_type_"
 const val KEEP_LAST_MODIFIED = "keep_last_modified"
 const val USE_ENGLISH = "use_english"
 const val WAS_USE_ENGLISH_TOGGLED = "was_use_english_toggled"
@ -106,6 +109,7 @@ const val WAS_OTG_HANDLED = "was_otg_handled_2"
 const val WAS_UPGRADED_FROM_FREE_SHOWN = "was_upgraded_from_free_shown"
 const val WAS_RATE_US_PROMPT_SHOWN = "was_rate_us_prompt_shown"
 const val WAS_SORTING_BY_NUMERIC_VALUE_ADDED = "was_sorting_by_numeric_value_added"
+const val WAS_FOLDER_LOCKING_NOTICE_SHOWN = "was_folder_locking_notice_shown"

 // licenses
 internal const val LICENSE_KOTLIN = 1
@ -160,6 +164,7 @@ const val SORT_USE_NUMERIC_VALUE = 32768

 // security
 const val WAS_PROTECTION_HANDLED = "was_protection_handled"
+const val PROTECTION_NONE = -1
 const val PROTECTION_PATTERN = 0
 const val PROTECTION_PIN = 1
 const val PROTECTION_FINGERPRINT = 2
--- a/commons/src/main/res/drawable-hdpi/ic_lock_huge.png
+++ b/commons/src/main/res/drawable-hdpi/ic_lock_huge.png
--- a/commons/src/main/res/drawable-xhdpi/ic_lock_huge.png
+++ b/commons/src/main/res/drawable-xhdpi/ic_lock_huge.png
--- a/commons/src/main/res/drawable-xxhdpi/ic_lock_huge.png
+++ b/commons/src/main/res/drawable-xxhdpi/ic_lock_huge.png
--- a/commons/src/main/res/drawable-xxxhdpi/ic_lock_huge.png
+++ b/commons/src/main/res/drawable-xxxhdpi/ic_lock_huge.png
--- a/commons/src/main/res/values-ar/strings.xml
+++ b/commons/src/main/res/values-ar/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">لا يمكن أن يكون تنسيق الملف فارغًا</string>
    <string name="source_file_doesnt_exist">ملف المصدر %s غير موجود</string>
    <string name="prepend_filenames">Prepend filenames</string>
-    <string name="append_filenames">Append filenames (before file extension)</string>
+    <string name="append_filenames">Append filenames</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -165,6 +165,8 @@
    <string name="camera">Camera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Song title</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">لون الخلفية</string>
--- a/commons/src/main/res/values-az/strings.xml
+++ b/commons/src/main/res/values-az/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">Uzantı boş ola bilməz</string>
    <string name="source_file_doesnt_exist">Kök faylı %s yoxdur</string>
    <string name="prepend_filenames">Prepend filenames</string>
-    <string name="append_filenames">Append filenames (before file extension)</string>
+    <string name="append_filenames">Append filenames</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -165,6 +165,8 @@
    <string name="camera">Kamera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Musiqi başlığı</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Arxaplan rəngi</string>
--- a/commons/src/main/res/values-br/strings.xml
+++ b/commons/src/main/res/values-br/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">Extension cannot be empty</string>
    <string name="source_file_doesnt_exist">Source file %s doesn\'t exist</string>
    <string name="prepend_filenames">Prepend filenames</string>
-    <string name="append_filenames">Append filenames (before file extension)</string>
+    <string name="append_filenames">Append filenames</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -165,6 +165,8 @@
    <string name="camera">Camera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Song title</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Background color</string>
--- a/commons/src/main/res/values-ca/strings.xml
+++ b/commons/src/main/res/values-ca/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">La extensió no pot estar buida</string>
    <string name="source_file_doesnt_exist">El fitxer %s no existeix</string>
    <string name="prepend_filenames">Posar abans noms de fitxer</string>
-    <string name="append_filenames">Afegeix noms de fitxer (abans de l\'extensió de fitxer)</string>
+    <string name="append_filenames">Afegeix noms de fitxer</string>
    <string name="rename_date_time_pattern">%Y - any\n%M - mes\n%D - dia\n%h - hora\n%m - minut\n%s - segon</string>

    <!-- Copy / Move -->
@ -165,6 +165,8 @@
    <string name="camera">Càmera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Títol de la canço</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Color del fons</string>
--- a/commons/src/main/res/values-cs/strings.xml
+++ b/commons/src/main/res/values-cs/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">Přípona nemůže být prázdná</string>
    <string name="source_file_doesnt_exist">Zdrojový soubor %s neexistuje</string>
    <string name="prepend_filenames">Přidat před názvy souborů</string>
-    <string name="append_filenames">Přidat za názvy souborů (před příponu)</string>
+    <string name="append_filenames">Přidat za názvy souborů</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -168,6 +168,8 @@
    <string name="camera">Fotoaparát</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Název skladby</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Barva pozadí</string>
--- a/commons/src/main/res/values-cy/strings.xml
+++ b/commons/src/main/res/values-cy/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">Ni all yr estyniad fod yn wag</string>
    <string name="source_file_doesnt_exist">Dyw\'r ffeil tarddiad %s ddim yn bodoli</string>
    <string name="prepend_filenames">Rhagddodi enwau ffeiliau</string>
-    <string name="append_filenames">Ôl-ddodi enwau ffeiliau (cyn estyniad y ffeil)</string>
+    <string name="append_filenames">Ôl-ddodi enwau ffeiliau</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -177,6 +177,8 @@
    <string name="camera">Camera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Teitl trac</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Lliw cefndir</string>
--- a/commons/src/main/res/values-da/strings.xml
+++ b/commons/src/main/res/values-da/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">Filtypen kan ikke stå tom</string>
    <string name="source_file_doesnt_exist">Kildefilen %s eksisterer ikke</string>
    <string name="prepend_filenames">Tilføj forrest til filnavne</string>
-    <string name="append_filenames">Tilføj bagerst til filnavne (foran filtypenavnet)</string>
+    <string name="append_filenames">Tilføj bagerst til filnavne</string>
    <string name="rename_date_time_pattern">%Y - år\n%M - måned\n%D - dag\n%h - time\n%m - minut\n%s - sekund</string>

    <!-- Copy / Move -->
@ -165,6 +165,8 @@
    <string name="camera">Kamera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Sangtitel</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Baggrundsfarve</string>
--- a/commons/src/main/res/values-de/strings.xml
+++ b/commons/src/main/res/values-de/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">Dateiendung darf nicht leer sein</string>
    <string name="source_file_doesnt_exist">Quelldatei %s existiert nicht</string>
    <string name="prepend_filenames">Dateinamen voranstellen</string>
-    <string name="append_filenames">Dateinamen anhängen (vor Dateiendung)</string>
+    <string name="append_filenames">Dateinamen anhängen</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -165,6 +165,8 @@
    <string name="camera">Kamera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Liedtitel</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Hintergrundfarbe</string>
--- a/commons/src/main/res/values-el/strings.xml
+++ b/commons/src/main/res/values-el/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">Η επέκταση δεν μπορεί να είναι κενή</string>
    <string name="source_file_doesnt_exist">To αρχείο προέλευσης %s δεν υπάρχει</string>
    <string name="prepend_filenames">Προεπιλεγμένα ονόματα αρχείων</string>
-    <string name="append_filenames">Προσθέστε ονόματα αρχείων (πρίν την επέκταση)</string>
+    <string name="append_filenames">Προσθέστε ονόματα αρχείων</string>
    <string name="rename_date_time_pattern">%Y - έτος\n%M - μήνας\n%D - ημέρα\n%h - ώρα\n%m - λεπτό\n%s - δευτ/το</string>

    <!-- Copy / Move -->
@ -165,6 +165,8 @@
    <string name="camera">Κάμερα</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Τίτλος τραγουδιού</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Χρώμα φόντου</string>
--- a/commons/src/main/res/values-es/strings.xml
+++ b/commons/src/main/res/values-es/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">La extensión no puede estar vacía</string>
    <string name="source_file_doesnt_exist">El archivo %s no existe</string>
    <string name="prepend_filenames">Preponer los nombres de archivo</string>
-    <string name="append_filenames">Adjuntar nombres de archivos (antes de la extensión de archivo)</string>
+    <string name="append_filenames">Adjuntar nombres de archivos</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -165,6 +165,8 @@
    <string name="camera">Cámara</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Título de la canción</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Color del fondo</string>
--- a/commons/src/main/res/values-fi/strings.xml
+++ b/commons/src/main/res/values-fi/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">Tiedostomuoto ei voi olla tyhjä</string>
    <string name="source_file_doesnt_exist">Lähdetiedostoa %s ei löydy</string>
    <string name="prepend_filenames">Prepend filenames</string>
-    <string name="append_filenames">Append filenames (before file extension)</string>
+    <string name="append_filenames">Append filenames</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -165,6 +165,8 @@
    <string name="camera">Kamera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Kappaleen nimi</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Taustaväri</string>
--- a/commons/src/main/res/values-fr/strings.xml
+++ b/commons/src/main/res/values-fr/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">L\'extension ne peut pas rester vide</string>
    <string name="source_file_doesnt_exist">Le fichier source %s n\'existe pas</string>
    <string name="prepend_filenames">Ajouter un préfixe aux noms de fichiers</string>
-    <string name="append_filenames">Ajouter un suffixe aux noms de fichiers (avant l\'extension du fichier)</string>
+    <string name="append_filenames">Ajouter un suffixe aux noms de fichiers</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -165,6 +165,8 @@
    <string name="camera">Caméra</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Titre de la chanson</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Couleur de l\'arrière-plan</string>
@ -239,7 +241,7 @@
    <string name="ascending">Croissant</string>
    <string name="descending">Décroissant</string>
    <string name="use_for_this_folder">Utiliser pour ce dossier uniquement</string>
-    <string name="sort_numeric_parts">Sort numeric parts by actual value</string>
+    <string name="sort_numeric_parts">Trier les parties numériques</string>

    <!-- Confirmation dialog -->
    <string name="proceed_with_deletion">Voulez-vous vraiment effectuer la suppression ?</string>
@ -278,9 +280,9 @@
    <string name="go_to_settings">Aller aux Paramètres</string>
    <string name="protection_setup_successfully">Mot de passe défini. Veuillez réinstaller l\'application en cas problèmes de réinitialisation.</string>
    <string name="fingerprint_setup_successfully">Protection définie. Veuillez réinstaller l\'application en cas problèmes de réinitialisation.</string>
-    <string name="lock_folder">Lock folder</string>
-    <string name="unlock_folder">Unlock folder</string>
-    <string name="lock_folder_notice">This protection works in this app only, it is not supposed to replace a real systemwide folder encryption.</string>
+    <string name="lock_folder">Verrouiller le dossier</string>
+    <string name="unlock_folder">Déverrouiller le dossier</string>
+    <string name="lock_folder_notice">Le verrouillage ne fonctionne que dans cette application. Cette protection ne remplace pas un cryptage de dossier système.</string>

    <!-- Times -->
    <string name="yesterday">Hier</string>
--- a/commons/src/main/res/values-gl/strings.xml
+++ b/commons/src/main/res/values-gl/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">La extensión no puede estar vacía</string>
    <string name="source_file_doesnt_exist">El archivo %s no existe</string>
    <string name="prepend_filenames">Prepend filenames</string>
-    <string name="append_filenames">Append filenames (before file extension)</string>
+    <string name="append_filenames">Append filenames</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -165,6 +165,8 @@
    <string name="camera">Cámara</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Título de la canción</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Color del fondo</string>
--- a/commons/src/main/res/values-hi-rIN/strings.xml
+++ b/commons/src/main/res/values-hi-rIN/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">Extension cannot be empty</string>
    <string name="source_file_doesnt_exist">Source file %s doesn\'t exist</string>
    <string name="prepend_filenames">Prepend filenames</string>
-    <string name="append_filenames">Append filenames (before file extension)</string>
+    <string name="append_filenames">Append filenames</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -165,6 +165,8 @@
    <string name="camera">Camera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Song title</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Background color</string>
--- a/commons/src/main/res/values-hr/strings.xml
+++ b/commons/src/main/res/values-hr/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">Ekstenzija ne smije biti prazna</string>
    <string name="source_file_doesnt_exist">Izvorišna datoteka %s ne postoji</string>
    <string name="prepend_filenames">Dodavanje na početak imena datoteke</string>
-    <string name="append_filenames">Dodavanje naziva datoteka (prije tipa datoteke)</string>
+    <string name="append_filenames">Dodavanje naziva datoteka</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -168,6 +168,8 @@
    <string name="camera">Kamera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Naziv pjesme</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Boja pozadine</string>
--- a/commons/src/main/res/values-hu/strings.xml
+++ b/commons/src/main/res/values-hu/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">A kiterjesztés nem lehet üres</string>
    <string name="source_file_doesnt_exist">A forrás fájl %s nem létezik</string>
    <string name="prepend_filenames">Fájlnevek megadása</string>
-    <string name="append_filenames">Fájlnevek csatolása (fájl kiterjesztés előtt)</string>
+    <string name="append_filenames">Fájlnevek csatolása</string>
    <string name="rename_date_time_pattern">%É - év\\n%H - hónap\\n%N - nap\\n%ó - óra\\n%p - perc\\n%mp - másodperc</string>

    <!-- Copy / Move -->
@ -165,6 +165,8 @@
    <string name="camera">Kamera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Dal címe</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Háttérszín</string>
--- a/commons/src/main/res/values-id/strings.xml
+++ b/commons/src/main/res/values-id/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">Ekstensi tidak boleh kosong</string>
    <string name="source_file_doesnt_exist">Berkas sumber %s tidak ada</string>
    <string name="prepend_filenames">Tambah akhiran nama berkas</string>
-    <string name="append_filenames">Tambah awalan nama berkas (sebelum ekstensi berkas)</string>
+    <string name="append_filenames">Tambah awalan nama berkas</string>
    <string name="rename_date_time_pattern">%Y - tahun\n%M - bulan\n%D - hari\n%h - jam\n%m - menit\n%s - detik</string>

    <!-- Copy / Move -->
@ -162,6 +162,8 @@
    <string name="camera">Kamera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Judul lagu</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Warna latar belakang</string>
--- a/commons/src/main/res/values-in/strings.xml
+++ b/commons/src/main/res/values-in/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">Ekstensi tidak boleh kosong</string>
    <string name="source_file_doesnt_exist">Berkas sumber %s tidak ada</string>
    <string name="prepend_filenames">Tambah akhiran nama berkas</string>
-    <string name="append_filenames">Tambah awalan nama berkas (sebelum ekstensi berkas)</string>
+    <string name="append_filenames">Tambah awalan nama berkas</string>
    <string name="rename_date_time_pattern">%Y - tahun\n%M - bulan\n%D - hari\n%h - jam\n%m - menit\n%s - detik</string>

    <!-- Copy / Move -->
@ -162,6 +162,8 @@
    <string name="camera">Kamera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Judul lagu</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Warna latar belakang</string>
--- a/commons/src/main/res/values-it/strings.xml
+++ b/commons/src/main/res/values-it/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">L\'estensione non può essere vuota</string>
    <string name="source_file_doesnt_exist">Il file di origine %s non esiste</string>
    <string name="prepend_filenames">Anteponi i nomi dei file</string>
-    <string name="append_filenames">Aggiungi i nomi dei file (prima dell\'estensione)</string>
+    <string name="append_filenames">Aggiungi i nomi dei file</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -165,6 +165,8 @@
    <string name="camera">Camera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Titolo canzone</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Colore di sfondo</string>
--- a/commons/src/main/res/values-iw/strings.xml
+++ b/commons/src/main/res/values-iw/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">Extension cannot be empty</string>
    <string name="source_file_doesnt_exist">Source file %s doesn\'t exist</string>
    <string name="prepend_filenames">Prepend filenames</string>
-    <string name="append_filenames">Append filenames (before file extension)</string>
+    <string name="append_filenames">Append filenames</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -165,6 +165,8 @@
    <string name="camera">Camera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Song title</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Background color</string>
--- a/commons/src/main/res/values-ja/strings.xml
+++ b/commons/src/main/res/values-ja/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">拡張子は省略できません</string>
    <string name="source_file_doesnt_exist">ソースファイル %s が存在しません</string>
    <string name="prepend_filenames">ファイル名の前に追加</string>
-    <string name="append_filenames">ファイル名の後に追加 (拡張子の前)</string>
+    <string name="append_filenames">ファイル名の後に追加</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -162,6 +162,8 @@
    <string name="camera">カメラ名</string>
    <string name="exif">EXIF</string>
    <string name="song_title">曲名</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">背景色</string>
--- a/commons/src/main/res/values-ko-rKR/strings.xml
+++ b/commons/src/main/res/values-ko-rKR/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">확장자가 비어있으면 안됨</string>
    <string name="source_file_doesnt_exist">Source file %s doesn\'t exist</string>
    <string name="prepend_filenames">Prepend filenames</string>
-    <string name="append_filenames">Append filenames (before file extension)</string>
+    <string name="append_filenames">Append filenames</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -162,6 +162,8 @@
    <string name="camera">Camera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Song title</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">배경 색상</string>
--- a/commons/src/main/res/values-lt/strings.xml
+++ b/commons/src/main/res/values-lt/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">Papildinys negali būti paliktas tuščias</string>
    <string name="source_file_doesnt_exist">Šaltinio byla %s neegzistuoja</string>
    <string name="prepend_filenames">Prepend filenames</string>
-    <string name="append_filenames">Append filenames (before file extension)</string>
+    <string name="append_filenames">Append filenames</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -165,6 +165,8 @@
    <string name="camera">Kamera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Dainos pavadinimas</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Fono spalva</string>
--- a/commons/src/main/res/values-nb/strings.xml
+++ b/commons/src/main/res/values-nb/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">Extension cannot be empty</string>
    <string name="source_file_doesnt_exist">Source file %s doesn\'t exist</string>
    <string name="prepend_filenames">Prepend filenames</string>
-    <string name="append_filenames">Append filenames (before file extension)</string>
+    <string name="append_filenames">Append filenames</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -165,6 +165,8 @@
    <string name="camera">Kamera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Sangtittel</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Bakgrunnsfarge</string>
--- a/commons/src/main/res/values-nl/strings.xml
+++ b/commons/src/main/res/values-nl/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">Extensie mag niet leeg zijn</string>
    <string name="source_file_doesnt_exist">Bronbestand %s bestaat niet</string>
    <string name="prepend_filenames">Voor bestandsnaam</string>
-    <string name="append_filenames">Na bestandsnaam (voor extensie)</string>
+    <string name="append_filenames">Na bestandsnaam</string>
    <string name="rename_date_time_pattern">%Y - jaar\n%M - maand\n%D - dag\n%h - uur\n%m - minuut\n%s - seconde</string>

    <!-- Copy / Move -->
@ -165,6 +165,8 @@
    <string name="camera">Camera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Titel</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Achtergrondkleur</string>
--- a/commons/src/main/res/values-no/strings.xml
+++ b/commons/src/main/res/values-no/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">Extension cannot be empty</string>
    <string name="source_file_doesnt_exist">Source file %s doesn\'t exist</string>
    <string name="prepend_filenames">Prepend filenames</string>
-    <string name="append_filenames">Append filenames (before file extension)</string>
+    <string name="append_filenames">Append filenames</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -165,6 +165,8 @@
    <string name="camera">Camera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Song title</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Bakgrunnsfarge</string>
--- a/commons/src/main/res/values-pl/strings.xml
+++ b/commons/src/main/res/values-pl/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">Rozszerzenie pliku nie może być puste</string>
    <string name="source_file_doesnt_exist">Plik źródłowy nie istnieje</string>
    <string name="prepend_filenames">Poprzedzaj nazwy plików</string>
-    <string name="append_filenames">Dołączaj nazwy plików (przed rozszerzeniem)</string>
+    <string name="append_filenames">Dołączaj nazwy plików</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -166,6 +166,8 @@
    <string name="camera">Kamera/aparat</string>
    <string name="exif">Dane EXIF</string>
    <string name="song_title">Tytuł piosenki</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Tło</string>
--- a/commons/src/main/res/values-pt-rBR/strings.xml
+++ b/commons/src/main/res/values-pt-rBR/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">A extensão não pode ficar em branco</string>
    <string name="source_file_doesnt_exist">Arquivo de origem %s não existe</string>
    <string name="prepend_filenames">Adicionar ao início dos nomes</string>
-    <string name="append_filenames">Adicionar ao fim dos nomes (antes da extensão)</string>
+    <string name="append_filenames">Adicionar ao fim dos nomes</string>
    <string name="rename_date_time_pattern">%Y - ano\n%M - mês\n%D - dia\n%h - hora\n%m - minuto\n%s - segundo</string>

    <!-- Copy / Move -->
@ -164,6 +164,8 @@
    <string name="camera">Câmera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Título da música</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Cor de fundo</string>
--- a/commons/src/main/res/values-pt/strings.xml
+++ b/commons/src/main/res/values-pt/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">A extensão não pode estar vazia</string>
    <string name="source_file_doesnt_exist">O ficheiro de origem %s não existe</string>
    <string name="prepend_filenames">Introduzir antes do nome do ficheiro</string>
-    <string name="append_filenames">Introduzir depois do nome do ficheiro (e antes da extensão)</string>
+    <string name="append_filenames">Introduzir depois do nome do ficheiro</string>
    <string name="rename_date_time_pattern">%Y - ano\n%M - mês\n%D - dia\n%h - horas\n%m - minutos\n%s - segundos</string>

    <!-- Copy / Move -->
@ -165,6 +165,8 @@
    <string name="camera">Câmara</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Título da faixa</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Cor de fundo</string>
@ -276,9 +278,9 @@
    <string name="go_to_settings">Ir para Definições</string>
    <string name="protection_setup_successfully">Palavra-passe definida com sucesso. Deve reinstalar esta aplicação se não se lembrar da palavra-passe.</string>
    <string name="fingerprint_setup_successfully">Proteção definida com sucesso. Deve reinstalar a aplicação se ocorrerem problemas.</string>
-    <string name="lock_folder">Lock folder</string>
-    <string name="unlock_folder">Unlock folder</string>
-    <string name="lock_folder_notice">This protection works in this app only, it is not supposed to replace a real systemwide folder encryption.</string>
+    <string name="lock_folder">Bloquear pasta</string>
+    <string name="unlock_folder">Desbloquear pasta</string>
+    <string name="lock_folder_notice">A proteção aqui definida apenas funciona para esta aplicação e não protege o restante conteúdo do seu sistema.</string>

    <!-- Times -->
    <string name="yesterday">Ontem</string>
--- a/commons/src/main/res/values-ru/strings.xml
+++ b/commons/src/main/res/values-ru/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">Расширение не может быть пустым</string>
    <string name="source_file_doesnt_exist">Исходный файл \"%s\" не существует</string>
    <string name="prepend_filenames">Перед именем файла</string>
-    <string name="append_filenames">После имени файла (до расширения)</string>
+    <string name="append_filenames">После имени файла</string>
    <string name="rename_date_time_pattern">%Y - год\n%M - месяц\n%D - день\n%h - час\n%m - минута\n%s - секунда</string>

    <!-- Copy / Move -->
@ -168,6 +168,8 @@
    <string name="camera">Камера</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Название композиции</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Цвет фона</string>
--- a/commons/src/main/res/values-sk/strings.xml
+++ b/commons/src/main/res/values-sk/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">Prípona nesmie byť prázdna</string>
    <string name="source_file_doesnt_exist">Zdrojový súbor %s neexistuje</string>
    <string name="prepend_filenames">Pridať pred názvy súborov</string>
-    <string name="append_filenames">Pridať za názvy súborov (pred prípony)</string>
+    <string name="append_filenames">Pridať za názvy súborov</string>
    <string name="rename_date_time_pattern">%Y - rok\n%M - mesiac\n%D - deň\n%h - hodina\n%m - minúta\n%s - sekunda</string>

    <!-- Copy / Move -->
@ -168,6 +168,8 @@
    <string name="camera">Fotoaparát</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Názov skladby</string>
+    <string name="gps_coordinates">GPS súradnice</string>
+    <string name="altitude">Nadmorská výška</string>

    <!-- Color customization -->
    <string name="background_color">Farba pozadia</string>
--- a/commons/src/main/res/values-sl/strings.xml
+++ b/commons/src/main/res/values-sl/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">Končnica ne more biti prazna</string>
    <string name="source_file_doesnt_exist">Datoteka %s ne obstaja</string>
    <string name="prepend_filenames">Pripravi mena datotek</string>
-    <string name="append_filenames">Dodaj imena datotek (pred končnico)</string>
+    <string name="append_filenames">Dodaj imena datotek</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -170,6 +170,8 @@
    <string name="camera">Fotoaparat</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Naslov pesmi</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Barva ozadja</string>
--- a/commons/src/main/res/values-sr/strings.xml
+++ b/commons/src/main/res/values-sr/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">Тип датотеке не може бити празан</string>
    <string name="source_file_doesnt_exist">Изворни код датотеке %s не постоји</string>
    <string name="prepend_filenames">Додај префикс именима датотека</string>
-    <string name="append_filenames">Додај суфикс именима датотека (пре екстензије датотеке)</string>
+    <string name="append_filenames">Додај суфикс именима датотека</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -164,6 +164,8 @@
    <string name="camera">Камера</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Име песме</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Боја позадине</string>
--- a/commons/src/main/res/values-sv/strings.xml
+++ b/commons/src/main/res/values-sv/strings.xml
@ -23,8 +23,8 @@
    <string name="transparent_color">Genomskinlig färg</string>
    <string name="select_a_different_color">Välj en annan färg</string>
    <string name="download">Hämta</string>
-    <string name="notification">Notification</string>
-    <string name="email">Email</string>
+    <string name="notification">Avisering</string>
+    <string name="email">E-post</string>

    <!-- Favorites -->
    <string name="favorites">Favoriter</string>
@ -63,8 +63,8 @@
    <string name="extension_cannot_be_empty">Filnamnstillägget får inte vara tomt</string>
    <string name="source_file_doesnt_exist">Källfilen %s finns inte</string>
    <string name="prepend_filenames">Lägg till före filnamnen</string>
-    <string name="append_filenames">Lägg till efter filnamnen (före filnamnstilläggen)</string>
-    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>
+    <string name="append_filenames">Lägg till efter filnamnen</string>
+    <string name="rename_date_time_pattern">%Y - år\n%M - månad\n%D - dag\n%h - timme\n%m - minut\n%s - sekund</string>

    <!-- Copy / Move -->
    <string name="copy">Kopiera</string>
@ -91,7 +91,7 @@
    <string name="saving">Sparar…</string>
    <string name="could_not_create_folder">Det gick inte att skapa mappen %s</string>
    <string name="could_not_create_file">Det gick inte att skapa filen %s</string>
-    <string name="no_new_items">No new items have been found</string>
+    <string name="no_new_items">Inga nya objekt hittades</string>

    <!-- Create new -->
    <string name="create_new">Skapa ny</string>
@ -165,6 +165,8 @@
    <string name="camera">Kamera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Låttitel</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Bakgrundsfärg</string>
@ -223,7 +225,7 @@
    <string name="undo">Ångra</string>
    <string name="redo">Gör om</string>
    <string name="print">Skriv ut</string>
-    <string name="create_shortcut">Create shortcut</string>
+    <string name="create_shortcut">Skapa genväg</string>

    <!-- Sorting -->
    <string name="sort_by">Sortera efter</string>
@ -239,7 +241,7 @@
    <string name="ascending">Stigande</string>
    <string name="descending">Fallande</string>
    <string name="use_for_this_folder">Använd bara för denna mapp</string>
-    <string name="sort_numeric_parts">Sort numeric parts by actual value</string>
+    <string name="sort_numeric_parts">Sortera numeriska delar efter faktiskt värde</string>

    <!-- Confirmation dialog -->
    <string name="proceed_with_deletion">Är du säker på att du vill fortsätta med borttagningen?</string>
@ -250,7 +252,7 @@
    <string name="do_not_ask_again">Fråga inte igen i denna session</string>
    <string name="yes">Ja</string>
    <string name="no">Nej</string>
-    <string name="maybe">Maybe</string>
+    <string name="maybe">Kanske</string>

    <plurals name="delete_warning">
        <item quantity="one">VARNING! Du håller på att ta bort %d mapp</item>
@ -276,8 +278,8 @@
    <string name="go_to_settings">Gå till Inställningar</string>
    <string name="protection_setup_successfully">Lösenordet har ställts in. Installera om appen om du glömmer bort det.</string>
    <string name="fingerprint_setup_successfully">Skyddet har ställts in. Installera om appen om du inte kan ta bort skyddet.</string>
-    <string name="lock_folder">Lock folder</string>
-    <string name="unlock_folder">Unlock folder</string>
+    <string name="lock_folder">Lås mapp</string>
+    <string name="unlock_folder">Lås upp mapp</string>
    <string name="lock_folder_notice">This protection works in this app only, it is not supposed to replace a real systemwide folder encryption.</string>

    <!-- Times -->
@ -332,50 +334,50 @@
        <item quantity="other">%d timmar</item>
    </plurals>
    <plurals name="in_days">
-        <item quantity="one">%d day</item>
-        <item quantity="other">%d days</item>
+        <item quantity="one">%d dag</item>
+        <item quantity="other">%d dagar</item>
    </plurals>
    <plurals name="in_weeks">
-        <item quantity="one">%d week</item>
-        <item quantity="other">%d weeks</item>
+        <item quantity="one">%d vecka</item>
+        <item quantity="other">%d veckor</item>
    </plurals>
    <plurals name="in_months">
-        <item quantity="one">%d month</item>
-        <item quantity="other">%d months</item>
+        <item quantity="one">%d månad</item>
+        <item quantity="other">%d månader</item>
    </plurals>
    <plurals name="in_years">
-        <item quantity="one">%d year</item>
-        <item quantity="other">%d years</item>
+        <item quantity="one">%d år</item>
+        <item quantity="other">%d år</item>
    </plurals>

    <!-- For example: Event reminder: 3 minutes before -->
    <plurals name="seconds_before">
-        <item quantity="one">%d sekund före</item>
-        <item quantity="other">%d sekunder före</item>
+        <item quantity="one">%d sekund innan</item>
+        <item quantity="other">%d sekunder innan</item>
    </plurals>
    <plurals name="minutes_before">
-        <item quantity="one">%d minut före</item>
-        <item quantity="other">%d minuter före</item>
+        <item quantity="one">%d minut innan</item>
+        <item quantity="other">%d minuter innan</item>
    </plurals>
    <plurals name="hours_before">
-        <item quantity="one">%d timme före</item>
-        <item quantity="other">%d timmar före</item>
+        <item quantity="one">%d timme innan</item>
+        <item quantity="other">%d timmar innan</item>
    </plurals>
    <plurals name="days_before">
-        <item quantity="one">%d dag före</item>
-        <item quantity="other">%d dagar före</item>
+        <item quantity="one">%d dag innan</item>
+        <item quantity="other">%d dagar innan</item>
    </plurals>
    <plurals name="weeks_before">
-        <item quantity="one">%d vecka före</item>
-        <item quantity="other">%d veckor före</item>
+        <item quantity="one">%d vecka innan</item>
+        <item quantity="other">%d veckor innan</item>
    </plurals>
    <plurals name="months_before">
-        <item quantity="one">%d månad före</item>
-        <item quantity="other">%d månader före</item>
+        <item quantity="one">%d månad innan</item>
+        <item quantity="other">%d månader innan</item>
    </plurals>
    <plurals name="years_before">
-        <item quantity="one">%d år före</item>
-        <item quantity="other">%d år före</item>
+        <item quantity="one">%d år innan</item>
+        <item quantity="other">%d år innan</item>
    </plurals>

    <!-- For example: Postpone reminder by 3 minutes -->
@ -471,7 +473,7 @@
    <string name="saving_label">Sparande</string>
    <string name="startup">Start</string>
    <string name="text">Text</string>
-    <string name="migrating">Migrating</string>
+    <string name="migrating">Migrering</string>

    <!-- Recycle Bin -->
    <string name="restore_this_file">Återställ filen</string>
@ -481,7 +483,7 @@
    <string name="files_restored_successfully">Filerna har återställts</string>
    <string name="empty_recycle_bin_confirmation">Är du säker på att du vill tömma Papperskorgen? Filerna tas bort permanent.</string>
    <string name="recycle_bin_empty">Papperskorgen är tom</string>
-    <string name="moving_recycle_bin_items_disabled">Moving Recycle bin items is disabled, please use Restore</string>
+    <string name="moving_recycle_bin_items_disabled">Flytt av objekt i Papperskorgen är inaktiverad, använd Återställ</string>
    <string name="show_the_recycle_bin">Visa Papperskorgen</string>
    <string name="hide_the_recycle_bin">Dölj Papperskorgen</string>

@ -499,8 +501,8 @@
    <string name="exporting_failed">Exporten misslyckades</string>
    <string name="importing_some_entries_failed">Importen av vissa poster misslyckades</string>
    <string name="exporting_some_entries_failed">Exporten av vissa poster misslyckades</string>
-    <string name="no_entries_for_importing">No entries for importing have been found</string>
-    <string name="no_entries_for_exporting">Inga poster hittades för export</string>
+    <string name="no_entries_for_importing">Inga poster som kan importeras hittades</string>
+    <string name="no_entries_for_exporting">Inga poster som kan exporteras hittades</string>

    <!-- OTG devices -->
    <string name="usb">USB</string>
@ -571,14 +573,14 @@
    <string name="about">Om</string>
    <string name="website_label">Du hittar källkoden på</string>
    <string name="email_label">Skicka dina synpunkter och förslag till</string>
-    <string name="upgrade_to_pro">Upgrade to Pro</string>
+    <string name="upgrade_to_pro">Uppgradera till Pro</string>
    <string name="more_apps_underlined"><u>Fler appar</u></string>
    <string name="third_party_licences_underlined"><u>Tredjepartslicenser</u></string>
    <string name="invite_friends_underlined"><u>Bjud in vänner</u></string>
    <string name="share_text">Hej, läs om %1$s på %2$s</string>
    <string name="invite_via">Bjud in via</string>
    <string name="rate_us_underlined"><u>Betygsätt oss</u></string>
-    <string name="rate">Rate</string>
+    <string name="rate">Betygsätt</string>
    <string name="donate">Donera</string>
    <string name="donate_underlined"><u>Donera</u></string>
    <string name="follow_us">Följ oss</string>
--- a/commons/src/main/res/values-tr/strings.xml
+++ b/commons/src/main/res/values-tr/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">Uzantı boş olamaz</string>
    <string name="source_file_doesnt_exist">%s kaynak dosyası mevcut değil</string>
    <string name="prepend_filenames">Ön dosya adları</string>
-    <string name="append_filenames">Dosya adlarını ekle (dosya uzantısından önce)</string>
+    <string name="append_filenames">Dosya adlarını ekle</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -165,6 +165,8 @@
    <string name="camera">Kamera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Şarkı başlığı</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Arka plan rengi</string>
--- a/commons/src/main/res/values-uk/strings.xml
+++ b/commons/src/main/res/values-uk/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">Розширення не може бути порожнім</string>
    <string name="source_file_doesnt_exist">Вихідний файл %s не існує</string>
    <string name="prepend_filenames">Префікс імен файлів</string>
-    <string name="append_filenames">Суфікс імен файлів (перед розширенням)</string>
+    <string name="append_filenames">Суфікс імен файлів</string>
    <string name="rename_date_time_pattern">%Y - рік\n%M - місяць\n%D - день\n%h - година\n%m - хвилина\n%s - секунда</string>

    <!-- Copy / Move -->
@ -165,6 +165,8 @@
    <string name="camera">Камера</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Назва пісні</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Колір фону</string>
--- a/commons/src/main/res/values-zh-rCN/strings.xml
+++ b/commons/src/main/res/values-zh-rCN/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">扩展名不能为空</string>
    <string name="source_file_doesnt_exist">原文件 %s 不存在</string>
    <string name="prepend_filenames">文件名前缀</string>
-    <string name="append_filenames">文件名后缀(格式后缀之前)</string>
+    <string name="append_filenames">文件名后缀</string>
    <string name="rename_date_time_pattern">%Y - 年\n%M - 月\n%D - 日\n%h - 时\n%m - 分\n%s - 秒</string>

    <!-- Copy / Move -->
@ -162,6 +162,8 @@
    <string name="camera">相机</string>
    <string name="exif">EXIF</string>
    <string name="song_title">歌曲标题</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">背景色</string>
--- a/commons/src/main/res/values-zh-rTW/strings.xml
+++ b/commons/src/main/res/values-zh-rTW/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">副檔名不得空白</string>
    <string name="source_file_doesnt_exist">原始檔案 %s 不存在</string>
    <string name="prepend_filenames">檔名前綴</string>
-    <string name="append_filenames">附加檔名（在副檔名前）</string>
+    <string name="append_filenames">附加檔名</string>
    <string name="rename_date_time_pattern">%Y - 年\n%M - 月\n%D - 日\n%h - 小時\n%m - 分鐘\n%s - 秒鐘</string>

    <!-- Copy / Move -->
@ -162,6 +162,8 @@
    <string name="camera">相機</string>
    <string name="exif">EXIF</string>
    <string name="song_title">歌名</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">背景顏色</string>
--- a/commons/src/main/res/values/strings.xml
+++ b/commons/src/main/res/values/strings.xml
@ -63,7 +63,7 @@
    <string name="extension_cannot_be_empty">Extension cannot be empty</string>
    <string name="source_file_doesnt_exist">Source file %s doesn\'t exist</string>
    <string name="prepend_filenames">Prepend filenames</string>
-    <string name="append_filenames">Append filenames (before file extension)</string>
+    <string name="append_filenames">Append filenames</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -165,6 +165,8 @@
    <string name="camera">Camera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Song title</string>
+    <string name="gps_coordinates">GPS coordinates</string>
+    <string name="altitude">Altitude</string>

    <!-- Color customization -->
    <string name="background_color">Background color</string>
--- a/commons/src/main/res/values/styles.xml
+++ b/commons/src/main/res/values/styles.xml
@ -9,6 +9,8 @@
        <item name="android:spinnerDropDownItemStyle">@style/SpinnerItem.DropDownItem</item>
        <item name="buttonStyle">@style/MyTransparentButton</item>
        <item name="android:buttonStyle">@style/MyTransparentButton</item>
+        <item name="android:itemBackground">@color/default_background_color</item>
+        <item name="android:textColor">@color/default_text_color</item>
    </style>

    <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">