Merge pull request #13 from SimpleMobileTools/master

update

build.gradle

@@ -6,8 +6,8 @@ buildscript {
         propMinSdkVersion = 16
         propTargetSdkVersion = propCompileSdkVersion
         propVersionCode = 1
-        propVersionName = '3.7.5'
+        propVersionName = '3.8.11'
-        kotlin_version = '1.2.10'
+        kotlin_version = '1.2.21'
         support_libs = '27.0.2'
     }
 

commons/src/main/kotlin/com/simplemobiletools/commons/activities/AboutActivity.kt

@@ -87,7 +87,7 @@ class AboutActivity : BaseSimpleActivity() {
     }
 
     private fun setupRateUs() {
-        if (baseConfig.appRunCount < 5) {
+        if (baseConfig.appRunCount < 3) {
             about_rate_us.visibility = View.GONE
         } else {
             about_rate_us.setOnClickListener {

commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSimpleActivity.kt

@@ -24,6 +24,7 @@ import com.simplemobiletools.commons.helpers.APP_LICENSES
 import com.simplemobiletools.commons.helpers.APP_NAME
 import com.simplemobiletools.commons.helpers.APP_VERSION_NAME
 import com.simplemobiletools.commons.helpers.OPEN_DOCUMENT_TREE
+import com.simplemobiletools.commons.interfaces.CopyMoveListener
 import java.io.File
 import java.util.*
 
@@ -127,7 +128,7 @@ open class BaseSimpleActivity : AppCompatActivity() {
         baseConfig.treeUri = treeUri.toString()
 
         val takeFlags = Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-        contentResolver.takePersistableUriPermission(treeUri, takeFlags)
+        applicationContext.contentResolver.takePersistableUriPermission(treeUri, takeFlags)
     }
 
     private fun isProperFolder(uri: Uri) = isExternalStorageDocument(uri) && isRootUri(uri) && !isInternalStorage(uri)
@@ -244,7 +245,7 @@ open class BaseSimpleActivity : AppCompatActivity() {
         }
     }
 
-    val copyMoveListener = object : CopyMoveTask.CopyMoveListener {
+    val copyMoveListener = object : CopyMoveListener {
         override fun copySucceeded(copyOnly: Boolean, copiedAll: Boolean) {
             if (copyOnly) {
                 toast(if (copiedAll) R.string.copying_success else R.string.copying_success_partial)

commons/src/main/kotlin/com/simplemobiletools/commons/adapters/FilepickerItemsAdapter.kt

@@ -88,8 +88,8 @@ class FilepickerItemsAdapter(activity: BaseSimpleActivity, val fileDirItems: Lis
                     path
                 }
 
-                if (context != null) {
+                if (!activity.isActivityDestroyed()) {
-                    Glide.with(context).load(itemToLoad).transition(withCrossFade()).apply(options).into(list_item_icon)
+                    Glide.with(activity).load(itemToLoad).transition(withCrossFade()).apply(options).into(list_item_icon)
                 }
             }
         }

commons/src/main/kotlin/com/simplemobiletools/commons/asynctasks/CopyMoveTask.kt

@@ -8,6 +8,7 @@ import android.support.v4.util.Pair
 import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
 import com.simplemobiletools.commons.extensions.*
+import com.simplemobiletools.commons.interfaces.CopyMoveListener
 import java.io.File
 import java.io.FileInputStream
 import java.io.InputStream
@@ -16,10 +17,10 @@ import java.lang.ref.WeakReference
 import java.util.*
 
 class CopyMoveTask(val activity: BaseSimpleActivity, val copyOnly: Boolean = false, val copyMediaOnly: Boolean,
-                   listener: CopyMoveTask.CopyMoveListener) : AsyncTask<Pair<ArrayList<File>, File>, Void, Boolean>() {
+                   listener: CopyMoveListener) : AsyncTask<Pair<ArrayList<File>, File>, Void, Boolean>() {
     private var mListener: WeakReference<CopyMoveListener>? = null
     private var mMovedFiles: ArrayList<File> = ArrayList()
-    private var mDocument: DocumentFile? = null
+    private var mDocuments = LinkedHashMap<String, DocumentFile?>()
     lateinit var mFiles: ArrayList<File>
 
     init {
@@ -72,8 +73,9 @@ class CopyMoveTask(val activity: BaseSimpleActivity, val copyOnly: Boolean = fal
         val children = source.list()
         for (child in children) {
             val newFile = File(destination, child)
-            if (newFile.exists())
+            if (newFile.exists()) {
                 continue
+            }
 
             val oldFile = File(source, child)
             copy(oldFile, newFile)
@@ -82,8 +84,9 @@ class CopyMoveTask(val activity: BaseSimpleActivity, val copyOnly: Boolean = fal
     }
 
     private fun copyFile(source: File, destination: File) {
-        if (copyMediaOnly && !source.absolutePath.isImageVideoGif())
+        if (copyMediaOnly && !source.absolutePath.isImageVideoGif()) {
             return
+        }
 
         val directory = destination.parentFile
         if (!activity.createDirectorySync(directory)) {
@@ -95,11 +98,11 @@ class CopyMoveTask(val activity: BaseSimpleActivity, val copyOnly: Boolean = fal
         var inputStream: InputStream? = null
         var out: OutputStream? = null
         try {
-            if (mDocument == null && activity.needsStupidWritePermissions(destination.absolutePath)) {
+            if (!mDocuments.containsKey(destination.parent) && activity.needsStupidWritePermissions(destination.absolutePath)) {
-                mDocument = activity.getFileDocument(destination.parent)
+                mDocuments[destination.parent] = activity.getFileDocument(destination.parent)
             }
 
-            out = activity.getFileOutputStreamSync(destination.absolutePath, source.getMimeType(), mDocument)
+            out = activity.getFileOutputStreamSync(destination.absolutePath, source.getMimeType(), mDocuments[destination.parent])
 
             inputStream = FileInputStream(source)
             inputStream.copyTo(out!!)
@@ -135,7 +138,7 @@ class CopyMoveTask(val activity: BaseSimpleActivity, val copyOnly: Boolean = fal
         val uri = MediaStore.Files.getContentUri("external")
         val selection = "${MediaStore.MediaColumns.DATA} = ?"
         var selectionArgs = arrayOf(source.absolutePath)
-        val cursor = activity.contentResolver.query(uri, projection, selection, selectionArgs, null)
+        val cursor = activity.applicationContext.contentResolver.query(uri, projection, selection, selectionArgs, null)
 
         cursor?.use {
             if (cursor.moveToFirst()) {
@@ -149,15 +152,9 @@ class CopyMoveTask(val activity: BaseSimpleActivity, val copyOnly: Boolean = fal
 
                 selectionArgs = arrayOf(destination.absolutePath)
                 activity.scanFile(destination) {
-                    activity.contentResolver.update(uri, values, selection, selectionArgs)
+                    activity.applicationContext.contentResolver.update(uri, values, selection, selectionArgs)
                 }
             }
         }
     }
-
-    interface CopyMoveListener {
-        fun copySucceeded(copyOnly: Boolean, copiedAll: Boolean)
-
-        fun copyFailed()
-    }
 }

commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ColorPickerDialog.kt

@@ -124,7 +124,7 @@ class ColorPickerDialog(val activity: Activity, color: Int, val callback: (color
 
         val textColor = activity.baseConfig.textColor
         AlertDialog.Builder(activity)
-                .setPositiveButton(R.string.ok, { dialog, which -> callback(getColor()) })
+                .setPositiveButton(R.string.ok, { dialog, which -> confirmNewColor() })
                 .setNegativeButton(R.string.cancel, null)
                 .create().apply {
             activity.setupDialogStuff(view, this) {
@@ -140,7 +140,16 @@ class ColorPickerDialog(val activity: Activity, color: Int, val callback: (color
         }
     }
 
-    private fun getHexCode(color: Int) = Integer.toHexString(color).substring(2).toUpperCase()
+    private fun confirmNewColor() {
+        val hexValue = newHexField.value
+        if (hexValue.length == 6) {
+            callback(Color.parseColor("#$hexValue"))
+        } else {
+            callback(getColor())
+        }
+    }
+
+    private fun getHexCode(color: Int) = color.toHex().substring(1)
 
     private fun updateHue() {
         viewSatVal.setHue(getHue())

commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt

@@ -419,7 +419,7 @@ fun BaseSimpleActivity.deleteFileBg(file: File, allowDeleteFolder: Boolean = fal
                 if (!fileDeleted) {
                     val document = getFileDocument(file.absolutePath)
                     if (document != null && (file.isDirectory == document.isDirectory)) {
-                        fileDeleted = (document.isFile == true || allowDeleteFolder) && DocumentsContract.deleteDocument(contentResolver, document.uri)
+                        fileDeleted = (document.isFile == true || allowDeleteFolder) && DocumentsContract.deleteDocument(applicationContext.contentResolver, document.uri)
                     }
                 }
 
@@ -439,7 +439,7 @@ fun BaseSimpleActivity.rescanDeletedFile(file: File, callback: (() -> Unit)? = n
     } else {
         MediaScannerConnection.scanFile(applicationContext, arrayOf(file.absolutePath), null, { s, uri ->
             try {
-                contentResolver.delete(uri, null, null)
+                applicationContext.contentResolver.delete(uri, null, null)
             } catch (e: Exception) {
             }
             callback?.invoke()
@@ -458,6 +458,26 @@ private fun deleteRecursively(file: File): Boolean {
     return file.delete()
 }
 
+fun Activity.scanFile(file: File, callback: (() -> Unit)? = null) {
+    applicationContext.scanFile(file, callback)
+}
+
+fun Activity.scanPath(path: String, callback: (() -> Unit)? = null) {
+    applicationContext.scanPath(path, callback)
+}
+
+fun Activity.scanFiles(files: ArrayList<File>, callback: (() -> Unit)? = null) {
+    applicationContext.scanFiles(files, callback)
+}
+
+fun Activity.scanPaths(paths: ArrayList<String>, callback: (() -> Unit)? = null) {
+    applicationContext.scanPaths(paths, callback)
+}
+
+fun Activity.rescanPaths(paths: ArrayList<String>, callback: (() -> Unit)? = null) {
+    applicationContext.rescanPaths(paths, callback)
+}
+
 @SuppressLint("NewApi")
 fun BaseSimpleActivity.renameFile(oldFile: File, newFile: File, callback: ((success: Boolean) -> Unit)? = null) {
     if (needsStupidWritePermissions(newFile.absolutePath)) {
@@ -469,7 +489,7 @@ fun BaseSimpleActivity.renameFile(oldFile: File, newFile: File, callback: ((succ
             }
 
             try {
-                val uri = DocumentsContract.renameDocument(contentResolver, document.uri, newFile.name)
+                val uri = DocumentsContract.renameDocument(applicationContext.contentResolver, document.uri, newFile.name)
                 if (document.uri != uri) {
                     updateInMediaStore(oldFile, newFile)
                     scanFiles(arrayListOf(oldFile, newFile)) {
@@ -539,7 +559,7 @@ fun BaseSimpleActivity.getFileOutputStream(file: File, callback: (outputStream:
             }
 
             if (document?.exists() == true) {
-                callback(contentResolver.openOutputStream(document.uri))
+                callback(applicationContext.contentResolver.openOutputStream(document.uri))
             } else {
                 val error = String.format(getString(R.string.could_not_create_file), file.absolutePath)
                 showErrorToast(error)
@@ -563,7 +583,7 @@ fun BaseSimpleActivity.getFileOutputStreamSync(targetPath: String, mimeType: Str
         }
 
         val newDocument = documentFile.createFile(mimeType, targetPath.getFilenameFromPath())
-        contentResolver.openOutputStream(newDocument!!.uri)
+        applicationContext.contentResolver.openOutputStream(newDocument!!.uri)
     } else {
         FileOutputStream(targetFile)
     }
@@ -640,7 +660,7 @@ fun Activity.isActivityDestroyed() = isJellyBean1Plus() && isDestroyed
 fun Activity.updateSharedTheme(sharedTheme: SharedTheme): Int {
     try {
         val contentValues = MyContentProvider.fillThemeContentValues(sharedTheme)
-        return contentResolver.update(MyContentProvider.CONTENT_URI, contentValues, null, null)
+        return applicationContext.contentResolver.update(MyContentProvider.CONTENT_URI, contentValues, null, null)
     } catch (e: Exception) {
         showErrorToast(e)
     }

commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Int.kt

@@ -9,7 +9,7 @@ fun Int.getContrastColor(): Int {
     return if (y >= 149) DARK_GREY else Color.WHITE
 }
 
-fun Int.toHex() = String.format("#%06X", 0xFFFFFF and this)
+fun Int.toHex() = String.format("#%06X", 0xFFFFFF and this).toUpperCase()
 
 fun Int.adjustAlpha(factor: Float): Int {
     val alpha = Math.round(Color.alpha(this) * factor)

commons/src/main/kotlin/com/simplemobiletools/commons/extensions/String.kt

@@ -29,7 +29,7 @@ fun String.isAValidFilename(): Boolean {
 
 val String.photoExtensions: Array<String> get() = arrayOf(".jpg", ".png", ".jpeg", ".bmp", ".webp", ".dng")
 val String.videoExtensions: Array<String> get() = arrayOf(".mp4", ".mkv", ".webm", ".avi", ".3gp", ".mov", ".m4v", ".3gpp")
-val String.audioExtensions: Array<String> get() = arrayOf(".mp3", ".wav", ".wma", ".ogg", ".m4a", ".opus")
+val String.audioExtensions: Array<String> get() = arrayOf(".mp3", ".wav", ".wma", ".ogg", ".m4a", ".opus", ".flac")
 
 fun String.isImageVideoGif() = isImageFast() || isVideoFast() || isGif()
 

commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt

@@ -5,6 +5,7 @@ val APP_LICENSES = "app_licenses"
 val APP_VERSION_NAME = "app_version_name"
 val REAL_FILE_PATH = "real_file_path"
 val IS_FROM_GALLERY = "is_from_gallery"
+val BROADCAST_REFRESH_MEDIA = "com.simplemobiletools.REFRESH_MEDIA"
 
 // shared preferences
 val PREFS_KEY = "Prefs"

commons/src/main/kotlin/com/simplemobiletools/commons/interfaces/CopyMoveListener.kt

@@ -0,0 +1,7 @@
+package com.simplemobiletools.commons.interfaces
+
+interface CopyMoveListener {
+    fun copySucceeded(copyOnly: Boolean, copiedAll: Boolean)
+
+    fun copyFailed()
+}

commons/src/main/kotlin/com/simplemobiletools/commons/models/FileDirItem.kt

@@ -5,7 +5,7 @@ import com.simplemobiletools.commons.extensions.formatSize
 import com.simplemobiletools.commons.helpers.*
 import java.io.File
 
-data class FileDirItem(val path: String, val name: String, val isDirectory: Boolean, val children: Int, val size: Long) :
+data class FileDirItem(val path: String, val name: String, val isDirectory: Boolean, var children: Int, var size: Long) :
         Comparable<FileDirItem> {
     companion object {
         var sorting: Int = 0

commons/src/main/res/values-ca/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="ok">OK</string>
     <string name="cancel">Cancel·lar</string>
-    <string name="search">Buscar</string>
     <string name="save_as">Desar com</string>
     <string name="file_saved">Arxiu desat amb éxit</string>
     <string name="invalid_file_format">Format d\'arxiu no vàlid</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">Valor copiat al portaretalls</string>
     <string name="unknown">Desconegut</string>
 
+    <!-- Search -->
+    <string name="search">Buscar</string>
+    <string name="type_2_characters">Escriu al menys dos caracters per iniciar la cerca.</string>
+
     <!-- Filters -->
     <string name="filter">Filtrar</string>
     <string name="no_items_found">No s\'ha trobat arxius.</string>
@@ -119,7 +122,7 @@
     <string name="f_number">F-number</string>
     <string name="camera">Càmera</string>
     <string name="exif">EXIF</string>
-    <string name="song_title">Song title</string>
+    <string name="song_title">Títol de la canço</string>
 
     <!-- Color customization -->
     <string name="background_color">Color del fons</string>
@@ -235,16 +238,22 @@
     <string name="keep_last_modified">Mantenir el valor de la darrera modificació al copiar/moure/canviar el nom dels arxius</string>
     <string name="show_info_bubble">Mostra una bombolla d\'informació en elements de desplaçament mitjançant arrossegament de la barra de desplaçament</string>
 
+    <!-- Setting sections -->
+    <string name="visibility">Visibilitat</string>
+    <string name="security">Seguretat</string>
+    <string name="scrolling">Desplaçament</string>
+    <string name="file_operations">Operacions de fitxers</string>
+
     <!-- Import / Export -->
-    <string name="importing">Importing…</string>
+    <string name="importing">Important…</string>
-    <string name="exporting">Exporting…</string>
+    <string name="exporting">Exportant…</string>
-    <string name="importing_successful">Importing successful</string>
+    <string name="importing_successful">Importació correcta</string>
-    <string name="exporting_successful">Exporting successful</string>
+    <string name="exporting_successful">Exportació correcta</string>
-    <string name="importing_failed">Importing failed</string>
+    <string name="importing_failed">Importacó fallida</string>
-    <string name="exporting_failed">Exporting failed</string>
+    <string name="exporting_failed">Exportació fallida</string>
-    <string name="importing_some_entries_failed">Importing some entries failed</string>
+    <string name="importing_some_entries_failed">L\'impotació d\'algunes entrades ha fallat</string>
-    <string name="exporting_some_entries_failed">Exporting some entries failed</string>
+    <string name="exporting_some_entries_failed">L\'exportació d\'algunes entrades ha fallat</string>
-    <string name="no_entries_for_exporting">No entries for exporting have been found</string>
+    <string name="no_entries_for_exporting">No s\'han trobat entrades per exportar</string>
 
     <!-- About -->
     <string name="about">Sobre</string>

commons/src/main/res/values-cs/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="ok">OK</string>
     <string name="cancel">Zrušit</string>
-    <string name="search">Hledat</string>
     <string name="save_as">Uložit jako</string>
     <string name="file_saved">Soubor úspěšně uložen</string>
     <string name="invalid_file_format">Neplatný formát souboru</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">Value copied to clipboard</string>
     <string name="unknown">Unknown</string>
 
+    <!-- Search -->
+    <string name="search">Hledat</string>
+    <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
+
     <!-- Filters -->
     <string name="filter">Filtrovat</string>
     <string name="no_items_found">No items found.</string>
@@ -236,6 +239,12 @@
     <string name="keep_last_modified">Keep old last-modified value at file copy/move/rename</string>
     <string name="show_info_bubble">Show an info bubble at scrolling items by scrollbar dragging</string>
 
+    <!-- Setting sections -->
+    <string name="visibility">Visibility</string>
+    <string name="security">Security</string>
+    <string name="scrolling">Scrolling</string>
+    <string name="file_operations">File operations</string>
+
     <!-- Import / Export -->
     <string name="importing">Importování…</string>
     <string name="exporting">Exportování…</string>
@@ -267,7 +276,7 @@
     <string name="donate_please">
         <![CDATA[
             Hello,<br><br>
-            hope you are enjoying the app. It contains no ads, so please support its development by purchasing the <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Simple Thank You</a> app, it will also prevent this dialog from showing up again.<br><br>
+            hope you are enjoying the app. It contains no ads, please support its development by purchasing the <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Simple Thank You</a> app, it will also prevent this dialog from showing up again.<br><br>
             You can find more donating options <a href="http://simplemobiletools.com/donate">here</a>.<br><br>
             Thank you!
         ]]>

commons/src/main/res/values-da/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="ok">OK</string>
     <string name="cancel">Annuller</string>
-    <string name="search">Søg</string>
     <string name="save_as">Gem som</string>
     <string name="file_saved">Fil gemt</string>
     <string name="invalid_file_format">Ugyldigt filformat</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">Værdi kopieret til udklipsholder</string>
     <string name="unknown">Ukendt</string>
 
+    <!-- Search -->
+    <string name="search">Søg</string>
+    <string name="type_2_characters">Start søgningen ved at skrive mindst to tegn.</string>
+
     <!-- Filters -->
     <string name="filter">Filter</string>
     <string name="no_items_found">Intet fundet.</string>
@@ -236,15 +239,21 @@
     <string name="keep_last_modified">Kopi/flyt/omdøb skal ikke påvirke ændringstidspunktet</string>
     <string name="show_info_bubble">Show an info bubble at scrolling items by scrollbar dragging</string>
 
+    <!-- Setting sections -->
+    <string name="visibility">Synlighed</string>
+    <string name="security">Sikkerhed</string>
+    <string name="scrolling">Scrolling</string>
+    <string name="file_operations">Filoperationer</string>
+
     <!-- Import / Export -->
     <string name="importing">Importerer…</string>
     <string name="exporting">Eksporterer…</string>
-    <string name="importing_successful">Importing successful</string>
+    <string name="importing_successful">Import gennemført</string>
-    <string name="exporting_successful">Exporting successful</string>
+    <string name="exporting_successful">Eksport gennemført</string>
     <string name="importing_failed">Import mislykkedes</string>
-    <string name="exporting_failed">Export mislykkedes</string>
+    <string name="exporting_failed">Eksport mislykkedes</string>
-    <string name="importing_some_entries_failed">Importing mislykkedes delvist</string>
+    <string name="importing_some_entries_failed">Import mislykkedes delvist</string>
-    <string name="exporting_some_entries_failed">Exporting  mislykkedes delvist</string>
+    <string name="exporting_some_entries_failed">Eksport mislykkedes delvist</string>
     <string name="no_entries_for_exporting">Der er ikke fundet indhold til eksport</string>
 
     <!-- About -->

commons/src/main/res/values-de/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="ok">OK</string>
     <string name="cancel">Abbrechen</string>
-    <string name="search">Suchen</string>
     <string name="save_as">Speichern unter</string>
     <string name="file_saved">Datei erfolgreich gespeichert</string>
     <string name="invalid_file_format">Ungültiges Dateiformat</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">Wert in Zwischenablage kopiert</string>
     <string name="unknown">Unbekannt</string>
 
+    <!-- Search -->
+    <string name="search">Suchen</string>
+    <string name="type_2_characters">Du musst mindestens 2 Zeichen eingeben, um die Suche zu starten.</string>
+
     <!-- Filters -->
     <string name="filter">Sortieren</string>
     <string name="no_items_found">Nichts gefunden.</string>
@@ -236,6 +239,12 @@
     <string name="keep_last_modified">Beim Modifizieren von Dateien die alte Änderungszeit beibehalten</string>
     <string name="show_info_bubble">Zeige Infofenster beim Scrollen mithilfe des Scrollbalkens an</string>
 
+    <!-- Setting sections -->
+    <string name="visibility">Sichtbarkeit</string>
+    <string name="security">Sicherheit</string>
+    <string name="scrolling">Scrollen</string>
+    <string name="file_operations">Dateioperationen</string>
+
     <!-- Import / Export -->
     <string name="importing">Importiere…</string>
     <string name="exporting">Exportiere…</string>

commons/src/main/res/values-es/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="ok">OK</string>
     <string name="cancel">Cancelar</string>
-    <string name="search">Buscar</string>
     <string name="save_as">Guardar como</string>
     <string name="file_saved">Archivo guardado con éxito</string>
     <string name="invalid_file_format">Formato de archivo no válido</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">Valor copiado en el portapapeles</string>
     <string name="unknown">Desconocido</string>
 
+    <!-- Search -->
+    <string name="search">Buscar</string>
+    <string name="type_2_characters">Escribe por lo menos dos caracteres para iniciar la búsqueda.</string>
+
     <!-- Filters -->
     <string name="filter">Filtrar</string>
     <string name="no_items_found">No se encontraron artículos.</string>
@@ -119,7 +122,7 @@
     <string name="f_number">F-number</string>
     <string name="camera">Cámara</string>
     <string name="exif">EXIF</string>
-    <string name="song_title">Song title</string>
+    <string name="song_title">Título de la canción</string>
 
     <!-- Color customization -->
     <string name="background_color">Color del fondo</string>
@@ -235,16 +238,22 @@
     <string name="keep_last_modified">Mantener el valor de ultima modificación al copiar/mover/renombrar los archivos</string>
     <string name="show_info_bubble">Mostrar una burbuja de información al desplazar elementos arrastrando la barra de desplazamiento</string>
 
+    <!-- Setting sections -->
+    <string name="visibility">Visibilidad</string>
+    <string name="security">Seguridad</string>
+    <string name="scrolling">Desplazamiento</string>
+    <string name="file_operations">Operaciones de ficheros</string>
+
     <!-- Import / Export -->
     <string name="importing">Importando…</string>
     <string name="exporting">Exportando…</string>
-    <string name="importing_successful">Importing successful</string>
+    <string name="importing_successful">Importación correcta</string>
-    <string name="exporting_successful">Exporting successful</string>
+    <string name="exporting_successful">Exportación correcta</string>
-    <string name="importing_failed">Importing failed</string>
+    <string name="importing_failed">Importación fallida</string>
-    <string name="exporting_failed">Exporting failed</string>
+    <string name="exporting_failed">Exportación fallida</string>
-    <string name="importing_some_entries_failed">Importing some entries failed</string>
+    <string name="importing_some_entries_failed">La importación de algunas entradas ha fallado</string>
-    <string name="exporting_some_entries_failed">Exporting some entries failed</string>
+    <string name="exporting_some_entries_failed">La exportación de algunas entradas ha fallado</string>
-    <string name="no_entries_for_exporting">No entries for exporting have been found</string>
+    <string name="no_entries_for_exporting">No se han encontrado entradas para exportar</string>
 
     <!-- About -->
     <string name="about">Acerca de</string>

commons/src/main/res/values-fi/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="ok">OK</string>
     <string name="cancel">Cancel</string>
-    <string name="search">Search</string>
     <string name="save_as">Save as</string>
     <string name="file_saved">File saved successfully</string>
     <string name="invalid_file_format">Invalid file format</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">Valeur copiée dans le presse-papier</string>
     <string name="unknown">Unknown</string>
 
+    <!-- Search -->
+    <string name="search">Search</string>
+    <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
+
     <!-- Filters -->
     <string name="filter">Filter</string>
     <string name="no_items_found">No items found.</string>
@@ -236,6 +239,12 @@
     <string name="keep_last_modified">Keep old last-modified value at file copy/move/rename</string>
     <string name="show_info_bubble">Show an info bubble at scrolling items by scrollbar dragging</string>
 
+    <!-- Setting sections -->
+    <string name="visibility">Visibility</string>
+    <string name="security">Security</string>
+    <string name="scrolling">Scrolling</string>
+    <string name="file_operations">File operations</string>
+
     <!-- Import / Export -->
     <string name="importing">Importing…</string>
     <string name="exporting">Exporting…</string>
@@ -267,7 +276,7 @@
     <string name="donate_please">
         <![CDATA[
             Hello,<br><br>
-            hope you are enjoying the app. It contains no ads, so please support its development by purchasing the <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Simple Thank You</a> app, it will also prevent this dialog from showing up again.<br><br>
+            hope you are enjoying the app. It contains no ads, please support its development by purchasing the <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Simple Thank You</a> app, it will also prevent this dialog from showing up again.<br><br>
             You can find more donating options <a href="http://simplemobiletools.com/donate">here</a>.<br><br>
             Thank you!
         ]]>

commons/src/main/res/values-fr/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="ok">Ok</string>
     <string name="cancel">Annuler</string>
-    <string name="search">Recherche</string>
     <string name="save_as">Sauvegarder sous</string>
     <string name="file_saved">Fichier sauvegardé avec succès</string>
     <string name="invalid_file_format">Format de fichier invalide</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">Value copied to clipboard</string>
     <string name="unknown">Inconnu</string>
 
+    <!-- Search -->
+    <string name="search">Recherche</string>
+    <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
+
     <!-- Filters -->
     <string name="filter">Filtrer</string>
     <string name="no_items_found">Aucun élément trouvé.</string>
@@ -236,6 +239,12 @@
     <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>
 
+    <!-- Setting sections -->
+    <string name="visibility">Visibility</string>
+    <string name="security">Security</string>
+    <string name="scrolling">Scrolling</string>
+    <string name="file_operations">File operations</string>
+
     <!-- Import / Export -->
     <string name="importing">Importer…</string>
     <string name="exporting">Exporter…</string>

commons/src/main/res/values-hi-rIN/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="ok">ठीक</string>
     <string name="cancel">रद्द करें</string>
-    <string name="search">Search</string>
     <string name="save_as">Save as</string>
     <string name="file_saved">File saved successfully</string>
     <string name="invalid_file_format">Invalid file format</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">Value copied to clipboard</string>
     <string name="unknown">Unknown</string>
 
+    <!-- Search -->
+    <string name="search">Search</string>
+    <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
+
     <!-- Filters -->
     <string name="filter">Filter</string>
     <string name="no_items_found">No items found.</string>
@@ -236,6 +239,12 @@
     <string name="keep_last_modified">Keep old last-modified value at file copy/move/rename</string>
     <string name="show_info_bubble">Show an info bubble at scrolling items by scrollbar dragging</string>
 
+    <!-- Setting sections -->
+    <string name="visibility">Visibility</string>
+    <string name="security">Security</string>
+    <string name="scrolling">Scrolling</string>
+    <string name="file_operations">File operations</string>
+
     <!-- Import / Export -->
     <string name="importing">Importing…</string>
     <string name="exporting">Exporting…</string>
@@ -267,7 +276,7 @@
     <string name="donate_please">
         <![CDATA[
             Hello,<br><br>
-            hope you are enjoying the app. It contains no ads, so please support its development by purchasing the <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Simple Thank You</a> app, it will also prevent this dialog from showing up again.<br><br>
+            hope you are enjoying the app. It contains no ads, please support its development by purchasing the <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Simple Thank You</a> app, it will also prevent this dialog from showing up again.<br><br>
             You can find more donating options <a href="http://simplemobiletools.com/donate">here</a>.<br><br>
             Thank you!
         ]]>

commons/src/main/res/values-hr/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="ok">U redu</string>
     <string name="cancel">Poništi</string>
-    <string name="search">Traži</string>
     <string name="save_as">Spremi kao</string>
     <string name="file_saved">Datoteka uspješno spremljena</string>
     <string name="invalid_file_format">Nevažeći format datoteke</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">Vrijednost spremljena u međuspremnik</string>
     <string name="unknown">Unknown</string>
 
+    <!-- Search -->
+    <string name="search">Traži</string>
+    <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
+
     <!-- Filters -->
     <string name="filter">Filter</string>
     <string name="no_items_found">No items found.</string>
@@ -240,6 +243,12 @@
     <string name="keep_last_modified">Zadrži stari datum zadnje izmjene pri kopiranje/premještanju/preimenovanju datoteke</string>
     <string name="show_info_bubble">Show an info bubble at scrolling items by scrollbar dragging</string>
 
+    <!-- Setting sections -->
+    <string name="visibility">Visibility</string>
+    <string name="security">Security</string>
+    <string name="scrolling">Scrolling</string>
+    <string name="file_operations">File operations</string>
+
     <!-- Import / Export -->
     <string name="importing">Importing…</string>
     <string name="exporting">Exporting…</string>

commons/src/main/res/values-hu/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="ok">OK</string>
     <string name="cancel">Cancel</string>
-    <string name="search">Search</string>
     <string name="save_as">Save as</string>
     <string name="file_saved">File saved successfully</string>
     <string name="invalid_file_format">Invalid file format</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">Value copied to clipboard</string>
     <string name="unknown">Unknown</string>
 
+    <!-- Search -->
+    <string name="search">Search</string>
+    <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
+
     <!-- Filters -->
     <string name="filter">Filter</string>
     <string name="no_items_found">No items found.</string>
@@ -236,6 +239,12 @@
     <string name="keep_last_modified">Keep old last-modified value at file copy/move/rename</string>
     <string name="show_info_bubble">Show an info bubble at scrolling items by scrollbar dragging</string>
 
+    <!-- Setting sections -->
+    <string name="visibility">Visibility</string>
+    <string name="security">Security</string>
+    <string name="scrolling">Scrolling</string>
+    <string name="file_operations">File operations</string>
+
     <!-- Import / Export -->
     <string name="importing">Importing…</string>
     <string name="exporting">Exporting…</string>
@@ -267,7 +276,7 @@
     <string name="donate_please">
         <![CDATA[
             Hello,<br><br>
-            hope you are enjoying the app. It contains no ads, so please support its development by purchasing the <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Simple Thank You</a> app, it will also prevent this dialog from showing up again.<br><br>
+            hope you are enjoying the app. It contains no ads, please support its development by purchasing the <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Simple Thank You</a> app, it will also prevent this dialog from showing up again.<br><br>
             You can find more donating options <a href="http://simplemobiletools.com/donate">here</a>.<br><br>
             Thank you!
         ]]>

commons/src/main/res/values-it/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="ok">OK</string>
     <string name="cancel">Annulla</string>
-    <string name="search">Cerca</string>
     <string name="save_as">Salva come</string>
     <string name="file_saved">File salvato correttamente</string>
     <string name="invalid_file_format">Formato file non valido</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">Valore copiato negli appunti</string>
     <string name="unknown">Sconosciuto</string>
 
+    <!-- Search -->
+    <string name="search">Cerca</string>
+    <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
+
     <!-- Filters -->
     <string name="filter">Filtro</string>
     <string name="no_items_found">Nessun elemento trovato.</string>
@@ -236,6 +239,12 @@
     <string name="keep_last_modified">Mantieni data/ora ultima modifica in copia/sposta/rinomina</string>
     <string name="show_info_bubble">Mostra un fumetto informativo durante il trascinamento della barra di scorrimento</string>
 
+    <!-- Setting sections -->
+    <string name="visibility">Visibility</string>
+    <string name="security">Security</string>
+    <string name="scrolling">Scrolling</string>
+    <string name="file_operations">File operations</string>
+
     <!-- Import / Export -->
     <string name="importing">Importing…</string>
     <string name="exporting">Exporting…</string>

commons/src/main/res/values-ja/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="ok">OK</string>
     <string name="cancel">キャンセル</string>
-    <string name="search">検索</string>
     <string name="save_as">名前を付けて保存</string>
     <string name="file_saved">ファイルを正常に保存しました</string>
     <string name="invalid_file_format">使用できないファイル形式</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">値をクリップボードにコピーしました</string>
     <string name="unknown">Unknown</string>
 
+    <!-- Search -->
+    <string name="search">検索</string>
+    <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
+
     <!-- Filters -->
     <string name="filter">Filter</string>
     <string name="no_items_found">No items found.</string>
@@ -236,6 +239,12 @@
     <string name="keep_last_modified">Keep old last-modified value at file copy/move/rename</string>
     <string name="show_info_bubble">Show an info bubble at scrolling items by scrollbar dragging</string>
 
+    <!-- Setting sections -->
+    <string name="visibility">Visibility</string>
+    <string name="security">Security</string>
+    <string name="scrolling">Scrolling</string>
+    <string name="file_operations">File operations</string>
+
     <!-- Import / Export -->
     <string name="importing">Importing…</string>
     <string name="exporting">Exporting…</string>
@@ -267,7 +276,7 @@
     <string name="donate_please">
         <![CDATA[
             Hello,<br><br>
-            hope you are enjoying the app. It contains no ads, so please support its development by purchasing the <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Simple Thank You</a> app, it will also prevent this dialog from showing up again.<br><br>
+            hope you are enjoying the app. It contains no ads, please support its development by purchasing the <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Simple Thank You</a> app, it will also prevent this dialog from showing up again.<br><br>
             You can find more donating options <a href="http://simplemobiletools.com/donate">here</a>.<br><br>
             Thank you!
         ]]>

commons/src/main/res/values-ko-rKR/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="ok">확인</string>
     <string name="cancel">취소</string>
-    <string name="search">검색</string>
     <string name="save_as">다른이름으로 저장</string>
     <string name="file_saved">파일저장 성공</string>
     <string name="invalid_file_format">잘못된 파일 형식</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">클립보드에 복사됨</string>
     <string name="unknown">알 수 없음</string>
 
+    <!-- Search -->
+    <string name="search">검색</string>
+    <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
+
     <!-- Filters -->
     <string name="filter">필터</string>
     <string name="no_items_found">항목을 찾지 못함</string>
@@ -236,6 +239,12 @@
     <string name="keep_last_modified">파일 복사/이동/변경 시 최종 수정시간 정보를 유지</string>
     <string name="show_info_bubble">스크롤바 드래그 시 항목별 툴팁 활성화</string>
 
+    <!-- Setting sections -->
+    <string name="visibility">Visibility</string>
+    <string name="security">Security</string>
+    <string name="scrolling">Scrolling</string>
+    <string name="file_operations">File operations</string>
+
     <!-- Import / Export -->
     <string name="importing">가져오는 중…</string>
     <string name="exporting">내보내는 중…</string>

commons/src/main/res/values-lt/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="ok">Gerai</string>
     <string name="cancel">Atðaukti</string>
-    <string name="search">Ieðkoti</string>
     <string name="save_as">Iðsaugoti kaip</string>
     <string name="file_saved">Failas iðsaugotas sëkmingai</string>
     <string name="invalid_file_format">Neteisingas failo formatas</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">Value copied to clipboard</string>
     <string name="unknown">Unknown</string>
 
+    <!-- Search -->
+    <string name="search">Ieðkoti</string>
+    <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
+
     <!-- Filters -->
     <string name="filter">Filter</string>
     <string name="no_items_found">No items found.</string>
@@ -236,6 +239,12 @@
     <string name="keep_last_modified">Keep old last-modified value at file copy/move/rename</string>
     <string name="show_info_bubble">Show an info bubble at scrolling items by scrollbar dragging</string>
 
+    <!-- Setting sections -->
+    <string name="visibility">Visibility</string>
+    <string name="security">Security</string>
+    <string name="scrolling">Scrolling</string>
+    <string name="file_operations">File operations</string>
+
     <!-- Import / Export -->
     <string name="importing">Importing…</string>
     <string name="exporting">Exporting…</string>
@@ -266,7 +275,7 @@
     <string name="donate_please">
         <![CDATA[
             Hello,<br><br>
-            hope you are enjoying the app. It contains no ads, so please support its development by purchasing the <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Simple Thank You</a> app, it will also prevent this dialog from showing up again.<br><br>
+            hope you are enjoying the app. It contains no ads, please support its development by purchasing the <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Simple Thank You</a> app, it will also prevent this dialog from showing up again.<br><br>
             You can find more donating options <a href="http://simplemobiletools.com/donate">here</a>.<br><br>
             Thank you!
         ]]>

commons/src/main/res/values-nb/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="ok">OK</string>
     <string name="cancel">Avbryt</string>
-    <string name="search">Søk</string>
     <string name="save_as">Lagre som</string>
     <string name="file_saved">Fil vellykket lagret</string>
     <string name="invalid_file_format">Ugyldig filformat</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">Verdi kopiert til utklippstavle</string>
     <string name="unknown">Ukjent</string>
 
+    <!-- Search -->
+    <string name="search">Søk</string>
+    <string name="type_2_characters">Skriv inn minst 2 tegn for å starte søket.</string>
+
     <!-- Filters -->
     <string name="filter">Filter</string>
     <string name="no_items_found">Ingen elementer funnet.</string>
@@ -119,7 +122,7 @@
     <string name="f_number">Blendertall</string>
     <string name="camera">Kamera</string>
     <string name="exif">EXIF</string>
-    <string name="song_title">Song title</string>
+    <string name="song_title">Sangtittel</string>
 
     <!-- Color customization -->
     <string name="background_color">Bakgrunnsfarge</string>
@@ -236,16 +239,22 @@
     <string name="keep_last_modified">Behold gammel Sist endret-verdi ved kopier/flytt/endre navn for filer</string>
     <string name="show_info_bubble">Vis en info-boble ved å dra i rullefeltet</string>
 
+    <!-- Setting sections -->
+    <string name="visibility">Synlighet</string>
+    <string name="security">Sikkerhet</string>
+    <string name="scrolling">Rulling</string>
+    <string name="file_operations">Filoperasjoner</string>
+
     <!-- Import / Export -->
     <string name="importing">Importerer…</string>
     <string name="exporting">Eksporterer…</string>
-    <string name="importing_successful">Importing successful</string>
+    <string name="importing_successful">Importering vellykket</string>
-    <string name="exporting_successful">Exporting successful</string>
+    <string name="exporting_successful">Eksportering vellykket</string>
-    <string name="importing_failed">Importing failed</string>
+    <string name="importing_failed">Importering feilet</string>
-    <string name="exporting_failed">Exporting failed</string>
+    <string name="exporting_failed">Eksportering feilet</string>
-    <string name="importing_some_entries_failed">Importing some entries failed</string>
+    <string name="importing_some_entries_failed">Importering av noen oppføringer feilet</string>
-    <string name="exporting_some_entries_failed">Exporting some entries failed</string>
+    <string name="exporting_some_entries_failed">Eksportering av noen oppføringer feilet</string>
-    <string name="no_entries_for_exporting">No entries for exporting have been found</string>
+    <string name="no_entries_for_exporting">Ingen oppføringer for eksportering er funnet</string>
 
     <!-- About -->
     <string name="about">Om</string>
@@ -267,7 +276,7 @@
     <string name="donate_please">
         <![CDATA[
             Hello,<br><br>
-            hope you are enjoying the app. It contains no ads, so please support its development by purchasing the <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Simple Thank You</a> app, it will also prevent this dialog from showing up again.<br><br>
+            hope you are enjoying the app. It contains no ads, please support its development by purchasing the <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Simple Thank You</a> app, it will also prevent this dialog from showing up again.<br><br>
             You can find more donating options <a href="http://simplemobiletools.com/donate">here</a>.<br><br>
             Thank you!
         ]]>

commons/src/main/res/values-nl/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="ok">OK</string>
     <string name="cancel">Annuleren</string>
-    <string name="search">Zoeken</string>
     <string name="save_as">Opslaan als</string>
     <string name="file_saved">Bestand opgeslagen</string>
     <string name="invalid_file_format">Ongeldig bestandsformaat</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">Gekopieerd naar klembord</string>
     <string name="unknown">Onbekend</string>
 
+    <!-- Search -->
+    <string name="search">Zoeken</string>
+    <string name="type_2_characters">Vul tenminste 2 tekens in.</string>
+
     <!-- Filters -->
     <string name="filter">Filter</string>
     <string name="no_items_found">Geen items gevonden.</string>
@@ -236,6 +239,12 @@
     <string name="keep_last_modified">Datum laatst gewijzigd behouden bij bestandsoperaties</string>
     <string name="show_info_bubble">Bij slepen van schuifbalk extra informatie tonen</string>
 
+    <!-- Setting sections -->
+    <string name="visibility">Opmaak</string>
+    <string name="security">Beveiliging</string>
+    <string name="scrolling">Scrollen</string>
+    <string name="file_operations">Bestandsoperaties</string>
+
     <!-- Import / Export -->
     <string name="importing">Importeren…</string>
     <string name="exporting">Exporteren…</string>

commons/src/main/res/values-no/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="ok">OK</string>
     <string name="cancel">Avbryt</string>
-    <string name="search">Søk</string>
     <string name="save_as">Lagre som</string>
     <string name="file_saved">Fil vellykket lagret</string>
     <string name="invalid_file_format">Ugyldig filformat</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">Value copied to clipboard</string>
     <string name="unknown">Unknown</string>
 
+    <!-- Search -->
+    <string name="search">Søk</string>
+    <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
+
     <!-- Filters -->
     <string name="filter">Filter</string>
     <string name="no_items_found">No items found.</string>
@@ -236,6 +239,12 @@
     <string name="keep_last_modified">Keep old last-modified value at file copy/move/rename</string>
     <string name="show_info_bubble">Show an info bubble at scrolling items by scrollbar dragging</string>
 
+    <!-- Setting sections -->
+    <string name="visibility">Visibility</string>
+    <string name="security">Security</string>
+    <string name="scrolling">Scrolling</string>
+    <string name="file_operations">File operations</string>
+
     <!-- Import / Export -->
     <string name="importing">Importerer…</string>
     <string name="exporting">Eksporterer…</string>
@@ -267,7 +276,7 @@
     <string name="donate_please">
         <![CDATA[
             Hello,<br><br>
-            hope you are enjoying the app. It contains no ads, so please support its development by purchasing the <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Simple Thank You</a> app, it will also prevent this dialog from showing up again.<br><br>
+            hope you are enjoying the app. It contains no ads, please support its development by purchasing the <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Simple Thank You</a> app, it will also prevent this dialog from showing up again.<br><br>
             You can find more donating options <a href="http://simplemobiletools.com/donate">here</a>.<br><br>
             Thank you!
         ]]>

commons/src/main/res/values-pl/strings.xml

@@ -1,8 +1,7 @@
 <resources>
     <string name="ok">OK</string>
     <string name="cancel">Anuluj</string>
-    <string name="search">Szukaj</string>
+    <string name="save_as">Zapisz jako</string>
-    <string name="save_as">Zapisz jako&#8230;</string>
     <string name="file_saved">Plik został zapisany</string>
     <string name="invalid_file_format">Nieprawidłowy format pliku</string>
     <string name="out_of_memory_error">Błąd pamięci</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">Wartość została skopiowana do schowka</string>
     <string name="unknown">Nieznane</string>
 
+    <!-- Search -->
+    <string name="search">Szukaj</string>
+    <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
+
     <!-- Filters -->
     <string name="filter">Filtr</string>
     <string name="no_items_found">Nic nie znalazłem.</string>
@@ -240,6 +243,12 @@
     <string name="keep_last_modified">Zachowuj starą datę i czas modyfikacji przy kopiowaniu / przenoszeniu / zmianie nazwy plików</string>
     <string name="show_info_bubble">Pokazuj dodatkowe informacje o elementach przy przeciąganiu paska przewijania</string>
 
+    <!-- Setting sections -->
+    <string name="visibility">Visibility</string>
+    <string name="security">Security</string>
+    <string name="scrolling">Scrolling</string>
+    <string name="file_operations">File operations</string>
+
     <!-- Import / Export -->
     <string name="importing">Importuję…</string>
     <string name="exporting">Eksportuję…</string>

commons/src/main/res/values-pt-rBR/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="ok">OK</string>
     <string name="cancel">Cancelar</string>
-    <string name="search">Pesquisar</string>
     <string name="save_as">Salvar como</string>
     <string name="file_saved">Arquivo salvo com sucesso</string>
     <string name="invalid_file_format">Formato de arquivo inválido</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">Valor copiado para a área de transferência</string>
     <string name="unknown">Unknown</string>
 
+    <!-- Search -->
+    <string name="search">Pesquisar</string>
+    <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
+
     <!-- Filters -->
     <string name="filter">Filtrar</string>
     <string name="no_items_found">Nenhum item encontrado.</string>
@@ -236,6 +239,12 @@
     <string name="keep_last_modified">Manter valor anterior do arquivo modificado por último ao copiar/mover/renomear arquivo</string>
     <string name="show_info_bubble">Mostrar bolha de informação ao rolar usando a barra de rolagem</string>
 
+    <!-- Setting sections -->
+    <string name="visibility">Visibility</string>
+    <string name="security">Security</string>
+    <string name="scrolling">Scrolling</string>
+    <string name="file_operations">File operations</string>
+
     <!-- Import / Export -->
     <string name="importing">Importing…</string>
     <string name="exporting">Exporting…</string>

commons/src/main/res/values-pt/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="ok">OK</string>
     <string name="cancel">Cancelar</string>
-    <string name="search">Pesquisar</string>
     <string name="save_as">Guardar como</string>
     <string name="file_saved">Ficheiro guardado com sucesso</string>
     <string name="invalid_file_format">Formato de ficheiro inválido</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">Valor copiado para a área de transferência</string>
     <string name="unknown">Desconhecido</string>
 
+    <!-- Search -->
+    <string name="search">Pesquisar</string>
+    <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
+
     <!-- Filters -->
     <string name="filter">Filtrar</string>
     <string name="no_items_found">Sem itens.</string>
@@ -236,6 +239,12 @@
     <string name="keep_last_modified">Manter dados da última modificação ao copiar/mover/renomear</string>
     <string name="show_info_bubble">Mostrar informação ao arrastar a barra de deslocamento</string>
 
+    <!-- Setting sections -->
+    <string name="visibility">Visibility</string>
+    <string name="security">Security</string>
+    <string name="scrolling">Scrolling</string>
+    <string name="file_operations">File operations</string>
+
     <!-- Import / Export -->
     <string name="importing">A importar…</string>
     <string name="exporting">A exportar…</string>

commons/src/main/res/values-ru/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="ok">OK</string>
     <string name="cancel">Отмена</string>
-    <string name="search">Поиск</string>
     <string name="save_as">Сохранить как</string>
     <string name="file_saved">Файл успешно сохранён</string>
     <string name="invalid_file_format">Недопустимый формат файла</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">Значение скопировано в буфер обмена</string>
     <string name="unknown">Неизвестно</string>
 
+    <!-- Search -->
+    <string name="search">Поиск</string>
+    <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
+
     <!-- Filters -->
     <string name="filter">Фильтрация</string>
     <string name="no_items_found">Ничего не найдено.</string>
@@ -239,6 +242,12 @@
     <string name="keep_last_modified">Сохранять значение даты изменения файла при копировании/перемещении/переименовании</string>
     <string name="show_info_bubble">Показывать информационное окно при прокрутке элементов перетаскиванием полосы прокрутки</string>
 
+    <!-- Setting sections -->
+    <string name="visibility">Visibility</string>
+    <string name="security">Security</string>
+    <string name="scrolling">Scrolling</string>
+    <string name="file_operations">File operations</string>
+
     <!-- Import / Export -->
     <string name="importing">Импорт…</string>
     <string name="exporting">Экспорт…</string>

commons/src/main/res/values-sk/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="ok">OK</string>
     <string name="cancel">Zrušiť</string>
-    <string name="search">Hľadať</string>
     <string name="save_as">Uložiť ako</string>
     <string name="file_saved">Súbor bol úspešne uložený</string>
     <string name="invalid_file_format">Neplatný formát súboru</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">Hodnota bola vložená do schránky</string>
     <string name="unknown">Neznámy</string>
 
+    <!-- Search -->
+    <string name="search">Hľadať</string>
+    <string name="type_2_characters">Zadajte aspoň 2 znaky pre spustenie hľadania.</string>
+
     <!-- Filters -->
     <string name="filter">Filtrovať</string>
     <string name="no_items_found">Nenašli sa žiadne položky.</string>
@@ -240,6 +243,12 @@
     <string name="keep_last_modified">Ponechať starú hodnotu naposledy-upravené pri kopírovaní/presúvaní/premenúvaní súborov</string>
     <string name="show_info_bubble">Zobraziť informačnú bublinu pri prehliadaní položiek ťahaním posuvníka</string>
 
+    <!-- Setting sections -->
+    <string name="visibility">Viditeľnosť</string>
+    <string name="security">Bezpečnosť</string>
+    <string name="scrolling">Skrolovanie</string>
+    <string name="file_operations">Súborové operácie</string>
+
     <!-- Import / Export -->
     <string name="importing">Importovanie…</string>
     <string name="exporting">Exportovanie…</string>

commons/src/main/res/values-sv/strings.xml

@@ -1,22 +1,25 @@
 <resources>
     <string name="ok">OK</string>
     <string name="cancel">Avbryt</string>
-    <string name="search">Sök</string>
     <string name="save_as">Spara som</string>
-    <string name="file_saved">Filen sparad</string>
+    <string name="file_saved">Filen har sparats</string>
     <string name="invalid_file_format">Ogiltigt filformat</string>
     <string name="out_of_memory_error">Minnet är fullt</string>
     <string name="an_error_occurred">Ett fel har uppstått: %s</string>
     <string name="open_with">Öppna med</string>
-    <string name="no_app_found">Hittade ingen giltig app</string>
+    <string name="no_app_found">Ingen giltig app hittades</string>
     <string name="set_as">Ange som</string>
     <string name="value_copied_to_clipboard">Värdet har kopierats till urklipp</string>
-    <string name="unknown">Unknown</string>
+    <string name="unknown">Okänd</string>
+
+    <!-- Search -->
+    <string name="search">Sök</string>
+    <string name="type_2_characters">Skriv in minst två tecken för att starta sökningen.</string>
 
     <!-- Filters -->
     <string name="filter">Filtrera</string>
-    <string name="no_items_found">No items found.</string>
+    <string name="no_items_found">Inga objekt hittades.</string>
-    <string name="change_filter">Change filter</string>
+    <string name="change_filter">Ändra filter</string>
 
     <!-- Permissions -->
     <string name="no_storage_permissions">Lagringsbehörighet krävs</string>
@@ -25,15 +28,15 @@
     <string name="no_audio_permissions">Mikrofonbehörighet krävs</string>
 
     <!-- Renaming -->
-    <string name="rename_file">Döp om fil</string>
+    <string name="rename_file">Byt namn på fil</string>
-    <string name="rename_folder">Döp om mapp</string>
+    <string name="rename_folder">Byt namn på mapp</string>
-    <string name="rename_file_error">Det gick inte att döpa om filen</string>
+    <string name="rename_file_error">Det gick inte att byta namn på filen</string>
-    <string name="rename_folder_error">Det gick inte att döpa om mappen</string>
+    <string name="rename_folder_error">Det gick inte att byta namn på mappen</string>
     <string name="rename_folder_empty">Du måste ange ett mappnamn</string>
     <string name="rename_folder_exists">En mapp med det namnet finns redan</string>
-    <string name="rename_folder_root">Det går inte att döpa om rotmappen på lagringsutrymmet</string>
+    <string name="rename_folder_root">Det går inte att byta namn på rotmappen på ett lagringsutrymme</string>
-    <string name="rename_folder_ok">Mappen döptes om</string>
+    <string name="rename_folder_ok">Mappen har fått ett nytt namn</string>
-    <string name="renaming_folder">Döper om mappen</string>
+    <string name="renaming_folder">Byter namn på mappen</string>
     <string name="filename_cannot_be_empty">Du måste ange ett filnamn</string>
     <string name="filename_invalid_characters">Filnamnet innehåller ogiltiga tecken</string>
     <string name="extension_cannot_be_empty">Filändelsen får inte vara tom</string>
@@ -119,7 +122,7 @@
     <string name="f_number">F-nummer</string>
     <string name="camera">Kamera</string>
     <string name="exif">EXIF</string>
-    <string name="song_title">Song title</string>
+    <string name="song_title">Låttitel</string>
 
     <!-- Color customization -->
     <string name="background_color">Bakgrundsfärg</string>
@@ -146,7 +149,7 @@
     <string name="dark_theme">Mörkt</string>
     <string name="solarized">Solariserat</string>
     <string name="dark_red">Mörkrött</string>
-    <string name="black_white">Black &amp; White</string>
+    <string name="black_white">Svartvitt</string>
     <string name="custom">Anpassat</string>
     <string name="shared">Delat</string>
 
@@ -156,8 +159,8 @@
 
     <!-- Actionbar items -->
     <string name="delete">Ta bort</string>
-    <string name="remove">Remove</string>
+    <string name="remove">Ta bort</string>
-    <string name="rename">Döp om</string>
+    <string name="rename">Byt namn</string>
     <string name="share">Dela</string>
     <string name="share_via">Dela via</string>
     <string name="select_all">Välj alla</string>
@@ -225,7 +228,7 @@
     <string name="settings">Inställningar</string>
     <string name="customize_colors">Anpassa färger</string>
     <string name="use_english_language">Använd engelska</string>
-    <string name="show_hidden_items">Show hidden items</string>
+    <string name="show_hidden_items">Visa dolda objekt</string>
     <string name="font_size">Teckenstorlek</string>
     <string name="small">Liten</string>
     <string name="medium">Medelstor</string>
@@ -234,18 +237,24 @@
     <string name="password_protect_hidden_items">Lösenordsskydda synligheten för dolda objekt</string>
     <string name="password_protect_whole_app">Lösenordsskydda hela appen</string>
     <string name="keep_last_modified">Behåll senast ändrad-tider när filer kopieras, flyttas eller får nya namn</string>
-    <string name="show_info_bubble">Show an info bubble at scrolling items by scrollbar dragging</string>
+    <string name="show_info_bubble">Visa en informationsbubbla när jag rullar genom objekt genom att dra rullningslisten</string>
+
+    <!-- Setting sections -->
+    <string name="visibility">Synlighet</string>
+    <string name="security">Säkerhet</string>
+    <string name="scrolling">Rullning</string>
+    <string name="file_operations">Filåtgärder</string>
 
     <!-- Import / Export -->
     <string name="importing">Importerar…</string>
     <string name="exporting">Exporterar…</string>
-    <string name="importing_successful">Importing successful</string>
+    <string name="importing_successful">Importen lyckades</string>
-    <string name="exporting_successful">Exporting successful</string>
+    <string name="exporting_successful">Exporten lyckades</string>
-    <string name="importing_failed">Importing failed</string>
+    <string name="importing_failed">Importen misslyckades</string>
-    <string name="exporting_failed">Exporting failed</string>
+    <string name="exporting_failed">Exporten misslyckades</string>
-    <string name="importing_some_entries_failed">Importing some entries failed</string>
+    <string name="importing_some_entries_failed">Importen av vissa poster misslyckades</string>
-    <string name="exporting_some_entries_failed">Exporting some entries failed</string>
+    <string name="exporting_some_entries_failed">Exporten av vissa poster misslyckades</string>
-    <string name="no_entries_for_exporting">No entries for exporting have been found</string>
+    <string name="no_entries_for_exporting">Inga poster hittades för export</string>
 
     <!-- About -->
     <string name="about">Om</string>

commons/src/main/res/values-tr/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="ok">TAMAM</string>
     <string name="cancel">İptal</string>
-    <string name="search">Arama</string>
     <string name="save_as">Farklı kaydet</string>
     <string name="file_saved">Dosya başarıyla kaydedildi</string>
     <string name="invalid_file_format">Invalid file format</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">Panoya kopyalanan değer</string>
     <string name="unknown">Unknown</string>
 
+    <!-- Search -->
+    <string name="search">Arama</string>
+    <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
+
     <!-- Filters -->
     <string name="filter">Filtre</string>
     <string name="no_items_found">No items found.</string>
@@ -236,6 +239,12 @@
     <string name="keep_last_modified">Keep old last-modified value at file copy/move/rename</string>
     <string name="show_info_bubble">Show an info bubble at scrolling items by scrollbar dragging</string>
 
+    <!-- Setting sections -->
+    <string name="visibility">Visibility</string>
+    <string name="security">Security</string>
+    <string name="scrolling">Scrolling</string>
+    <string name="file_operations">File operations</string>
+
     <!-- Import / Export -->
     <string name="importing">Importing…</string>
     <string name="exporting">Exporting…</string>
@@ -267,7 +276,7 @@
     <string name="donate_please">
         <![CDATA[
             Hello,<br><br>
-            hope you are enjoying the app. It contains no ads, so please support its development by purchasing the <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Simple Thank You</a> app, it will also prevent this dialog from showing up again.<br><br>
+            hope you are enjoying the app. It contains no ads, please support its development by purchasing the <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Simple Thank You</a> app, it will also prevent this dialog from showing up again.<br><br>
             You can find more donating options <a href="http://simplemobiletools.com/donate">here</a>.<br><br>
             Thank you!
         ]]>

commons/src/main/res/values-zh-rCN/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="ok">确认</string>
     <string name="cancel">取消</string>
-    <string name="search">搜索</string>
     <string name="save_as">保存</string>
     <string name="file_saved">文件保存成功</string>
     <string name="invalid_file_format">无效文件格式</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">颜色值已复制到剪贴板</string>
     <string name="unknown">未知</string>
 
+    <!-- Search -->
+    <string name="search">搜索</string>
+    <string name="type_2_characters">请输入至少两个字符来开始搜索</string>
+
     <!-- Filters -->
     <string name="filter">过滤</string>
     <string name="no_items_found">找不到任何项目。</string>
@@ -236,6 +239,12 @@
     <string name="keep_last_modified">在复制/移动/重命名文件时保留旧的修改日期</string>
     <string name="show_info_bubble">拖动滚动条时在滚动项目旁显示一个信息气泡</string>
 
+    <!-- Setting sections -->
+    <string name="visibility">可见度</string>
+    <string name="security">安全</string>
+    <string name="scrolling">滚动</string>
+    <string name="file_operations">文件操作</string>
+
     <!-- Import / Export -->
     <string name="importing">正在导入...</string>
     <string name="exporting">正在导出...</string>

commons/src/main/res/values-zh-rTW/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="ok">確定</string>
     <string name="cancel">取消</string>
-    <string name="search">搜尋</string>
     <string name="save_as">儲存</string>
     <string name="file_saved">成功儲存檔案</string>
     <string name="invalid_file_format">無效的檔案格式</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">數值複製到剪貼簿</string>
     <string name="unknown">未知的</string>
 
+    <!-- Search -->
+    <string name="search">搜尋</string>
+    <string name="type_2_characters">輸入兩個字以上來開始搜尋。</string>
+
     <!-- Filters -->
     <string name="filter">篩選</string>
     <string name="no_items_found">未發現項目</string>
@@ -119,7 +122,7 @@
     <string name="f_number">光圈</string>
     <string name="camera">相機</string>
     <string name="exif">EXIF</string>
-    <string name="song_title">Song title</string>
+    <string name="song_title">歌名</string>
 
     <!-- Color customization -->
     <string name="background_color">背景顏色</string>
@@ -156,7 +159,7 @@
 
     <!-- Actionbar items -->
     <string name="delete">刪除</string>
-    <string name="remove">Remove</string>
+    <string name="remove">移除</string>
     <string name="rename">重新命名</string>
     <string name="share">分享</string>
     <string name="share_via">分享方式</string>
@@ -236,16 +239,22 @@
     <string name="keep_last_modified">當檔案複製/移動/重新命名時，保留舊的「最後修改」數值</string>
     <string name="show_info_bubble">拖曳滾動條時，顯示訊息氣泡</string>
 
+    <!-- Setting sections -->
+    <string name="visibility">Visibility</string>
+    <string name="security">Security</string>
+    <string name="scrolling">Scrolling</string>
+    <string name="file_operations">File operations</string>
+
     <!-- Import / Export -->
-    <string name="importing">Importing…</string>
+    <string name="importing">正在導入…</string>
-    <string name="exporting">Exporting…</string>
+    <string name="exporting">正在導出…</string>
-    <string name="importing_successful">Importing successful</string>
+    <string name="importing_successful">導入成功</string>
-    <string name="exporting_successful">Exporting successful</string>
+    <string name="exporting_successful">導出成功</string>
-    <string name="importing_failed">Importing failed</string>
+    <string name="importing_failed">導入成功</string>
-    <string name="exporting_failed">Exporting failed</string>
+    <string name="exporting_failed">導出失敗</string>
-    <string name="importing_some_entries_failed">Importing some entries failed</string>
+    <string name="importing_some_entries_failed">部分項目導入失敗</string>
-    <string name="exporting_some_entries_failed">Exporting some entries failed</string>
+    <string name="exporting_some_entries_failed">部分項目導出失敗</string>
-    <string name="no_entries_for_exporting">No entries for exporting have been found</string>
+    <string name="no_entries_for_exporting">未發現供導出的項目</string>
 
     <!-- About -->
     <string name="about">關於</string>

commons/src/main/res/values/colors.xml

@@ -6,16 +6,16 @@
 
     <color name="pressed_item_foreground">#08000000</color>
     <color name="activated_item_foreground">#44888888</color>
-    <color name="divider_grey">#80808080</color>
+    <color name="divider_grey">#40808080</color>
     <color name="gradient_grey_start">#AA000000</color>
 
     <!-- Color Customization -->
     <color name="theme_light_text_color">@color/md_grey_600</color>
-    <color name="theme_light_background_color">@color/md_grey_200</color>
+    <color name="theme_light_background_color">@color/md_grey_white</color>
     <color name="theme_dark_text_color">@color/md_grey_200</color>
     <color name="theme_dark_background_color">@color/md_grey_800</color>
-    <color name="default_text_color">@color/theme_light_text_color</color>
+    <color name="default_text_color">@color/theme_dark_text_color</color>
-    <color name="default_background_color">@color/theme_light_background_color</color>
+    <color name="default_background_color">@color/theme_dark_background_color</color>
     <color name="theme_solarized_background_color">@color/md_indigo_900_dark</color>
     <color name="theme_solarized_text_color">@color/md_amber_700</color>
     <color name="theme_solarized_primary_color">@color/md_indigo_900</color>

commons/src/main/res/values/donottranslate.xml

@@ -10,9 +10,9 @@
     <string name="my_email">hello@simplemobiletools.com</string>
 
     <!-- License -->
-    <string name="kotlin_text">Copyright 2010 - 2016 JetBrains s.r.o.\n\nLicensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.You may obtain a copy of the License at\n\nhttps://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.See the License for the specific language governing permissions and limitations under the License.</string>
+    <string name="kotlin_text">Copyright 2010 - 2018 JetBrains s.r.o.\n\nLicensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.You may obtain a copy of the License at\n\nhttps://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.See the License for the specific language governing permissions and limitations under the License.</string>
     <string name="kotlin_url">https://github.com/JetBrains/kotlin</string>
-    <string name="subsampling_text">Copyright 2016 David Morrissey\n\nLicensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.You may obtain a copy of the License at\n\nhttps://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.See the License for the specific language governing permissions and limitations under the License.</string>
+    <string name="subsampling_text">Copyright 2018 David Morrissey\n\nLicensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.You may obtain a copy of the License at\n\nhttps://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.See the License for the specific language governing permissions and limitations under the License.</string>
     <string name="subsampling_url">https://github.com/davemorrissey/subsampling-scale-image-view</string>
     <string name="glide_text">Copyright 2014 Google, Inc. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\n\n1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\n\n2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\n\nTHIS SOFTWARE IS PROVIDED BY GOOGLE, INC. ``AS IS\'\' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE, INC. OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</string>
     <string name="glide_url">https://github.com/bumptech/glide</string>
@@ -30,7 +30,7 @@
     <string name="stetho_url">https://github.com/facebook/stetho</string>
     <string name="otto_text">Copyright 2012 Square, Inc.\nCopyright 2010 Google, Inc.\n\nLicensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at\n\nhttps://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</string>
     <string name="otto_url">https://github.com/square/otto</string>
-    <string name="photoview_text">Copyright 2016 Chris Banes\n\nLicensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at\n\nhttps://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</string>
+    <string name="photoview_text">Copyright 2017 Chris Banes\n\nLicensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at\n\nhttps://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</string>
     <string name="photoview_url">https://github.com/chrisbanes/PhotoView</string>
     <string name="pattern_text">Copyright 2017 aritraroy\n\nLicensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at\n\nhttps://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</string>
     <string name="pattern_url">https://github.com/aritraroy/PatternLockView</string>

commons/src/main/res/values/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="ok">OK</string>
     <string name="cancel">Cancel</string>
-    <string name="search">Search</string>
     <string name="save_as">Save as</string>
     <string name="file_saved">File saved successfully</string>
     <string name="invalid_file_format">Invalid file format</string>
@@ -13,6 +12,10 @@
     <string name="value_copied_to_clipboard">Value copied to clipboard</string>
     <string name="unknown">Unknown</string>
 
+    <!-- Search -->
+    <string name="search">Search</string>
+    <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
+
     <!-- Filters -->
     <string name="filter">Filter</string>
     <string name="no_items_found">No items found.</string>
@@ -236,6 +239,12 @@
     <string name="keep_last_modified">Keep old last-modified value at file copy/move/rename</string>
     <string name="show_info_bubble">Show an info bubble at scrolling items by scrollbar dragging</string>
 
+    <!-- Setting sections -->
+    <string name="visibility">Visibility</string>
+    <string name="security">Security</string>
+    <string name="scrolling">Scrolling</string>
+    <string name="file_operations">File operations</string>
+
     <!-- Import / Export -->
     <string name="importing">Importing…</string>
     <string name="exporting">Exporting…</string>
@@ -267,7 +276,7 @@
     <string name="donate_please">
         <![CDATA[
             Hello,<br><br>
-            hope you are enjoying the app. It contains no ads, so please support its development by purchasing the <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Simple Thank You</a> app, it will also prevent this dialog from showing up again.<br><br>
+            hope you are enjoying the app. It contains no ads, please support its development by purchasing the <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Simple Thank You</a> app, it will also prevent this dialog from showing up again.<br><br>
             You can find more donating options <a href="http://simplemobiletools.com/donate">here</a>.<br><br>
             Thank you!
         ]]>