From 3c07e394323473891a9a69d5d91f9a7db94d1b9f Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 20 Oct 2018 19:17:39 +0200
Subject: [PATCH 01/15] adding some recyclerview item selection optimizations

---
 build.gradle                                  |  2 +-
 .../commons/adapters/MyRecyclerViewAdapter.kt | 44 ++++++++++---------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/build.gradle b/build.gradle
index dbe33a7a8..342011ffd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         propMinSdkVersion = 21
         propTargetSdkVersion = propCompileSdkVersion
         propVersionCode = 1
-        propVersionName = '5.1.6'
+        propVersionName = '5.1.10'
         kotlin_version = '1.2.71'
     }
 
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 790ed8a4f..a83579f9e 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/MyRecyclerViewAdapter.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/MyRecyclerViewAdapter.kt
@@ -83,9 +83,10 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc
                 (selectedKeys.clone() as HashSet<Int>).forEach {
                     val position = getItemKeyPosition(it)
                     if (position != -1) {
-                        toggleItemSelection(false, position)
+                        toggleItemSelection(false, position, false)
                     }
                 }
+                updateTitle()
                 selectedKeys.clear()
                 actBarTextView?.text = ""
                 actMode = null
@@ -94,7 +95,7 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc
         }
     }
 
-    protected fun toggleItemSelection(select: Boolean, pos: Int) {
+    protected fun toggleItemSelection(select: Boolean, pos: Int, updateTitle: Boolean = true) {
         if (select && !getIsItemSelectable(pos)) {
             return
         }
@@ -112,17 +113,18 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc
 
         notifyItemChanged(pos + positionOffset)
 
-        if (selectedKeys.isEmpty()) {
-            finishActMode()
-            return
+        if (updateTitle) {
+            updateTitle()
         }
 
-        updateTitle(selectedKeys.size)
+        if (selectedKeys.isEmpty()) {
+            finishActMode()
+        }
     }
 
-    private fun updateTitle(cnt: Int) {
+    private fun updateTitle() {
         val selectableItemCount = getSelectableItemCount()
-        val selectedCount = Math.min(cnt, selectableItemCount)
+        val selectedCount = Math.min(selectedKeys.size, selectableItemCount)
         val oldTitle = actBarTextView?.text
         val newTitle = "$selectedCount / $selectableItemCount"
         if (oldTitle != newTitle) {
@@ -139,8 +141,9 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc
             val min = Math.min(lastLongPressedItem, position)
             val max = Math.max(lastLongPressedItem, position)
             for (i in min..max) {
-                toggleItemSelection(true, i)
+                toggleItemSelection(true, i, false)
             }
+            updateTitle()
             position
         }
     }
@@ -166,16 +169,17 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc
     protected fun selectAll() {
         val cnt = itemCount - positionOffset
         for (i in 0 until cnt) {
-            toggleItemSelection(true, i)
+            toggleItemSelection(true, i, false)
         }
         lastLongPressedItem = -1
+        updateTitle()
     }
 
     protected fun setupDragListener(enable: Boolean) {
         if (enable) {
             recyclerView.setupDragListener(object : MyRecyclerView.MyDragListener {
                 override fun selectItem(position: Int) {
-                    toggleItemSelection(true, position)
+                    toggleItemSelection(true, position, true)
                 }
 
                 override fun selectRange(initialSelection: Int, lastDraggedIndex: Int, minReached: Int, maxReached: Int) {
@@ -190,36 +194,36 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc
 
     protected fun selectItemRange(from: Int, to: Int, min: Int, max: Int) {
         if (from == to) {
-            (min..max).filter { it != from }.forEach { toggleItemSelection(false, it) }
+            (min..max).filter { it != from }.forEach { toggleItemSelection(false, it, true) }
             return
         }
 
         if (to < from) {
             for (i in to..from) {
-                toggleItemSelection(true, i)
+                toggleItemSelection(true, i, true)
             }
 
             if (min > -1 && min < to) {
-                (min until to).filter { it != from }.forEach { toggleItemSelection(false, it) }
+                (min until to).filter { it != from }.forEach { toggleItemSelection(false, it, true) }
             }
 
             if (max > -1) {
                 for (i in from + 1..max) {
-                    toggleItemSelection(false, i)
+                    toggleItemSelection(false, i, true)
                 }
             }
         } else {
             for (i in from..to) {
-                toggleItemSelection(true, i)
+                toggleItemSelection(true, i, true)
             }
 
             if (max > -1 && max > to) {
-                (to + 1..max).filter { it != from }.forEach { toggleItemSelection(false, it) }
+                (to + 1..max).filter { it != from }.forEach { toggleItemSelection(false, it, true) }
             }
 
             if (min > -1) {
                 for (i in min until from) {
-                    toggleItemSelection(false, i)
+                    toggleItemSelection(false, i, true)
                 }
             }
         }
@@ -295,7 +299,7 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc
             if (actModeCallback.isSelectable) {
                 val currentPosition = adapterPosition - positionOffset
                 val isSelected = selectedKeys.contains(getItemSelectionKey(currentPosition))
-                toggleItemSelection(!isSelected, currentPosition)
+                toggleItemSelection(!isSelected, currentPosition, true)
             } else {
                 itemClick.invoke(any)
             }
@@ -308,7 +312,7 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc
                 activity.startSupportActionMode(actModeCallback)
             }
 
-            toggleItemSelection(true, currentPosition)
+            toggleItemSelection(true, currentPosition, true)
             itemLongClicked(currentPosition)
         }
     }

From 8d3ec8058664081ece56261339a3edccd5f101ab Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 20 Oct 2018 21:05:32 +0200
Subject: [PATCH 02/15] show proper exposure values at long exposure photos

---
 build.gradle                                              | 2 +-
 .../com/simplemobiletools/commons/extensions/String.kt    | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 342011ffd..eee5ecc5f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         propMinSdkVersion = 21
         propTargetSdkVersion = propCompileSdkVersion
         propVersionCode = 1
-        propVersionName = '5.1.10'
+        propVersionName = '5.1.12'
         kotlin_version = '1.2.71'
     }
 
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 c9097c20e..4a3acc45f 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/String.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/String.kt
@@ -87,8 +87,12 @@ fun String.getExifProperties(exif: ExifInterface): String {
 
     exif.getAttribute(ExifInterface.TAG_EXPOSURE_TIME).let {
         if (it?.isNotEmpty() == true) {
-            val exposureSec = Math.round(1 / it.toFloat())
-            exifString += "1/${exposureSec}s  "
+            val exposureValue = it.toFloat()
+            exifString += if (exposureValue > 1f) {
+                "${exposureValue}s  "
+            } else {
+                "1/${Math.round(1 / exposureValue)}s  "
+            }
         }
     }
 

From 8bf518c99b602aba167edfe179461e7b82bcfb29 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 20 Oct 2018 22:11:26 +0200
Subject: [PATCH 03/15] adding some new strings related to simple batch
 renaming

---
 commons/src/main/res/values-ar/strings.xml     | 2 ++
 commons/src/main/res/values-az/strings.xml     | 2 ++
 commons/src/main/res/values-br/strings.xml     | 2 ++
 commons/src/main/res/values-ca/strings.xml     | 2 ++
 commons/src/main/res/values-cs/strings.xml     | 2 ++
 commons/src/main/res/values-da/strings.xml     | 2 ++
 commons/src/main/res/values-de/strings.xml     | 2 ++
 commons/src/main/res/values-el/strings.xml     | 2 ++
 commons/src/main/res/values-es/strings.xml     | 2 ++
 commons/src/main/res/values-fi/strings.xml     | 2 ++
 commons/src/main/res/values-fr/strings.xml     | 2 ++
 commons/src/main/res/values-gl/strings.xml     | 2 ++
 commons/src/main/res/values-hi-rIN/strings.xml | 2 ++
 commons/src/main/res/values-hr/strings.xml     | 2 ++
 commons/src/main/res/values-hu/strings.xml     | 2 ++
 commons/src/main/res/values-id/strings.xml     | 2 ++
 commons/src/main/res/values-it/strings.xml     | 2 ++
 commons/src/main/res/values-iw/strings.xml     | 2 ++
 commons/src/main/res/values-ja/strings.xml     | 2 ++
 commons/src/main/res/values-ko-rKR/strings.xml | 2 ++
 commons/src/main/res/values-lt/strings.xml     | 2 ++
 commons/src/main/res/values-nb/strings.xml     | 2 ++
 commons/src/main/res/values-nl/strings.xml     | 2 ++
 commons/src/main/res/values-no/strings.xml     | 2 ++
 commons/src/main/res/values-pl/strings.xml     | 2 ++
 commons/src/main/res/values-pt-rBR/strings.xml | 2 ++
 commons/src/main/res/values-pt/strings.xml     | 2 ++
 commons/src/main/res/values-ru/strings.xml     | 2 ++
 commons/src/main/res/values-sk/strings.xml     | 2 ++
 commons/src/main/res/values-sl/strings.xml     | 2 ++
 commons/src/main/res/values-sv/strings.xml     | 2 ++
 commons/src/main/res/values-tr/strings.xml     | 2 ++
 commons/src/main/res/values-zh-rCN/strings.xml | 2 ++
 commons/src/main/res/values-zh-rTW/strings.xml | 2 ++
 commons/src/main/res/values/strings.xml        | 2 ++
 35 files changed, 70 insertions(+)

diff --git a/commons/src/main/res/values-ar/strings.xml b/commons/src/main/res/values-ar/strings.xml
index de03483da..41e22a5b8 100644
--- a/commons/src/main/res/values-ar/strings.xml
+++ b/commons/src/main/res/values-ar/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Filename \'%s\' contains invalid characters</string>
     <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>
 
     <!-- Copy / Move -->
     <string name="copy">Copy</string>
diff --git a/commons/src/main/res/values-az/strings.xml b/commons/src/main/res/values-az/strings.xml
index 76db14c2c..af8c74029 100644
--- a/commons/src/main/res/values-az/strings.xml
+++ b/commons/src/main/res/values-az/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Fayl adı \'%s\' etibarsız simvollar ehtiva edir</string>
     <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>
 
     <!-- Copy / Move -->
     <string name="copy">Kopyala</string>
diff --git a/commons/src/main/res/values-br/strings.xml b/commons/src/main/res/values-br/strings.xml
index 0a16a6aac..fd88040d8 100644
--- a/commons/src/main/res/values-br/strings.xml
+++ b/commons/src/main/res/values-br/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Filename \'%s\' contains invalid characters</string>
     <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>
 
     <!-- Copy / Move -->
     <string name="copy">Copy</string>
diff --git a/commons/src/main/res/values-ca/strings.xml b/commons/src/main/res/values-ca/strings.xml
index 457538b28..767ca366c 100644
--- a/commons/src/main/res/values-ca/strings.xml
+++ b/commons/src/main/res/values-ca/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">El nom de l\'arxiu  \'%s\' conté caràcters no vàlids</string>
     <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">Prepend filenames</string>
+    <string name="append_filenames">Append filenames (before file extension)</string>
 
     <!-- Copy / Move -->
     <string name="copy">Copiar</string>
diff --git a/commons/src/main/res/values-cs/strings.xml b/commons/src/main/res/values-cs/strings.xml
index 40edccb0c..1980f9796 100644
--- a/commons/src/main/res/values-cs/strings.xml
+++ b/commons/src/main/res/values-cs/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Název souboru \'%s\' obsahuje neplatné znaky</string>
     <string name="extension_cannot_be_empty">Přípona nemůže být prázdná</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>
 
     <!-- Copy / Move -->
     <string name="copy">Kopírovat</string>
diff --git a/commons/src/main/res/values-da/strings.xml b/commons/src/main/res/values-da/strings.xml
index bc987e5ba..618b42d5c 100644
--- a/commons/src/main/res/values-da/strings.xml
+++ b/commons/src/main/res/values-da/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Filnavnet \"%s\" indeholder ugyldige tegn</string>
     <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">Prepend filenames</string>
+    <string name="append_filenames">Append filenames (before file extension)</string>
 
     <!-- Copy / Move -->
     <string name="copy">Kopier</string>
diff --git a/commons/src/main/res/values-de/strings.xml b/commons/src/main/res/values-de/strings.xml
index d9097ffc7..7a83f5c91 100644
--- a/commons/src/main/res/values-de/strings.xml
+++ b/commons/src/main/res/values-de/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Dateiname \'%s\' anthält ungültige Zeichen</string>
     <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">Prepend filenames</string>
+    <string name="append_filenames">Append filenames (before file extension)</string>
 
     <!-- Copy / Move -->
     <string name="copy">Kopieren</string>
diff --git a/commons/src/main/res/values-el/strings.xml b/commons/src/main/res/values-el/strings.xml
index 33e4e31f9..c1c94d7ac 100644
--- a/commons/src/main/res/values-el/strings.xml
+++ b/commons/src/main/res/values-el/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Το όνομα \'%s\' περιέχει μη έγκυρους χαρακτήρες</string>
     <string name="extension_cannot_be_empty">Η επέκταση δεν μπορεί να είναι κενή</string>
     <string name="source_file_doesnt_exist">To αρχείο προέλευσης %s δεν υπάρχει</string>
+    <string name="prepend_filenames">Prepend filenames</string>
+    <string name="append_filenames">Append filenames (before file extension)</string>
 
     <!-- Copy / Move -->
     <string name="copy">Αντιγραφή</string>
diff --git a/commons/src/main/res/values-es/strings.xml b/commons/src/main/res/values-es/strings.xml
index 8346a9a2b..1b684a198 100644
--- a/commons/src/main/res/values-es/strings.xml
+++ b/commons/src/main/res/values-es/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">El nombre del archivo \'%s\' contiene caracteres no válidos</string>
     <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>
 
     <!-- Copy / Move -->
     <string name="copy">Copiar</string>
diff --git a/commons/src/main/res/values-fi/strings.xml b/commons/src/main/res/values-fi/strings.xml
index a5cf5d2c1..2275ba787 100644
--- a/commons/src/main/res/values-fi/strings.xml
+++ b/commons/src/main/res/values-fi/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Tiedostonimi \'%s\' sisältää kiellettyjä merkkejä</string>
     <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>
 
     <!-- Copy / Move -->
     <string name="copy">Kopioi</string>
diff --git a/commons/src/main/res/values-fr/strings.xml b/commons/src/main/res/values-fr/strings.xml
index b198a8bf5..79ab0dc1d 100644
--- a/commons/src/main/res/values-fr/strings.xml
+++ b/commons/src/main/res/values-fr/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Le nom de fichier \'%s\' contient des caractères invalides</string>
     <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">Prepend filenames</string>
+    <string name="append_filenames">Append filenames (before file extension)</string>
 
     <!-- Copy / Move -->
     <string name="copy">Copier</string>
diff --git a/commons/src/main/res/values-gl/strings.xml b/commons/src/main/res/values-gl/strings.xml
index 01bad4c34..158455c53 100644
--- a/commons/src/main/res/values-gl/strings.xml
+++ b/commons/src/main/res/values-gl/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">El nombre del archivo \'%s\' contiene caracteres no válidos</string>
     <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>
 
     <!-- Copy / Move -->
     <string name="copy">Copiar</string>
diff --git a/commons/src/main/res/values-hi-rIN/strings.xml b/commons/src/main/res/values-hi-rIN/strings.xml
index 8e47a767b..6acb10f33 100644
--- a/commons/src/main/res/values-hi-rIN/strings.xml
+++ b/commons/src/main/res/values-hi-rIN/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Filename \'%s\' contains invalid characters</string>
     <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>
 
     <!-- Copy / Move -->
     <string name="copy">Copy</string>
diff --git a/commons/src/main/res/values-hr/strings.xml b/commons/src/main/res/values-hr/strings.xml
index 142314a3b..33c2da30e 100644
--- a/commons/src/main/res/values-hr/strings.xml
+++ b/commons/src/main/res/values-hr/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Naziv datoteke \'%s\' sadrži nevažeće znakove</string>
     <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">Prepend filenames</string>
+    <string name="append_filenames">Append filenames (before file extension)</string>
 
     <!-- Copy / Move -->
     <string name="copy">Kopiraj</string>
diff --git a/commons/src/main/res/values-hu/strings.xml b/commons/src/main/res/values-hu/strings.xml
index 876c16e03..360752a06 100644
--- a/commons/src/main/res/values-hu/strings.xml
+++ b/commons/src/main/res/values-hu/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Filename \'%s\' contains invalid characters</string>
     <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>
 
     <!-- Copy / Move -->
     <string name="copy">Copy</string>
diff --git a/commons/src/main/res/values-id/strings.xml b/commons/src/main/res/values-id/strings.xml
index 7a8159a39..9a0cc690d 100644
--- a/commons/src/main/res/values-id/strings.xml
+++ b/commons/src/main/res/values-id/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Filename \'%s\' contains invalid characters</string>
     <string name="extension_cannot_be_empty">Extension Tidak Boleh Kosong</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>
 
     <!-- Copy / Move -->
     <string name="copy">Salin</string>
diff --git a/commons/src/main/res/values-it/strings.xml b/commons/src/main/res/values-it/strings.xml
index 28a3f6850..12faf69b9 100644
--- a/commons/src/main/res/values-it/strings.xml
+++ b/commons/src/main/res/values-it/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Il nome del file \'%s\' contiene caratteri non validi</string>
     <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">Prepend filenames</string>
+    <string name="append_filenames">Append filenames (before file extension)</string>
 
     <!-- Copy / Move -->
     <string name="copy">Copia</string>
diff --git a/commons/src/main/res/values-iw/strings.xml b/commons/src/main/res/values-iw/strings.xml
index c8a22e212..797215d24 100644
--- a/commons/src/main/res/values-iw/strings.xml
+++ b/commons/src/main/res/values-iw/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Filename \'%s\' contains invalid characters</string>
     <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>
 
     <!-- Copy / Move -->
     <string name="copy">Copy</string>
diff --git a/commons/src/main/res/values-ja/strings.xml b/commons/src/main/res/values-ja/strings.xml
index 132a11365..d684b5e17 100644
--- a/commons/src/main/res/values-ja/strings.xml
+++ b/commons/src/main/res/values-ja/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">ファイル名 \'%s\' に無効な文字が含まれています</string>
     <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>
 
     <!-- Copy / Move -->
     <string name="copy">コピー</string>
diff --git a/commons/src/main/res/values-ko-rKR/strings.xml b/commons/src/main/res/values-ko-rKR/strings.xml
index 1eb1d61ed..468da2d1f 100644
--- a/commons/src/main/res/values-ko-rKR/strings.xml
+++ b/commons/src/main/res/values-ko-rKR/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Filename \'%s\' contains invalid characters</string>
     <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>
 
     <!-- Copy / Move -->
     <string name="copy">복사</string>
diff --git a/commons/src/main/res/values-lt/strings.xml b/commons/src/main/res/values-lt/strings.xml
index b77423bd0..92e4ac3b5 100644
--- a/commons/src/main/res/values-lt/strings.xml
+++ b/commons/src/main/res/values-lt/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Bylos pavadinimas \'%s\' susideda iš negalimų simbolių</string>
     <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>
 
     <!-- Copy / Move -->
     <string name="copy">Kopijuoti</string>
diff --git a/commons/src/main/res/values-nb/strings.xml b/commons/src/main/res/values-nb/strings.xml
index eb184eee9..347c2b935 100644
--- a/commons/src/main/res/values-nb/strings.xml
+++ b/commons/src/main/res/values-nb/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Filename \'%s\' contains invalid characters</string>
     <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>
 
     <!-- Copy / Move -->
     <string name="copy">Kopier</string>
diff --git a/commons/src/main/res/values-nl/strings.xml b/commons/src/main/res/values-nl/strings.xml
index 73345b5ee..05769d819 100644
--- a/commons/src/main/res/values-nl/strings.xml
+++ b/commons/src/main/res/values-nl/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Bestandsnaam \'%s\' bevat ongeldige tekens</string>
     <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">Prepend filenames</string>
+    <string name="append_filenames">Append filenames (before file extension)</string>
 
     <!-- Copy / Move -->
     <string name="copy">Kopiëren</string>
diff --git a/commons/src/main/res/values-no/strings.xml b/commons/src/main/res/values-no/strings.xml
index b44b0e31b..7035fcde2 100644
--- a/commons/src/main/res/values-no/strings.xml
+++ b/commons/src/main/res/values-no/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Filename \'%s\' contains invalid characters</string>
     <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>
 
     <!-- Copy / Move -->
     <string name="copy">Kopier</string>
diff --git a/commons/src/main/res/values-pl/strings.xml b/commons/src/main/res/values-pl/strings.xml
index d46c85abb..1b22c95aa 100644
--- a/commons/src/main/res/values-pl/strings.xml
+++ b/commons/src/main/res/values-pl/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Nazwa \'%s\' zawiera niedozwolone znaki</string>
     <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">Prepend filenames</string>
+    <string name="append_filenames">Append filenames (before file extension)</string>
 
     <!-- Copy / Move -->
     <string name="copy">Kopiuj</string>
diff --git a/commons/src/main/res/values-pt-rBR/strings.xml b/commons/src/main/res/values-pt-rBR/strings.xml
index 1e7224344..efb5d97a6 100644
--- a/commons/src/main/res/values-pt-rBR/strings.xml
+++ b/commons/src/main/res/values-pt-rBR/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">O nome do arquivo \'%s\' contém caracteres inválidos</string>
     <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">Prepend filenames</string>
+    <string name="append_filenames">Append filenames (before file extension)</string>
 
     <!-- Copy / Move -->
     <string name="copy">Copiar</string>
diff --git a/commons/src/main/res/values-pt/strings.xml b/commons/src/main/res/values-pt/strings.xml
index be5b6fa59..5fd241eac 100644
--- a/commons/src/main/res/values-pt/strings.xml
+++ b/commons/src/main/res/values-pt/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">O nome \'%s\' contém caracteres inválidos</string>
     <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">Prepend filenames</string>
+    <string name="append_filenames">Append filenames (before file extension)</string>
 
     <!-- Copy / Move -->
     <string name="copy">Copiar</string>
diff --git a/commons/src/main/res/values-ru/strings.xml b/commons/src/main/res/values-ru/strings.xml
index 08648630e..7adff938b 100644
--- a/commons/src/main/res/values-ru/strings.xml
+++ b/commons/src/main/res/values-ru/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Имя файла \"%s\" содержит недопустимые символы</string>
     <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>
 
     <!-- Copy / Move -->
     <string name="copy">Копировать</string>
diff --git a/commons/src/main/res/values-sk/strings.xml b/commons/src/main/res/values-sk/strings.xml
index 2bae0222a..40af2a5c9 100644
--- a/commons/src/main/res/values-sk/strings.xml
+++ b/commons/src/main/res/values-sk/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Názov súboru \'%s\' obsahuje neplatné znaky</string>
     <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>
 
     <!-- Copy / Move -->
     <string name="copy">Kopírovať</string>
diff --git a/commons/src/main/res/values-sl/strings.xml b/commons/src/main/res/values-sl/strings.xml
index f973f5b03..a9016fad8 100644
--- a/commons/src/main/res/values-sl/strings.xml
+++ b/commons/src/main/res/values-sl/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Ime \'%s\' vsebuje neveljavne znake</string>
     <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">Prepend filenames</string>
+    <string name="append_filenames">Append filenames (before file extension)</string>
 
     <!-- Copy / Move -->
     <string name="copy">Kopiraj</string>
diff --git a/commons/src/main/res/values-sv/strings.xml b/commons/src/main/res/values-sv/strings.xml
index f15a26ebf..22ffbd12d 100644
--- a/commons/src/main/res/values-sv/strings.xml
+++ b/commons/src/main/res/values-sv/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Filnamnet \'%s\' innehåller ogiltiga tecken</string>
     <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">Prepend filenames</string>
+    <string name="append_filenames">Append filenames (before file extension)</string>
 
     <!-- Copy / Move -->
     <string name="copy">Kopiera</string>
diff --git a/commons/src/main/res/values-tr/strings.xml b/commons/src/main/res/values-tr/strings.xml
index 5eaad9a0f..0e1432a88 100644
--- a/commons/src/main/res/values-tr/strings.xml
+++ b/commons/src/main/res/values-tr/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Dosya adı \'%s\' geçersiz karakterler içeriyor</string>
     <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">Prepend filenames</string>
+    <string name="append_filenames">Append filenames (before file extension)</string>
 
     <!-- Copy / Move -->
     <string name="copy">Kopyala</string>
diff --git a/commons/src/main/res/values-zh-rCN/strings.xml b/commons/src/main/res/values-zh-rCN/strings.xml
index 645fda694..0d91f9ee0 100644
--- a/commons/src/main/res/values-zh-rCN/strings.xml
+++ b/commons/src/main/res/values-zh-rCN/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Filename \'%s\' contains invalid characters</string>
     <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>
 
     <!-- Copy / Move -->
     <string name="copy">复制</string>
diff --git a/commons/src/main/res/values-zh-rTW/strings.xml b/commons/src/main/res/values-zh-rTW/strings.xml
index 1826bb43f..696f99400 100644
--- a/commons/src/main/res/values-zh-rTW/strings.xml
+++ b/commons/src/main/res/values-zh-rTW/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">檔名 \'%s\' 包含無效字元</string>
     <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>
 
     <!-- Copy / Move -->
     <string name="copy">複製</string>
diff --git a/commons/src/main/res/values/strings.xml b/commons/src/main/res/values/strings.xml
index 5c864aea8..4b5fe66f0 100644
--- a/commons/src/main/res/values/strings.xml
+++ b/commons/src/main/res/values/strings.xml
@@ -55,6 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Filename \'%s\' contains invalid characters</string>
     <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>
 
     <!-- Copy / Move -->
     <string name="copy">Copy</string>

From f624a5a7de43472e876012fef0ca303ab287ea37 Mon Sep 17 00:00:00 2001
From: Emanuele Petriglia <inbox@emanuelepetriglia.me>
Date: Sun, 21 Oct 2018 10:43:52 +0000
Subject: [PATCH 04/15] Update italian translation

---
 commons/src/main/res/values-it/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/commons/src/main/res/values-it/strings.xml b/commons/src/main/res/values-it/strings.xml
index 12faf69b9..61a9f23cd 100644
--- a/commons/src/main/res/values-it/strings.xml
+++ b/commons/src/main/res/values-it/strings.xml
@@ -55,8 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Il nome del file \'%s\' contiene caratteri non validi</string>
     <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">Prepend filenames</string>
-    <string name="append_filenames">Append filenames (before file extension)</string>
+    <string name="prepend_filenames">Anteponi i nomi dei file</string>
+    <string name="append_filenames">Appendi i nomi dei file (prima dell\'estensione)</string>
 
     <!-- Copy / Move -->
     <string name="copy">Copia</string>

From eeb55688df37fd09f06d3c4cdd8bbbd6856e6ad4 Mon Sep 17 00:00:00 2001
From: Guillaume <ltGuillaume@users.noreply.github.com>
Date: Sun, 21 Oct 2018 15:36:04 +0200
Subject: [PATCH 05/15] Dutch

---
 commons/src/main/res/values-nl/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/commons/src/main/res/values-nl/strings.xml b/commons/src/main/res/values-nl/strings.xml
index 05769d819..a567089ca 100644
--- a/commons/src/main/res/values-nl/strings.xml
+++ b/commons/src/main/res/values-nl/strings.xml
@@ -55,8 +55,8 @@
     <string name="filename_invalid_characters_placeholder">Bestandsnaam \'%s\' bevat ongeldige tekens</string>
     <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">Prepend filenames</string>
-    <string name="append_filenames">Append filenames (before file extension)</string>
+    <string name="prepend_filenames">Voor bestandsnaam</string>
+    <string name="append_filenames">Na bestandsnaam (voor extensie)</string>
 
     <!-- Copy / Move -->
     <string name="copy">Kopiëren</string>

From 71231666733160ff8cb6de8fa6ddda45562d3aa3 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 21 Oct 2018 21:10:50 +0200
Subject: [PATCH 06/15] remove MyBorderlessBackgroundStyle since there is no
 separate v21 version anymore

---
 build.gradle                           | 2 +-
 commons/src/main/res/values/styles.xml | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index eee5ecc5f..b40b2c285 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         propMinSdkVersion = 21
         propTargetSdkVersion = propCompileSdkVersion
         propVersionCode = 1
-        propVersionName = '5.1.12'
+        propVersionName = '5.1.13'
         kotlin_version = '1.2.71'
     }
 
diff --git a/commons/src/main/res/values/styles.xml b/commons/src/main/res/values/styles.xml
index cda2f9b40..c8e56d45a 100644
--- a/commons/src/main/res/values/styles.xml
+++ b/commons/src/main/res/values/styles.xml
@@ -53,10 +53,6 @@
         <item name="android:windowBackground">@color/theme_dark_background_color</item>
     </style>
 
-    <style name="MyBorderlessBackgroundStyle">
-        <item name="android:background">?attr/selectableItemBackgroundBorderless</item>
-    </style>
-
     <style name="Theme.Transparent" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>

From a4c52f0f6e434d47b80558ef10eda57efebb1295 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 21 Oct 2018 22:32:13 +0200
Subject: [PATCH 07/15] removing an extra sl string

---
 build.gradle                               | 2 +-
 commons/src/main/res/values-sl/strings.xml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index b40b2c285..8f12e55ef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         propMinSdkVersion = 21
         propTargetSdkVersion = propCompileSdkVersion
         propVersionCode = 1
-        propVersionName = '5.1.13'
+        propVersionName = '5.1.14'
         kotlin_version = '1.2.71'
     }
 
diff --git a/commons/src/main/res/values-sl/strings.xml b/commons/src/main/res/values-sl/strings.xml
index a9016fad8..79d8371da 100644
--- a/commons/src/main/res/values-sl/strings.xml
+++ b/commons/src/main/res/values-sl/strings.xml
@@ -589,7 +589,6 @@
     <string name="glide_title">Glide (nalaganje in predpomnjevanje slik)</string>
     <string name="picasso_title">Picasso (nalaganje in predpomnjevanje slik)</string>
     <string name="cropper_title">Android Image Cropper (obrezovanje in rotacija slik)</string>
-    <string name="multiselect_title">RecyclerView MultiSelect (izbiranje večih elementov)</string>
     <string name="rtl_viewpager_title">RtlViewPager (right to left swiping)</string>
     <string name="joda_title">Joda-Time (nadomestitev za Java datume)</string>
     <string name="stetho_title">Stetho (debugging databases)</string>

From d910f6d4cf6c8f3a64716892a4ea0069f772144b Mon Sep 17 00:00:00 2001
From: ScratchBuild <foobarbuzz@gmail.com>
Date: Mon, 22 Oct 2018 15:00:03 +0900
Subject: [PATCH 08/15] Update Japanese translation

---
 commons/src/main/res/values-ja/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/commons/src/main/res/values-ja/strings.xml b/commons/src/main/res/values-ja/strings.xml
index d684b5e17..af07dc894 100644
--- a/commons/src/main/res/values-ja/strings.xml
+++ b/commons/src/main/res/values-ja/strings.xml
@@ -55,8 +55,8 @@
     <string name="filename_invalid_characters_placeholder">ファイル名 \'%s\' に無効な文字が含まれています</string>
     <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="prepend_filenames">ファイル名の前に追加</string>
+    <string name="append_filenames">ファイル名の後に追加 (拡張子の前)</string>
 
     <!-- Copy / Move -->
     <string name="copy">コピー</string>

From 0bec0a994efe5247f303d2a2e9b7b1242b8c69b3 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 22 Oct 2018 10:53:17 +0200
Subject: [PATCH 09/15] adding a dialog for renaming multiple items at once

---
 build.gradle                                  |  2 +-
 .../commons/dialogs/FileConflictDialog.kt     |  2 +-
 .../commons/dialogs/RenameItemsDialog.kt      | 88 +++++++++++++++++++
 .../main/res/layout/dialog_rename_items.xml   | 41 +++++++++
 4 files changed, 131 insertions(+), 2 deletions(-)
 create mode 100644 commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/RenameItemsDialog.kt
 create mode 100644 commons/src/main/res/layout/dialog_rename_items.xml

diff --git a/build.gradle b/build.gradle
index 8f12e55ef..d532aa124 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         propMinSdkVersion = 21
         propTargetSdkVersion = propCompileSdkVersion
         propVersionCode = 1
-        propVersionName = '5.1.14'
+        propVersionName = '5.1.15'
         kotlin_version = '1.2.71'
     }
 
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/FileConflictDialog.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/FileConflictDialog.kt
index 36264e830..4d8b369fa 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/FileConflictDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/FileConflictDialog.kt
@@ -33,7 +33,7 @@ class FileConflictDialog(val activity: Activity, val fileDirItem: FileDirItem, v
         }
 
         AlertDialog.Builder(activity)
-                .setPositiveButton(R.string.ok, { dialog, which -> dialogConfirmed() })
+                .setPositiveButton(R.string.ok) { dialog, which -> dialogConfirmed() }
                 .setNegativeButton(R.string.cancel, null)
                 .create().apply {
                     activity.setupDialogStuff(view, this)
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/RenameItemsDialog.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/RenameItemsDialog.kt
new file mode 100644
index 000000000..4eac00431
--- /dev/null
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/RenameItemsDialog.kt
@@ -0,0 +1,88 @@
+package com.simplemobiletools.commons.dialogs
+
+import androidx.appcompat.app.AlertDialog
+import com.simplemobiletools.commons.R
+import com.simplemobiletools.commons.activities.BaseSimpleActivity
+import com.simplemobiletools.commons.extensions.*
+import kotlinx.android.synthetic.main.dialog_rename_items.*
+import kotlinx.android.synthetic.main.dialog_rename_items.view.*
+import java.util.*
+
+class RenameItemsDialog(val activity: BaseSimpleActivity, val paths: ArrayList<String>, val callback: () -> Unit) {
+    init {
+
+        val view = activity.layoutInflater.inflate(R.layout.dialog_rename_items, null)
+
+        AlertDialog.Builder(activity)
+                .setPositiveButton(R.string.ok, null)
+                .setNegativeButton(R.string.cancel, null)
+                .create().apply {
+                    activity.setupDialogStuff(view, this, R.string.rename) {
+                        showKeyboard(view.rename_items_value)
+                        getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
+                            val valueToAdd = view.rename_items_value.value
+                            val append = view.rename_items_radio_group.checkedRadioButtonId == rename_items_radio_append.id
+
+                            if (valueToAdd.isEmpty()) {
+                                callback()
+                                dismiss()
+                                return@setOnClickListener
+                            }
+
+                            if (!valueToAdd.isAValidFilename()) {
+                                activity.toast(R.string.invalid_name)
+                                return@setOnClickListener
+                            }
+
+                            val validPaths = paths.filter { activity.getDoesFilePathExist(it) }
+                            val sdFilePath = validPaths.firstOrNull { activity.isPathOnSD(it) } ?: validPaths.firstOrNull()
+                            if (sdFilePath == null) {
+                                activity.toast(R.string.unknown_error_occurred)
+                                dismiss()
+                                return@setOnClickListener
+                            }
+
+                            var pathsCnt = validPaths.size
+
+                            activity.handleSAFDialog(sdFilePath) {
+                                for (path in validPaths) {
+                                    val fullName = path.getFilenameFromPath()
+                                    var dotAt = fullName.lastIndexOf(".")
+                                    if (dotAt == -1) {
+                                        dotAt = fullName.length
+                                    }
+
+                                    val name = fullName.substring(0, dotAt)
+                                    val extension = if (fullName.contains(".")) ".${fullName.getFilenameExtension()}" else ""
+
+                                    val newName = if (append) {
+                                        "$name$valueToAdd$extension"
+                                    } else {
+                                        "$valueToAdd$fullName"
+                                    }
+
+                                    val newPath = "${path.getParentPath()}/$newName"
+
+                                    if (activity.getDoesFilePathExist(newPath)) {
+                                        continue
+                                    }
+
+                                    activity.renameFile(path, newPath) {
+                                        if (it) {
+                                            pathsCnt--
+                                            if (pathsCnt == 0) {
+                                                callback()
+                                                dismiss()
+                                            }
+                                        } else {
+                                            activity.toast(R.string.unknown_error_occurred)
+                                            dismiss()
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+    }
+}
diff --git a/commons/src/main/res/layout/dialog_rename_items.xml b/commons/src/main/res/layout/dialog_rename_items.xml
new file mode 100644
index 000000000..7f1fa43ae
--- /dev/null
+++ b/commons/src/main/res/layout/dialog_rename_items.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rename_items_holder"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="@dimen/activity_margin">
+
+    <com.simplemobiletools.commons.views.MyEditText
+        android:id="@+id/rename_items_value"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/activity_margin"
+        android:singleLine="true"
+        android:textCursorDrawable="@null"
+        android:textSize="@dimen/normal_text_size"/>
+
+    <RadioGroup
+        android:id="@+id/rename_items_radio_group"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.simplemobiletools.commons.views.MyCompatRadioButton
+            android:id="@+id/rename_items_radio_append"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:checked="true"
+            android:paddingTop="@dimen/normal_margin"
+            android:paddingBottom="@dimen/normal_margin"
+            android:text="@string/append_filenames"/>
+
+        <com.simplemobiletools.commons.views.MyCompatRadioButton
+            android:id="@+id/rename_items_radio_prepend"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="@dimen/normal_margin"
+            android:paddingBottom="@dimen/normal_margin"
+            android:text="@string/prepend_filenames"/>
+    </RadioGroup>
+</LinearLayout>

From db611ebc7ea88c0460aa074feffb1c4c122362ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Solatec=20Inform=C3=A0tica?=
 <35220662+Solatec@users.noreply.github.com>
Date: Mon, 22 Oct 2018 17:47:08 +0200
Subject: [PATCH 10/15] Update strings.xml

---
 commons/src/main/res/values-es/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/commons/src/main/res/values-es/strings.xml b/commons/src/main/res/values-es/strings.xml
index 1b684a198..222467e7b 100644
--- a/commons/src/main/res/values-es/strings.xml
+++ b/commons/src/main/res/values-es/strings.xml
@@ -55,8 +55,8 @@
     <string name="filename_invalid_characters_placeholder">El nombre del archivo \'%s\' contiene caracteres no válidos</string>
     <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="prepend_filenames">Preponer los nombres de archivo</string>
+    <string name="append_filenames">Adjuntar nombres de archivos (antes de la extensión de archivo)</string>
 
     <!-- Copy / Move -->
     <string name="copy">Copiar</string>

From 324256977db95d5176e1672d371ce64ec0c83f20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Solatec=20Inform=C3=A0tica?=
 <35220662+Solatec@users.noreply.github.com>
Date: Mon, 22 Oct 2018 17:48:01 +0200
Subject: [PATCH 11/15] Update strings.xml

---
 commons/src/main/res/values-ca/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/commons/src/main/res/values-ca/strings.xml b/commons/src/main/res/values-ca/strings.xml
index 767ca366c..f0878cc5e 100644
--- a/commons/src/main/res/values-ca/strings.xml
+++ b/commons/src/main/res/values-ca/strings.xml
@@ -55,8 +55,8 @@
     <string name="filename_invalid_characters_placeholder">El nom de l\'arxiu  \'%s\' conté caràcters no vàlids</string>
     <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">Prepend filenames</string>
-    <string name="append_filenames">Append filenames (before file extension)</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>
 
     <!-- Copy / Move -->
     <string name="copy">Copiar</string>

From 678521398dfdc138bf33a039a9a34a876261f95b Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 22 Oct 2018 17:50:50 +0200
Subject: [PATCH 12/15] removing a redundant v21 version of the selector file

---
 .../src/main/res/drawable-v21/selector.xml    | 17 ----------------
 commons/src/main/res/drawable/selector.xml    | 20 +++++++++++++++----
 2 files changed, 16 insertions(+), 21 deletions(-)
 delete mode 100644 commons/src/main/res/drawable-v21/selector.xml

diff --git a/commons/src/main/res/drawable-v21/selector.xml b/commons/src/main/res/drawable-v21/selector.xml
deleted file mode 100644
index a24cfe2b1..000000000
--- a/commons/src/main/res/drawable-v21/selector.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <selector>
-            <item
-                android:drawable="@color/activated_item_foreground"
-                android:state_selected="true"/>
-        </selector>
-    </item>
-    <item>
-        <ripple android:color="@color/pressed_item_foreground">
-            <item android:id="@android:id/mask">
-                <color android:color="@android:color/white"/>
-            </item>
-        </ripple>
-    </item>
-</layer-list>
diff --git a/commons/src/main/res/drawable/selector.xml b/commons/src/main/res/drawable/selector.xml
index c7e60e3f0..a24cfe2b1 100644
--- a/commons/src/main/res/drawable/selector.xml
+++ b/commons/src/main/res/drawable/selector.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/pressed_item_foreground" android:state_pressed="true"/>
-    <item android:drawable="@color/activated_item_foreground" android:state_selected="true"/>
-</selector>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <selector>
+            <item
+                android:drawable="@color/activated_item_foreground"
+                android:state_selected="true"/>
+        </selector>
+    </item>
+    <item>
+        <ripple android:color="@color/pressed_item_foreground">
+            <item android:id="@android:id/mask">
+                <color android:color="@android:color/white"/>
+            </item>
+        </ripple>
+    </item>
+</layer-list>

From f6bb45ba100b68432b9e15552d80f5d8c11a237d Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 22 Oct 2018 21:52:47 +0200
Subject: [PATCH 13/15] adding an extra check to avoid deleting unwritable
 files

---
 build.gradle                                                 | 2 +-
 .../com/simplemobiletools/commons/extensions/Activity.kt     | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d532aa124..05d26fa28 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         propMinSdkVersion = 21
         propTargetSdkVersion = propCompileSdkVersion
         propVersionCode = 1
-        propVersionName = '5.1.15'
+        propVersionName = '5.1.17'
         kotlin_version = '1.2.71'
     }
 
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 7057cd51c..e1d1ed110 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt
@@ -487,6 +487,11 @@ fun BaseSimpleActivity.deleteFile(fileDirItem: FileDirItem, allowDeleteFolder: B
 fun BaseSimpleActivity.deleteFileBg(fileDirItem: FileDirItem, allowDeleteFolder: Boolean = false, callback: ((wasSuccess: Boolean) -> Unit)? = null) {
     val path = fileDirItem.path
     val file = File(path)
+    if (!file.canWrite()) {
+        callback?.invoke(false)
+        return
+    }
+
     var fileDeleted = !path.startsWith(OTG_PATH) && ((!file.exists() && file.length() == 0L) || file.delete())
     if (fileDeleted) {
         rescanDeletedPath(path) {

From 99d61bb0410667b93af51dae4c3fe592a5df548f Mon Sep 17 00:00:00 2001
From: KowalskiOmniROM <KowalskiOmniROM@users.noreply.github.com>
Date: Tue, 23 Oct 2018 09:00:50 +0200
Subject: [PATCH 14/15] Update strings.xml

---
 commons/src/main/res/values-fr/strings.xml | 369 +++++++++++----------
 1 file changed, 185 insertions(+), 184 deletions(-)

diff --git a/commons/src/main/res/values-fr/strings.xml b/commons/src/main/res/values-fr/strings.xml
index 79ab0dc1d..4151432d5 100644
--- a/commons/src/main/res/values-fr/strings.xml
+++ b/commons/src/main/res/values-fr/strings.xml
@@ -1,114 +1,114 @@
 <resources>
-    <string name="ok">Ok</string>
+    <string name="ok">OK</string>
     <string name="cancel">Annuler</string>
     <string name="save_as">Enregistrer sous</string>
-    <string name="file_saved">Fichier sauvegardé avec succès</string>
-    <string name="invalid_file_format">Format de fichier invalide</string>
-    <string name="out_of_memory_error">Erreur excès de mémoire</string>
-    <string name="an_error_occurred">Une erreur est survenue: %s</string>
+    <string name="file_saved">Fichier enregistré</string>
+    <string name="invalid_file_format">Format de fichier incorrect</string>
+    <string name="out_of_memory_error">Erreur : mémoire insuffisante</string>
+    <string name="an_error_occurred">Une erreur est survenue : %s</string>
     <string name="open_with">Ouvrir avec</string>
-    <string name="no_app_found">Aucune application valide trouvée</string>
-    <string name="set_as">Définir comme</string>
+    <string name="no_app_found">Aucune application disponible</string>
+    <string name="set_as">Définir en tant que</string>
     <string name="value_copied_to_clipboard">Valeur copiée dans le presse-papier</string>
     <string name="unknown">Inconnu</string>
     <string name="always">Toujours</string>
     <string name="never">Jamais</string>
     <string name="details">Détails</string>
     <string name="notes">Notes</string>
-    <string name="deleting_folder">Supprimer le dossier \'%s\'</string>
-    <string name="none">None</string>
-    <string name="label">Label</string>
+    <string name="deleting_folder">Suppression du dossier \'%s\'</string>
+    <string name="none">Aucun</string>
+    <string name="label">Libellé</string>
 
     <!-- Favorites -->
     <string name="favorites">Favoris</string>
     <string name="add_favorites">Ajouter des favoris</string>
     <string name="add_to_favorites">Ajouter aux favoris</string>
-    <string name="remove_from_favorites">Enlever des favoris</string>
+    <string name="remove_from_favorites">Supprimer des favoris</string>
 
     <!-- Search -->
     <string name="search">Recherche</string>
-    <string name="type_2_characters">Tapez au moins 2 caractères pour lancer la recherche.</string>
+    <string name="type_2_characters">Saisissez au moins deux caractères pour démarrer la recherche</string>
 
     <!-- Filters -->
     <string name="filter">Filtrer</string>
-    <string name="no_items_found">Aucun élément trouvé.</string>
-    <string name="change_filter">Changer le filtre</string>
+    <string name="no_items_found">Aucun élément trouvé</string>
+    <string name="change_filter">Modifier le filtre</string>
 
     <!-- Permissions -->
-    <string name="no_storage_permissions">L\'autorisation d\'accès au stockage est requise</string>
-    <string name="no_contacts_permission">L\'autorisation d\'accès aux contacts est requise</string>
-    <string name="no_camera_permissions">L\'autorisation d\'accès à l\'appareil photo est requise</string>
-    <string name="no_audio_permissions">L\'autorisation d\'accès aux paramètres audios est requise</string>
+    <string name="no_storage_permissions">L\'autorisation d\'accès au stockage est nécessaire</string>
+    <string name="no_contacts_permission">L\'autorisation d\'accès aux contacts est nécessaire</string>
+    <string name="no_camera_permissions">L\'autorisation d\'accès à l\'appareil photo est nécessaire</string>
+    <string name="no_audio_permissions">L\'autorisation d\'accès aux paramètres audios est nécessaire</string>
 
     <!-- Renaming -->
     <string name="rename_file">Renommer le fichier</string>
     <string name="rename_folder">Renommer le dossier</string>
     <string name="rename_file_error">Impossible de renommer le fichier</string>
-    <string name="rename_folder_error">Impossible de renommer le dossier.</string>
-    <string name="rename_folder_empty">Le nom de dossier ne peut pas être vide.</string>
-    <string name="rename_folder_exists">Un dossier homonyme existe déjà.</string>
-    <string name="rename_folder_root">Impossible de renommer le dossier racine de la mémoire.</string>
-    <string name="rename_folder_ok">Dossier renommé avec succès</string>
-    <string name="renaming_folder">Renommage du dossier</string>
-    <string name="filename_cannot_be_empty">Le nom de fichier ne peut pas rester vide</string>
-    <string name="filename_invalid_characters">Le nom de fichier contient des caractères invalides</string>
-    <string name="filename_invalid_characters_placeholder">Le nom de fichier \'%s\' contient des caractères invalides</string>
+    <string name="rename_folder_error">Impossible de renommer le dossier</string>
+    <string name="rename_folder_empty">Impossible d\'utiliser un nom de dossier vide</string>
+    <string name="rename_folder_exists">Un dossier portant ce nom existe déjà</string>
+    <string name="rename_folder_root">Impossible de renommer le dossier racine de la mémoire</string>
+    <string name="rename_folder_ok">Dossier renommé</string>
+    <string name="renaming_folder">Modification en cours…</string>
+    <string name="filename_cannot_be_empty">Impossible d\'utiliser un nom de fichier vide</string>
+    <string name="filename_invalid_characters">Le nom de fichier contient des caractères incorrectes</string>
+    <string name="filename_invalid_characters_placeholder">Le nom du fichier \"%s\" contient des caractères incorrectes</string>
     <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">Prepend filenames</string>
-    <string name="append_filenames">Append filenames (before file extension)</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>
 
     <!-- Copy / Move -->
     <string name="copy">Copier</string>
     <string name="move">Déplacer</string>
-    <string name="copy_move">Copier / Déplacer</string>
+    <string name="copy_move">Copier ou déplacer</string>
     <string name="copy_to">Copier vers</string>
     <string name="move_to">Déplacer vers</string>
     <string name="source">Source</string>
     <string name="destination">Destination</string>
     <string name="select_destination">Sélectionner la destination</string>
-    <string name="click_select_destination">Cliquez ici pour sélectionner la destination</string>
+    <string name="click_select_destination">Appuyez ici pour sélectionner la destination</string>
     <string name="invalid_destination">Impossible d\'écrire dans la destination sélectionnée</string>
-    <string name="please_select_destination">Veuillez choisir une destination</string>
+    <string name="please_select_destination">Veuillez sélectionner une destination</string>
     <string name="source_and_destination_same">La source et la destination ne peuvent pas être identiques</string>
     <string name="copy_failed">Impossible de copier les fichiers</string>
-    <string name="copying">Copie…</string>
-    <string name="copying_success">Fichiers copiés avec succès</string>
+    <string name="copying">Copie en cours…</string>
+    <string name="copying_success">Fichiers copiés</string>
     <string name="copy_move_failed">Une erreur est survenue</string>
-    <string name="moving">Déplacement…</string>
-    <string name="moving_success">Fichiers déplacés avec succès</string>
+    <string name="moving">Déplacement en cours…</string>
+    <string name="moving_success">Fichiers déplacés</string>
     <string name="moving_success_partial">Certains fichiers n\'ont pu être déplacés</string>
     <string name="copying_success_partial">Certains fichiers n\'ont pu être copiés</string>
     <string name="no_files_selected">Aucun fichier sélectionné</string>
-    <string name="saving">Enregistrement…</string>
+    <string name="saving">Enregistrement en cours…</string>
     <string name="could_not_create_folder">Impossible de créer le dossier %s</string>
     <string name="could_not_create_file">Impossible de créer le fichier %s</string>
 
     <!-- Create new -->
-    <string name="create_new">Créer nouveau</string>
+    <string name="create_new">Créer un nouveau</string>
     <string name="folder">Dossier</string>
     <string name="file">Fichier</string>
     <string name="create_new_folder">Créer un nouveau dossier</string>
-    <string name="name_taken">Un répertoire ou un fichier avec ce nom existe déjà</string>
-    <string name="invalid_name">Le nom contient des caractères invalides</string>
+    <string name="name_taken">Un répertoire ou un fichier portant ce nom existe déjà</string>
+    <string name="invalid_name">Le nom contient des caractères incorrectes</string>
     <string name="empty_name">Veuillez saisir un nom</string>
-    <string name="unknown_error_occurred">Une erreur inconnue est survenue.</string>
+    <string name="unknown_error_occurred">Une erreur inconnue est survenue</string>
 
     <!-- File operation conflicts -->
     <string name="file_already_exists">Le fichier \"%s\" existe déjà</string>
-    <string name="file_already_exists_overwrite">Le fichier \"%s\" existe déjà. Ecraser?</string>
+    <string name="file_already_exists_overwrite">Le fichier \"%s\" existe déjà. Écraser ?</string>
     <string name="folder_already_exists">Le répertoire \"%s\" existe déjà</string>
     <string name="merge">Fusionner</string>
     <string name="overwrite">Écraser</string>
     <string name="skip">Passer</string>
-    <string name="append">Suffixer avec \'_1\'</string>
-    <string name="apply_to_all">Appliquer à tous les conflits</string>
+    <string name="append">Ajouter un suffixe \"_1\"</string>
+    <string name="apply_to_all">Appliquer pour tous</string>
 
     <!-- File picker -->
     <string name="select_folder">Sélectionner un dossier</string>
     <string name="select_file">Sélectionner un fichier</string>
-    <string name="confirm_storage_access_title">Confirmer l\'accès au stockage externe</string>
-    <string name="confirm_storage_access_text">Veuillez choisir le dossier racine de la carte SD dans le prochain écran, pour accorder le droit d\'écriture</string>
+    <string name="confirm_storage_access_title">Confirmez l\'accès au stockage externe</string>
+    <string name="confirm_storage_access_text">Veuillez sélectionner le dossier racine de la carte SD sur le prochain écran, pour accorder le droit en écriture</string>
     <string name="confirm_storage_access_text_sd">Si vous ne voyez pas la carte SD, essayez ceci</string>
     <string name="confirm_selection">Confirmer la sélection</string>
 
@@ -124,8 +124,8 @@
     </plurals>
 
     <plurals name="deleting_items">
-        <item quantity="one">Deleting %d item</item>
-        <item quantity="other">Deleting %d items</item>
+        <item quantity="one">Suppression d\' %d élément en cours…</item>
+        <item quantity="other">Suppression de %d éléments en cours…</item>
     </plurals>
 
     <!-- Storages -->
@@ -133,17 +133,17 @@
     <string name="internal">Interne</string>
     <string name="sd_card">Carte SD</string>
     <string name="root">Racine</string>
-    <string name="wrong_root_selected">Mauvais dossier sélectionné, veuillez sélectionner le dossier racine de votre carte SD</string>
-    <string name="sd_card_otg_same">Les chemins de la carte SD et du stockage USB OTG ne peuvent être similaires.</string>
-    <string name="app_on_sd_card">You seem to have the app installed on an SD card, that makes the app widgets unavailable. You won\'t even see them on the list of available widgets.
-        It is a system limitation, so if you want to use the widgets, you have to move the app back on the internal storage.</string>
+    <string name="wrong_root_selected">Dossier sélectionné incorrecte, veuillez sélectionner le dossier racine de votre carte SD</string>
+    <string name="sd_card_otg_same">Les chemins de la carte SD et du stockage USB OTG ne peuvent être similaires</string>
+    <string name="app_on_sd_card">L\'application semble installée sur une carte SD, ce qui empêche l\'utilisation des widgets de l\'applications. Ils n\'apparaîtront même pas dans la liste des widgets disponibles.
+        C\'est une limitation système. Si vous voulez utiliser le widget, vous devez déplacer l\'application vers la mémoire interne.</string>
 
     <!-- File properties -->
     <string name="properties">Propriétés</string>
     <string name="path">Chemin</string>
-    <string name="items_selected">Eléments sélectionnés</string>
-    <string name="direct_children_count">Compte des enfants directs</string>
-    <string name="files_count">Compte total des fichiers</string>
+    <string name="items_selected">Éléments sélectionnés</string>
+    <string name="direct_children_count">Nombre total de fichiers enfants directs</string>
+    <string name="files_count">Nombre total de fichiers</string>
     <string name="resolution">Résolution</string>
     <string name="duration">Durée</string>
     <string name="artist">Artiste</string>
@@ -160,37 +160,37 @@
     <string name="background_color">Couleur d\'arrière-plan</string>
     <string name="text_color">Couleur du texte</string>
     <string name="primary_color">Couleur primaire</string>
-    <string name="foreground_color">Couleur de fond</string>
-    <string name="app_icon_color">Couleur de fond de l\'îcone de l\'application</string>
+    <string name="foreground_color">Couleur d\'arrière-plan</string>
+    <string name="app_icon_color">Couleur d\'arrière-plan de l\'icône de l\'application</string>
     <string name="restore_defaults">Restaurer les valeurs par défaut</string>
-    <string name="change_color">Changer couleur</string>
+    <string name="change_color">Modifier la couleur</string>
     <string name="theme">Thème</string>
-    <string name="changing_color_description">Changer une couleur le basculera en thème personnalisé</string>
-    <string name="save">Sauvegarder</string>
-    <string name="discard">Rejeter</string>
+    <string name="changing_color_description">Modifier une couleur rend le thème \"personnalisé\"</string>
+    <string name="save">Enregistrer</string>
+    <string name="discard">Annuler</string>
     <string name="undo_changes">Annuler les changements</string>
-    <string name="undo_changes_confirmation">Etes-vous sûr•e de vouloir annuler vos changements ?</string>
-    <string name="save_before_closing">Vous avez des changements non sauvegardés. Sauvegarder avant de quitter ?</string>
-    <string name="apply_to_all_apps">Appliquer ces couleurs à toutes les Applis Simples</string>
-    <string name="share_colors_success">Couleurs mises à jour. Un nouveau thème nommé \'Partagé\' a été ajouté, veuillez utiliser celui-ci pour mettre à jour les couleurs de toutes les applis à partir de maintenant.</string>
+    <string name="undo_changes_confirmation">Êtes-vous sûr(-e) de vouloir annuler vos changements ?</string>
+    <string name="save_before_closing">Vous avez des changements non enregistrés. Enregistrer avant de quitter ?</string>
+    <string name="apply_to_all_apps">Appliquer à l\'ensemble de la suite d\'applications Simples</string>
+    <string name="share_colors_success">Couleurs actualisées. Un nouveau thème nommé \"Partagé\" a été ajouté. Veuillez utiliser ce thème pour actualiser les couleurs de toutes les applications à partir de maintenant.</string>
     <string name="purchase_thank_you">
         <![CDATA[
-            Veuillez acquérir <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Un petit Merci</a> pour déverrouiller cette fonctionnalité et soutenir le développeur. Merci!
+            Veuillez acheter <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Un petit Merci</a> pour déverrouiller cette fonctionnalité et soutenir le développeur. Merci !
         ]]>
     </string>
 
     <!-- Themes -->
-    <string name="light_theme">Lumineux</string>
+    <string name="light_theme">Clair</string>
     <string name="dark_theme">Sombre</string>
     <string name="solarized">Solarisé</string>
     <string name="dark_red">Noir et Rouge</string>
-    <string name="black_white">Noir &amp; Blanc</string>
+    <string name="black_white">Noir et Blanc</string>
     <string name="custom">Personnalisé</string>
     <string name="shared">Partagé</string>
 
     <!-- What's new -->
     <string name="whats_new">Quoi de neuf ?</string>
-    <string name="whats_new_disclaimer">* seules les mises à jour les plus importantes sont listées ici, elles sont toujours accompagnées de plus petites améliorations qui ne sont pas détaillées</string>
+    <string name="whats_new_disclaimer">* seules les mises à jour les plus importantes sont listées ici. Les améliorations mineures ne sont pas détaillées.</string>
 
     <!-- Actionbar items -->
     <string name="delete">Supprimer</string>
@@ -198,24 +198,24 @@
     <string name="rename">Renommer</string>
     <string name="share">Partager</string>
     <string name="share_via">Partager via</string>
-    <string name="select_all">Sélectionner tout</string>
+    <string name="select_all">Tout sélectionner</string>
     <string name="hide">Masquer</string>
-    <string name="unhide">Démasquer</string>
-    <string name="hide_folder">Masquer dossier</string>
-    <string name="unhide_folder">Démasquer dossier</string>
-    <string name="temporarily_show_hidden">Afficher temporairement les fichiers masqués</string>
-    <string name="stop_showing_hidden">Arrêter d\'afficher les medias masqués</string>
-    <string name="maximum_share_reached">Vous ne pouvez pas partager autant de contenu à la fois</string>
-    <string name="empty_and_disable_recycle_bin">Empty and disable the Recycle Bin</string>
-    <string name="undo">Undo</string>
-    <string name="redo">Redo</string>
+    <string name="unhide">Dévoiler</string>
+    <string name="hide_folder">Masquer le dossier</string>
+    <string name="unhide_folder">Dévoiler le dossier</string>
+    <string name="temporarily_show_hidden">Afficher les fichiers masqués</string>
+    <string name="stop_showing_hidden">Ne plus afficher les médias masqués</string>
+    <string name="maximum_share_reached">Impossible de partager autant de contenu à la fois</string>
+    <string name="empty_and_disable_recycle_bin">Vider et désactiver la corbeille</string>
+    <string name="undo">Annuler</string>
+    <string name="redo">Répéter</string>
 
     <!-- Sorting -->
     <string name="sort_by">Trier par</string>
     <string name="name">Nom</string>
-    <string name="size">Taille</string>
-    <string name="last_modified">Dernière modification</string>
-    <string name="date_taken">Date prise</string>
+    <string name="size">Dimension</string>
+    <string name="last_modified">Date de modification</string>
+    <string name="date_taken">Date de prise de vue</string>
     <string name="title">Titre</string>
     <string name="filename">Nom de fichier</string>
     <string name="extension">Extension</string>
@@ -224,43 +224,43 @@
     <string name="use_for_this_folder">Utiliser pour ce dossier uniquement</string>
 
     <!-- Confirmation dialog -->
-    <string name="proceed_with_deletion">Êtes-vous sûr•e de vouloir effectuer la suppression ?</string>
-    <string name="deletion_confirmation">Êtes-vous sûr•e de vouloir supprimer %s ?</string>    <!-- Are you sure you want to delete 5 items? -->
-    <string name="move_to_recycle_bin_confirmation">Êtes-vous sûr•e de vouloir déplacer %s vers la corbeille ?</string>    <!-- Are you sure you want to move 3 items into the Recycle Bin? -->
-    <string name="are_you_sure_delete">Are you sure you want to delete this item?</string>
-    <string name="are_you_sure_recycle_bin">Are you sure you want to move this item into the Recycle Bin?</string>
-    <string name="do_not_ask_again">Ne pas redemander pour cette session</string>
+    <string name="proceed_with_deletion">Êtes-vous sûr(-e) de vouloir effectuer la suppression ?</string>
+    <string name="deletion_confirmation">Êtes-vous sûr(-e) de vouloir supprimer %s ?</string>    <!-- Are you sure you want to delete 5 items? -->
+    <string name="move_to_recycle_bin_confirmation">Êtes-vous sûr(-e) de vouloir déplacer %s vers la corbeille ?</string>    <!-- Are you sure you want to move 3 items into the Recycle Bin? -->
+    <string name="are_you_sure_delete">Êtes-vous sûr(-e) de vouloir supprimer cet élément?</string>
+    <string name="are_you_sure_recycle_bin">Êtes-vous sûr(-e) de vouloir déplacer cet élément dans la corbeille ?</string>
+    <string name="do_not_ask_again">Ne plus demander pour cette session</string>
     <string name="yes">Oui</string>
     <string name="no">Non</string>
 
     <plurals name="delete_warning">
-        <item quantity="one">WARNING: You are deleting %d folder</item>
-        <item quantity="other">WARNING: You are deleting %d folders</item>
+        <item quantity="one">ATTENTION : Vous supprimez %d dossier</item>
+        <item quantity="other">ATTENTION : Vous supprimez %d dossiers</item>
     </plurals>
 
     <!-- Password protection -->
     <string name="pin">PIN</string>
-    <string name="enter_pin">Saisir PIN</string>
-    <string name="please_enter_pin">Veuillez saisir un PIN</string>
-    <string name="wrong_pin">PIN erroné</string>
-    <string name="repeat_pin">Répéter PIN</string>
-    <string name="pattern">Modèle</string>
-    <string name="insert_pattern">Insérer modèle</string>
-    <string name="wrong_pattern">Modèle erroné</string>
-    <string name="repeat_pattern">Répéter modèle</string>
+    <string name="enter_pin">Saisir le code PIN</string>
+    <string name="please_enter_pin">Veuillez saisir un code PIN</string>
+    <string name="wrong_pin">PIN incorrect</string>
+    <string name="repeat_pin">Saisissez à nouveau le code PIN</string>
+    <string name="pattern">Schéma</string>
+    <string name="insert_pattern">Dessinez un schéma</string>
+    <string name="wrong_pattern">Schéma incorrect</string>
+    <string name="repeat_pattern">Redessinez le schéma</string>
     <string name="fingerprint">Empreinte</string>
     <string name="add_fingerprint">Ajouter une empreinte</string>
-    <string name="place_finger">Veuillez placer votre doigt sur le capteur d\'empreintes digitales</string>
-    <string name="authentication_failed">L\'identification a échoué</string>
-    <string name="authentication_blocked">Identification bloquée, veuillez réessayer dans quelques instants</string>
-    <string name="no_fingerprints_registered">Vous n\'avez aucune empreinte digitale enregistrée, veuillez en ajouter dans les paramètres de votre appareil</string>
+    <string name="place_finger">Veuillez placer votre doigt sur le capteur d\'empreinte digitale</string>
+    <string name="authentication_failed">Échec de l\'identification</string>
+    <string name="authentication_blocked">Identification bloquée. Veuillez réessayer dans quelques instants.</string>
+    <string name="no_fingerprints_registered">Vous n\'avez aucune empreinte digitale enregistrée. Veuillez en ajouter depuis les paramètres de votre appareil</string>
     <string name="go_to_settings">Aller aux Paramètres</string>
-    <string name="protection_setup_successfully">Mot de passe défini avec succès. Veuillez réinstaller l\'appli en cas d\'oubli.</string>
-    <string name="fingerprint_setup_successfully">Protection mise en place avec succès. Veuillez réinstaller l\'appli en cas d\'oubli.</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>
 
     <!-- Times -->
-    <string name="yesterday">Yesterday</string>
-    <string name="today">Today</string>
+    <string name="yesterday">Hier</string>
+    <string name="today">Aujourd\'hui</string>
     <string name="tomorrow">Demain</string>
     <string name="seconds_raw">secondes</string>
     <string name="minutes_raw">minutes</string>
@@ -343,11 +343,11 @@
     </plurals>
 
     <!-- For example: Time remaining till the alarm goes off: 6 hours, 5 minutes -->
-    <string name="alarm_goes_off_in">Temps restant jusqu\'au déclenchement de l\'alarme : \n%s</string>
-    <string name="reminder_triggers_in">Time remaining till the reminder triggers:\n%s</string>
+    <string name="alarm_goes_off_in">Durée restante jusqu\'au déclenchement de l\'alarme :\n%s</string>
+    <string name="reminder_triggers_in">Durée restante jusqu\'au déclenchement du rappel :\n%s</string>
     <string name="alarm_warning">Veuillez vérifier que l\'alarme fonctionne correctement avant de lui faire confiance. Elle pourrait ne pas fonctionner correctement, à cause de la politique d\'économie d\'énergie de votre appareil.</string>
     <string name="reminder_warning">Veuillez vérifier que les rappels fonctionnent correctement avant de leur faire confiance. Ils pourraient ne pas fonctionner correctement, à cause de la politique d\'économie d\'énergie de votre appareil.</string>
-    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
+    <string name="notifications_disabled">Les notifications de cette application sont désactivées. Veuillez les activer depuis les paramètres de votre appareil.</string>
 
     <!-- Alarms -->
     <string name="alarm">Réveil</string>
@@ -355,39 +355,39 @@
     <string name="dismiss">Ignorer</string>
     <string name="no_reminder">Pas de rappel</string>
     <string name="at_start">Au démarrage</string>
-    <string name="system_sounds">Sonneries du système</string>
+    <string name="system_sounds">Sonneries système</string>
     <string name="your_sounds">Vos sonneries</string>
     <string name="add_new_sound">Ajouter une nouvelle sonnerie</string>
-    <string name="no_sound">Pas de son</string>
+    <string name="no_sound">Aucune sonnerie</string>
 
     <!-- Settings -->
     <string name="settings">Paramètres</string>
-    <string name="purchase_simple_thank_you">Purchase Simple Thank You</string>
+    <string name="purchase_simple_thank_you">Acheter Simple Thank You</string>
     <string name="customize_colors">Personnaliser les couleurs</string>
     <string name="customize_widget_colors">Personnaliser les couleurs du widget</string>
-    <string name="use_english_language">Utiliser l\'affichage en anglais</string>
-    <string name="avoid_whats_new">Ne pas montrer les nouveautés au démarrage</string>
-    <string name="show_hidden_items">Afficher les éléments cachés</string>
-    <string name="font_size">Taille police</string>
+    <string name="use_english_language">Utiliser la langue anglaise</string>
+    <string name="avoid_whats_new">Ne pas afficher les nouveautés au démarrage</string>
+    <string name="show_hidden_items">Afficher les éléments masqués</string>
+    <string name="font_size">Taille de la police</string>
     <string name="small">Petite</string>
     <string name="medium">Moyenne</string>
     <string name="large">Large</string>
     <string name="extra_large">Extra large</string>
-    <string name="password_protect_hidden_items">Visibilité des éléments protégés par un mot de passe</string>
+    <string name="password_protect_hidden_items">Afficher les éléments protégés par mot de passe</string>
     <string name="password_protect_whole_app">Le mot de passe protège l\'ensemble de l\'application</string>
-    <string name="keep_last_modified">Garder la valeur de l\'ancienne modification lors de renommage/déplacement/copie de fichier</string>
-    <string name="show_info_bubble">Afficher une bulle d\'information des éléments qui s\'affichent lorsque vous faites glisser la barre de défilement</string>
-    <string name="prevent_phone_from_sleeping">Ne pas mettre en veille tant que l\'application est active.</string>
-    <string name="skip_delete_confirmation">Ne jamais montrer le dialogue de confirmation de suppression</string>
-    <string name="enable_pull_to_refresh">Activer le rafraîchissement en glissant à partir du haut</string>
-    <string name="use_24_hour_time_format">Utiliser le format horaire 24 heures.</string>
+    <string name="keep_last_modified">Conserver la valeur de l\'ancienne modification lors de la copie, du déplacement ou du renommage du fichier</string>
+    <string name="show_info_bubble">Afficher une bulle d\'information des éléments lors de l\'utilisation de la barre de défilement</string>
+    <string name="prevent_phone_from_sleeping">Ne pas mettre en veille tant que l\'application est active</string>
+    <string name="skip_delete_confirmation">Ne jamais afficher le dialogue de confirmation de suppression</string>
+    <string name="enable_pull_to_refresh">Activer l\'actualisation par glissement à partir du haut de l\'écran</string>
+    <string name="use_24_hour_time_format">Utiliser le format horaire sur 24 heures</string>
     <string name="sunday_first">Démarrer la semaine le dimanche</string>
     <string name="widgets">Widgets</string>
     <string name="use_same_snooze">Toujours utiliser le même intervalle de répétition</string>
-    <string name="snooze_time">Temps de répétition</string>
+    <string name="snooze_time">Intervalle de répétition</string>
     <string name="vibrate_on_button_press">Vibrer lors de l\'appui sur un bouton</string>
     <string name="move_items_into_recycle_bin">Déplacer les éléments vers la corbeille au lieu de les supprimer</string>
-    <string name="recycle_bin_cleaning_interval">Interval de vidage de la corbeille</string>
+    <string name="recycle_bin_cleaning_interval">intervalle de vidage de la corbeille</string>
     <string name="empty_recycle_bin">Vider la corbeille</string>
     <string name="force_portrait_mode">Forcer le mode portrait</string>
 
@@ -397,39 +397,39 @@
     <string name="scrolling">Défilement</string>
     <string name="file_operations">Opérations sur les fichiers</string>
     <string name="recycle_bin">Corbeille</string>
-    <string name="saving_label">Saving</string>
-    <string name="startup">Startup</string>
-    <string name="text">Text</string>
+    <string name="saving_label">Enregistrement en cours…</string>
+    <string name="startup">Démarrage en cours…</string>
+    <string name="text">Texte</string>
 
     <!-- Recycle Bin -->
-    <string name="restore_this_file">Restore this file</string>
-    <string name="restore_selected_files">Restore selected files</string>
-    <string name="restore_all_files">Restore all files</string>
-    <string name="recycle_bin_emptied">The Recycle Bin has been emptied successfully</string>
-    <string name="files_restored_successfully">Files have been restored successfully</string>
-    <string name="empty_recycle_bin_confirmation">Are you sure you want to empty the Recycle Bin? The files will be permanently lost.</string>
-    <string name="recycle_bin_empty">The Recycle Bin is empty</string>
+    <string name="restore_this_file">Récupérer ce fichier</string>
+    <string name="restore_selected_files">Récupérer les fichiers sélectionnés</string>
+    <string name="restore_all_files">Récupérer tous les fichiers </string>
+    <string name="recycle_bin_emptied">Corbeille vidée</string>
+    <string name="files_restored_successfully">Les fichiers récupérerés</string>
+    <string name="empty_recycle_bin_confirmation">Êtes-vous sûr(-e) de vouloir vider la corbeille ? Les fichiers seront définitivement supprimés.</string>
+    <string name="recycle_bin_empty">La corbeille est vide</string>
 
     <plurals name="moving_items_into_bin">
-        <item quantity="one">Moving %d item into the Recycle Bin</item>
-        <item quantity="other">Moving %d items into the Recycle Bin</item>
+        <item quantity="one">Déplacement d\' %d élément dans la corbeille en cours…</item>
+        <item quantity="other">Déplacement de %d éléments dans la corbeille en cours…</item>
     </plurals>
 
     <!-- Import / Export -->
     <string name="importing">Importer…</string>
     <string name="exporting">Exporter…</string>
-    <string name="importing_successful">Importation réussie</string>
-    <string name="exporting_successful">Exportation réussie</string>
-    <string name="importing_failed">L\'importation a échoué</string>
-    <string name="exporting_failed">L\'exportation a échoué</string>
-    <string name="importing_some_entries_failed">L\'importation de certains items a échoué</string>
-    <string name="exporting_some_entries_failed">L\'exportation de certains items a échoué</string>
-    <string name="no_entries_for_exporting">Aucun item pouvant être exporté n\'a été trouvé</string>
+    <string name="importing_successful">Importation terminée</string>
+    <string name="exporting_successful">Exportation terminée</string>
+    <string name="importing_failed">Échec de l\'importation</string>
+    <string name="exporting_failed">Échec de l\'exportation</string>
+    <string name="importing_some_entries_failed">Échec de l\'importation de certains éléments</string>
+    <string name="exporting_some_entries_failed">Échec de l\'exportation de certains éléments</string>
+    <string name="no_entries_for_exporting">Aucun élément pouvant être exporté n\'a été trouvé</string>
 
     <!-- OTG devices -->
     <string name="otg">USB OTG</string>
-    <string name="confirm_otg_storage_access_text">Veuillez choisir le répertoire racine du périphérique USB OTG au prochain écran afin de pouvoir y accèder.</string>
-    <string name="wrong_root_selected_otg">Mauvais répertoire choisi, merci de sélectionner le répertoire racine du périphérique USB OTG.</string>
+    <string name="confirm_otg_storage_access_text">Veuillez sélectionner le répertoire racine du périphérique USB OTG sur l\'écran suivant afin de pouvoir y accéder</string>
+    <string name="wrong_root_selected_otg">Mauvais répertoire sélectionné. Veuillez sélectionner le répertoire racine du périphérique USB OTG.</string>
 
     <!-- Dates -->
     <string name="january">Janvier</string>
@@ -468,8 +468,8 @@
     <string name="sunday">Dimanche</string>
 
     <string name="monday_letter">L</string>
-    <string name="tuesday_letter">M</string>
-    <string name="wednesday_letter">M</string>
+    <string name="tuesday_letter">Ma</string>
+    <string name="wednesday_letter">Me</string>
     <string name="thursday_letter">J</string>
     <string name="friday_letter">V</string>
     <string name="saturday_letter">S</string>
@@ -485,82 +485,83 @@
 
     <!-- About -->
     <string name="about">À propos</string>
-    <string name="website_label">Pour le code source, visitez</string>
-    <string name="email_label">Envoyez vos réactions et suggestions à</string>
+    <string name="website_label">Pour le code source, consultez</string>
+    <string name="email_label">Envoyez vos commentaires ou suggestions à</string>
     <string name="more_apps_underlined"><u>Plus d\'applications</u></string>
     <string name="third_party_licences_underlined"><u>Licences tierces</u></string>
     <string name="invite_friends_underlined"><u>Inviter des amis</u></string>
-    <string name="share_text">Hey, viens voir %1$s à %2$s</string>
+    <string name="share_text">Salut, viens voir %1$s à %2$s</string>
     <string name="invite_via">Inviter via</string>
     <string name="rate_us_underlined"><u>Nous évaluer</u></string>
-    <string name="donate">Donner</string>
-    <string name="donate_underlined"><u>Donner</u></string>
+    <string name="donate">Effectuer un don</string>
+    <string name="donate_underlined"><u>Effectuer un don</u></string>
     <string name="follow_us">Suivez-nous</string>
     <string name="copyright">v %1$s\nCopyright © Simple Mobile Tools %2$d</string>
     <string name="additional_info">Info supplémentaire</string>
-    <string name="app_version">Version appli : %s</string>
-    <string name="device_os">OS appareil : %s</string>
+    <string name="app_version">Version de l\'application : %s</string>
+    <string name="device_os">Système d\'exploitation de l\'appareil : %s</string>
     <string name="donate_please">
         <![CDATA[
-            Salut,<br><br>
-            nous espérons que vous appréciez cette appli. Elle ne contient aucune publicité, mais vous pouvez soutenir son développement en achetant l\'appli <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Un petit Merci</a>. Cela nous permettra également de ne plus vous montrer cette boite de dialogue.<br><br>
+            Bonjour,<br><br>
+            Nous espérons que vous appréciez cette application. Elle ne contient aucune publicité, mais vous pouvez soutenir son développement en achetant l\'application <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Un petit Merci</a>. Cela nous permettra également de ne plus vous montrer cette boite de dialogue.<br><br>
             Merci !
         ]]>
     </string>
     <string name="purchase">Acheter</string>
-    <string name="update_thank_you">Veuillez mettre à jour Simple Merci à la dernière version</string>
-    <string name="before_asking_question_read_faq">Before you ask a question, please read the Frequently Asked Questions first, maybe the solution is there.</string>
-    <string name="read_it">Read it</string>
+    <string name="update_thank_you">Veuillez mettre à jour Simple Merci</string>
+    <string name="before_asking_question_read_faq">Avant de poser une question, consultez d\'abord la</string>
+    <string name="read_it">Consulter</string>
 
     <!-- New app (do not translate anything on the 4th line) -->
     <string name="new_app">
         <![CDATA[
-            Hey,<br><br>
-            just letting you know that a new app has been released recently:<br><br>
+            Bonjour,<br><br>
+            Une nouvelle application a été publiée récemment :<br><br>
             <a href="%1$s">%2$s</a><br><br>
-            You can download it by pressing the title.<br><br>
-            Thanks
+            Vous pouvez la télécharger en appuyant sur le titre.<br><br>
+            Merci
         ]]>
     </string>
 
     <!-- FAQ -->
     <string name="frequently_asked_questions">Foire aux questions (FAQ)</string>
-    <string name="before_asking_question">Avant de poser une question, lisez d\'abord le</string>
-    <string name="faq_1_title_commons">Pourquoi je ne vois pas les widgets de cette appli dans la liste des widgets ?</string>
-    <string name="faq_1_text_commons">Probablement parce que l\'appli a été déplacée sur la carte SD. Android a une limitation qui fait qu\'il n\'affiche pas les widgets de cette appli dans ce cas. La seule solution consiste à replacer l\'appli dans le stockage interne via les paramètres du système.</string>
-    <string name="faq_2_title_commons">Je voudrais vous apporter mon support, mais je ne peux pas vous donner de l\'argent. Existe t-il un autre moyen ?</string>
-    <string name="faq_2_text_commons"> Bien sûr. Vous pouvez recommander ces applis et/ou donner de bonnes évaluations. Vous pouvez aussi nous aider en traduisant les applis dans une nouvelle langue, ou mettre à jour les traductions existantes. Vous pouvez trouver le guide à l\'adresse https://github.com/SimpleMobileTools/General-Discussion , ou juste m\'envoyer un mail à hello@simplemobiletools.com si vous avez besoin d\'aide.</string>
+    <string name="before_asking_question">Avant de poser une question, consultez d\'abord la</string>
+    <string name="faq_1_title_commons">Pourquoi ne vois-je pas les widgets de cette application dans la liste des widgets ?</string>
+    <string name="faq_1_text_commons">Probablement parce que l\'application a été déplacée sur la carte SD. Android a une limitation qui fait qu\'il n\'affiche pas les widgets de cette application dans ce cas. La seule solution consiste à déplacer l\'application vers le stockage interne depuis les paramètres système.</string>
+    <string name="faq_2_title_commons">Je voudrais vous apporter mon soutien, mais je ne peux pas vous donner de l\'argent. Y a-t-il autre chose que je puisse faire ?</string>
+    <string name="faq_2_text_commons">Oui, bien sûr. Vous pouvez recommander cette application et/ou mettre une bonne évaluation. Vous pouvez aussi nous aider en traduisant les applications dans une nouvelle langue, ou en actualisant les traductions existantes.
+        Vous pouvez trouver le guide à l\'adresse https://github.com/SimpleMobileTools/General-Discussion , ou simplement m\'envoyer un courriel à hello@simplemobiletools.com si vous avez besoin d\'aide.</string>
     <string name="faq_3_title_commons">J\'ai effacé des fichiers par erreurs. Comment les récupérer ?</string>
     <string name="faq_3_text_commons">C\'est malheureusement impossible, car les fichiers sont supprimés instantanément après le dialogue de confirmation et il n\'y a pas de corbeille.</string>
-    <string name="faq_4_title_commons">Je n\'aime pas les couleurs du widget. Puis-je la changer ?</string>
+    <string name="faq_4_title_commons">Je n\'aime pas les couleurs du widget. Puis-je les changer ?</string>
     <string name="faq_4_text_commons">Oui, quand vous glissez le widget sur l\'écran d\'accueil un dialogue de configuration apparaît. Vous verrez des carrés en bas à gauche, en appuyant dessus vous pouvez choisir une nouvelle couleur. Vous pouvez aussi utiliser le curseur pour régler la transparence.</string>
-    <string name="faq_5_title_commons">Puis-je d\'une manière ou d\'une autre restaurer les fichiers supprimés ?</string>
-    <string name="faq_5_text_commons">Si ils ont déjà été supprimés, vous ne pouvez pas. Toutefois, vous pouvez activer l\'utilisation de la corbeille à la place de la suppression dans les paramètres de l\'app. Cela devrait seulement y déplacer les fichiers au lieu de les supprimer.</string>
+    <string name="faq_5_title_commons">Puis-je restaurer les fichiers supprimés ?</string>
+    <string name="faq_5_text_commons">S\'ils ont déjà été supprimés, vous ne pouvez pas. Toutefois, vous pouvez activer l\'utilisation de la corbeille à la place de la suppression dans les paramètres de l\'application. Les fichiers seront alors placés dans la corbeille plutôt que d\'être supprimés.</string>
 
     <!-- License -->
     <string name="notice">Cette application utilise les bibliothèques tierces suivantes pour me simplifier la vie. Merci.</string>
     <string name="third_party_licences">Licences tierces</string>
     <string name="kotlin_title">Kotlin (langage de programmation)</string>
-    <string name="subsampling_title">Subsampling Scale Image View (imageviews zoomables)</string>
+    <string name="subsampling_title">Subsampling Scale Image View (affichage par zoom des images)</string>
     <string name="glide_title">Glide (chargement et mise en cache d\'image)</string>
     <string name="picasso_title">Picasso (chargement et mise en cache d\'image)</string>
-    <string name="cropper_title">Android Image Cropper (découpe et rotation d\'image)</string>
+    <string name="cropper_title">Android Image Cropper (recadrage et rotation d\'image)</string>
     <string name="rtl_viewpager_title">RtlViewPager (glissement de droite à gauche)</string>
     <string name="joda_title">Joda-Time (remplacement de date Java)</string>
     <string name="stetho_title">Stetho (débogage de bases de données)</string>
-    <string name="otto_title">Otto (bus d\'évenement)</string>
-    <string name="photoview_title">PhotoView (GIFs zoomables)</string>
-    <string name="pattern_title">PatternLockView (protection de modèle)</string>
+    <string name="otto_title">Otto (bus d\'événement)</string>
+    <string name="photoview_title">PhotoView (affichage par zoom des GIFs)</string>
+    <string name="pattern_title">PatternLockView (protection par schéma)</string>
     <string name="reprint_title">Reprint (protection par empreinte digitale)</string>
     <string name="gif_drawable_title">Gif Drawable (chargement des GIFs)</string>
     <string name="autofittextview_title">AutoFitTextView (redimensionnement du texte)</string>
-    <string name="robolectric_title">Robolectric (framework de test)</string>
+    <string name="robolectric_title">Robolectric (structure de système de test)</string>
     <string name="espresso_title">Espresso (assistant de test)</string>
-    <string name="gson_title">Gson (parser JSON)</string>
+    <string name="gson_title">Gson (analyseur JSON)</string>
     <string name="leak_canary_title">Leak Canary (détecteur de fuite de mémoire)</string>
-    <string name="number_picker_title">Number Picker (customizable number picker)</string>
-    <string name="exoplayer_title">ExoPlayer (video player)</string>
-    <string name="panorama_view_title">VR Panorama View (displaying panoramas)</string>
-    <string name="sanselan_title">Apache Sanselan (reading image metadata)</string>
-    <string name="filters_title">Android Photo Filters (image filters)</string>
+    <string name="number_picker_title">Number Picker (sélecteur de numéro personnalisable)</string>
+    <string name="exoplayer_title">ExoPlayer (lecteur vidéo)</string>
+    <string name="panorama_view_title">VR Panorama View (affichage des panoramas)</string>
+    <string name="sanselan_title">Apache Sanselan (lecture de métadonnées d\'image)</string>
+    <string name="filters_title">Android Photo Filters (filtres d\'image)</string>
 </resources>

From 5d9ca8a135e0eb3f008ff5cce3a4fd7b18fc2890 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 23 Oct 2018 10:57:24 +0200
Subject: [PATCH 15/15] update version to 5.2.0

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 05d26fa28..6a65ed054 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         propMinSdkVersion = 21
         propTargetSdkVersion = propCompileSdkVersion
         propVersionCode = 1
-        propVersionName = '5.1.17'
+        propVersionName = '5.2.0'
         kotlin_version = '1.2.71'
     }