From 0e8d61b33e34a929bc5183135405f5bec136269a Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Thu, 14 Jun 2018 22:51:16 +0200
Subject: [PATCH 01/17] allow selecting multiple items by long pressing the
 first and last selection item

---
 build.gradle                                           |  2 +-
 .../commons/adapters/MyRecyclerViewAdapter.kt          | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 053fd5afa..da06ed804 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         propMinSdkVersion = 16
         propTargetSdkVersion = propCompileSdkVersion
         propVersionCode = 1
-        propVersionName = '4.1.11'
+        propVersionName = '4.1.14'
         kotlin_version = '1.2.50'
         support_libs = '27.1.1'
     }
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 08b55b808..aabe19991 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/MyRecyclerViewAdapter.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/MyRecyclerViewAdapter.kt
@@ -35,6 +35,7 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc
     private val multiSelector = MultiSelector()
     private var actMode: ActionMode? = null
     private var actBarTextView: TextView? = null
+    private var lastLongPressedItem = -1
 
     abstract fun getActionMenuId(): Int
 
@@ -88,6 +89,7 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc
             notifyItemChanged(i + positionOffset)
         }
         updateTitle(cnt)
+        lastLongPressedItem = -1
     }
 
     protected fun setupDragListener(enable: Boolean) {
@@ -184,12 +186,19 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc
     private val adapterListener = object : MyAdapterListener {
         override fun toggleItemSelectionAdapter(select: Boolean, position: Int) {
             toggleItemSelection(select, position)
+            lastLongPressedItem = -1
         }
 
         override fun getSelectedPositions() = selectedPositions
 
         override fun itemLongClicked(position: Int) {
             recyclerView.setDragSelectActive(position)
+            lastLongPressedItem = if (lastLongPressedItem == -1) {
+                position
+            } else {
+                selectItemRange(lastLongPressedItem, position, Math.min(lastLongPressedItem, position), Math.max(lastLongPressedItem, position))
+                -1
+            }
         }
     }
 
@@ -228,6 +237,7 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc
             selectedPositions.clear()
             actBarTextView?.text = ""
             actMode = null
+            lastLongPressedItem = -1
         }
     }
 

From b6807363561fd7f1a78a96fd9e437930f27346af Mon Sep 17 00:00:00 2001
From: Guillaume <ltGuillaume@users.noreply.github.com>
Date: Fri, 15 Jun 2018 00:05:30 +0200
Subject: [PATCH 02/17] 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 fe86ecb92..527afe2dd 100644
--- a/commons/src/main/res/values-nl/strings.xml
+++ b/commons/src/main/res/values-nl/strings.xml
@@ -212,8 +212,8 @@
     <string name="no">Nee</string>
 
     <plurals name="delete_warning">
-        <item quantity="one">WARNING: You are deleting a folder</item>
-        <item quantity="other">WARNING: You are deleting %d folders</item>
+        <item quantity="one">WAARSCHUWING: Hele map zal worden verwijderd</item>
+        <item quantity="other">WAARSCHUWING: %d mappen zullen worden verwijderd</item>
     </plurals>
 
     <!-- Password protection -->

From 9947864246b87b8c12e5f8ff47406f7555f0cd9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Solatec=20Inform=C3=A0tica?=
 <35220662+Solatec@users.noreply.github.com>
Date: Fri, 15 Jun 2018 12:26:18 +0200
Subject: [PATCH 03/17] 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 aabb0342a..8a6451252 100644
--- a/commons/src/main/res/values-ca/strings.xml
+++ b/commons/src/main/res/values-ca/strings.xml
@@ -211,8 +211,8 @@
     <string name="no">No</string>
 
     <plurals name="delete_warning">
-        <item quantity="one">WARNING: You are deleting a folder</item>
-        <item quantity="other">WARNING: You are deleting %d folders</item>
+        <item quantity="one">ADVERTIMENT: s\'eliminarà una carpeta</item>
+        <item quantity="other">ADVERTIMENT: s\'eliminaran %d carpetes WARNING: You are deleting %d folders</item>
     </plurals>
 
     <!-- Password protection -->

From 80d4730c58c17d71572d0ddc73a88abf637a2781 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Solatec=20Inform=C3=A0tica?=
 <35220662+Solatec@users.noreply.github.com>
Date: Fri, 15 Jun 2018 12:27:29 +0200
Subject: [PATCH 04/17] 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 6194ebb69..fbedfa3b8 100644
--- a/commons/src/main/res/values-es/strings.xml
+++ b/commons/src/main/res/values-es/strings.xml
@@ -211,8 +211,8 @@
     <string name="no">No</string>
 
     <plurals name="delete_warning">
-        <item quantity="one">WARNING: You are deleting a folder</item>
-        <item quantity="other">WARNING: You are deleting %d folders</item>
+        <item quantity="one">ADVERTENCIA: está eliminando una carpeta</item>
+        <item quantity="other">ADVERTENCIA: está eliminando %d carpetas</item>
     </plurals>
 
     <!-- Password protection -->

From efd7451c6104462a9b17e889d1fabc4e5f8c482d Mon Sep 17 00:00:00 2001
From: Tibor Kaputa <tibor@kaputa.sk>
Date: Fri, 15 Jun 2018 13:09:13 +0200
Subject: [PATCH 05/17] removing a copypaste error

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

diff --git a/commons/src/main/res/values-ca/strings.xml b/commons/src/main/res/values-ca/strings.xml
index 8a6451252..ec513cb37 100644
--- a/commons/src/main/res/values-ca/strings.xml
+++ b/commons/src/main/res/values-ca/strings.xml
@@ -212,7 +212,7 @@
 
     <plurals name="delete_warning">
         <item quantity="one">ADVERTIMENT: s\'eliminarà una carpeta</item>
-        <item quantity="other">ADVERTIMENT: s\'eliminaran %d carpetes WARNING: You are deleting %d folders</item>
+        <item quantity="other">ADVERTIMENT: s\'eliminaran %d carpetes</item>
     </plurals>
 
     <!-- Password protection -->

From b49229d6a6b0a86677a45855d0d9361c09fb477d Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 15 Jun 2018 13:53:38 +0200
Subject: [PATCH 06/17] do not scroll the pattern tab while inserting it

---
 build.gradle                                  |  2 +-
 .../commons/adapters/PasswordTypesAdapter.kt  |  5 ++-
 .../commons/dialogs/SecurityDialog.kt         |  2 +-
 .../commons/interfaces/SecurityTab.kt         |  4 +-
 .../commons/views/FingerprintTab.kt           |  2 +-
 .../commons/views/MyScrollView.kt             | 37 +++++++++++++++++++
 .../commons/views/PatternTab.kt               | 17 +++++++--
 .../simplemobiletools/commons/views/PinTab.kt |  2 +-
 .../src/main/res/layout/dialog_security.xml   |  4 +-
 9 files changed, 63 insertions(+), 12 deletions(-)
 create mode 100644 commons/src/main/kotlin/com/simplemobiletools/commons/views/MyScrollView.kt

diff --git a/build.gradle b/build.gradle
index da06ed804..e5b464f48 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         propMinSdkVersion = 16
         propTargetSdkVersion = propCompileSdkVersion
         propVersionCode = 1
-        propVersionName = '4.1.14'
+        propVersionName = '4.1.16'
         kotlin_version = '1.2.50'
         support_libs = '27.1.1'
     }
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/PasswordTypesAdapter.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/PasswordTypesAdapter.kt
index 17b3aa5a5..c82e49201 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/PasswordTypesAdapter.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/PasswordTypesAdapter.kt
@@ -10,15 +10,16 @@ import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.extensions.isFingerPrintSensorAvailable
 import com.simplemobiletools.commons.interfaces.HashListener
 import com.simplemobiletools.commons.interfaces.SecurityTab
+import com.simplemobiletools.commons.views.MyScrollView
 
-class PasswordTypesAdapter(val context: Context, val requiredHash: String, val hashListener: HashListener) : PagerAdapter() {
+class PasswordTypesAdapter(val context: Context, val requiredHash: String, val hashListener: HashListener, val scrollView: MyScrollView) : PagerAdapter() {
     private val tabs = SparseArray<SecurityTab>()
 
     override fun instantiateItem(container: ViewGroup, position: Int): Any {
         val view = LayoutInflater.from(context).inflate(layoutSelection(position), container, false)
         container.addView(view)
         tabs.put(position, view as SecurityTab)
-        (view as SecurityTab).initTab(requiredHash, hashListener)
+        (view as SecurityTab).initTab(requiredHash, hashListener, scrollView)
         return view
     }
 
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/SecurityDialog.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/SecurityDialog.kt
index b7a1258e8..09626bf18 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/SecurityDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/SecurityDialog.kt
@@ -27,7 +27,7 @@ class SecurityDialog(val activity: Activity, val requiredHash: String, val showT
         view.apply {
             viewPager = findViewById(R.id.dialog_tab_view_pager)
             viewPager.offscreenPageLimit = 2
-            tabsAdapter = PasswordTypesAdapter(context, requiredHash, this@SecurityDialog)
+            tabsAdapter = PasswordTypesAdapter(context, requiredHash, this@SecurityDialog, dialog_scrollview)
             viewPager.adapter = tabsAdapter
             viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
                 override fun onPageScrollStateChanged(state: Int) {
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/interfaces/SecurityTab.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/interfaces/SecurityTab.kt
index 87ca89625..fee4b8a93 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/interfaces/SecurityTab.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/interfaces/SecurityTab.kt
@@ -1,7 +1,9 @@
 package com.simplemobiletools.commons.interfaces
 
+import com.simplemobiletools.commons.views.MyScrollView
+
 interface SecurityTab {
-    fun initTab(requiredHash: String, listener: HashListener)
+    fun initTab(requiredHash: String, listener: HashListener, scrollView: MyScrollView)
 
     fun visibilityChanged(isVisible: Boolean)
 }
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/views/FingerprintTab.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/views/FingerprintTab.kt
index 846491729..98696fe9a 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/views/FingerprintTab.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/views/FingerprintTab.kt
@@ -38,7 +38,7 @@ class FingerprintTab(context: Context, attrs: AttributeSet) : RelativeLayout(con
         }
     }
 
-    override fun initTab(requiredHash: String, listener: HashListener) {
+    override fun initTab(requiredHash: String, listener: HashListener, scrollView: MyScrollView) {
         hashListener = listener
     }
 
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/views/MyScrollView.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/views/MyScrollView.kt
new file mode 100644
index 000000000..c36a6c6d2
--- /dev/null
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/views/MyScrollView.kt
@@ -0,0 +1,37 @@
+package com.simplemobiletools.commons.views
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.MotionEvent
+import android.widget.ScrollView
+
+class MyScrollView : ScrollView {
+    var isScrollable = true
+
+    constructor(context: Context) : super(context)
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
+
+    constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle)
+
+    override fun onTouchEvent(ev: MotionEvent): Boolean {
+        return when (ev.action) {
+            MotionEvent.ACTION_DOWN -> {
+                if (isScrollable) {
+                    super.onTouchEvent(ev)
+                } else {
+                    isScrollable
+                }
+            }
+            else -> super.onTouchEvent(ev)
+        }
+    }
+
+    override fun onInterceptTouchEvent(ev: MotionEvent?): Boolean {
+        return if (!isScrollable) {
+            false
+        } else {
+            super.onInterceptTouchEvent(ev)
+        }
+    }
+}
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/views/PatternTab.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/views/PatternTab.kt
index 2faca0a0c..15f8866a6 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/views/PatternTab.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/views/PatternTab.kt
@@ -3,6 +3,7 @@ package com.simplemobiletools.commons.views
 import android.content.Context
 import android.os.Handler
 import android.util.AttributeSet
+import android.view.MotionEvent
 import android.widget.RelativeLayout
 import com.andrognito.patternlockview.PatternLockView
 import com.andrognito.patternlockview.listener.PatternLockViewListener
@@ -19,12 +20,22 @@ import kotlinx.android.synthetic.main.tab_pattern.view.*
 class PatternTab(context: Context, attrs: AttributeSet) : RelativeLayout(context, attrs), SecurityTab {
     private var hash = ""
     private var requiredHash = ""
+    private var scrollView: MyScrollView? = null
     lateinit var hashListener: HashListener
 
     override fun onFinishInflate() {
         super.onFinishInflate()
         val textColor = context.baseConfig.textColor
         context.updateTextColors(pattern_lock_holder)
+
+        pattern_lock_view.setOnTouchListener { v, event ->
+            when (event.action) {
+                MotionEvent.ACTION_DOWN -> scrollView?.isScrollable = false
+                MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> scrollView?.isScrollable = true
+            }
+            false
+        }
+
         pattern_lock_view.correctStateColor = context.baseConfig.primaryColor
         pattern_lock_view.normalStateColor = textColor
         pattern_lock_view.addPatternLockListener(object : PatternLockViewListener {
@@ -36,13 +47,13 @@ class PatternTab(context: Context, attrs: AttributeSet) : RelativeLayout(context
 
             override fun onStarted() {}
 
-            override fun onProgress(progressPattern: MutableList<PatternLockView.Dot>?) {
-            }
+            override fun onProgress(progressPattern: MutableList<PatternLockView.Dot>?) {}
         })
     }
 
-    override fun initTab(requiredHash: String, listener: HashListener) {
+    override fun initTab(requiredHash: String, listener: HashListener, scrollView: MyScrollView) {
         this.requiredHash = requiredHash
+        this.scrollView = scrollView
         hash = requiredHash
         hashListener = listener
     }
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/views/PinTab.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/views/PinTab.kt
index 47ecb3226..35b397962 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/views/PinTab.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/views/PinTab.kt
@@ -38,7 +38,7 @@ class PinTab(context: Context, attrs: AttributeSet) : RelativeLayout(context, at
         pin_ok.applyColorFilter(context.baseConfig.textColor)
     }
 
-    override fun initTab(requiredHash: String, listener: HashListener) {
+    override fun initTab(requiredHash: String, listener: HashListener, scrollView: MyScrollView) {
         this.requiredHash = requiredHash
         hash = requiredHash
         hashListener = listener
diff --git a/commons/src/main/res/layout/dialog_security.xml b/commons/src/main/res/layout/dialog_security.xml
index b64c74f0e..0ca6d5e77 100644
--- a/commons/src/main/res/layout/dialog_security.xml
+++ b/commons/src/main/res/layout/dialog_security.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
+<com.simplemobiletools.commons.views.MyScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/dialog_scrollview"
     android:layout_width="match_parent"
@@ -42,4 +42,4 @@
             android:layout_below="@+id/dialog_tab_layout"/>
 
     </RelativeLayout>
-</ScrollView>
+</com.simplemobiletools.commons.views.MyScrollView>

From 8450994a0388a1b2bf24173b9e94d3075330152a Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 15 Jun 2018 14:17:53 +0200
Subject: [PATCH 07/17] adding a new constant used for saving protection state

---
 build.gradle                                                    | 2 +-
 .../kotlin/com/simplemobiletools/commons/helpers/Constants.kt   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index e5b464f48..3a6851619 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         propMinSdkVersion = 16
         propTargetSdkVersion = propCompileSdkVersion
         propVersionCode = 1
-        propVersionName = '4.1.16'
+        propVersionName = '4.1.17'
         kotlin_version = '1.2.50'
         support_libs = '27.1.1'
     }
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt
index c19b2e8f3..01b798da7 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt
@@ -136,6 +136,7 @@ const val SORT_BY_ARTIST = 4096
 const val SORT_BY_DURATION = 8192
 
 // security
+const val WAS_PROTECTION_HANDLED = "was_protection_handled"
 const val PROTECTION_PATTERN = 0
 const val PROTECTION_PIN = 1
 const val PROTECTION_FINGERPRINT = 2

From fac6e92dc22f3007db197d502a1a2ee1a1f0988e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20F=C4=B1r=C4=B1nc=C4=B1?= <fatihfirinci@gmail.com>
Date: Fri, 15 Jun 2018 23:00:36 +0300
Subject: [PATCH 08/17] Update strings.xml

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

diff --git a/commons/src/main/res/values-tr/strings.xml b/commons/src/main/res/values-tr/strings.xml
index 9effcb410..9439a73c7 100644
--- a/commons/src/main/res/values-tr/strings.xml
+++ b/commons/src/main/res/values-tr/strings.xml
@@ -212,8 +212,8 @@
     <string name="no">Hayır</string>
 
     <plurals name="delete_warning">
-        <item quantity="one">WARNING: You are deleting a folder</item>
-        <item quantity="other">WARNING: You are deleting %d folders</item>
+        <item quantity="one">UYARI: Bir klasör siliyorsunuz</item>
+        <item quantity="other">UYARI: %d klasör siliyorsunuz</item>
     </plurals>
 
     <!-- Password protection -->

From 953c6b5471ee9695e140b168a3c00413331e571c Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 16 Jun 2018 09:13:46 +0200
Subject: [PATCH 09/17] use the direct way of selecting items with long presses
 at recycler view adapter

---
 .../commons/adapters/MyRecyclerViewAdapter.kt               | 6 +++++-
 .../com/simplemobiletools/commons/dialogs/SecurityDialog.kt | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

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 aabe19991..5168cb675 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/MyRecyclerViewAdapter.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/MyRecyclerViewAdapter.kt
@@ -196,7 +196,11 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc
             lastLongPressedItem = if (lastLongPressedItem == -1) {
                 position
             } else {
-                selectItemRange(lastLongPressedItem, position, Math.min(lastLongPressedItem, position), Math.max(lastLongPressedItem, position))
+                val min = Math.min(lastLongPressedItem, position)
+                val max = Math.max(lastLongPressedItem, position)
+                for (i in min..max) {
+                    toggleItemSelection(true, i)
+                }
                 -1
             }
         }
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/SecurityDialog.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/SecurityDialog.kt
index 09626bf18..78327c6df 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/SecurityDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/SecurityDialog.kt
@@ -79,7 +79,7 @@ class SecurityDialog(val activity: Activity, val requiredHash: String, val showT
 
         dialog = AlertDialog.Builder(activity)
                 .setOnCancelListener { onCancelFail() }
-                .setNegativeButton(R.string.cancel, { dialog, which -> onCancelFail() })
+                .setNegativeButton(R.string.cancel) { dialog, which -> onCancelFail() }
                 .create().apply {
                     activity.setupDialogStuff(view, this)
                 }

From cc510d2a6607689e5e328320b8c7ff48db45877c Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 16 Jun 2018 21:36:07 +0200
Subject: [PATCH 10/17] rewrite the recyclerview adapter, store viewholders
 instead of views

---
 build.gradle                                  |  2 +-
 .../adapters/FilepickerItemsAdapter.kt        |  4 +-
 .../commons/adapters/MyRecyclerViewAdapter.kt | 49 +++++++++++++------
 3 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3a6851619..4cdd829a8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         propMinSdkVersion = 16
         propTargetSdkVersion = propCompileSdkVersion
         propVersionCode = 1
-        propVersionName = '4.1.17'
+        propVersionName = '4.2.0'
         kotlin_version = '1.2.50'
         support_libs = '27.1.1'
     }
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/FilepickerItemsAdapter.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/FilepickerItemsAdapter.kt
index fbc9f9bea..9f09f3bed 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/FilepickerItemsAdapter.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/FilepickerItemsAdapter.kt
@@ -29,9 +29,9 @@ class FilepickerItemsAdapter(activity: BaseSimpleActivity, val fileDirItems: Lis
 
     override fun getActionMenuId() = 0
 
-    override fun prepareItemSelection(view: View) {}
+    override fun prepareItemSelection(viewHolder: ViewHolder) {}
 
-    override fun markItemSelection(select: Boolean, view: View?) {}
+    override fun markItemHolderSelection(select: Boolean, viewHolder: ViewHolder?) {}
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = createViewHolder(R.layout.filepicker_list_item, parent)
 
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 5168cb675..187d4b458 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/MyRecyclerViewAdapter.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/MyRecyclerViewAdapter.kt
@@ -28,7 +28,7 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc
     protected var primaryColor = baseConfig.primaryColor
     protected var textColor = baseConfig.textColor
     protected var backgroundColor = baseConfig.backgroundColor
-    protected var itemViews = SparseArray<View>()
+    protected var itemHolders = SparseArray<ViewHolder>()
     protected val selectedPositions = HashSet<Int>()
     protected var positionOffset = 0
 
@@ -39,9 +39,9 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc
 
     abstract fun getActionMenuId(): Int
 
-    abstract fun prepareItemSelection(view: View)
+    abstract fun prepareItemSelection(viewHolder: ViewHolder)
 
-    abstract fun markItemSelection(select: Boolean, view: View?)
+    abstract fun markItemHolderSelection(select: Boolean, viewHolder: ViewHolder?)
 
     abstract fun prepareActionMode(menu: Menu)
 
@@ -53,15 +53,15 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc
 
     protected fun toggleItemSelection(select: Boolean, pos: Int) {
         if (select) {
-            if (itemViews[pos] != null) {
-                prepareItemSelection(itemViews[pos])
-                selectedPositions.add(pos)
+            if (itemHolders[pos] != null) {
+                prepareItemSelection(itemHolders[pos])
             }
+            selectedPositions.add(pos)
         } else {
             selectedPositions.remove(pos)
         }
 
-        markItemSelection(select, itemViews[pos])
+        markItemHolderSelection(select, itemHolders[pos])
 
         if (selectedPositions.isEmpty()) {
             finishActMode()
@@ -236,7 +236,7 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc
         override fun onDestroyActionMode(actionMode: ActionMode?) {
             super.onDestroyActionMode(actionMode)
             selectedPositions.forEach {
-                markItemSelection(false, itemViews[it])
+                markItemHolderSelection(false, itemHolders[it])
             }
             selectedPositions.clear()
             actBarTextView?.text = ""
@@ -251,23 +251,40 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc
     }
 
     protected fun bindViewHolder(holder: MyRecyclerViewAdapter.ViewHolder, position: Int, view: View) {
-        itemViews.put(position, view)
+        itemHolders.put(position, holder)
         toggleItemSelection(selectedPositions.contains(position), position)
         holder.itemView.tag = holder
     }
 
+    override fun onViewRecycled(holder: ViewHolder) {
+        super.onViewRecycled(holder)
+        val pos = itemHolders.indexOfValue(holder)
+        try {
+            if (pos != -1) {
+                itemHolders.removeAt(pos)
+            }
+        } catch (ignored: ArrayIndexOutOfBoundsException) {
+        }
+    }
+
     protected fun removeSelectedItems() {
+        val newViewHolders = SparseArray<ViewHolder>()
+        val cnt = itemHolders.size()
+        for (i in 0..cnt) {
+            if (selectedPositions.contains(i)) {
+                continue
+            }
+
+            val view = itemHolders.get(i, null)
+            val newIndex = i - selectedPositions.count { it <= i }
+            newViewHolders.put(newIndex, view)
+        }
+        itemHolders = newViewHolders
+
         selectedPositions.sortedDescending().forEach {
             notifyItemRemoved(it + positionOffset)
-            itemViews.put(it, null)
         }
 
-        val newItems = SparseArray<View>()
-        (0 until itemViews.size())
-                .filter { itemViews[it] != null }
-                .forEachIndexed { curIndex, i -> newItems.put(curIndex, itemViews[i]) }
-
-        itemViews = newItems
         finishActMode()
         fastScroller?.measureRecyclerView()
     }

From 031de40e48a2fcf861022086867615301d66ce80 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 16 Jun 2018 21:44:21 +0200
Subject: [PATCH 11/17] rename itemHolders to viewHolders

---
 build.gradle                                  |  2 +-
 .../adapters/FilepickerItemsAdapter.kt        |  2 +-
 .../commons/adapters/MyRecyclerViewAdapter.kt | 24 +++++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4cdd829a8..5ff977f1b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         propMinSdkVersion = 16
         propTargetSdkVersion = propCompileSdkVersion
         propVersionCode = 1
-        propVersionName = '4.2.0'
+        propVersionName = '4.2.1'
         kotlin_version = '1.2.50'
         support_libs = '27.1.1'
     }
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/FilepickerItemsAdapter.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/FilepickerItemsAdapter.kt
index 9f09f3bed..a1f378e73 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/FilepickerItemsAdapter.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/FilepickerItemsAdapter.kt
@@ -31,7 +31,7 @@ class FilepickerItemsAdapter(activity: BaseSimpleActivity, val fileDirItems: Lis
 
     override fun prepareItemSelection(viewHolder: ViewHolder) {}
 
-    override fun markItemHolderSelection(select: Boolean, viewHolder: ViewHolder?) {}
+    override fun markViewHolderSelection(select: Boolean, viewHolder: ViewHolder?) {}
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = createViewHolder(R.layout.filepicker_list_item, parent)
 
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 187d4b458..5c0cd5aba 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/MyRecyclerViewAdapter.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/MyRecyclerViewAdapter.kt
@@ -28,7 +28,7 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc
     protected var primaryColor = baseConfig.primaryColor
     protected var textColor = baseConfig.textColor
     protected var backgroundColor = baseConfig.backgroundColor
-    protected var itemHolders = SparseArray<ViewHolder>()
+    protected var viewHolders = SparseArray<ViewHolder>()
     protected val selectedPositions = HashSet<Int>()
     protected var positionOffset = 0
 
@@ -41,7 +41,7 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc
 
     abstract fun prepareItemSelection(viewHolder: ViewHolder)
 
-    abstract fun markItemHolderSelection(select: Boolean, viewHolder: ViewHolder?)
+    abstract fun markViewHolderSelection(select: Boolean, viewHolder: ViewHolder?)
 
     abstract fun prepareActionMode(menu: Menu)
 
@@ -53,15 +53,15 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc
 
     protected fun toggleItemSelection(select: Boolean, pos: Int) {
         if (select) {
-            if (itemHolders[pos] != null) {
-                prepareItemSelection(itemHolders[pos])
+            if (viewHolders[pos] != null) {
+                prepareItemSelection(viewHolders[pos])
             }
             selectedPositions.add(pos)
         } else {
             selectedPositions.remove(pos)
         }
 
-        markItemHolderSelection(select, itemHolders[pos])
+        markViewHolderSelection(select, viewHolders[pos])
 
         if (selectedPositions.isEmpty()) {
             finishActMode()
@@ -236,7 +236,7 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc
         override fun onDestroyActionMode(actionMode: ActionMode?) {
             super.onDestroyActionMode(actionMode)
             selectedPositions.forEach {
-                markItemHolderSelection(false, itemHolders[it])
+                markViewHolderSelection(false, viewHolders[it])
             }
             selectedPositions.clear()
             actBarTextView?.text = ""
@@ -251,17 +251,17 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc
     }
 
     protected fun bindViewHolder(holder: MyRecyclerViewAdapter.ViewHolder, position: Int, view: View) {
-        itemHolders.put(position, holder)
+        viewHolders.put(position, holder)
         toggleItemSelection(selectedPositions.contains(position), position)
         holder.itemView.tag = holder
     }
 
     override fun onViewRecycled(holder: ViewHolder) {
         super.onViewRecycled(holder)
-        val pos = itemHolders.indexOfValue(holder)
+        val pos = viewHolders.indexOfValue(holder)
         try {
             if (pos != -1) {
-                itemHolders.removeAt(pos)
+                viewHolders.removeAt(pos)
             }
         } catch (ignored: ArrayIndexOutOfBoundsException) {
         }
@@ -269,17 +269,17 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc
 
     protected fun removeSelectedItems() {
         val newViewHolders = SparseArray<ViewHolder>()
-        val cnt = itemHolders.size()
+        val cnt = viewHolders.size()
         for (i in 0..cnt) {
             if (selectedPositions.contains(i)) {
                 continue
             }
 
-            val view = itemHolders.get(i, null)
+            val view = viewHolders.get(i, null)
             val newIndex = i - selectedPositions.count { it <= i }
             newViewHolders.put(newIndex, view)
         }
-        itemHolders = newViewHolders
+        viewHolders = newViewHolders
 
         selectedPositions.sortedDescending().forEach {
             notifyItemRemoved(it + positionOffset)

From 67c4981077ea76a7a57f4eb2ecb2cd14925d0e09 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 16 Jun 2018 23:27:07 +0200
Subject: [PATCH 12/17] differentiate photo and raw files

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

diff --git a/build.gradle b/build.gradle
index 5ff977f1b..c04b0c59a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         propMinSdkVersion = 16
         propTargetSdkVersion = propCompileSdkVersion
         propVersionCode = 1
-        propVersionName = '4.2.1'
+        propVersionName = '4.2.2'
         kotlin_version = '1.2.50'
         support_libs = '27.1.1'
     }
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/File.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/File.kt
index c30419e83..60bebd4b0 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/File.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/File.kt
@@ -3,6 +3,7 @@ package com.simplemobiletools.commons.extensions
 import android.content.Context
 import com.simplemobiletools.commons.helpers.audioExtensions
 import com.simplemobiletools.commons.helpers.photoExtensions
+import com.simplemobiletools.commons.helpers.rawExtensions
 import com.simplemobiletools.commons.helpers.videoExtensions
 import com.simplemobiletools.commons.models.FileDirItem
 import java.io.File
@@ -12,6 +13,7 @@ fun File.isGif() = absolutePath.endsWith(".gif", true)
 fun File.isVideoFast() = videoExtensions.any { absolutePath.endsWith(it, true) }
 fun File.isImageFast() = photoExtensions.any { absolutePath.endsWith(it, true) }
 fun File.isAudioFast() = audioExtensions.any { absolutePath.endsWith(it, true) }
+fun File.isRawFast() = rawExtensions.any { absolutePath.endsWith(it, true) }
 
 fun File.isImageSlow() = absolutePath.isImageFast() || getMimeType().startsWith("image")
 fun File.isVideoSlow() = absolutePath.isVideoFast() || getMimeType().startsWith("video")
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 c8eb9c8c1..9969c2bf7 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/String.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/String.kt
@@ -9,10 +9,7 @@ import android.media.MediaMetadataRetriever
 import android.text.Spannable
 import android.text.SpannableString
 import android.text.style.ForegroundColorSpan
-import com.simplemobiletools.commons.helpers.OTG_PATH
-import com.simplemobiletools.commons.helpers.audioExtensions
-import com.simplemobiletools.commons.helpers.photoExtensions
-import com.simplemobiletools.commons.helpers.videoExtensions
+import com.simplemobiletools.commons.helpers.*
 import java.text.SimpleDateFormat
 import java.util.*
 
@@ -49,13 +46,14 @@ fun String.isPng() = endsWith(".png", true)
 
 fun String.isJpg() = endsWith(".jpg", true) or endsWith(".jpeg")
 
-fun String.isDng() = endsWith(".dng", true)
+fun String.isRaw() = endsWith(".dng", true)
 
 // fast extension checks, not guaranteed to be accurate
 fun String.isVideoFast() = videoExtensions.any { endsWith(it, true) }
 
 fun String.isImageFast() = photoExtensions.any { endsWith(it, true) }
 fun String.isAudioFast() = audioExtensions.any { endsWith(it, true) }
+fun String.isRawFast() = rawExtensions.any { endsWith(it, true) }
 
 fun String.isImageSlow() = isImageFast() || getMimeType().startsWith("image")
 fun String.isVideoSlow() = isVideoFast() || getMimeType().startsWith("video")
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt
index 01b798da7..96890923c 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt
@@ -173,9 +173,10 @@ const val EVERY_DAY_BIT = MONDAY_BIT or TUESDAY_BIT or WEDNESDAY_BIT or THURSDAY
 const val WEEK_DAYS_BIT = MONDAY_BIT or TUESDAY_BIT or WEDNESDAY_BIT or THURSDAY_BIT or FRIDAY_BIT
 const val WEEKENDS_BIT = SATURDAY_BIT or SUNDAY_BIT
 
-val photoExtensions: Array<String> get() = arrayOf(".jpg", ".png", ".jpeg", ".bmp", ".webp", ".dng", ".orf")
+val photoExtensions: Array<String> get() = arrayOf(".jpg", ".png", ".jpeg", ".bmp", ".webp")
 val videoExtensions: Array<String> get() = arrayOf(".mp4", ".mkv", ".webm", ".avi", ".3gp", ".mov", ".m4v", ".3gpp")
 val audioExtensions: Array<String> get() = arrayOf(".mp3", ".wav", ".wma", ".ogg", ".m4a", ".opus", ".flac")
+val rawExtensions: Array<String> get() = arrayOf(".dng", ".orf")
 
 val appIconColorStrings = arrayListOf(
         ".Red",

From a1e8b7f3e8c90f651e341c8c22961ab6d641a5cb Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 18 Jun 2018 14:25:18 +0200
Subject: [PATCH 13/17] remove a redundant String isRaw check

---
 build.gradle                                                    | 2 +-
 .../kotlin/com/simplemobiletools/commons/extensions/String.kt   | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index c04b0c59a..f3144bcb7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         propMinSdkVersion = 16
         propTargetSdkVersion = propCompileSdkVersion
         propVersionCode = 1
-        propVersionName = '4.2.2'
+        propVersionName = '4.2.4'
         kotlin_version = '1.2.50'
         support_libs = '27.1.1'
     }
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 9969c2bf7..2e9d713f7 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/String.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/String.kt
@@ -46,8 +46,6 @@ fun String.isPng() = endsWith(".png", true)
 
 fun String.isJpg() = endsWith(".jpg", true) or endsWith(".jpeg")
 
-fun String.isRaw() = endsWith(".dng", true)
-
 // fast extension checks, not guaranteed to be accurate
 fun String.isVideoFast() = videoExtensions.any { endsWith(it, true) }
 

From f0312e09766a87c9c5d97a12738729fcc5322ad1 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 18 Jun 2018 14:42:06 +0200
Subject: [PATCH 14/17] check Raw at isImageVideoGif too

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

diff --git a/build.gradle b/build.gradle
index f3144bcb7..b39370a44 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         propMinSdkVersion = 16
         propTargetSdkVersion = propCompileSdkVersion
         propVersionCode = 1
-        propVersionName = '4.2.4'
+        propVersionName = '4.2.5'
         kotlin_version = '1.2.50'
         support_libs = '27.1.1'
     }
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/File.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/File.kt
index 60bebd4b0..559712a54 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/File.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/File.kt
@@ -8,7 +8,7 @@ import com.simplemobiletools.commons.helpers.videoExtensions
 import com.simplemobiletools.commons.models.FileDirItem
 import java.io.File
 
-fun File.isImageVideoGif() = absolutePath.isImageFast() || absolutePath.isVideoFast() || absolutePath.isGif()
+fun File.isImageVideoGif() = absolutePath.isImageFast() || absolutePath.isVideoFast() || absolutePath.isGif() || absolutePath.isRawFast()
 fun File.isGif() = absolutePath.endsWith(".gif", true)
 fun File.isVideoFast() = videoExtensions.any { absolutePath.endsWith(it, true) }
 fun File.isImageFast() = photoExtensions.any { absolutePath.endsWith(it, true) }
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 2e9d713f7..df4611f68 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/String.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/String.kt
@@ -38,7 +38,7 @@ fun String.isAValidFilename(): Boolean {
     return true
 }
 
-fun String.isImageVideoGif() = isImageFast() || isVideoFast() || isGif()
+fun String.isImageVideoGif() = isImageFast() || isVideoFast() || isGif() || isRawFast()
 
 fun String.isGif() = endsWith(".gif", true)
 

From f9af0153b831d13cfcea394767c6449ad364404a Mon Sep 17 00:00:00 2001
From: gregory678 <gregory678@users.noreply.github.com>
Date: Mon, 18 Jun 2018 20:31:31 +0200
Subject: [PATCH 15/17] PL translation update [2018.06.18]

---
 commons/src/main/res/values-pl/strings.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/commons/src/main/res/values-pl/strings.xml b/commons/src/main/res/values-pl/strings.xml
index a7de3398e..f13161e83 100644
--- a/commons/src/main/res/values-pl/strings.xml
+++ b/commons/src/main/res/values-pl/strings.xml
@@ -214,8 +214,9 @@
     <string name="no">Nie</string>
 
     <plurals name="delete_warning">
-        <item quantity="one">WARNING: You are deleting a folder</item>
-        <item quantity="other">WARNING: You are deleting %d folders</item>
+        <item quantity="one">UWAGA: usuwasz folder</item>
+        <item quantity="few">UWAGA: usuwasz %d foldery</item>
+        <item quantity="other">UWAGA: usuwasz %d folderów</item>
     </plurals>
 
     <!-- Password protection -->
@@ -353,8 +354,8 @@
 
     <!-- Settings -->
     <string name="settings">Ustawienia</string>
-    <string name="customize_colors">Dostosuj kolory</string>
-    <string name="customize_widget_colors">Customize widget colors</string>
+    <string name="customize_colors">Dostosuj kolory aplikacji</string>
+    <string name="customize_widget_colors">Dostosuj kolory widżetu</string>
     <string name="use_english_language">Wymuś używanie przez aplikację języka angielskiego</string>
     <string name="avoid_whats_new">Nie pokazuj okna \'Co nowego\' po uruchomieniu aplikacji</string>
     <string name="show_hidden_items">Pokazuj ukryte elementy</string>
@@ -494,7 +495,7 @@
             Cześć!<br><br>
             Dajemy Ci znać, że ostatnio wyszła nowa aplikacja:<br><br>
             <a href="%1$s">%2$s</a><br><br>
-            Możesz ją pobrać, klikając tytuł.<br><br>
+            Możesz ją pobrać, klikając powyższy odnośnik.<br><br>
             Dziękujemy!
         ]]>
     </string>

From 57c986e40604713c4ae0c2a8043f50f44ac6b136 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 18 Jun 2018 22:48:23 +0200
Subject: [PATCH 16/17] update version to 4.2.6

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

diff --git a/build.gradle b/build.gradle
index b39370a44..88ebb610e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         propMinSdkVersion = 16
         propTargetSdkVersion = propCompileSdkVersion
         propVersionCode = 1
-        propVersionName = '4.2.5'
+        propVersionName = '4.2.6'
         kotlin_version = '1.2.50'
         support_libs = '27.1.1'
     }

From e2c7ef7ca16d99e56ada31c95bebc81602b08014 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 19 Jun 2018 22:41:10 +0200
Subject: [PATCH 17/17] adding some new Favorite related strings

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

diff --git a/build.gradle b/build.gradle
index 88ebb610e..c9b93eb05 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         propMinSdkVersion = 16
         propTargetSdkVersion = propCompileSdkVersion
         propVersionCode = 1
-        propVersionName = '4.2.6'
+        propVersionName = '4.2.8'
         kotlin_version = '1.2.50'
         support_libs = '27.1.1'
     }
diff --git a/commons/src/main/res/values-ar/strings.xml b/commons/src/main/res/values-ar/strings.xml
new file mode 100644
index 000000000..dee8cc1fb
--- /dev/null
+++ b/commons/src/main/res/values-ar/strings.xml
@@ -0,0 +1,530 @@
+<resources>
+    <string name="ok">OK</string>
+    <string name="cancel">Cancel</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>
+    <string name="out_of_memory_error">Out of memory error</string>
+    <string name="an_error_occurred">An error occurred: %s</string>
+    <string name="open_with">Open with</string>
+    <string name="no_app_found">No valid app found</string>
+    <string name="set_as">Set as</string>
+    <string name="value_copied_to_clipboard">Value copied to clipboard</string>
+    <string name="unknown">Unknown</string>
+    <string name="always">Always</string>
+    <string name="never">Never</string>
+    <string name="details">Details</string>
+    <string name="notes">Notes</string>
+    <string name="deleting_folder">Deleting folder \'%s\'</string>
+
+    <!-- Favorites -->
+    <string name="favorites">المفضلة</string>
+    <string name="add_favorites">Add favorites</string>
+    <string name="add_to_favorites">اضافة الى المفضلة</string>
+    <string name="remove_from_favorites">حذف من المفضلة</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>
+    <string name="change_filter">Change filter</string>
+
+    <!-- Permissions -->
+    <string name="no_storage_permissions">Storage permission is required</string>
+    <string name="no_contacts_permission">Contacts permission is required</string>
+    <string name="no_camera_permissions">Camera permission is required</string>
+    <string name="no_audio_permissions">Audio permission is required</string>
+
+    <!-- Renaming -->
+    <string name="rename_file">Rename file</string>
+    <string name="rename_folder">Rename folder</string>
+    <string name="rename_file_error">Could not rename the file</string>
+    <string name="rename_folder_error">Could not rename the folder</string>
+    <string name="rename_folder_empty">Folder name must not be empty</string>
+    <string name="rename_folder_exists">A folder with that name already exists</string>
+    <string name="rename_folder_root">Cannot rename the root folder of a storage</string>
+    <string name="rename_folder_ok">Folder renamed successfully</string>
+    <string name="renaming_folder">Renaming folder</string>
+    <string name="filename_cannot_be_empty">Filename cannot be empty</string>
+    <string name="filename_invalid_characters">Filename contains invalid characters</string>
+    <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>
+
+    <!-- Copy / Move -->
+    <string name="copy">Copy</string>
+    <string name="move">Move</string>
+    <string name="copy_move">Copy / Move</string>
+    <string name="copy_to">Copy to</string>
+    <string name="move_to">Move to</string>
+    <string name="source">Source</string>
+    <string name="destination">Destination</string>
+    <string name="select_destination">Select destination</string>
+    <string name="click_select_destination">Click here to select destination</string>
+    <string name="invalid_destination">Could not write to the selected destination</string>
+    <string name="please_select_destination">Please select a destination</string>
+    <string name="source_and_destination_same">Source and destination cannot be the same</string>
+    <string name="copy_failed">Could not copy the files</string>
+    <string name="copying">Copying…</string>
+    <string name="copying_success">Files copied successfully</string>
+    <string name="copy_move_failed">An error occurred</string>
+    <string name="moving">Moving…</string>
+    <string name="moving_success">Files moved successfully</string>
+    <string name="moving_success_partial">Some files could not be moved</string>
+    <string name="copying_success_partial">Some files could not be copied</string>
+    <string name="no_files_selected">No files selected</string>
+    <string name="saving">Saving…</string>
+    <string name="could_not_create_folder">Could not create folder %s</string>
+    <string name="could_not_create_file">Could not create file %s</string>
+
+    <!-- Create new -->
+    <string name="create_new">Create new</string>
+    <string name="folder">Folder</string>
+    <string name="file">File</string>
+    <string name="create_new_folder">Create new folder</string>
+    <string name="name_taken">A file or folder with that name already exists</string>
+    <string name="invalid_name">The name contains invalid characters</string>
+    <string name="empty_name">Please enter a name</string>
+    <string name="unknown_error_occurred">An unknown error occurred</string>
+
+    <!-- File operation conflicts -->
+    <string name="file_already_exists">File \"%s\" already exists</string>
+    <string name="file_already_exists_overwrite">File \"%s\" already exists. Overwrite?</string>
+    <string name="folder_already_exists">Folder \"%s\" already exists</string>
+    <string name="merge">Merge</string>
+    <string name="overwrite">Overwrite</string>
+    <string name="skip">Skip</string>
+    <string name="append">Append with \'_1\'</string>
+    <string name="apply_to_all">Apply to all</string>
+
+    <!-- File picker -->
+    <string name="select_folder">Select a folder</string>
+    <string name="select_file">Select a file</string>
+    <string name="confirm_storage_access_title">Confirm external storage access</string>
+    <string name="confirm_storage_access_text">Please choose the root folder of the SD card on the next screen, to grant write access</string>
+    <string name="confirm_storage_access_text_sd">If you don\'t see the SD card, try this</string>
+    <string name="confirm_selection">Confirm selection</string>
+
+    <plurals name="items">
+        <item quantity="one">%d item</item>
+        <item quantity="other">%d items</item>
+    </plurals>
+
+    <!-- Are you sure you want to delete 5 items? -->
+    <plurals name="delete_items">
+        <item quantity="one">%d item</item>
+        <item quantity="other">%d items</item>
+    </plurals>
+
+    <!-- Storages -->
+    <string name="select_storage">Select storage</string>
+    <string name="internal">Internal</string>
+    <string name="sd_card">SD Card</string>
+    <string name="root">Root</string>
+    <string name="wrong_root_selected">Wrong folder selected, please select the root folder of your SD card</string>
+    <string name="sd_card_otg_same">SD card and OTG device paths cannot be the same</string>
+
+    <!-- File properties -->
+    <string name="properties">Properties</string>
+    <string name="path">Path</string>
+    <string name="items_selected">Items selected</string>
+    <string name="direct_children_count">Direct children count</string>
+    <string name="files_count">Total files count</string>
+    <string name="resolution">Resolution</string>
+    <string name="duration">Duration</string>
+    <string name="artist">Artist</string>
+    <string name="album">Album</string>
+    <string name="focal_length">Focal length</string>
+    <string name="exposure_time">Exposure time</string>
+    <string name="iso_speed">ISO speed</string>
+    <string name="f_number">F-number</string>
+    <string name="camera">Camera</string>
+    <string name="exif">EXIF</string>
+    <string name="song_title">Song title</string>
+
+    <!-- Color customization -->
+    <string name="background_color">Background color</string>
+    <string name="text_color">Text color</string>
+    <string name="primary_color">Primary color</string>
+    <string name="foreground_color">Foreground color</string>
+    <string name="app_icon_color">App icon color</string>
+    <string name="restore_defaults">Restore defaults</string>
+    <string name="change_color">Change color</string>
+    <string name="theme">Theme</string>
+    <string name="changing_color_description">Changing a color will make it switch to Custom theme</string>
+    <string name="save">Save</string>
+    <string name="discard">Discard</string>
+    <string name="undo_changes">Undo changes</string>
+    <string name="undo_changes_confirmation">Are you sure you want to undo your changes?</string>
+    <string name="save_before_closing">You have unsaved changes. Save before exit?</string>
+    <string name="apply_to_all_apps">Apply colors to all Simple Apps</string>
+    <string name="share_colors_success">Colors updated successfully. A new Theme called \'Shared\' has been added, please use that for updating all app colors in the future.</string>
+    <string name="purchase_thank_you">
+        <![CDATA[
+            Please purchase <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Simple Thank You</a> to unlock this function and support the development. Thanks!
+        ]]>
+    </string>
+
+    <!-- Themes -->
+    <string name="light_theme">Light</string>
+    <string name="dark_theme">Dark</string>
+    <string name="solarized">Solarized</string>
+    <string name="dark_red">Dark red</string>
+    <string name="black_white">Black &amp; White</string>
+    <string name="custom">Custom</string>
+    <string name="shared">Shared</string>
+
+    <!-- What's new -->
+    <string name="whats_new">What\'s new</string>
+    <string name="whats_new_disclaimer">* only the bigger updates are listed here, there are always some smaller improvements too</string>
+
+    <!-- Actionbar items -->
+    <string name="delete">Delete</string>
+    <string name="remove">Remove</string>
+    <string name="rename">Rename</string>
+    <string name="share">Share</string>
+    <string name="share_via">Share via</string>
+    <string name="select_all">Select all</string>
+    <string name="hide">Hide</string>
+    <string name="unhide">Unhide</string>
+    <string name="hide_folder">Hide folder</string>
+    <string name="unhide_folder">Unhide folder</string>
+    <string name="temporarily_show_hidden">Temporarily show hidden</string>
+    <string name="stop_showing_hidden">Stop showing hidden media</string>
+    <string name="maximum_share_reached">You cannot share this much content at once</string>
+
+    <!-- Sorting -->
+    <string name="sort_by">Sort by</string>
+    <string name="name">Name</string>
+    <string name="size">Size</string>
+    <string name="last_modified">Last modified</string>
+    <string name="date_taken">Date taken</string>
+    <string name="title">Title</string>
+    <string name="filename">Filename</string>
+    <string name="extension">Extension</string>
+    <string name="ascending">Ascending</string>
+    <string name="descending">Descending</string>
+    <string name="use_for_this_folder">Use for this folder only</string>
+
+    <!-- Confirmation dialog -->
+    <string name="proceed_with_deletion">Are you sure you want to proceed with the deletion?</string>
+    <string name="deletion_confirmation">Are you sure you want to delete %s?</string>    <!-- Are you sure you want to delete 5 items? -->
+    <string name="move_to_recycle_bin_confirmation">Are you sure you want to move %s to Recycle Bin?</string>    <!-- Are you sure you want to move 3 items to Recycle Bin? -->
+    <string name="do_not_ask_again">Do not ask again in this session</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
+
+    <plurals name="delete_warning">
+        <item quantity="one">WARNING: You are deleting a folder</item>
+        <item quantity="other">WARNING: You are deleting %d folders</item>
+    </plurals>
+
+    <!-- Password protection -->
+    <string name="pin">PIN</string>
+    <string name="enter_pin">Enter PIN</string>
+    <string name="please_enter_pin">Please enter a PIN</string>
+    <string name="wrong_pin">Wrong PIN</string>
+    <string name="repeat_pin">Repeat PIN</string>
+    <string name="pattern">Pattern</string>
+    <string name="insert_pattern">Insert pattern</string>
+    <string name="wrong_pattern">Wrong pattern</string>
+    <string name="repeat_pattern">Repeat pattern</string>
+    <string name="fingerprint">Fingerprint</string>
+    <string name="add_fingerprint">Add fingerprint</string>
+    <string name="place_finger">Please place your finger on the fingerprint sensor</string>
+    <string name="authentication_failed">Authentication failed</string>
+    <string name="authentication_blocked">Authentication blocked, please try again in a moment</string>
+    <string name="no_fingerprints_registered">You have no fingerprints registered, please add some in the Settings of your device</string>
+    <string name="go_to_settings">Go to Settings</string>
+    <string name="protection_setup_successfully">Password setup successfully. Please reinstall the app in case you forget it.</string>
+    <string name="fingerprint_setup_successfully">Protection setup successfully. Please reinstall the app in case of problems with reseting it.</string>
+
+    <!-- Times -->
+    <string name="tomorrow">Tomorrow</string>
+    <string name="seconds_raw">seconds</string>
+    <string name="minutes_raw">minutes</string>
+    <string name="hours_raw">hours</string>
+    <string name="days_raw">days</string>
+
+    <plurals name="seconds">
+        <item quantity="one">%d second</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="minutes">
+        <item quantity="one">%d minute</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="hours">
+        <item quantity="one">%d hour</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="days">
+        <item quantity="one">%d day</item>
+        <item quantity="other">%d days</item>
+    </plurals>
+    <plurals name="weeks">
+        <item quantity="one">%d week</item>
+        <item quantity="other">%d weeks</item>
+    </plurals>
+    <plurals name="months">
+        <item quantity="one">%d month</item>
+        <item quantity="other">%d months</item>
+    </plurals>
+    <plurals name="years">
+        <item quantity="one">%d year</item>
+        <item quantity="other">%d years</item>
+    </plurals>
+
+    <!-- For example: I will be there in 5 minutes -->
+    <plurals name="in_seconds">
+        <item quantity="one">%d second</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="in_minutes">
+        <item quantity="one">%d minute</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="in_hours">
+        <item quantity="one">%d hour</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+
+    <!-- For example: Event reminder: 3 minutes before -->
+    <plurals name="seconds_before">
+        <item quantity="one">%d second before</item>
+        <item quantity="other">%d seconds before</item>
+    </plurals>
+    <plurals name="minutes_before">
+        <item quantity="one">%d minute before</item>
+        <item quantity="other">%d minutes before</item>
+    </plurals>
+    <plurals name="hours_before">
+        <item quantity="one">%d hour before</item>
+        <item quantity="other">%d hours before</item>
+    </plurals>
+    <plurals name="days_before">
+        <item quantity="one">%d day before</item>
+        <item quantity="other">%d days before</item>
+    </plurals>
+
+    <!-- For example: Postpone reminder by 3 minutes -->
+    <plurals name="by_seconds">
+        <item quantity="one">%d second</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="by_minutes">
+        <item quantity="one">%d minute</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="by_hours">
+        <item quantity="one">%d hour</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+
+    <!-- For example: Time remaining till the alarm goes off: 6 hours, 5 minutes -->
+    <string name="alarm_goes_off_in">Time remaining till the alarm goes off:\n%s</string>
+    <string name="alarm_warning">Please make sure the alarm works properly before relying on it. It could misbehave due to system restrictions related to battery saving.</string>
+    <string name="reminder_warning">Please make sure the reminders work properly before relying on them. They could misbehave due to system restrictions related to battery saving.</string>
+
+    <!-- Alarms -->
+    <string name="alarm">Alarm</string>
+    <string name="snooze">Snooze</string>
+    <string name="dismiss">Dismiss</string>
+    <string name="no_reminder">No reminder</string>
+    <string name="at_start">At start</string>
+    <string name="system_sounds">System sounds</string>
+    <string name="your_sounds">Your sounds</string>
+    <string name="add_new_sound">Add a new sound</string>
+    <string name="no_sound">No sound</string>
+
+    <!-- Settings -->
+    <string name="settings">Settings</string>
+    <string name="customize_colors">Customize colors</string>
+    <string name="customize_widget_colors">Customize widget colors</string>
+    <string name="use_english_language">Use English language</string>
+    <string name="avoid_whats_new">Avoid showing What\'s New on startup</string>
+    <string name="show_hidden_items">Show hidden items</string>
+    <string name="font_size">Font size</string>
+    <string name="small">Small</string>
+    <string name="medium">Medium</string>
+    <string name="large">Large</string>
+    <string name="extra_large">Extra large</string>
+    <string name="password_protect_hidden_items">Password protect hidden item visibility</string>
+    <string name="password_protect_whole_app">Password protect the whole application</string>
+    <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>
+    <string name="prevent_phone_from_sleeping">Prevent phone from sleeping while the app is in foreground</string>
+    <string name="skip_delete_confirmation">Always skip delete confirmation dialog</string>
+    <string name="enable_pull_to_refresh">Enable pull-to-refresh from the top</string>
+    <string name="use_24_hour_time_format">Use 24-hour time format</string>
+    <string name="sunday_first">Start week on Sunday</string>
+    <string name="widgets">Widgets</string>
+    <string name="use_same_snooze">Always use same snooze time</string>
+    <string name="snooze_time">Snooze time</string>
+    <string name="vibrate_on_button_press">Vibrate on button press</string>
+    <string name="move_items_to_trash_bin">Move items in Recycle Bin instead of deleting</string>
+    <string name="recycle_bin_cleaning_interval">Recycle Bin cleaning interval</string>
+    <string name="empty_recycle_bin">Empty Recycle Bin</string>
+    <string name="recycle_bin_location">Recycle Bin location</string>
+    <string name="force_portrait_mode">Force portrait mode</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>
+    <string name="recycle_bin">Recycle Bin</string>
+    <string name="saving_label">Saving</string>
+    <string name="startup">Startup</string>
+    <string name="text">Text</string>
+
+    <!-- Import / Export -->
+    <string name="importing">Importing…</string>
+    <string name="exporting">Exporting…</string>
+    <string name="importing_successful">Importing successful</string>
+    <string name="exporting_successful">Exporting successful</string>
+    <string name="importing_failed">Importing failed</string>
+    <string name="exporting_failed">Exporting failed</string>
+    <string name="importing_some_entries_failed">Importing some entries failed</string>
+    <string name="exporting_some_entries_failed">Exporting some entries failed</string>
+    <string name="no_entries_for_exporting">No entries for exporting have been found</string>
+
+    <!-- OTG devices -->
+    <string name="otg">OTG</string>
+    <string name="confirm_otg_storage_access_text">Please choose the root folder of the OTG device on the next screen, to grant access</string>
+    <string name="wrong_root_selected_otg">Wrong folder selected, please select the root folder of your OTG device</string>
+
+    <!-- Dates -->
+    <string name="january">January</string>
+    <string name="february">February</string>
+    <string name="march">March</string>
+    <string name="april">April</string>
+    <string name="may">May</string>
+    <string name="june">June</string>
+    <string name="july">July</string>
+    <string name="august">August</string>
+    <string name="september">September</string>
+    <string name="october">October</string>
+    <string name="november">November</string>
+    <string name="december">December</string>
+
+    <!-- in January -->
+    <string name="in_january">in January</string>
+    <string name="in_february">in February</string>
+    <string name="in_march">in March</string>
+    <string name="in_april">in April</string>
+    <string name="in_may">in May</string>
+    <string name="in_june">in June</string>
+    <string name="in_july">in July</string>
+    <string name="in_august">in August</string>
+    <string name="in_september">in September</string>
+    <string name="in_october">in October</string>
+    <string name="in_november">in November</string>
+    <string name="in_december">in December</string>
+
+    <string name="monday">Monday</string>
+    <string name="tuesday">Tuesday</string>
+    <string name="wednesday">Wednesday</string>
+    <string name="thursday">Thursday</string>
+    <string name="friday">Friday</string>
+    <string name="saturday">Saturday</string>
+    <string name="sunday">Sunday</string>
+
+    <string name="monday_letter">M</string>
+    <string name="tuesday_letter">T</string>
+    <string name="wednesday_letter">W</string>
+    <string name="thursday_letter">T</string>
+    <string name="friday_letter">F</string>
+    <string name="saturday_letter">S</string>
+    <string name="sunday_letter">S</string>
+
+    <string name="monday_short">Mon</string>
+    <string name="tuesday_short">Tue</string>
+    <string name="wednesday_short">Wed</string>
+    <string name="thursday_short">Thu</string>
+    <string name="friday_short">Fri</string>
+    <string name="saturday_short">Sat</string>
+    <string name="sunday_short">Sun</string>
+
+    <!-- About -->
+    <string name="about">About</string>
+    <string name="website_label">For the source codes visit</string>
+    <string name="email_label">Send your feedback or suggestions to</string>
+    <string name="more_apps_underlined"><u>More apps</u></string>
+    <string name="third_party_licences_underlined"><u>Third party licences</u></string>
+    <string name="invite_friends_underlined"><u>Invite friends</u></string>
+    <string name="share_text">Hey, come check out %1$s at %2$s</string>
+    <string name="invite_via">Invite via</string>
+    <string name="rate_us_underlined"><u>Rate us</u></string>
+    <string name="donate">Donate</string>
+    <string name="donate_underlined"><u>Donate</u></string>
+    <string name="follow_us">Follow us</string>
+    <string name="copyright">v %1$s\nCopyright © Simple Mobile Tools %2$d</string>
+    <string name="additional_info">Additional info</string>
+    <string name="app_version">App version: %s</string>
+    <string name="device_os">Device OS: %s</string>
+    <string name="donate_please">
+        <![CDATA[
+            Hello,<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="https://simplemobiletools.com/donate">here</a>.<br><br>
+            Thank you!
+        ]]>
+    </string>
+    <string name="purchase">Purchase</string>
+    <string name="update_thank_you">Please update Simple Thank You to the latest version</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>
+            <a href="%1$s">%2$s</a><br><br>
+            You can download it by pressing the title.<br><br>
+            Thanks
+        ]]>
+    </string>
+
+    <!-- FAQ -->
+    <string name="frequently_asked_questions">Frequently asked questions</string>
+    <string name="before_asking_question">Before you ask a question, please first read the</string>
+    <string name="faq_1_title_commons">How come I don\'t see this apps widget on the list of widgets?</string>
+    <string name="faq_1_text_commons">It is most likely because you moved the app on an SD card. There is an Android system limitation which hides the given app widgets
+        in that case. The only solution is to move the app back onto the Internal Storage via your device settings.</string>
+    <string name="faq_2_title_commons">I want to support you, but I cannot donate money. Is there anything else I can do?</string>
+    <string name="faq_2_text_commons">Yes, of course. You can spread the word about the apps or give good feedback and ratings. You can also help by translating the apps in a new language, or just update some existing translations.
+        You can find the guide at https://github.com/SimpleMobileTools/General-Discussion , or just shoot me a message at hello@simplemobiletools.com if you need help.</string>
+    <string name="faq_3_title_commons">I deleted some files by mistake, how can I recover them?</string>
+    <string name="faq_3_text_commons">Sadly, you cannot. Files are deleted instantly after the confirmation dialog, there is no trashbin available.</string>
+    <string name="faq_4_title_commons">I don\'t like the widget colors, can I change them?</string>
+    <string name="faq_4_text_commons">Yep, as you drag a widget on your home screen a widget config screen appears. You will see colored squares at the bottom left corner, just press them to pick a new color. You can use the slider for adjusting the alpha too.</string>
+    <string name="faq_5_title_commons">Can I somehow restore deleted files?</string>
+    <string name="faq_5_text_commons">If they were really deleted, you cannot. However, you can enable using a Recycle Bin instead of deleting in the app settings. That will just move the files in it instead of deleting them. You can customize the Recycle Bin location, emptying interval, or empty it manually.</string>
+
+    <!-- License -->
+    <string name="notice">This app uses the following third party libraries to make my life easier. Thank you.</string>
+    <string name="third_party_licences">Third party licences</string>
+    <string name="kotlin_title">Kotlin (programming language)</string>
+    <string name="subsampling_title">Subsampling Scale Image View (zoomable imageviews)</string>
+    <string name="glide_title">Glide (image loading and caching)</string>
+    <string name="picasso_title">Picasso (image loading and caching)</string>
+    <string name="cropper_title">Android Image Cropper (image crop and rotate)</string>
+    <string name="multiselect_title">RecyclerView MultiSelect (selecting multiple list items)</string>
+    <string name="rtl_viewpager_title">RtlViewPager (right to left swiping)</string>
+    <string name="joda_title">Joda-Time (Java date replacement)</string>
+    <string name="stetho_title">Stetho (debugging databases)</string>
+    <string name="otto_title">Otto (event bus)</string>
+    <string name="photoview_title">PhotoView (zoomable GIFs)</string>
+    <string name="pattern_title">PatternLockView (pattern protection)</string>
+    <string name="reprint_title">Reprint (fingerprint protection)</string>
+    <string name="gif_drawable_title">Gif Drawable (loading GIFs)</string>
+    <string name="autofittextview_title">AutoFitTextView (resizing text)</string>
+    <string name="robolectric_title">Robolectric (testing framework)</string>
+    <string name="espresso_title">Espresso (testing helper)</string>
+    <string name="gson_title">Gson (JSON parser)</string>
+    <string name="leak_canary_title">Leak Canary (memory leak detector)</string>
+    <string name="number_picker_title">Number Picker (customizable number picker)</string>
+</resources>
diff --git a/commons/src/main/res/values-az/strings.xml b/commons/src/main/res/values-az/strings.xml
index fd3edf34e..486bfd4f6 100644
--- a/commons/src/main/res/values-az/strings.xml
+++ b/commons/src/main/res/values-az/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Qeydlər</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Sevimlilər</string>
+    <string name="add_favorites">Sevimlilər əlavə et</string>
+    <string name="add_to_favorites">Sevimlilərə əlavə et</string>
+    <string name="remove_from_favorites">Sevimlilərdən sil</string>
+
     <!-- Search -->
     <string name="search">Axtar</string>
     <string name="type_2_characters">Axtarışa başlamaq üçün ən az 2 simvol yazın.</string>
diff --git a/commons/src/main/res/values-br/strings.xml b/commons/src/main/res/values-br/strings.xml
index d2a80e16f..4bb4b6d90 100644
--- a/commons/src/main/res/values-br/strings.xml
+++ b/commons/src/main/res/values-br/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Favorites</string>
+    <string name="add_favorites">Add favorites</string>
+    <string name="add_to_favorites">Add to favorites</string>
+    <string name="remove_from_favorites">Remove from favorites</string>
+
     <!-- Search -->
     <string name="search">Search</string>
     <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
diff --git a/commons/src/main/res/values-ca/strings.xml b/commons/src/main/res/values-ca/strings.xml
index ec513cb37..7fe576b5b 100644
--- a/commons/src/main/res/values-ca/strings.xml
+++ b/commons/src/main/res/values-ca/strings.xml
@@ -15,7 +15,13 @@
     <string name="never">Mai</string>
     <string name="details">Detalls</string>
     <string name="notes">Notes</string>
-    <string name="deleting_folder">S'està eliminant la carpeta \'%s\'</string>
+    <string name="deleting_folder">S\'està eliminant la carpeta \'%s\'</string>
+
+    <!-- Favorites -->
+    <string name="favorites">Favorites</string>
+    <string name="add_favorites">Add favorites</string>
+    <string name="add_to_favorites">Add to favorites</string>
+    <string name="remove_from_favorites">Remove from favorites</string>
 
     <!-- Search -->
     <string name="search">Buscar</string>
diff --git a/commons/src/main/res/values-cs/strings.xml b/commons/src/main/res/values-cs/strings.xml
index 512951ead..4417e9967 100644
--- a/commons/src/main/res/values-cs/strings.xml
+++ b/commons/src/main/res/values-cs/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Oblíbené</string>
+    <string name="add_favorites">Add favorites</string>
+    <string name="add_to_favorites">Přidat do oblíbených</string>
+    <string name="remove_from_favorites">Odebrat z oblíbených</string>
+
     <!-- Search -->
     <string name="search">Hledat</string>
     <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
diff --git a/commons/src/main/res/values-da/strings.xml b/commons/src/main/res/values-da/strings.xml
index 0d1abeacc..56162f024 100644
--- a/commons/src/main/res/values-da/strings.xml
+++ b/commons/src/main/res/values-da/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Noter</string>
     <string name="deleting_folder">Sletter mappen \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Bogmærker</string>
+    <string name="add_favorites">Tilføj bogmærker</string>
+    <string name="add_to_favorites">Føj til bogmærker</string>
+    <string name="remove_from_favorites">Fjern fra bogmærker</string>
+
     <!-- Search -->
     <string name="search">Søg</string>
     <string name="type_2_characters">Start søgningen ved at skrive mindst to tegn.</string>
diff --git a/commons/src/main/res/values-de/strings.xml b/commons/src/main/res/values-de/strings.xml
index 95a51d4f7..fdc5443c8 100644
--- a/commons/src/main/res/values-de/strings.xml
+++ b/commons/src/main/res/values-de/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Notizen</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Favoriten</string>
+    <string name="add_favorites">Favoriten hinzufügen</string>
+    <string name="add_to_favorites">Zu Favoriten hinzufügen</string>
+    <string name="remove_from_favorites">Aus Favoriten entfernen</string>
+
     <!-- Search -->
     <string name="search">Suchen</string>
     <string name="type_2_characters">Du musst mindestens 2 Zeichen eingeben, um die Suche zu starten.</string>
diff --git a/commons/src/main/res/values-el/strings.xml b/commons/src/main/res/values-el/strings.xml
index a0af61d23..02c83c7d1 100644
--- a/commons/src/main/res/values-el/strings.xml
+++ b/commons/src/main/res/values-el/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Favorites</string>
+    <string name="add_favorites">Add favorites</string>
+    <string name="add_to_favorites">Add to favorites</string>
+    <string name="remove_from_favorites">Remove from favorites</string>
+
     <!-- Search -->
     <string name="search">Search</string>
     <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
diff --git a/commons/src/main/res/values-es/strings.xml b/commons/src/main/res/values-es/strings.xml
index fbedfa3b8..91fc356c6 100644
--- a/commons/src/main/res/values-es/strings.xml
+++ b/commons/src/main/res/values-es/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Notas</string>
     <string name="deleting_folder">Eliminando carpeta \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Favoritos</string>
+    <string name="add_favorites">Add favorites</string>
+    <string name="add_to_favorites">Agregar a favoritos</string>
+    <string name="remove_from_favorites">Eliminar de favoritos</string>
+
     <!-- Search -->
     <string name="search">Buscar</string>
     <string name="type_2_characters">Escribe por lo menos dos caracteres para iniciar la búsqueda.</string>
diff --git a/commons/src/main/res/values-fi/strings.xml b/commons/src/main/res/values-fi/strings.xml
index 63b481d48..fdb28b358 100644
--- a/commons/src/main/res/values-fi/strings.xml
+++ b/commons/src/main/res/values-fi/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Muistiinpanot</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Favorites</string>
+    <string name="add_favorites">Add favorites</string>
+    <string name="add_to_favorites">Add to favorites</string>
+    <string name="remove_from_favorites">Remove from favorites</string>
+
     <!-- Search -->
     <string name="search">Haku</string>
     <string name="type_2_characters">Syötä ainakin 2 merkkiä hakeaksesi</string>
diff --git a/commons/src/main/res/values-fr/strings.xml b/commons/src/main/res/values-fr/strings.xml
index b14690148..04e8943fa 100644
--- a/commons/src/main/res/values-fr/strings.xml
+++ b/commons/src/main/res/values-fr/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">Supprimer le dossier \'%s\'</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>
+
     <!-- Search -->
     <string name="search">Recherche</string>
     <string name="type_2_characters">Tapez au moins 2 caractères pour lancer la recherche.</string>
diff --git a/commons/src/main/res/values-gl/strings.xml b/commons/src/main/res/values-gl/strings.xml
index 2194c0648..958a44d71 100644
--- a/commons/src/main/res/values-gl/strings.xml
+++ b/commons/src/main/res/values-gl/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Notas</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Favorites</string>
+    <string name="add_favorites">Add favorites</string>
+    <string name="add_to_favorites">Add to favorites</string>
+    <string name="remove_from_favorites">Remove from favorites</string>
+
     <!-- Search -->
     <string name="search">Buscar</string>
     <string name="type_2_characters">Escribe por lo menos dos caracteres para iniciar la búsqueda.</string>
diff --git a/commons/src/main/res/values-hi-rIN/strings.xml b/commons/src/main/res/values-hi-rIN/strings.xml
index 4f882b2df..52d30a9e2 100644
--- a/commons/src/main/res/values-hi-rIN/strings.xml
+++ b/commons/src/main/res/values-hi-rIN/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Favorites</string>
+    <string name="add_favorites">Add favorites</string>
+    <string name="add_to_favorites">Add to favorites</string>
+    <string name="remove_from_favorites">Remove from favorites</string>
+
     <!-- Search -->
     <string name="search">Search</string>
     <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
diff --git a/commons/src/main/res/values-hr/strings.xml b/commons/src/main/res/values-hr/strings.xml
index c0675f4e4..abe90bc5f 100644
--- a/commons/src/main/res/values-hr/strings.xml
+++ b/commons/src/main/res/values-hr/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Favoriti</string>
+    <string name="add_favorites">Dodaj favorite</string>
+    <string name="add_to_favorites">Dodaj u favorite</string>
+    <string name="remove_from_favorites">Ukloni iz favorita</string>
+
     <!-- Search -->
     <string name="search">Traži</string>
     <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
diff --git a/commons/src/main/res/values-hu/strings.xml b/commons/src/main/res/values-hu/strings.xml
index 3e2eb5e6a..529bc170d 100644
--- a/commons/src/main/res/values-hu/strings.xml
+++ b/commons/src/main/res/values-hu/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Jegyzetek</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Kedvencek</string>
+    <string name="add_favorites">Add favorites</string>
+    <string name="add_to_favorites">Kedvencnek jelölés</string>
+    <string name="remove_from_favorites">Törlés a kedvencek közül</string>
+
     <!-- Search -->
     <string name="search">Search</string>
     <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
diff --git a/commons/src/main/res/values-id/strings.xml b/commons/src/main/res/values-id/strings.xml
index db4ec553e..e9ea4cb33 100644
--- a/commons/src/main/res/values-id/strings.xml
+++ b/commons/src/main/res/values-id/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Favorit</string>
+    <string name="add_favorites">Tambahkan Favorit</string>
+    <string name="add_to_favorites">Tambahkan Ke Favorit</string>
+    <string name="remove_from_favorites">Hapus Dari Favorit</string>
+
     <!-- Search -->
     <string name="search">Cari</string>
     <string name="type_2_characters">Ketik minimal 2 Karakter Untuk Mencari.</string>
diff --git a/commons/src/main/res/values-it/strings.xml b/commons/src/main/res/values-it/strings.xml
index b96785638..c92e0f959 100644
--- a/commons/src/main/res/values-it/strings.xml
+++ b/commons/src/main/res/values-it/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Note</string>
     <string name="deleting_folder">Eliminazione cartella \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Preferiti</string>
+    <string name="add_favorites">Aggiungi preferiti</string>
+    <string name="add_to_favorites">Aggiungi ai preferiti</string>
+    <string name="remove_from_favorites">Rimuovi dai preferiti</string>
+
     <!-- Search -->
     <string name="search">Cerca</string>
     <string name="type_2_characters">Digita almeno 2 caratteri per iniziare la ricerca.</string>
diff --git a/commons/src/main/res/values-iw/strings.xml b/commons/src/main/res/values-iw/strings.xml
index 125282a39..0529e9238 100644
--- a/commons/src/main/res/values-iw/strings.xml
+++ b/commons/src/main/res/values-iw/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Favorites</string>
+    <string name="add_favorites">Add favorites</string>
+    <string name="add_to_favorites">Add to favorites</string>
+    <string name="remove_from_favorites">Remove from favorites</string>
+
     <!-- Search -->
     <string name="search">Search</string>
     <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
diff --git a/commons/src/main/res/values-ja/strings.xml b/commons/src/main/res/values-ja/strings.xml
index 967a33991..36397d20c 100644
--- a/commons/src/main/res/values-ja/strings.xml
+++ b/commons/src/main/res/values-ja/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">メモ</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">お気に入り</string>
+    <string name="add_favorites">お気に入りを追加</string>
+    <string name="add_to_favorites">お気に入りに追加</string>
+    <string name="remove_from_favorites">お気に入りから削除</string>
+
     <!-- Search -->
     <string name="search">検索</string>
     <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
diff --git a/commons/src/main/res/values-ko-rKR/strings.xml b/commons/src/main/res/values-ko-rKR/strings.xml
index 1cd61f833..3c8ccaa93 100644
--- a/commons/src/main/res/values-ko-rKR/strings.xml
+++ b/commons/src/main/res/values-ko-rKR/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">즐겨찾기</string>
+    <string name="add_favorites">Add favorites</string>
+    <string name="add_to_favorites">즐겨찾기에 추가</string>
+    <string name="remove_from_favorites">즐겨찾기에서 제거</string>
+
     <!-- Search -->
     <string name="search">검색</string>
     <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
diff --git a/commons/src/main/res/values-lt/strings.xml b/commons/src/main/res/values-lt/strings.xml
index 264eca3e7..f7b944504 100644
--- a/commons/src/main/res/values-lt/strings.xml
+++ b/commons/src/main/res/values-lt/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Užrašai</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Mėgiamiausieji</string>
+    <string name="add_favorites">Pridėti mėgiamiausiuosius</string>
+    <string name="add_to_favorites">pridėti į mėgiamiausiuosius</string>
+    <string name="remove_from_favorites">Pašalinti iš mėgiamiausiųjų</string>
+
     <!-- Search -->
     <string name="search">Ieškoti</string>
     <string name="type_2_characters">Įvesti mažiausiai 2 simbolius, kad pradėti paiešką.</string>
diff --git a/commons/src/main/res/values-nb/strings.xml b/commons/src/main/res/values-nb/strings.xml
index 0771e16e0..4d9ac818c 100644
--- a/commons/src/main/res/values-nb/strings.xml
+++ b/commons/src/main/res/values-nb/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">Sletter mappen \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Favoritter</string>
+    <string name="add_favorites">Legg til favoritter</string>
+    <string name="add_to_favorites">Legg til i favorittene</string>
+    <string name="remove_from_favorites">Fjern fra favorittene</string>
+
     <!-- Search -->
     <string name="search">Søk</string>
     <string name="type_2_characters">Skriv inn minst 2 tegn for å starte søket.</string>
diff --git a/commons/src/main/res/values-nl/strings.xml b/commons/src/main/res/values-nl/strings.xml
index 527afe2dd..dd91481b7 100644
--- a/commons/src/main/res/values-nl/strings.xml
+++ b/commons/src/main/res/values-nl/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Notities</string>
     <string name="deleting_folder">Map \'%s\' verwijderen</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Favorieten</string>
+    <string name="add_favorites">Add favorites</string>
+    <string name="add_to_favorites">Aan favorieten toevoegen</string>
+    <string name="remove_from_favorites">Uit favorieten verwijderen</string>
+
     <!-- Search -->
     <string name="search">Zoeken</string>
     <string name="type_2_characters">Vul tenminste 2 tekens in.</string>
diff --git a/commons/src/main/res/values-no/strings.xml b/commons/src/main/res/values-no/strings.xml
index a958d0f41..eee3ccb4b 100644
--- a/commons/src/main/res/values-no/strings.xml
+++ b/commons/src/main/res/values-no/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Favorites</string>
+    <string name="add_favorites">Add favorites</string>
+    <string name="add_to_favorites">Add to favorites</string>
+    <string name="remove_from_favorites">Remove from favorites</string>
+
     <!-- Search -->
     <string name="search">Søk</string>
     <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
diff --git a/commons/src/main/res/values-pl/strings.xml b/commons/src/main/res/values-pl/strings.xml
index f13161e83..fb70c517b 100644
--- a/commons/src/main/res/values-pl/strings.xml
+++ b/commons/src/main/res/values-pl/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Notatnik</string>
     <string name="deleting_folder">Usuwam folder \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Ulubione</string>
+    <string name="add_favorites">Dodaj ulubione</string>
+    <string name="add_to_favorites">Dodaj do ulubionych</string>
+    <string name="remove_from_favorites">Usuń z ulubionych</string>
+
     <!-- Search -->
     <string name="search">Szukaj</string>
     <string name="type_2_characters">Wpisz co najmniej 2 znaki, aby rozpocząć wyszukiwanie.</string>
diff --git a/commons/src/main/res/values-pt-rBR/strings.xml b/commons/src/main/res/values-pt-rBR/strings.xml
index 6950ce2a3..8a5d81408 100644
--- a/commons/src/main/res/values-pt-rBR/strings.xml
+++ b/commons/src/main/res/values-pt-rBR/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Notas</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Favoritos</string>
+    <string name="add_favorites">Add favorites</string>
+    <string name="add_to_favorites">Adicionar aos favoritos</string>
+    <string name="remove_from_favorites">Remover dos favoritos</string>
+
     <!-- Search -->
     <string name="search">Pesquisar</string>
     <string name="type_2_characters">Digite pelo menos 2 letras para iniciar a pesquisa.</string>
diff --git a/commons/src/main/res/values-pt/strings.xml b/commons/src/main/res/values-pt/strings.xml
index 6c5eee38f..1f1730ba4 100644
--- a/commons/src/main/res/values-pt/strings.xml
+++ b/commons/src/main/res/values-pt/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Notas</string>
     <string name="deleting_folder">A apagar a pasta \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Favoritos</string>
+    <string name="add_favorites">Add favorites</string>
+    <string name="add_to_favorites">Adicionar aos favoritos</string>
+    <string name="remove_from_favorites">Remover dos favoritos</string>
+
     <!-- Search -->
     <string name="search">Pesquisar</string>
     <string name="type_2_characters">Digite, pelo menos, 2 caracteres para iniciar a pesquisa.</string>
diff --git a/commons/src/main/res/values-ru/strings.xml b/commons/src/main/res/values-ru/strings.xml
index 676ba874e..dae7c73cd 100644
--- a/commons/src/main/res/values-ru/strings.xml
+++ b/commons/src/main/res/values-ru/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Заметки</string>
     <string name="deleting_folder">Удаление папки \"%s\"</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Избранное</string>
+    <string name="add_favorites">Добавить избранные</string>
+    <string name="add_to_favorites">Добавить в избранное</string>
+    <string name="remove_from_favorites">Убрать из избранного</string>
+
     <!-- Search -->
     <string name="search">Поиск</string>
     <string name="type_2_characters">Введите как минимум 2 символа для начала поиска.</string>
diff --git a/commons/src/main/res/values-sk/strings.xml b/commons/src/main/res/values-sk/strings.xml
index c8de2db05..225f15543 100644
--- a/commons/src/main/res/values-sk/strings.xml
+++ b/commons/src/main/res/values-sk/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Poznámky</string>
     <string name="deleting_folder">Odstraňuje sa priečinok \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Obľúbené</string>
+    <string name="add_favorites">Pridať obľúbené</string>
+    <string name="add_to_favorites">Pridať medzi obľúbené</string>
+    <string name="remove_from_favorites">Odstrániť spomedzi obľúbených</string>
+
     <!-- Search -->
     <string name="search">Hľadať</string>
     <string name="type_2_characters">Zadajte aspoň 2 znaky pre spustenie hľadania.</string>
diff --git a/commons/src/main/res/values-sv/strings.xml b/commons/src/main/res/values-sv/strings.xml
index 928b63f42..6c4159f36 100644
--- a/commons/src/main/res/values-sv/strings.xml
+++ b/commons/src/main/res/values-sv/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Anteckningar</string>
     <string name="deleting_folder">Tar bort mappen \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Favoriter</string>
+    <string name="add_favorites">Lägg till favoriter</string>
+    <string name="add_to_favorites">Lägg till i favoriter</string>
+    <string name="remove_from_favorites">Ta bort från favoriter</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>
diff --git a/commons/src/main/res/values-tr/strings.xml b/commons/src/main/res/values-tr/strings.xml
index 9439a73c7..4b13f3b82 100644
--- a/commons/src/main/res/values-tr/strings.xml
+++ b/commons/src/main/res/values-tr/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Notlar</string>
     <string name="deleting_folder">\'%s\' klasörü siliniyor</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Favoriler</string>
+    <string name="add_favorites">Favori ekle</string>
+    <string name="add_to_favorites">Favorilere ekle</string>
+    <string name="remove_from_favorites">Favorilerden kaldır</string>
+
     <!-- Search -->
     <string name="search">Ara</string>
     <string name="type_2_characters">Aramaya başlamak için en az 2 karakter yazın.</string>
diff --git a/commons/src/main/res/values-zh-rCN/strings.xml b/commons/src/main/res/values-zh-rCN/strings.xml
index 4368bb222..6042d7a3f 100644
--- a/commons/src/main/res/values-zh-rCN/strings.xml
+++ b/commons/src/main/res/values-zh-rCN/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">笔记</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Favorites</string>
+    <string name="add_favorites">Add favorites</string>
+    <string name="add_to_favorites">Add to favorites</string>
+    <string name="remove_from_favorites">Remove from favorites</string>
+
     <!-- Search -->
     <string name="search">搜索</string>
     <string name="type_2_characters">请输入至少两个字符来开始搜索</string>
diff --git a/commons/src/main/res/values-zh-rTW/strings.xml b/commons/src/main/res/values-zh-rTW/strings.xml
index 1db431512..610d10c46 100644
--- a/commons/src/main/res/values-zh-rTW/strings.xml
+++ b/commons/src/main/res/values-zh-rTW/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">筆記</string>
     <string name="deleting_folder">資料夾 \'%s\' 刪除中</string>
 
+    <!-- Favorites -->
+    <string name="favorites">我的最愛</string>
+    <string name="add_favorites">添加我的最愛</string>
+    <string name="add_to_favorites">加入我的最愛</string>
+    <string name="remove_from_favorites">移除我的最愛</string>
+
     <!-- Search -->
     <string name="search">搜尋</string>
     <string name="type_2_characters">輸入兩個字以上來開始搜尋。</string>
diff --git a/commons/src/main/res/values/strings.xml b/commons/src/main/res/values/strings.xml
index a0af61d23..02c83c7d1 100644
--- a/commons/src/main/res/values/strings.xml
+++ b/commons/src/main/res/values/strings.xml
@@ -17,6 +17,12 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
 
+    <!-- Favorites -->
+    <string name="favorites">Favorites</string>
+    <string name="add_favorites">Add favorites</string>
+    <string name="add_to_favorites">Add to favorites</string>
+    <string name="remove_from_favorites">Remove from favorites</string>
+
     <!-- Search -->
     <string name="search">Search</string>
     <string name="type_2_characters">Type in at least 2 characters to start the search.</string>