diff --git a/build.gradle b/build.gradle
index 97993cfb6..30f9d51df 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,12 +3,12 @@
 buildscript {
     ext {
         propCompileSdkVersion = 28
-        propBuildToolsVersion = "28.0.2"
+        propBuildToolsVersion = "28.0.3"
         propMinSdkVersion = 16
         propTargetSdkVersion = propCompileSdkVersion
         propVersionCode = 1
-        propVersionName = '4.7.2'
-        kotlin_version = '1.2.61'
+        propVersionName = '4.8.0'
+        kotlin_version = '1.2.71'
         support_libs = '27.1.1'
     }
 
@@ -18,7 +18,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSimpleActivity.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSimpleActivity.kt
index 6073e6456..d20a56d29 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSimpleActivity.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSimpleActivity.kt
@@ -255,6 +255,7 @@ abstract class BaseSimpleActivity : AppCompatActivity() {
 
         handleSAFDialog(destination) {
             copyMoveCallback = callback
+            var fileCountToCopy = fileDirItems.size
             if (isCopyOperation) {
                 startCopyMove(fileDirItems, destination, isCopyOperation, copyPhotoVideoOnly, copyHidden)
             } else {
@@ -263,29 +264,40 @@ abstract class BaseSimpleActivity : AppCompatActivity() {
                         startCopyMove(fileDirItems, destination, isCopyOperation, copyPhotoVideoOnly, copyHidden)
                     }
                 } else {
-                    toast(R.string.moving)
-                    val updatedFiles = ArrayList<FileDirItem>(fileDirItems.size * 2)
                     try {
-                        val destinationFolder = File(destination)
-                        for (oldFileDirItem in fileDirItems) {
-                            val newFile = File(destinationFolder, oldFileDirItem.name)
-                            if (!newFile.exists() && File(oldFileDirItem.path).renameTo(newFile)) {
-                                if (!baseConfig.keepLastModified) {
-                                    newFile.setLastModified(System.currentTimeMillis())
+                        checkConflicts(fileDirItems, destination, 0, LinkedHashMap()) {
+                            toast(R.string.moving)
+                            val updatedFiles = ArrayList<FileDirItem>(fileDirItems.size * 2)
+                            val destinationFolder = File(destination)
+                            for (oldFileDirItem in fileDirItems) {
+                                val newFile = File(destinationFolder, oldFileDirItem.name)
+                                if (newFile.exists()) {
+                                    if (getConflictResolution(it, newFile.absolutePath) == CONFLICT_SKIP) {
+                                        fileCountToCopy--
+                                    } else {
+                                        // this file is guaranteed to be on the internal storage, so just delete it this way
+                                        newFile.delete()
+                                    }
                                 }
-                                updatedFiles.add(newFile.toFileDirItem(applicationContext))
-                            }
-                        }
 
-                        val updatedPaths = updatedFiles.map { it.path } as ArrayList<String>
-                        rescanPaths(updatedPaths) {
-                            runOnUiThread {
-                                copyMoveListener.copySucceeded(false, fileDirItems.size == updatedFiles.size, destination)
+                                if (!newFile.exists() && File(oldFileDirItem.path).renameTo(newFile)) {
+                                    if (!baseConfig.keepLastModified) {
+                                        newFile.setLastModified(System.currentTimeMillis())
+                                    }
+                                    updatedFiles.add(newFile.toFileDirItem(applicationContext))
+                                }
                             }
-                        }
 
-                        if (updatedPaths.isEmpty()) {
-                            copyMoveListener.copySucceeded(false, false, destination)
+                            val updatedPaths = updatedFiles.map { it.path } as ArrayList<String>
+                            if (updatedPaths.isEmpty()) {
+                                copyMoveListener.copySucceeded(false, fileCountToCopy == 0, destination)
+                            } else {
+                                rescanPaths(updatedPaths) {
+                                    runOnUiThread {
+                                        copyMoveListener.copySucceeded(false, fileCountToCopy <= updatedPaths.size, destination)
+                                    }
+                                }
+                            }
                         }
                     } catch (e: Exception) {
                         showErrorToast(e)
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/asynctasks/CopyMoveTask.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/asynctasks/CopyMoveTask.kt
index f5d94bf4e..82f09a98b 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/asynctasks/CopyMoveTask.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/asynctasks/CopyMoveTask.kt
@@ -13,10 +13,7 @@ import android.support.v4.util.Pair
 import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
 import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.helpers.CONFLICT_OVERWRITE
-import com.simplemobiletools.commons.helpers.CONFLICT_SKIP
-import com.simplemobiletools.commons.helpers.OTG_PATH
-import com.simplemobiletools.commons.helpers.isOreoPlus
+import com.simplemobiletools.commons.helpers.*
 import com.simplemobiletools.commons.interfaces.CopyMoveListener
 import com.simplemobiletools.commons.models.FileDirItem
 import java.io.File
@@ -70,7 +67,7 @@ class CopyMoveTask(val activity: BaseSimpleActivity, val copyOnly: Boolean = fal
             val newPath = "$mDestinationPath/${file.name}"
             val fileExists = if (newPath.startsWith(OTG_PATH)) activity.getOTGFastDocumentFile(newPath)?.exists()
                     ?: false else File(newPath).exists()
-            if (getConflictResolution(newPath) != CONFLICT_SKIP || !fileExists) {
+            if (getConflictResolution(conflictResolutions, newPath) != CONFLICT_SKIP || !fileExists) {
                 mMaxSize += (file.size / 1000).toInt()
             }
         }
@@ -85,7 +82,7 @@ class CopyMoveTask(val activity: BaseSimpleActivity, val copyOnly: Boolean = fal
                 val newPath = "$mDestinationPath/${file.name}"
                 val newFileDirItem = FileDirItem(newPath, newPath.getFilenameFromPath(), file.isDirectory)
                 if (activity.getDoesFilePathExist(newPath)) {
-                    val resolution = getConflictResolution(newPath)
+                    val resolution = getConflictResolution(conflictResolutions, newPath)
                     if (resolution == CONFLICT_SKIP) {
                         mFileCountToCopy--
                         continue
@@ -151,16 +148,6 @@ class CopyMoveTask(val activity: BaseSimpleActivity, val copyOnly: Boolean = fal
         }, PROGRESS_RECHECK_INTERVAL)
     }
 
-    private fun getConflictResolution(path: String): Int {
-        return if (conflictResolutions.size == 1 && conflictResolutions.containsKey("")) {
-            conflictResolutions[""]!!
-        } else if (conflictResolutions.containsKey(path)) {
-            conflictResolutions[path]!!
-        } else {
-            CONFLICT_SKIP
-        }
-    }
-
     private fun copy(source: FileDirItem, destination: FileDirItem) {
         if (source.isDirectory) {
             copyDirectory(source, destination.path)
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ConfirmationAdvancedDialog.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ConfirmationAdvancedDialog.kt
index f68707de5..29be75eb0 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ConfirmationAdvancedDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ConfirmationAdvancedDialog.kt
@@ -6,6 +6,7 @@ import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.extensions.setupDialogStuff
 import kotlinx.android.synthetic.main.dialog_message.view.*
 
+// similar fo ConfirmationDialog, but has a callback for negative button too
 class ConfirmationAdvancedDialog(activity: Activity, message: String = "", messageId: Int = R.string.proceed_with_deletion, positive: Int = R.string.yes,
                                  negative: Int, val callback: (result: Boolean) -> Unit) {
     var dialog: AlertDialog
@@ -15,8 +16,8 @@ class ConfirmationAdvancedDialog(activity: Activity, message: String = "", messa
         view.message.text = if (message.isEmpty()) activity.resources.getString(messageId) else message
 
         dialog = AlertDialog.Builder(activity)
-                .setPositiveButton(positive, { dialog, which -> positivePressed() })
-                .setNegativeButton(negative, { dialog, which -> negativePressed() })
+                .setPositiveButton(positive) { dialog, which -> positivePressed() }
+                .setNegativeButton(negative) { dialog, which -> negativePressed() }
                 .create().apply {
                     activity.setupDialogStuff(view, this)
                 }
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt
index 308a66f13..fdf9aab71 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt
@@ -630,8 +630,7 @@ fun BaseSimpleActivity.getFileOutputStream(fileDirItem: FileDirItem, allowCreati
             }
 
             if (document == null) {
-                val error = String.format(getString(R.string.could_not_create_file), fileDirItem.path)
-                showErrorToast(error)
+                showFileCreateError(fileDirItem.path)
                 callback(null)
                 return@handleSAFDialog
             }
@@ -648,8 +647,7 @@ fun BaseSimpleActivity.getFileOutputStream(fileDirItem: FileDirItem, allowCreati
                     callback(null)
                 }
             } else {
-                val error = String.format(getString(R.string.could_not_create_file), fileDirItem.path)
-                showErrorToast(error)
+                showFileCreateError(fileDirItem.path)
                 callback(null)
             }
         }
@@ -667,6 +665,12 @@ fun BaseSimpleActivity.getFileOutputStream(fileDirItem: FileDirItem, allowCreati
     }
 }
 
+fun BaseSimpleActivity.showFileCreateError(path: String) {
+    val error = String.format(getString(R.string.could_not_create_file), path)
+    baseConfig.treeUri = ""
+    showErrorToast(error)
+}
+
 fun BaseSimpleActivity.getFileOutputStreamSync(path: String, mimeType: String, parentDocumentFile: DocumentFile? = null): OutputStream? {
     val targetFile = File(path)
 
@@ -682,8 +686,7 @@ fun BaseSimpleActivity.getFileOutputStreamSync(path: String, mimeType: String, p
         }
 
         if (documentFile == null) {
-            val error = String.format(getString(R.string.could_not_create_file), targetFile.parent)
-            showErrorToast(error)
+            showFileCreateError(targetFile.parent)
             return null
         }
 
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context-storage.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context-storage.kt
index 9ad670a76..fd36aa3e8 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context-storage.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context-storage.kt
@@ -245,6 +245,11 @@ fun Context.scanPathsRecursively(paths: ArrayList<String>, callback: (() -> Unit
 }
 
 fun Context.rescanPaths(paths: ArrayList<String>, callback: (() -> Unit)? = null) {
+    if (paths.isEmpty()) {
+        callback?.invoke()
+        return
+    }
+
     var cnt = paths.size
     MediaScannerConnection.scanFile(applicationContext, paths.toTypedArray(), null) { s, uri ->
         if (--cnt == 0) {
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 6cf11e10f..d479afe37 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt
@@ -2,6 +2,7 @@ package com.simplemobiletools.commons.helpers
 
 import android.os.Build
 import android.os.Looper
+import java.util.*
 
 const val APP_NAME = "app_name"
 const val APP_LICENSES = "app_licenses"
@@ -238,3 +239,13 @@ fun getDateFormats() = arrayListOf(
 )
 
 val normalizeRegex = "\\p{InCombiningDiacriticalMarks}+".toRegex()
+
+fun getConflictResolution(resolutions: LinkedHashMap<String, Int>, path: String): Int {
+    return if (resolutions.size == 1 && resolutions.containsKey("")) {
+        resolutions[""]!!
+    } else if (resolutions.containsKey(path)) {
+        resolutions[path]!!
+    } else {
+        CONFLICT_SKIP
+    }
+}
diff --git a/commons/src/main/res/values-ar/strings.xml b/commons/src/main/res/values-ar/strings.xml
index cd3d7d256..8dc5a1857 100644
--- a/commons/src/main/res/values-ar/strings.xml
+++ b/commons/src/main/res/values-ar/strings.xml
@@ -345,6 +345,7 @@
     <string name="reminder_triggers_in">Time remaining till the reminder triggers:\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>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">Alarm</string>
diff --git a/commons/src/main/res/values-az/strings.xml b/commons/src/main/res/values-az/strings.xml
index 929b200a3..00bd28290 100644
--- a/commons/src/main/res/values-az/strings.xml
+++ b/commons/src/main/res/values-az/strings.xml
@@ -16,8 +16,8 @@
     <string name="details">Detallar</string>
     <string name="notes">Qeydlər</string>
     <string name="deleting_folder">\'%s\' qovluğu silinir</string>
-    <string name="none">None</string>
-    <string name="label">Label</string>
+    <string name="none">Heçnə</string>
+    <string name="label">Etiket</string>
 
     <!-- Favorites -->
     <string name="favorites">Sevimlilər</string>
@@ -122,8 +122,8 @@
     </plurals>
 
     <plurals name="deleting_items">
-        <item quantity="one">%d fayl silinir</item>
-        <item quantity="other">%d fayl silinir</item>
+        <item quantity="one">%d silinir</item>
+        <item quantity="other">%d silinir</item>
     </plurals>
 
     <!-- Storages -->
@@ -134,7 +134,7 @@
     <string name="wrong_root_selected">Seçilən qovluq yanlışdır, xahiş olunur SD kartın root qovluğunu seçin</string>
     <string name="sd_card_otg_same">SD kart və OTG cihaz yolu eyni ola bilməz</string>
     <string name="app_on_sd_card">Görünür tətbiqi SD karta yükləmisiniz, bu widgetlərin işləməsinin qarşısını alır. Siz widgetləri əlçatan widgetlər siyahısında belə görə bilməyəcəksiniz.
-        Bu sistem məhdudiyyətidir, əgər widgetlərin işləməsini istəyirsinizsə, tətbiqi daxili yaddaşa köçürməlisiniz.</string>
+        Bu sistem məhdudiyyətidir, əgər vidjetlərin işləməsini istəyirsinizsə, tətbiqi daxili yaddaşa köçürməlisiniz.</string>
 
     <!-- File properties -->
     <string name="properties">Xüsusiyyətlər</string>
@@ -345,6 +345,7 @@
     <string name="reminder_triggers_in">Xatırladıcının işləməsinə qalan vaxt:\n%s</string>
     <string name="alarm_warning">Xahiş olunur zəngə istinad etməzdən əvvəl işləyib işləmədiyini yoxlayın. Güc qoruma parametrləri onun işləməsində problem yarada bilər.</string>
     <string name="reminder_warning">Xahiş olunur xatırladıcılara istinad etməzdən əvvəl işləyib işləmədiyini yoxlayın. Güc qoruma parametrləri onların işləməsində problem yarada bilər.</string>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">Zəng</string>
diff --git a/commons/src/main/res/values-br/strings.xml b/commons/src/main/res/values-br/strings.xml
index f220aee58..0f4fc9f00 100644
--- a/commons/src/main/res/values-br/strings.xml
+++ b/commons/src/main/res/values-br/strings.xml
@@ -345,6 +345,7 @@
     <string name="reminder_triggers_in">Time remaining till the reminder triggers:\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>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">Alarm</string>
diff --git a/commons/src/main/res/values-ca/strings.xml b/commons/src/main/res/values-ca/strings.xml
index 820e5e125..5fb8eab92 100644
--- a/commons/src/main/res/values-ca/strings.xml
+++ b/commons/src/main/res/values-ca/strings.xml
@@ -17,7 +17,7 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">S\'està eliminant la carpeta \'%s\'</string>
     <string name="none">Cap</string>
-    <string name="label">Label</string>
+    <string name="label">Etiqueta</string>
 
     <!-- Favorites -->
     <string name="favorites">Preferits</string>
@@ -347,6 +347,7 @@
     <string name="reminder_triggers_in">Temps restant fins el recordatori:\n%s</string>
     <string name="alarm_warning">Assegureu-vos que l\'alarma funcioni correctament abans de confiar-hi. Pot comportar-se malament a causa de les restriccions del sistema relacionades amb l\'estalvi de bateria.</string>
     <string name="reminder_warning">Assegureu-vos que els recordatoris funcionin correctament abans de confiar-hi. Podrien comportar-se malament a causa de les restriccions del sistema relacionades amb l\'estalvi de bateria.</string>
+    <string name="notifications_disabled">Les notificacions d\'aquesta aplicació estan desactivades. Aneu a la configuració del vostre dispositiu per habilitar-los.</string>
 
     <!-- Alarms -->
     <string name="alarm">Alarma</string>
@@ -503,8 +504,8 @@
     </string>
     <string name="purchase">Comprar</string>
     <string name="update_thank_you">Si us plau, actualitzeu Simple Thank You a la darrera versió</string>
-    <string name="before_asking_question_read_faq">Before you ask a question, please read the Frequently Asked Questions first, maybe the solution is there.</string>
-    <string name="read_it">Read it</string>
+    <string name="before_asking_question_read_faq">Abans de fer una pregunta, llegiu les Preguntes més freqüents en primer lloc, potser la solució hi és.</string>
+    <string name="read_it">Llegiu</string>
 
     <!-- New app (do not translate anything on the 4th line) -->
     <string name="new_app">
diff --git a/commons/src/main/res/values-cs/strings.xml b/commons/src/main/res/values-cs/strings.xml
index e4337245d..5cb8be642 100644
--- a/commons/src/main/res/values-cs/strings.xml
+++ b/commons/src/main/res/values-cs/strings.xml
@@ -362,6 +362,7 @@
     <string name="reminder_triggers_in">Time remaining till the reminder triggers:\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>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">Alarm</string>
diff --git a/commons/src/main/res/values-da/strings.xml b/commons/src/main/res/values-da/strings.xml
index ad543ca21..fe6b55647 100644
--- a/commons/src/main/res/values-da/strings.xml
+++ b/commons/src/main/res/values-da/strings.xml
@@ -345,6 +345,7 @@
     <string name="reminder_triggers_in">Tid tilbage inden alarmen lyder:\n%s</string>
     <string name="alarm_warning">Du anbefales sikre dig at alarmen virker som den skal inden du stoler på den. Den kan drille som følge af strømbesparende begrænsninger på systemet.</string>
     <string name="reminder_warning">Du anbefales sikre dig at påmindelser virker som de skal inden du stoler på dem. De kan drille som følge af strømbesparende begrænsninger på systemet.</string>
+    <string name="notifications_disabled">Påmindelser er ikke aktiveret for denne app. Du kan aktivere dem i indstillingerne på din enhed.</string>
 
     <!-- Alarms -->
     <string name="alarm">Alarm</string>
diff --git a/commons/src/main/res/values-de/strings.xml b/commons/src/main/res/values-de/strings.xml
index 88a50f9a7..37b0dbedf 100644
--- a/commons/src/main/res/values-de/strings.xml
+++ b/commons/src/main/res/values-de/strings.xml
@@ -223,8 +223,8 @@
 
     <!-- Confirmation dialog -->
     <string name="proceed_with_deletion">Willst du mit dem Löschen fortfahren?</string>
-    <string name="deletion_confirmation">Sollen %s Elemente wirklich gelöscht werden?</string>    <!-- Are you sure you want to delete 5 items? -->
-    <string name="move_to_recycle_bin_confirmation">Sollen %s Elemente wirklich in den Papierkorb verschoben werden?</string>    <!-- Are you sure you want to move 3 items into the Recycle Bin? -->
+    <string name="deletion_confirmation">Sollen %s wirklich gelöscht werden?</string>       <!-- Are you sure you want to delete 5 items? -->
+    <string name="move_to_recycle_bin_confirmation">Sollen %s wirklich in den Papierkorb verschoben werden?</string>        <!-- Are you sure you want to move 3 items into the Recycle Bin? -->
     <string name="are_you_sure_delete">Soll dieses Element wirklich gelöscht werden?</string>
     <string name="are_you_sure_recycle_bin">Soll dieses Element wirklich in den Papierkorb verschoben werden?</string>
     <string name="do_not_ask_again">Nicht erneut fragen (in dieser Sitzung)</string>
@@ -345,17 +345,18 @@
     <string name="reminder_triggers_in">Verbleibende Zeit bis Alarm ausgelöst wird:\n%s</string>
     <string name="alarm_warning">Bitte stell sicher, dass der Alarm zuverlässig funktioniert, bevor Du Dich darauf verlässt. Es könnte wegen Systemeinschränkungen (z.B. Stromsparfunktion) fehlschlagen.</string>
     <string name="reminder_warning">Bitte stell sicher, dass die Erinnerung zuverlässig funktioniert, bevor Du Dich darauf verlässt. Es könnte wegen Systemeinschränkungen (z.B. Stromsparfunktion) fehlschlagen.</string>
+    <string name="notifications_disabled">Benachrichtigungen für diese App sind deaktiviert. Bitte geh in deine Systemeinstellungen und aktiviere sie.</string>
 
     <!-- Alarms -->
     <string name="alarm">Wecker</string>
-    <string name="snooze">Snooze</string>
+    <string name="snooze">Schlummern</string>
     <string name="dismiss">Abstellen</string>
     <string name="no_reminder">Keine Erinnerung</string>
     <string name="at_start">Zu Beginn</string>
     <string name="system_sounds">Systemtöne</string>
     <string name="your_sounds">Deine Töne</string>
     <string name="add_new_sound">Neuen Ton hinzufügen</string>
-    <string name="no_sound">No sound</string>
+    <string name="no_sound">Stumm</string>
 
     <!-- Settings -->
     <string name="settings">Einstellungen</string>
@@ -380,8 +381,8 @@
     <string name="use_24_hour_time_format">Benutze 24-Std.-Zeitformat</string>
     <string name="sunday_first">Beginne die Woche am Sonntag</string>
     <string name="widgets">Widgets</string>
-    <string name="use_same_snooze">Immer dasselbe Snooze-Intervall nutzen</string>
-    <string name="snooze_time">Schlummern-Intervall</string>
+    <string name="use_same_snooze">Immer den selben Schlummer-Intervall nutzen</string>
+    <string name="snooze_time">Schlummer-Intervall</string>
     <string name="vibrate_on_button_press">Bei Tastendruck vibrieren</string>
     <string name="move_items_into_recycle_bin">Elemente in den Papierkorb verschieben statt löschen</string>
     <string name="recycle_bin_cleaning_interval">Intervall zum Leeren des Papierkorbs</string>
@@ -421,7 +422,7 @@
     <!-- OTG devices -->
     <string name="otg">OTG</string>
     <string name="confirm_otg_storage_access_text">Bitte den Basis-Ordner des OTG-Geräts auf der folgenden Seite wählen, um Zugriff zu gewähren</string>
-    <string name="wrong_root_selected_otg">Falscher Ordner gewählt, bitte den Basis- (root-) Ordner des OTG-Geräts wählen</string>
+    <string name="wrong_root_selected_otg">Falscher Ordner gewählt, bitte den Basis- (Root-) Ordner des OTG-Geräts wählen</string>
 
     <!-- Dates -->
     <string name="january">Januar</string>
@@ -438,18 +439,18 @@
     <string name="december">Dezember</string>
 
     <!-- in January -->
-    <string name="in_january">in Januar</string>
-    <string name="in_february">in Februar</string>
-    <string name="in_march">in März</string>
-    <string name="in_april">in April</string>
-    <string name="in_may">in Mai</string>
-    <string name="in_june">in Juni</string>
-    <string name="in_july">in Juli</string>
-    <string name="in_august">in August</string>
-    <string name="in_september">in September</string>
-    <string name="in_october">in Oktober</string>
-    <string name="in_november">in November</string>
-    <string name="in_december">in Dezember</string>
+    <string name="in_january">im Januar</string>
+    <string name="in_february">im Februar</string>
+    <string name="in_march">im März</string>
+    <string name="in_april">im April</string>
+    <string name="in_may">im Mai</string>
+    <string name="in_june">im Juni</string>
+    <string name="in_july">im Juli</string>
+    <string name="in_august">im August</string>
+    <string name="in_september">im September</string>
+    <string name="in_october">im Oktober</string>
+    <string name="in_november">im November</string>
+    <string name="in_december">im Dezember</string>
 
     <string name="monday">Montag</string>
     <string name="tuesday">Dienstag</string>
@@ -519,7 +520,7 @@
     <string name="frequently_asked_questions">Häufig gestellte Fragen</string>
     <string name="before_asking_question">Bevor du eine Frage stellst, bitte lies diese Seite:</string>
     <string name="faq_1_title_commons">Weshalb sehe ich das Widget dieser App nicht in der Liste der Widgets?</string>
-    <string name="faq_1_text_commons">Wahrscheinlich, weil du die App auf die Speicherkarte verschoben hast. In diesem Fall werden durch eine Einschränkung von Android die Widgets dieser App versteckt. Die einzige Lösung ist die App über die Geräteeinstellungen wieder in den internen Speicher zu verschieben.</string>
+    <string name="faq_1_text_commons">Wahrscheinlich, weil du die App auf die Speicherkarte verschoben hast. In diesem Fall werden durch eine Einschränkung von Android die Widgets dieser App ausgeblendet. Die einzige Lösung ist die App über die Geräteeinstellungen wieder in den internen Speicher zu verschieben.</string>
     <string name="faq_2_title_commons">Ich will dich unterstützen, aber es ist mir nicht möglich Geld zu spenden. Gibt es eine andere Möglichkeit?</string>
     <string name="faq_2_text_commons">Ja, sicherlich. Du kannst die Apps weiterempfehlen oder gute Rückmeldung und Bewertungen geben. Du kannst ebenso helfen, indem du die Apps in neue Sprachen übersetzt oder vorhandene Übersetzungen aktualisierst.
         Die Anleitung dazu findest du unter https://github.com/SimpleMobileTools/General-Discussion oder sende mir eine Nachricht an hello@simplemobiletools.com, falls du Hilfe benötigst.</string>
diff --git a/commons/src/main/res/values-el/strings.xml b/commons/src/main/res/values-el/strings.xml
index eb8b939bb..d926b0c7a 100644
--- a/commons/src/main/res/values-el/strings.xml
+++ b/commons/src/main/res/values-el/strings.xml
@@ -345,6 +345,7 @@
     <string name="reminder_triggers_in">Χρόνος που απομένει μέχρι να ενεργοποιηθεί η υπενθύμιση:\n%s</string>
     <string name="alarm_warning">Βεβαιωθείτε ότι η ειδοποίηση λειτουργεί σωστά πριν βασιστείτε σε αυτήν. Θα μπορούσε να αποτύχει λόγω των περιορισμών του συστήματος που σχετίζονται με την εξοικονόμηση μπαταρίας.</string>
     <string name="reminder_warning">Βεβαιωθείτε ότι η υπενθύμιση λειτουργεί σωστά πριν βασιστείτε σε αυτήν. Θα μπορούσε να αποτύχει λόγω των περιορισμών του συστήματος που σχετίζονται με την εξοικονόμηση μπαταρίας.</string>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">Ειδοποιήσεις</string>
@@ -433,7 +434,7 @@
     <string name="july">Ιούλιος</string>
     <string name="august">Αύγουστος</string>
     <string name="september">Σεπτέμβριος</string>
-    <string name="october">Οκτώμβριος</string>
+    <string name="october">Οκτώβριος</string>
     <string name="november">Νοέμβριος</string>
     <string name="december">Δεκέμβριος</string>
 
@@ -447,7 +448,7 @@
     <string name="in_july">τον Ιούλιο</string>
     <string name="in_august">τον Αύγουστο</string>
     <string name="in_september">τον Σεπτέμβριο</string>
-    <string name="in_october">τον Οκτώμβριο</string>
+    <string name="in_october">τον Οκτώβριο</string>
     <string name="in_november">τον Νοέμβριο</string>
     <string name="in_december">τον Δεκέμβριο</string>
 
diff --git a/commons/src/main/res/values-es/strings.xml b/commons/src/main/res/values-es/strings.xml
index f6f1549a9..bd68fa082 100644
--- a/commons/src/main/res/values-es/strings.xml
+++ b/commons/src/main/res/values-es/strings.xml
@@ -17,7 +17,7 @@
     <string name="notes">Notas</string>
     <string name="deleting_folder">Eliminando carpeta \'%s\'</string>
     <string name="none">Ninguno</string>
-    <string name="label">Label</string>
+    <string name="label">Etiqueta</string>
 
     <!-- Favorites -->
     <string name="favorites">Favoritos</string>
@@ -344,6 +344,7 @@
     <string name="reminder_triggers_in">Tiempo restante hasta que se active el recordatorio:\n%s</string>
     <string name="alarm_warning">Asegúrese de que la alarma funcione correctamente antes de confiar en ella. Podría comportarse mal debido a las restricciones del sistema relacionadas con el ahorro de batería.</string>
     <string name="reminder_warning">Asegúrese de que los recordatorios funcionen correctamente antes de confiar en ellos. Podrían portarse mal debido a las restricciones del sistema relacionadas con el ahorro de batería.</string>
+    <string name="notifications_disabled">Las notificaciones de esta aplicación están deshabilitadas. Vaya a la configuración de su dispositivo para habilitarlos.</string>
 
     <!-- Alarms -->
     <string name="alarm">Alarma</string>
@@ -500,8 +501,8 @@
     </string>
     <string name="purchase">Comprar</string>
     <string name="update_thank_you">Por favor, actualice Simple Tank You a la última versión</string>
-    <string name="before_asking_question_read_faq">Before you ask a question, please read the Frequently Asked Questions first, maybe the solution is there.</string>
-    <string name="read_it">Read it</string>
+    <string name="before_asking_question_read_faq">Antes de hacer una pregunta, lea primero las Preguntas más frecuentes, quizás la solución esté allí.</string>
+    <string name="read_it">Leer</string>
 
     <!-- New app (do not translate anything on the 4th line) -->
     <string name="new_app">
diff --git a/commons/src/main/res/values-fi/strings.xml b/commons/src/main/res/values-fi/strings.xml
index ea8d1766c..a473209fc 100644
--- a/commons/src/main/res/values-fi/strings.xml
+++ b/commons/src/main/res/values-fi/strings.xml
@@ -345,6 +345,7 @@
     <string name="reminder_triggers_in">Time remaining till the reminder triggers:\n%s</string>
     <string name="alarm_warning">Varmista että hälytys toimii ennenkuin turvaudut siihen. Se voi toimia virheellisesti laitteesi virransäästötoiminnoista riippuen.</string>
     <string name="reminder_warning">Varmista että muistutus toimii ennenkuin turvaudut siihen. Se voi toimia virheellisesti laitteesi virransäästötoiminnoista riippuen.</string>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">Alarm</string>
diff --git a/commons/src/main/res/values-fr/strings.xml b/commons/src/main/res/values-fr/strings.xml
index 2b9844c4b..c8e822b01 100644
--- a/commons/src/main/res/values-fr/strings.xml
+++ b/commons/src/main/res/values-fr/strings.xml
@@ -345,6 +345,7 @@
     <string name="reminder_triggers_in">Time remaining till the reminder triggers:\n%s</string>
     <string name="alarm_warning">Veuillez vérifier que l\'alarme fonctionne correctement avant de lui faire confiance. Elle pourrait ne pas fonctionner correctement, à cause de la politique d\'économie d\'énergie de votre appareil.</string>
     <string name="reminder_warning">Veuillez vérifier que les rappels fonctionnent correctement avant de leur faire confiance. Ils pourraient ne pas fonctionner correctement, à cause de la politique d\'économie d\'énergie de votre appareil.</string>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">Réveil</string>
diff --git a/commons/src/main/res/values-gl/strings.xml b/commons/src/main/res/values-gl/strings.xml
index 619b64b05..91acd5a58 100644
--- a/commons/src/main/res/values-gl/strings.xml
+++ b/commons/src/main/res/values-gl/strings.xml
@@ -344,6 +344,7 @@
     <string name="reminder_triggers_in">Time remaining till the reminder triggers:\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>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">Alarm</string>
diff --git a/commons/src/main/res/values-hi-rIN/strings.xml b/commons/src/main/res/values-hi-rIN/strings.xml
index bc78a59d8..98637c61b 100644
--- a/commons/src/main/res/values-hi-rIN/strings.xml
+++ b/commons/src/main/res/values-hi-rIN/strings.xml
@@ -345,6 +345,7 @@
     <string name="reminder_triggers_in">Time remaining till the reminder triggers:\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>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">Alarm</string>
diff --git a/commons/src/main/res/values-hr/strings.xml b/commons/src/main/res/values-hr/strings.xml
index 53d845354..9b7293924 100644
--- a/commons/src/main/res/values-hr/strings.xml
+++ b/commons/src/main/res/values-hr/strings.xml
@@ -5,19 +5,19 @@
     <string name="file_saved">Datoteka uspješno spremljena</string>
     <string name="invalid_file_format">Nevažeći format datoteke</string>
     <string name="out_of_memory_error">Greška, nema slobodnog prostora</string>
-    <string name="an_error_occurred">Greška se dogodila: %s</string>
+    <string name="an_error_occurred">Dogodila se greška: %s</string>
     <string name="open_with">Otvori s</string>
     <string name="no_app_found">Nema odgovarajuće aplikacije</string>
     <string name="set_as">Postavi kao</string>
     <string name="value_copied_to_clipboard">Vrijednost spremljena u međuspremnik</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>
-    <string name="none">None</string>
-    <string name="label">Label</string>
+    <string name="unknown">Nepoznato</string>
+    <string name="always">Uvijek</string>
+    <string name="never">Nikad</string>
+    <string name="details">Detalji</string>
+    <string name="notes">Bilješke</string>
+    <string name="deleting_folder">Brisanje mape \'%s\'</string>
+    <string name="none">Nijedan</string>
+    <string name="label">Označi</string>
 
     <!-- Favorites -->
     <string name="favorites">Favoriti</string>
@@ -27,39 +27,39 @@
 
     <!-- Search -->
     <string name="search">Traži</string>
-    <string name="type_2_characters">Type in at least 2 characters to start the search.</string>
+    <string name="type_2_characters">Upiši najmanje 2 znaka za početak pretraživanja.</string>
 
     <!-- Filters -->
-    <string name="filter">Filter</string>
-    <string name="no_items_found">No items found.</string>
-    <string name="change_filter">Change filter</string>
+    <string name="filter">Filtar</string>
+    <string name="no_items_found">Nijedna stavka nije pronađena.</string>
+    <string name="change_filter">Promijeni filtar</string>
 
     <!-- Permissions -->
-    <string name="no_storage_permissions">Potrebna je dozvola za prostor za pohranu</string>
-    <string name="no_contacts_permission">Potrebna je dozvola za kontakte</string>
-    <string name="no_camera_permissions">Potrebna je dozvola za kameru</string>
-    <string name="no_audio_permissions">Potrebna je dozvola za zvuk</string>
+    <string name="no_storage_permissions">Potrebno je dopuštenje za prostor za pohranu</string>
+    <string name="no_contacts_permission">Potrebno je dopuštenje za kontakte</string>
+    <string name="no_camera_permissions">Potrebno je dopuštenje za kameru</string>
+    <string name="no_audio_permissions">Potrebno je dopuštenje za zvuk</string>
 
     <!-- Renaming -->
     <string name="rename_file">Preimenuj datoteku</string>
-    <string name="rename_folder">Preimenuj direktorij</string>
+    <string name="rename_folder">Preimenuj mapu</string>
     <string name="rename_file_error">Nije moguće preimenovati datoteku</string>
-    <string name="rename_folder_error">Nije moguće preimenovati direktorij</string>
-    <string name="rename_folder_empty">Naziv direktorija ne smije biti prazan</string>
-    <string name="rename_folder_exists">Direktorij s tim imenom već postoji</string>
-    <string name="rename_folder_root">Nije moguće preimenovati root direktorij prostora za pohranu</string>
-    <string name="rename_folder_ok">Direktorij uspješno preimenovan</string>
-    <string name="renaming_folder">Preimenovanje direktorija</string>
+    <string name="rename_folder_error">Nije moguće preimenovati mapu</string>
+    <string name="rename_folder_empty">Naziv mape ne smije biti prazan</string>
+    <string name="rename_folder_exists">Mapa s tim imenom već postoji</string>
+    <string name="rename_folder_root">Nije moguće preimenovati root mapu prostora za pohranu</string>
+    <string name="rename_folder_ok">Mapa uspješno preimenovana</string>
+    <string name="renaming_folder">Preimenovanje mape</string>
     <string name="filename_cannot_be_empty">Naziv datoteke ne smije biti prazan</string>
     <string name="filename_invalid_characters">Naziv datoteke sadrži ne podržane znakove</string>
-    <string name="filename_invalid_characters_placeholder">Filename \'%s\' contains invalid characters</string>
+    <string name="filename_invalid_characters_placeholder">Naziv datoteke \'%s\' sadrži nevažeće znakove</string>
     <string name="extension_cannot_be_empty">Ekstenzija ne smije biti prazna</string>
-    <string name="source_file_doesnt_exist">Source file %s doesn\'t exist</string>
+    <string name="source_file_doesnt_exist">Izvorišna datoteka %s ne postoji</string>
 
     <!-- Copy / Move -->
     <string name="copy">Kopiraj</string>
     <string name="move">Premjesti</string>
-    <string name="copy_move">Kopiraj / Premjesti</string>
+    <string name="copy_move">Kopiraj/Premjesti</string>
     <string name="copy_to">Kopiraj u</string>
     <string name="move_to">Premjesti u</string>
     <string name="source">Izvor</string>
@@ -67,27 +67,27 @@
     <string name="select_destination">Odabir odredišta</string>
     <string name="click_select_destination">Kliknite ovdje za odabir odredišta</string>
     <string name="invalid_destination">Nije moguće zapisivanje na odabranom odredištu</string>
-    <string name="please_select_destination">Molimo odaberite odredište</string>
+    <string name="please_select_destination">Molim odaberite odredište</string>
     <string name="source_and_destination_same">Izvor i odredište ne mogu biti isti</string>
     <string name="copy_failed">Nije moguće kopiranje datoteka</string>
     <string name="copying">Kopiranje…</string>
     <string name="copying_success">Datoteke uspješno kopirane</string>
-    <string name="copy_move_failed">Greška se dogodila</string>
+    <string name="copy_move_failed">Dogodila se greška</string>
     <string name="moving">Premještanje…</string>
     <string name="moving_success">Datoteke uspješno premještene</string>
     <string name="moving_success_partial">Neke datoteke nije bilo moguće premjestiti</string>
     <string name="copying_success_partial">Neke datoteke nije bilo moguće kopirati</string>
     <string name="no_files_selected">Nema odabranih datoteka</string>
     <string name="saving">Spremanje…</string>
-    <string name="could_not_create_folder">Nije moguće stvoriti direktorij %s</string>
+    <string name="could_not_create_folder">Nije moguće stvoriti mapu %s</string>
     <string name="could_not_create_file">Nije moguće stvoriti datoteku %s</string>
 
     <!-- Create new -->
     <string name="create_new">Stvori novo</string>
-    <string name="folder">Direktorij</string>
+    <string name="folder">Mapa</string>
     <string name="file">Datoteka</string>
-    <string name="create_new_folder">Stvori novi direktorij</string>
-    <string name="name_taken">Datoteka ili direktorij s tim nazivom već postoje</string>
+    <string name="create_new_folder">Stvori novu mapu</string>
+    <string name="name_taken">Datoteka ili mapa s tim nazivom već postoje</string>
     <string name="invalid_name">Naziv sadrži ne važeće znakove</string>
     <string name="empty_name">Molimo unesite naziv</string>
     <string name="unknown_error_occurred">Nepoznata greška se dogodila</string>
@@ -95,18 +95,18 @@
     <!-- File operation conflicts -->
     <string name="file_already_exists">Datoteka \"%s\" već postoji</string>
     <string name="file_already_exists_overwrite">Datoteka \"%s\" već postoji. Presnimiti?</string>
-    <string name="folder_already_exists">Folder \"%s\" already exists</string>
-    <string name="merge">Merge</string>
+    <string name="folder_already_exists">Mapa \"%s\" već postoji</string>
+    <string name="merge">Spoji</string>
     <string name="overwrite">Presnimi</string>
     <string name="skip">Preskoči</string>
     <string name="append">Dodaj s \'_1\'</string>
     <string name="apply_to_all">Primjeni na sve sukobe</string>
 
     <!-- File picker -->
-    <string name="select_folder">Odaberite direktorij</string>
+    <string name="select_folder">Odaberite mapu</string>
     <string name="select_file">Odaberite datoteku</string>
     <string name="confirm_storage_access_title">Potvrdite pristup vanjskom prostoru za pohranu</string>
-    <string name="confirm_storage_access_text">Molimo odaberite root direktorij SD kartice na sljedećem prozoru, da bi ste omogućili zapisivanje</string>
+    <string name="confirm_storage_access_text">Molimo odaberite root mapu SD kartice na sljedećem prozoru, da bi ste omogućili zapisivanje</string>
     <string name="confirm_storage_access_text_sd">Ukoliko ne vidite SD karticu, probajte ovo</string>
     <string name="confirm_selection">Potvrdi odabir</string>
 
@@ -118,15 +118,15 @@
 
     <!-- Are you sure you want to delete 5 items? -->
     <plurals name="delete_items">
-        <item quantity="one">%d item</item>
-        <item quantity="few">%d items</item>
-        <item quantity="other">%d items</item>
+        <item quantity="one">%d stavka</item>
+        <item quantity="few">%d stavke</item>
+        <item quantity="other">%d stavki</item>
     </plurals>
 
     <plurals name="deleting_items">
-        <item quantity="one">Deleting %d item</item>
-        <item quantity="few">Deleting %d items</item>
-        <item quantity="other">Deleting %d items</item>
+        <item quantity="one">Deleting %d stavke</item>
+        <item quantity="few">Deleting %d stavki</item>
+        <item quantity="other">Deleting %d stavki</item>
     </plurals>
 
     <!-- Storages -->
@@ -134,10 +134,10 @@
     <string name="internal">Unutranji prostor za pohranu</string>
     <string name="sd_card">SD kartica</string>
     <string name="root">Root</string>
-    <string name="wrong_root_selected">Odabran je pogrešan direktorij, molimo odaberite root direktorij Vaše SD kartice</string>
-    <string name="sd_card_otg_same">SD card and OTG device paths cannot be the same</string>
-    <string name="app_on_sd_card">You seem to have the app installed on an SD card, that makes the app widgets unavailable. You won\'t even see them on the list of available widgets.
-        It is a system limitation, so if you want to use the widgets, you have to move the app back on the internal storage.</string>
+    <string name="wrong_root_selected">Odabrana je pogrešana mapa, molimo odaberite root mapu Vaše SD kartice</string>
+    <string name="sd_card_otg_same">SD kartice i OTG putevi uređaja ne mogu biti isti</string>
+    <string name="app_on_sd_card">Čini se da je aplikacija instalirana na SD karticu, što čini widgete aplikacije nedostupnim. Nećete ih čak ni vidjeti na popisu dostupnih widgeta.
+        To je ograničenje sustava, pa ako želite upotrebljavati widgete, morate vratiti aplikaciju na unutarnju pohranu..</string>
 
     <!-- File properties -->
     <string name="properties">Svojstva</string>
@@ -155,18 +155,18 @@
     <string name="f_number">F-broj</string>
     <string name="camera">Kamera</string>
     <string name="exif">EXIF</string>
-    <string name="song_title">Song title</string>
+    <string name="song_title">Naziv pjesme</string>
 
     <!-- Color customization -->
     <string name="background_color">Boja pozadine</string>
     <string name="text_color">Boja teksta</string>
     <string name="primary_color">Primarna boja</string>
-    <string name="foreground_color">Foreground color</string>
-    <string name="app_icon_color">App icon color</string>
+    <string name="foreground_color">Boja pozadine</string>
+    <string name="app_icon_color">Boja ikone aplikacije</string>
     <string name="restore_defaults">Vrati zadano</string>
-    <string name="change_color">Change color</string>
+    <string name="change_color">Promijeni boju</string>
     <string name="theme">Tema</string>
-    <string name="changing_color_description">Promjenom boje, prelazi se na Prilagođenu temu</string>
+    <string name="changing_color_description">Promijenom boje, prelazi se na Prilagođenu temu</string>
     <string name="save">Spremi</string>
     <string name="discard">Odbaci</string>
     <string name="undo_changes">Poništi promjene</string>
@@ -176,7 +176,7 @@
     <string name="share_colors_success">Uspješno ažurirane boje. Nova tema pod nazivom \'Shared\' je dodana, molimo koristite ju za ažuriranje svih boja u aplikaciji u budućnosti.</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!
+            Molimo kupite <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Simple Thank You</a> za otključavanje ove funkcije i podršku razvoju. Hvala!
         ]]>
     </string>
 
@@ -185,7 +185,7 @@
     <string name="dark_theme">Tamna</string>
     <string name="solarized">Solarizirana</string>
     <string name="dark_red">Tamno crvena</string>
-    <string name="black_white">Black &amp; White</string>
+    <string name="black_white">Crno &amp; Bijelo</string>
     <string name="custom">Prilagođena</string>
     <string name="shared">Dijeljena</string>
 
@@ -202,14 +202,14 @@
     <string name="select_all">Odaberi sve</string>
     <string name="hide">Sakrij</string>
     <string name="unhide">Otkrij</string>
-    <string name="hide_folder">Sakrij direktorij</string>
-    <string name="unhide_folder">Otkrij direktorij</string>
+    <string name="hide_folder">Sakrij mapu</string>
+    <string name="unhide_folder">Otkrij mapu</string>
     <string name="temporarily_show_hidden">Privremeno prikaži skriveno</string>
     <string name="stop_showing_hidden">Zaustavi prikazivanje skrivenih stavki</string>
     <string name="maximum_share_reached">Nije moguće dijeliti ovoliko stavki odjednom</string>
-    <string name="empty_and_disable_recycle_bin">Empty and disable the Recycle Bin</string>
-    <string name="undo">Undo</string>
-    <string name="redo">Redo</string>
+    <string name="empty_and_disable_recycle_bin">Ispraznite i onemogućite koš za smeće</string>
+    <string name="undo">Poništi promjenu</string>
+    <string name="redo">Ponovi promjenu</string>
 
     <!-- Sorting -->
     <string name="sort_by">Sortiraj po</string>
@@ -219,24 +219,24 @@
     <string name="date_taken">Datum stvaranja</string>
     <string name="title">Naslov</string>
     <string name="filename">Naziv datoteke</string>
-    <string name="extension">Ekstenzija</string>
+    <string name="extension">Tip datoteke</string>
     <string name="ascending">Uzlazno</string>
     <string name="descending">Silazno</string>
-    <string name="use_for_this_folder">Koristi samo za ovaj direktorij</string>
+    <string name="use_for_this_folder">Koristi samo za ovu mapu</string>
 
     <!-- Confirmation dialog -->
     <string name="proceed_with_deletion">Jeste li sigurni da želite nastaviti s brisanjem?</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 into the Recycle Bin?</string>    <!-- Are you sure you want to move 3 items into the Recycle Bin? -->
-    <string name="are_you_sure_delete">Are you sure you want to delete this item?</string>
-    <string name="are_you_sure_recycle_bin">Are you sure you want to move this item into the Recycle Bin?</string>
+    <string name="deletion_confirmation">Jeste li sigurni da želite izbrisati %s?</string>    <!-- Are you sure you want to delete 5 items? -->
+    <string name="move_to_recycle_bin_confirmation">Jeste li sigurni da se želite premjestiti %s u koš za smeće?</string>    <!-- Are you sure you want to move 3 items into the Recycle Bin? -->
+    <string name="are_you_sure_delete">Jeste li sigurni da želite izbrisati ovu stavku?</string>
+    <string name="are_you_sure_recycle_bin">Jeste li sigurni da želite premjestiti ovu stavku u koš za smeće?</string>
     <string name="do_not_ask_again">Ne pitaj me više u ovoj sesiji</string>
     <string name="yes">Da</string>
     <string name="no">Ne</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">UPOZORENJE: Brišete mapu</item>
+        <item quantity="other">UPOZORENJE: Brišete %d mapa</item>
     </plurals>
 
     <!-- Password protection -->
@@ -254,19 +254,19 @@
     <string name="place_finger">Molimo postavite prst na senzor otiska prsta</string>
     <string name="authentication_failed">Neuspješna autentifikacija</string>
     <string name="authentication_blocked">Blokirana autentifikacija, molimo pokušajte za par trenutaka</string>
-    <string name="no_fingerprints_registered">Nemate registiranih otisaka prstiju, molimo dodajte ih u postavkama vašeg uređaja</string>
+    <string name="no_fingerprints_registered">Nemate registiranih otisaka prstiju, molimo dodajte ih u postavkama Vašeg uređaja</string>
     <string name="go_to_settings">Idi u Postavke</string>
     <string name="protection_setup_successfully">Uspješno postavljanje lozinke. Molimo reinstalirajte aplikaciju u slučaju da je zaboravite.</string>
     <string name="fingerprint_setup_successfully">Uspješno postavljanje zaštite. Molimo reinstalirajte aplikaciju u slučaju problema s resetiranjem.</string>
 
     <!-- Times -->
-    <string name="yesterday">Yesterday</string>
-    <string name="today">Today</string>
-    <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>
+    <string name="yesterday">Jučer</string>
+    <string name="today">Danas</string>
+    <string name="tomorrow">Sutra</string>
+    <string name="seconds_raw">sekunde</string>
+    <string name="minutes_raw">minute</string>
+    <string name="hours_raw">sati</string>
+    <string name="days_raw">dani</string>
 
     <plurals name="seconds">
         <item quantity="one">%d sekunda</item>
@@ -284,107 +284,108 @@
         <item quantity="other">%d sati</item>
     </plurals>
     <plurals name="days">
-        <item quantity="one">%d day</item>
-        <item quantity="few">%d days</item>
-        <item quantity="other">%d days</item>
+        <item quantity="one">%d dan</item>
+        <item quantity="few">%d dana</item>
+        <item quantity="other">%d dani</item>
     </plurals>
     <plurals name="weeks">
-        <item quantity="one">%d week</item>
-        <item quantity="few">%d weeks</item>
-        <item quantity="other">%d weeks</item>
+        <item quantity="one">%d tjedan</item>
+        <item quantity="few">%d tjedna</item>
+        <item quantity="other">%d tjedana</item>
     </plurals>
     <plurals name="months">
-        <item quantity="one">%d month</item>
-        <item quantity="few">%d months</item>
-        <item quantity="other">%d months</item>
+        <item quantity="one">%d mjesec</item>
+        <item quantity="few">%d mjeseca</item>
+        <item quantity="other">%d mjeseci</item>
     </plurals>
     <plurals name="years">
-        <item quantity="one">%d year</item>
-        <item quantity="few">%d years</item>
-        <item quantity="other">%d years</item>
+        <item quantity="one">%d godina</item>
+        <item quantity="few">%d godine</item>
+        <item quantity="other">%d godina</item>
     </plurals>
 
     <!-- For example: I will be there in 5 minutes -->
     <plurals name="in_seconds">
-        <item quantity="one">%d second</item>
-        <item quantity="few">%d seconds</item>
-        <item quantity="other">%d seconds</item>
+        <item quantity="one">%d sekundu</item>
+        <item quantity="few">%d sekundi</item>
+        <item quantity="other">%d sekunde</item>
     </plurals>
     <plurals name="in_minutes">
-        <item quantity="one">%d minute</item>
-        <item quantity="few">%d minutes</item>
-        <item quantity="other">%d minutes</item>
+        <item quantity="one">%d minutu</item>
+        <item quantity="few">%d minuta</item>
+        <item quantity="other">%d minute</item>
     </plurals>
     <plurals name="in_hours">
-        <item quantity="one">%d hour</item>
-        <item quantity="few">%d hours</item>
-        <item quantity="other">%d hours</item>
+        <item quantity="one">%d sat</item>
+        <item quantity="few">%d sati</item>
+        <item quantity="other">%d sate</item>
     </plurals>
 
     <!-- For example: Event reminder: 3 minutes before -->
     <plurals name="seconds_before">
-        <item quantity="one">%d second before</item>
-        <item quantity="few">%d seconds before</item>
-        <item quantity="other">%d seconds before</item>
+        <item quantity="one">%d sekunda prije</item>
+        <item quantity="few">%d sekundi prije</item>
+        <item quantity="other">%d sekunde prije</item>
     </plurals>
     <plurals name="minutes_before">
-        <item quantity="one">%d minute before</item>
-        <item quantity="few">%d minutes before</item>
-        <item quantity="other">%d minutes before</item>
+        <item quantity="one">%d minuta prije</item>
+        <item quantity="few">%d minuta prije</item>
+        <item quantity="other">%d minute prije</item>
     </plurals>
     <plurals name="hours_before">
-        <item quantity="one">%d hour before</item>
-        <item quantity="few">%d hours before</item>
-        <item quantity="other">%d hours before</item>
+        <item quantity="one">%d sat prije</item>
+        <item quantity="few">%d sati prije</item>
+        <item quantity="other">%d sate prije</item>
     </plurals>
     <plurals name="days_before">
-        <item quantity="one">%d day before</item>
-        <item quantity="few">%d days before</item>
-        <item quantity="other">%d days before</item>
+        <item quantity="one">%d dan prije</item>
+        <item quantity="few">%d dana prije</item>
+        <item quantity="other">%d dane prije</item>
     </plurals>
 
     <!-- For example: Postpone reminder by 3 minutes -->
     <plurals name="by_seconds">
-        <item quantity="one">%d second</item>
-        <item quantity="few">%d seconds</item>
-        <item quantity="other">%d seconds</item>
+        <item quantity="one">%d sekundu</item>
+        <item quantity="few">%d sekundi</item>
+        <item quantity="other">%d sekunde</item>
     </plurals>
     <plurals name="by_minutes">
-        <item quantity="one">%d minute</item>
-        <item quantity="few">%d minutes</item>
-        <item quantity="other">%d minutes</item>
+        <item quantity="one">%d minutu</item>
+        <item quantity="few">%d minuta</item>
+        <item quantity="other">%d minute</item>
     </plurals>
     <plurals name="by_hours">
-        <item quantity="one">%d hour</item>
-        <item quantity="few">%d hours</item>
-        <item quantity="other">%d hours</item>
+        <item quantity="one">%d sat</item>
+        <item quantity="few">%d sati</item>
+        <item quantity="other">%d sate</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="reminder_triggers_in">Time remaining till the reminder triggers:\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>
+    <string name="alarm_goes_off_in">Preostalo vrijeme do pokretanja alarma:\n%s</string>
+    <string name="reminder_triggers_in">Preostalo vrijeme do pokretanja podsjetnika:\n%s</string>
+    <string name="alarm_warning">Provjerite da li alarm ispravno funkcionira prije nego što se oslonite na njega. Moglo bi se dogoditi pogreška zbog ograničenja sustava vezanih uz štednju baterije.</string>
+    <string name="reminder_warning">Pazite da podsjetnici ispravno rade prije nego što se oslonite na njih. Moglo bi se dogoditi pogreška zbog ograničenja sustava vezanih uz štednju baterije.</string>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</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>
+    <string name="snooze">Odgodi</string>
+    <string name="dismiss">Odbaci</string>
+    <string name="no_reminder">Nema podsjetnika</string>
+    <string name="at_start">Na početku</string>
+    <string name="system_sounds">Zvukovi sustava</string>
+    <string name="your_sounds">Vaši zvukovi</string>
+    <string name="add_new_sound">Dodaj novi zvuk</string>
+    <string name="no_sound">Nema zvuka</string>
 
     <!-- Settings -->
     <string name="settings">Postavke</string>
-    <string name="purchase_simple_thank_you">Purchase Simple Thank You</string>
+    <string name="purchase_simple_thank_you">Kupite Jednostavno Hvala</string>
     <string name="customize_colors">Prilagodi boje</string>
-    <string name="customize_widget_colors">Customize widget colors</string>
+    <string name="customize_widget_colors">Prilagodi boje widgeta</string>
     <string name="use_english_language">Koristi Engleski jezik</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="avoid_whats_new">Izbjegavaj prikazivati ono što je novo pri pokretanju</string>
+    <string name="show_hidden_items">Prikaži skrivene stavke</string>
     <string name="font_size">Veličina fonta</string>
     <string name="small">Malo</string>
     <string name="medium">Srednje</string>
@@ -392,108 +393,108 @@
     <string name="extra_large">Puno veće</string>
     <string name="password_protect_hidden_items">Vidljivost skrivenih, lozinkom zaštićenih stavki</string>
     <string name="password_protect_whole_app">Zaštiti cijelu aplikaciju lozinkom</string>
-    <string name="keep_last_modified">Zadrži stari datum zadnje izmjene pri kopiranje/premještanju/preimenovanju datoteke</string>
-    <string name="show_info_bubble">Show an info bubble at scrolling items by scrollbar dragging</string>
-    <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_into_recycle_bin">Move items into the Recycle Bin instead of deleting</string>
-    <string name="recycle_bin_cleaning_interval">Recycle Bin cleaning interval</string>
-    <string name="empty_recycle_bin">Empty the Recycle Bin</string>
-    <string name="force_portrait_mode">Force portrait mode</string>
+    <string name="keep_last_modified">Zadrži stari datum zadnje izmjene pri kopiranju/premještanju/preimenovanju datoteke</string>
+    <string name="show_info_bubble">Prikažite informativni mjehur prilikom pomicanja stavki pomicanjem trake za pomicanje</string>
+    <string name="prevent_phone_from_sleeping">Spriječite da uređaj prijeđe u stanje mirovanja dok je aplikacija u prvom planu</string>
+    <string name="skip_delete_confirmation">Uvijek preskoči dijaloški okvir za potvrdu brisanja</string>
+    <string name="enable_pull_to_refresh">Omogućite osvježavanje povlačenjem s vrha</string>
+    <string name="use_24_hour_time_format">Koristite 24-satni format</string>
+    <string name="sunday_first">Početak tjedna u nedjelju</string>
+    <string name="widgets">Widgeti</string>
+    <string name="use_same_snooze">Uvijek koristi isto vrijeme odgode</string>
+    <string name="snooze_time">Vrijeme odgode</string>
+    <string name="vibrate_on_button_press">Vibrirajte pritiskom gumba</string>
+    <string name="move_items_into_recycle_bin">Premjesti stavke u koš za smeće umjesto brisanja</string>
+    <string name="recycle_bin_cleaning_interval">Interval čišćenja koša za smeće</string>
+    <string name="empty_recycle_bin">Isprazni koš za smeće</string>
+    <string name="force_portrait_mode">Prikaz stavke u portretnom formatu</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>
+    <string name="visibility">Vidljivost</string>
+    <string name="security">Sigurnost</string>
+    <string name="scrolling">Pomicanje</string>
+    <string name="file_operations">Radnje datoteka</string>
+    <string name="recycle_bin">Koš za smeće</string>
+    <string name="saving_label">Spremanje</string>
+    <string name="startup">Pokretanje</string>
+    <string name="text">Tekst</string>
 
     <!-- Recycle Bin -->
-    <string name="restore_this_file">Restore this file</string>
-    <string name="restore_selected_files">Restore selected files</string>
-    <string name="restore_all_files">Restore all files</string>
-    <string name="recycle_bin_emptied">The Recycle Bin has been emptied successfully</string>
-    <string name="files_restored_successfully">Files have been restored successfully</string>
-    <string name="empty_recycle_bin_confirmation">Are you sure you want to empty the Recycle Bin? The files will be permanently lost.</string>
-    <string name="recycle_bin_empty">The Recycle Bin is empty</string>
+    <string name="restore_this_file">Vrati ovu datoteku</string>
+    <string name="restore_selected_files">Vrati odabrane datoteke</string>
+    <string name="restore_all_files">Vrati sve datoteke</string>
+    <string name="recycle_bin_emptied">Koš za smeće je uspješno ispražnjen</string>
+    <string name="files_restored_successfully">Datoteke su uspješno vraćene</string>
+    <string name="empty_recycle_bin_confirmation">Jeste li sigurni da želite isprazniti koš za smeće? Datoteke će biti trajno izgubljene.</string>
+    <string name="recycle_bin_empty">Koš za smeće je prazan</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>
+    <string name="importing">Uvoz…</string>
+    <string name="exporting">Izvoz…</string>
+    <string name="importing_successful">Uvoz je uspješan</string>
+    <string name="exporting_successful">Izvoz je uspješan</string>
+    <string name="importing_failed">Uvoz nije uspio</string>
+    <string name="exporting_failed">Izvoz nije uspio</string>
+    <string name="importing_some_entries_failed">Uvoz nekih unosa nije uspio</string>
+    <string name="exporting_some_entries_failed">Izvoz nekih unosa nije uspio</string>
+    <string name="no_entries_for_exporting">Nije pronađen nijedan unos za izvoz</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>
+    <string name="confirm_otg_storage_access_text">Molimo odaberite root mapu OTG uređaja na sljedećem zaslonu, kako biste odobrili pristup</string>
+    <string name="wrong_root_selected_otg">Odabrana mapa je pogrešna, odaberite root mapu svog OTG uređaja</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>
+    <string name="january">Siječanj</string>
+    <string name="february">Veljača</string>
+    <string name="march">Ožujak</string>
+    <string name="april">Travanj</string>
+    <string name="may">Svibanj</string>
+    <string name="june">Lipanj</string>
+    <string name="july">Srpanj</string>
+    <string name="august">Kolovoz</string>
+    <string name="september">Rujan</string>
+    <string name="october">Listopad</string>
+    <string name="november">Studeni</string>
+    <string name="december">Prosinac</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="in_january">u Siječnju</string>
+    <string name="in_february">u Veljači</string>
+    <string name="in_march">u Ožujku</string>
+    <string name="in_april">u Travnju</string>
+    <string name="in_may">u Svibnju</string>
+    <string name="in_june">u Lipnju</string>
+    <string name="in_july">u Srpnju</string>
+    <string name="in_august">u Kolovozu</string>
+    <string name="in_september">u Rujnu</string>
+    <string name="in_october">u Listopadu</string>
+    <string name="in_november">u Studenom</string>
+    <string name="in_december">u Prosincu</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">Ponedjeljak</string>
+    <string name="tuesday">Utorak</string>
+    <string name="wednesday">Srijeda</string>
+    <string name="thursday">Četvrtak</string>
+    <string name="friday">Petak</string>
+    <string name="saturday">Subota</string>
+    <string name="sunday">Nedjelja</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="monday_letter">P</string>
+    <string name="tuesday_letter">U</string>
+    <string name="wednesday_letter">S</string>
+    <string name="thursday_letter">Č</string>
+    <string name="friday_letter">P</string>
     <string name="saturday_letter">S</string>
-    <string name="sunday_letter">S</string>
+    <string name="sunday_letter">N</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>
+    <string name="monday_short">Pon</string>
+    <string name="tuesday_short">Uto</string>
+    <string name="wednesday_short">Sri</string>
+    <string name="thursday_short">Čet</string>
+    <string name="friday_short">Pet</string>
+    <string name="saturday_short">Sub</string>
+    <string name="sunday_short">Ned</string>
 
     <!-- About -->
     <string name="about">O nama</string>
@@ -520,62 +521,62 @@
         ]]>
     </string>
     <string name="purchase">Kupi</string>
-    <string name="update_thank_you">Please update Simple Thank You to the latest version</string>
-    <string name="before_asking_question_read_faq">Before you ask a question, please read the Frequently Asked Questions first, maybe the solution is there.</string>
-    <string name="read_it">Read it</string>
+    <string name="update_thank_you">Molim ažurirajte Jednostavno hvala na najnoviju verziju</string>
+    <string name="before_asking_question_read_faq">Prije nego što postavite pitanje, najprije pročitajte Često postavljana pitanja, možda postoji rješenje.</string>
+    <string name="read_it">Pročitajte</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>
+            Hej,<br><br>
+            samo da te obavijestim da je nova aplikacija nedavno objavljena:<br><br>
             <a href="%1$s">%2$s</a><br><br>
-            You can download it by pressing the title.<br><br>
-            Thanks
+            Možeš je preuzeti pritiskom na naslov.<br><br>
+            Hvala
         ]]>
     </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.</string>
+    <string name="frequently_asked_questions">Često postavljenja pitanja</string>
+    <string name="before_asking_question">Prije postavljanja pitanja, najprije pročitajte</string>
+    <string name="faq_1_title_commons">Kako ne vidim widgete ove aplikacije na popisu widgeta?</string>
+    <string name="faq_1_text_commons">Najvjerojatnije zato jer ste premjestili aplikaciju na SD karticu. Postoji ograničenje Android sustava koje skriva dane widgete aplikacije u tom slučaju.
+        Jedino je rješenje vratiti aplikaciju na internu pohranu putem postavki uređaja.</string>
+    <string name="faq_2_title_commons">Želim Vam pomoći, ali ne mogu donirati novac. Ima li još nešto što mogu učiniti?</string>
+    <string name="faq_2_text_commons">Da naravno. Možete proširiti riječ o aplikacijama ili dati dobru povratnu informaciju i ocjene. Možete također pomoći prevođenjem aplikacija na novi jezik ili ažurirati neke postojeće prijevode.
+        Vodič možete pronaći na adresi https://github.com/SimpleMobileTools/General-Discussion , ili mi pošaljite poruku na hello@simplemobiletools.com ako Vam treba pomoć.</string>
+    <string name="faq_3_title_commons">Pogrešno sam izbrisao neke datoteke, kako ih mogu vratiti?</string>
+    <string name="faq_3_text_commons">Nažalost, ne možete. Datoteke se brišu odmah nakon dijaloškog okvira za potvrdu, nema dostupnog koša za smeće.</string>
+    <string name="faq_4_title_commons">Ne sviđa mi se boja widgeta, mogu li ih promijeniti?</string>
+    <string name="faq_4_text_commons">Da, kada povlačite widget na početnom zaslonu, pojavit će se zaslon za konfiguraciju widgeta. U donjem lijevom kutu vidjet ćete obojene kvadrate, samo ih pritisnite da biste odabrali novu boju. Možete koristiti i klizač za podešavanje alphe.</string>
+    <string name="faq_5_title_commons">Mogu li nekako vratiti izbrisane datoteke?</string>
+    <string name="faq_5_text_commons">Ako su stvarno izbrisane, ne možete. Međutim, možete omogućiti upotrebu koša za smeće umjesto da ih izbrišete, u postavkama aplikacije. To će samo premjestiti datoteke u nju umjesto da ih izbriše.</string>
 
     <!-- License -->
     <string name="notice">Ova aplikacija koristi biblioteke trećih strana kako bi olakšala moj život. Hvala Vam.</string>
     <string name="third_party_licences">Licence trećih strana</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="kotlin_title">Kotlin (programski jezik)</string>
+    <string name="subsampling_title">Subsampling Scale Image View (zumiranje prikaza slika)</string>
+    <string name="glide_title">Glide (učitavanje slika i predmemoriranje)</string>
+    <string name="picasso_title">Picasso (učitavanje slike i predmemoriranje)</string>
+    <string name="cropper_title">Android Image Cropper (rezanje slika i rotacija)</string>
+    <string name="multiselect_title">RecyclerView MultiSelect (odabir više stavki popisa)</string>
+    <string name="rtl_viewpager_title">RtlViewPager (pomicanje ulijevo ili udesno)</string>
+    <string name="joda_title">Joda-Time (zamjena Java datuma)</string>
+    <string name="stetho_title">Stetho (baza podataka za uklanjanje pogrešaka)</string>
+    <string name="otto_title">Otto (predajnik događaja)</string>
+    <string name="photoview_title">PhotoView (zumirajući GIF-ove)</string>
+    <string name="pattern_title">PatternLockView (zaštita uzoraka)</string>
+    <string name="reprint_title">Reprint (zaštita otisaka prstiju)</string>
+    <string name="gif_drawable_title">Gif Drawable (učitavanje GIF-ova)</string>
+    <string name="autofittextview_title">AutoFitTextView (mijenjanje veličine teksta)</string>
+    <string name="robolectric_title">Robolectric (framework za testiranje)</string>
+    <string name="espresso_title">Espresso (pomoćnik testiranja)</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>
+    <string name="leak_canary_title">Leak Canary (detektor propuštanja memorije)</string>
+    <string name="number_picker_title">Number Picker (prilagodljiv birač brojeva)</string>
     <string name="exoplayer_title">ExoPlayer (video player)</string>
-    <string name="panorama_view_title">VR Panorama View (displaying panoramas)</string>
-    <string name="sanselan_title">Apache Sanselan (reading image metadata)</string>
-    <string name="filters_title">Android Photo Filters (image filters)</string>
+    <string name="panorama_view_title">VR Panorama View (prikaz panorama)</string>
+    <string name="sanselan_title">Apache Sanselan (čitanje metapodataka slike)</string>
+    <string name="filters_title">Android Photo Filters (filteri za slike)</string>
 </resources>
diff --git a/commons/src/main/res/values-hu/strings.xml b/commons/src/main/res/values-hu/strings.xml
index ddca80ae0..7745dd792 100644
--- a/commons/src/main/res/values-hu/strings.xml
+++ b/commons/src/main/res/values-hu/strings.xml
@@ -345,6 +345,7 @@
     <string name="reminder_triggers_in">Time remaining till the reminder triggers:\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>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">Alarm</string>
diff --git a/commons/src/main/res/values-id/strings.xml b/commons/src/main/res/values-id/strings.xml
index 61fc80c95..5d7fdd1ac 100644
--- a/commons/src/main/res/values-id/strings.xml
+++ b/commons/src/main/res/values-id/strings.xml
@@ -345,6 +345,7 @@
     <string name="reminder_triggers_in">Time remaining till the reminder triggers:\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>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">Alarm</string>
diff --git a/commons/src/main/res/values-it/strings.xml b/commons/src/main/res/values-it/strings.xml
index 2ad06804c..dbc510cd4 100644
--- a/commons/src/main/res/values-it/strings.xml
+++ b/commons/src/main/res/values-it/strings.xml
@@ -16,8 +16,8 @@
     <string name="details">Dettagli</string>
     <string name="notes">Note</string>
     <string name="deleting_folder">Eliminazione cartella \'%s\'</string>
-    <string name="none">None</string>
-    <string name="label">Label</string>
+    <string name="none">Nessuno</string>
+    <string name="label">Etichetta</string>
 
     <!-- Favorites -->
     <string name="favorites">Preferiti</string>
@@ -345,6 +345,7 @@
     <string name="reminder_triggers_in">Tempo rimanente prima della notifica promemoria:\n%s</string>
     <string name="alarm_warning">Assicurati che la sveglia funzioni correttamente prima di fare affidamento su di essa. Potrebbe comportarsi in modo anomalo a causa di restrizioni di sistema relative al risparmio della batteria.</string>
     <string name="reminder_warning">Assicurati che i promemoria funzionino correttamente prima di fare affidamento su di essi. Potrebbero comportarsi in modo anomalo a causa di restrizioni di sistema relative al risparmio della batteria.</string>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">Sveglia</string>
diff --git a/commons/src/main/res/values-iw/strings.xml b/commons/src/main/res/values-iw/strings.xml
index b7db8b597..3f4227dde 100644
--- a/commons/src/main/res/values-iw/strings.xml
+++ b/commons/src/main/res/values-iw/strings.xml
@@ -345,6 +345,7 @@
     <string name="reminder_triggers_in">Time remaining till the reminder triggers:\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>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">Alarm</string>
diff --git a/commons/src/main/res/values-ja/strings.xml b/commons/src/main/res/values-ja/strings.xml
index c194e3917..53462568d 100644
--- a/commons/src/main/res/values-ja/strings.xml
+++ b/commons/src/main/res/values-ja/strings.xml
@@ -345,6 +345,7 @@
     <string name="reminder_triggers_in">Time remaining till the reminder triggers:\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>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">Alarm</string>
diff --git a/commons/src/main/res/values-ko-rKR/strings.xml b/commons/src/main/res/values-ko-rKR/strings.xml
index 4ed9e857f..f06e2c9c6 100644
--- a/commons/src/main/res/values-ko-rKR/strings.xml
+++ b/commons/src/main/res/values-ko-rKR/strings.xml
@@ -345,6 +345,7 @@
     <string name="reminder_triggers_in">Time remaining till the reminder triggers:\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>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">Alarm</string>
diff --git a/commons/src/main/res/values-lt/strings.xml b/commons/src/main/res/values-lt/strings.xml
index b7e26b683..70cf4fe31 100644
--- a/commons/src/main/res/values-lt/strings.xml
+++ b/commons/src/main/res/values-lt/strings.xml
@@ -362,6 +362,7 @@
     <string name="reminder_triggers_in">Time remaining till the reminder triggers:\n%s</string>
     <string name="alarm_warning">Prieš naudodamiesi, įsitikinkite, kad signalas veikia tinkamai. Gali nesuveikti dėl sistemos apribojimų, susijusių su baterijos taupymu.</string>
     <string name="reminder_warning">Prieš naudodamiesi, įsitikinkite, kad priminimai tinkamai veikia. Jie gali netinkamai veikti dėl sistemos apribojimų, susijusių su baterijos taupymu.</string>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">Žadintuvas</string>
diff --git a/commons/src/main/res/values-nb/strings.xml b/commons/src/main/res/values-nb/strings.xml
index a9e0f270d..85dc4f9a1 100644
--- a/commons/src/main/res/values-nb/strings.xml
+++ b/commons/src/main/res/values-nb/strings.xml
@@ -345,6 +345,7 @@
     <string name="reminder_triggers_in">Tid som gjenstår til påminnelsen utløser:\n%s</string>
     <string name="alarm_warning">Sørg for at alarmen fungerer ordentlig før du stoler på den. Den kan fungere dårlig på grunn av systembegrensninger relatert til batterisparing.</string>
     <string name="reminder_warning">Sørg for at påminnelsene fungerer riktig før du stoler på dem. De kan fungere dårlig på grunn av systembegrensninger relatert til batterisparing.</string>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">Alarm</string>
diff --git a/commons/src/main/res/values-nl/strings.xml b/commons/src/main/res/values-nl/strings.xml
index 52841fdb5..718dd4d48 100644
--- a/commons/src/main/res/values-nl/strings.xml
+++ b/commons/src/main/res/values-nl/strings.xml
@@ -345,6 +345,7 @@
     <string name="reminder_triggers_in">De herinnering zal worden getoond over\n%s</string>
     <string name="alarm_warning">Controleer eerst of het alarm goed werkt. Er kunnen zich problemen voordoen door de batterijbesparing van Android.</string>
     <string name="reminder_warning">Controleer eerst of de herinneringen goed werken. Er kunnen zich problemen voordoen door de batterijbesparing van Android.</string>
+    <string name="notifications_disabled">Notificaties van deze app zijn uitgeschakeld. Ga naar de systeeminstellingen voor de app om deze in te schakelen.</string>
 
     <!-- Alarms -->
     <string name="alarm">Alarm</string>
diff --git a/commons/src/main/res/values-no/strings.xml b/commons/src/main/res/values-no/strings.xml
index ad4bc00bb..519c7ba81 100644
--- a/commons/src/main/res/values-no/strings.xml
+++ b/commons/src/main/res/values-no/strings.xml
@@ -345,6 +345,7 @@
     <string name="reminder_triggers_in">Time remaining till the reminder triggers:\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>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">Alarm</string>
diff --git a/commons/src/main/res/values-pl/strings.xml b/commons/src/main/res/values-pl/strings.xml
index bb08e4ffb..87814f66b 100644
--- a/commons/src/main/res/values-pl/strings.xml
+++ b/commons/src/main/res/values-pl/strings.xml
@@ -362,6 +362,7 @@
     <string name="reminder_triggers_in">Czas pozostały do aktywacji przypomnienia:\n%s</string>
     <string name="alarm_warning">Upewnij się, że alarm działa poprawnie zanim zaczniesz na nim polegać. Przez ograniczenia związane m. in. z oszczędzaniem baterii coś może nie wypalić.</string>
     <string name="reminder_warning">Upewnij się, że przypomnienia działają poprawnie zanim zaczniesz na nich polegać. Przez ograniczenia związane m. in. z oszczędzaniem baterii coś może nie wypalić.</string>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">Alarm</string>
diff --git a/commons/src/main/res/values-pt-rBR/strings.xml b/commons/src/main/res/values-pt-rBR/strings.xml
index 7fd96781a..1e2b14ffa 100644
--- a/commons/src/main/res/values-pt-rBR/strings.xml
+++ b/commons/src/main/res/values-pt-rBR/strings.xml
@@ -345,6 +345,7 @@
     <string name="reminder_triggers_in">Time remaining till the reminder triggers:\n%s</string>
     <string name="alarm_warning">Por favor, verifique se o alarme funciona corretamente antes de confiar nele. Ele pode se comportar mal devido a restrições do sistema relacionadas à economia de bateria.</string>
     <string name="reminder_warning">Certifique-se de que os lembretes funcionem corretamente antes de confiar neles. Eles podem se comportar mal devido a restrições do sistema relacionadas à economia de bateria.</string>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">Alarme</string>
diff --git a/commons/src/main/res/values-pt/strings.xml b/commons/src/main/res/values-pt/strings.xml
index fe23341b3..71c870ff8 100644
--- a/commons/src/main/res/values-pt/strings.xml
+++ b/commons/src/main/res/values-pt/strings.xml
@@ -21,7 +21,7 @@
 
     <!-- Favorites -->
     <string name="favorites">Favoritos</string>
-    <string name="add_favorites">Add favorites</string>
+    <string name="add_favorites">Adicionar favoritos</string>
     <string name="add_to_favorites">Adicionar aos favoritos</string>
     <string name="remove_from_favorites">Remover dos favoritos</string>
 
@@ -342,9 +342,10 @@
 
     <!-- For example: Time remaining till the alarm goes off: 6 hours, 5 minutes -->
     <string name="alarm_goes_off_in">O alarme está definido para daqui a:\n%s</string>
-    <string name="reminder_triggers_in">Time remaining till the reminder triggers:\n%s</string>
+    <string name="reminder_triggers_in">O lembrete está definido para daqui a:\n%s</string>
     <string name="alarm_warning">Certifique-se de que o alarme está a funcionar corretamente antes de o utilizar na plenitude. Pode ter um comportamento errático devido a restrições do sistema.</string>
     <string name="reminder_warning">Certifique-se de que o lembrete está a funcionar corretamente antes de o utilizar na plenitude. Pode ter um comportamento errático devido a restrições do sistema.</string>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">Alarme</string>
@@ -359,7 +360,7 @@
 
     <!-- Settings -->
     <string name="settings">Definições</string>
-    <string name="purchase_simple_thank_you">Purchase Simple Thank You</string>
+    <string name="purchase_simple_thank_you">Comprar Simple Thank You</string>
     <string name="customize_colors">Personalizar cores</string>
     <string name="customize_widget_colors">Personalizar cores do widget</string>
     <string name="use_english_language">Utilizar aplicação em inglês</string>
@@ -500,7 +501,7 @@
         ]]>
     </string>
     <string name="purchase">Comprar</string>
-    <string name="update_thank_you">por favor atualize a aplicação Simple Thank You para a versão mais recente</string>
+    <string name="update_thank_you">Por favor atualize a aplicação Simple Thank You para a versão mais recente</string>
     <string name="before_asking_question_read_faq">Antes de colocar uma questão, leia as FAQ pois pode já existir uma solução para o seu problema.</string>
     <string name="read_it">Ler</string>
 
diff --git a/commons/src/main/res/values-ru/strings.xml b/commons/src/main/res/values-ru/strings.xml
index 594266056..9ad47f09c 100644
--- a/commons/src/main/res/values-ru/strings.xml
+++ b/commons/src/main/res/values-ru/strings.xml
@@ -375,6 +375,7 @@
     <string name="reminder_triggers_in">Время, оставшееся до срабатывания напоминания:\n%s</string>
     <string name="alarm_warning">Пожалуйста, убедитесь, что будильник работает правильно, прежде чем полагаться на него. Он может не работать должным образом из-за системных ограничений, связанных с экономией батареи.</string>
     <string name="reminder_warning">Пожалуйста, убедитесь, что напоминания работают правильно, прежде чем полагаться на них. Они могут не работать должным образом из-за системных ограничений, связанных с экономией батареи.</string>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">Будильник</string>
diff --git a/commons/src/main/res/values-sk/strings.xml b/commons/src/main/res/values-sk/strings.xml
index c0df6bffb..e57d2e650 100644
--- a/commons/src/main/res/values-sk/strings.xml
+++ b/commons/src/main/res/values-sk/strings.xml
@@ -366,6 +366,7 @@
     <string name="reminder_triggers_in">Zostávajúci čas do pripomienky:\n%s</string>
     <string name="alarm_warning">Pred tým, ako by ste sa na budík spoliehali, sa prosím uistite, že funguje správne. Niektoré systémové obmedzenia spojené so zlepšením výdrže batérie môžu spôsobiť problémy.</string>
     <string name="reminder_warning">Pred tým, ako by ste sa na pripomienky spoliehali, sa prosím uistite, že fungujú správne. Niektoré systémové obmedzenia spojené so zlepšením výdrže batérie môžu spôsobiť problémy.</string>
+    <string name="notifications_disabled">Pripomienky tejto aplikácie sú vypnuté. Pre ich zapnutie prosím choďte do nastavení zariadenia.</string>
 
     <!-- Alarms -->
     <string name="alarm">Budík</string>
diff --git a/commons/src/main/res/values-sv/strings.xml b/commons/src/main/res/values-sv/strings.xml
index 95d100b51..5711b0bda 100644
--- a/commons/src/main/res/values-sv/strings.xml
+++ b/commons/src/main/res/values-sv/strings.xml
@@ -345,6 +345,7 @@
     <string name="reminder_triggers_in">Time remaining till the reminder triggers:\n%s</string>
     <string name="alarm_warning">Kontrollera att alarmet fungerar som det ska innan du förlitar dig på det. Det kanske inte fungerar som det ska på grund av batterisparrelaterade systembegränsningar.</string>
     <string name="reminder_warning">Kontrollera att påminnelserna fungerar som de ska innan du förlitar dig på dem. De kanske inte fungerar som de ska på grund av batterisparrelaterade systembegränsningar.</string>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">Alarm</string>
diff --git a/commons/src/main/res/values-tr/strings.xml b/commons/src/main/res/values-tr/strings.xml
index a55b3b813..9d8efcc36 100644
--- a/commons/src/main/res/values-tr/strings.xml
+++ b/commons/src/main/res/values-tr/strings.xml
@@ -345,6 +345,7 @@
     <string name="reminder_triggers_in">Hatırlatıcı tetiklenene kadar kalan süre:\n%s</string>
     <string name="alarm_warning">Lütfen alarma güvenmeden önce düzgün çalıştığından emin olun. Pil tasarrufu ile ilgili sistem kısıtlamaları nedeniyle yanlış davranabilir.</string>
     <string name="reminder_warning">Lütfen hatırlatıcılara güvenmeden önce düzgün çalıştıklarından emin olun. Pil tasarrufu ile ilgili sistem kısıtlamaları nedeniyle yanlış davranabilirler.</string>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">Alarm</string>
diff --git a/commons/src/main/res/values-zh-rCN/strings.xml b/commons/src/main/res/values-zh-rCN/strings.xml
index 36ca7299c..1ef168fd6 100644
--- a/commons/src/main/res/values-zh-rCN/strings.xml
+++ b/commons/src/main/res/values-zh-rCN/strings.xml
@@ -345,6 +345,7 @@
     <string name="reminder_triggers_in">距提醒触发还有：\n%s</string>
     <string name="alarm_warning">在依赖它之前，请确保闹钟能够正常工作。由于系统与节电有关的限制，它有时可能会失灵。</string>
     <string name="reminder_warning">在依赖它们之前，请确保提醒能够正常工作。由于系统与节电有关的限制，它们有时可能会失灵。</string>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">闹钟</string>
diff --git a/commons/src/main/res/values-zh-rTW/strings.xml b/commons/src/main/res/values-zh-rTW/strings.xml
index 86846e149..c729cd700 100644
--- a/commons/src/main/res/values-zh-rTW/strings.xml
+++ b/commons/src/main/res/values-zh-rTW/strings.xml
@@ -344,6 +344,7 @@
     <string name="reminder_triggers_in">提醒觸發剩餘時間:\n%s</string>
     <string name="alarm_warning">依靠鬧鐘功能之前，請先確認是否正常運作，有可能因為省電相關的系統限制而導致失靈。</string>
     <string name="reminder_warning">依靠提醒功能之前，請先確認是否正常運作，有可能因為省電相關的系統限制而導致失靈。</string>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">鬧鐘</string>
diff --git a/commons/src/main/res/values/strings.xml b/commons/src/main/res/values/strings.xml
index 1bdd5fc69..908063324 100644
--- a/commons/src/main/res/values/strings.xml
+++ b/commons/src/main/res/values/strings.xml
@@ -345,6 +345,7 @@
     <string name="reminder_triggers_in">Time remaining till the reminder triggers:\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>
+    <string name="notifications_disabled">Notifications of this application are disabled. Please go in your device settings for enabling them.</string>
 
     <!-- Alarms -->
     <string name="alarm">Alarm</string>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 31ade6f4b..271735bb0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Nov 07 15:01:56 CET 2017
+#Fri Sep 28 14:59:26 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip