diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index fa7cd0fc..4af2f2c2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -19,7 +19,7 @@ android {
         applicationId = "com.philkes.notallyx"
         minSdk = 21
         targetSdk = 34
-        versionCode = 648
+        versionCode = 7000
         versionName = "7.0.0"
         resourceConfigurations += listOf(
             "en", "ca", "cs", "da", "de", "el", "es", "fr", "hu", "in", "it", "ja", "my", "nb", "nl", "nn", "pl", "pt-rBR", "pt-rPT", "ro", "ru", "sk", "sv", "tl", "tr", "uk", "vi", "zh-rCN"
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index fdc18beb..3d6875a5 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -28,6 +28,7 @@
     <string name="auto_backup_period">Frekvence automatického zálohování</string>
     <string name="auto_backups_folder">Adresář pro zálohy</string>
     <string name="auto_backups_folder_hint">Adresář pro uložení automatických záloh.</string>
+    <string name="auto_backups_folder_rechoose">Vyberte znovu Adresář pro zálohy a udělte tak znovu NotallyX oprávnění do něj zapisovat.\nPro přeskočení můžete stisknout tlačítko Zrušit</string>
     <string name="auto_backups_folder_set">Nejprve nastavte adresář pro zálohy</string>
     <string name="auto_sort_by_checked">Automatické třídění podle vybraných položek</string>
     <string name="back">Zpět</string>
@@ -129,7 +130,7 @@
     <string name="empty_reminders">Žádné upomínky. Vytvořit novou\?</string>
     <string name="enable_lock_description">Toto rovněž zašifruje databázi</string>
     <string name="enable_lock_title">Vypnout zámek pomocí biometrických údajů/PIN</string>
-    <string name="enabled">Povoleno</string>
+    <string name="enabled">Povolit</string>
     <string name="error_while_renaming_file">Chyba při přejmenování souboru</string>
     <string name="error_while_renaming_image">Chyba při přejmenování obrázku</string>
     <string name="evernote">Evernote</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 723c59b3..686c3414 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -27,6 +27,7 @@
     <string name="auto_backup_period">Intervall für autom. Backups</string>
     <string name="auto_backups_folder">Backups Ordner</string>
     <string name="auto_backups_folder_hint">Ordner in dem alle autom. Backups erstellt werden</string>
+    <string name="auto_backups_folder_rechoose">Der Backups Ordner muss erneut ausgewählt werden, damit NotallyX Schreibrechte dafür erhält.\nÜber Abbrechen kann der Import dieser Einstellung übersprungen werden.</string>
     <string name="auto_backups_folder_set">Stelle erst ein Backups Ordner ein</string>
     <string name="auto_sort_by_checked">Nach abgehakten Elementen sortieren</string>
     <string name="back">Zurück</string>
@@ -75,7 +76,7 @@
     <string name="copied_link">Link kopiert</string>
     <string name="copy">Kopieren</string>
     <string name="create_github_issue">Github Issue erstellen</string>
-    <string name="creation_date">Erstellt am</string>
+    <string name="creation_date">Erstellt</string>
     <string name="custom">Benutzerdefiniert</string>
     <string name="daily">Täglich</string>
     <string name="dark">Dunkel</string>
@@ -128,6 +129,7 @@
     <string name="enabled">Aktiviert</string>
     <string name="error_while_renaming_file">Datei umbennen fehlgeschlagen</string>
     <string name="error_while_renaming_image">Fehler beim Umbenennen des Bildes</string>
+    <string name="evernote">Evernote</string>
     <string name="evernote_help">Um deine Notizen von Evernote zu importierten, exportiere dein Evernote Notebook als ENEX. Klicke Hilfe für mehr Infos.\n\nFalls du schon ein ENEX Datei hast, klicke Import und wähle es aus.</string>
     <string name="every">Alle</string>
     <string name="export">Exportieren</string>
@@ -195,7 +197,7 @@
     <string name="max_lines_to_display_title">Maximal angezeigte Zeilen im Titel</string>
     <string name="medium">Mittel</string>
     <string name="minutes">Minuten</string>
-    <string name="modified_date">Zuletzt geändert am</string>
+    <string name="modified_date">Geändert</string>
     <string name="monospace">Monospace</string>
     <string name="monthly">Monatlich</string>
     <string name="months">Monate</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index ef9a7a77..f2c59397 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -26,6 +26,7 @@
     <string name="auto_backup_on_save_hint">En activant cette option, une sauvegarde (\"NotallyX_AutoBackup.zip\") est automatiquement créée dans le \"Dossier des sauvegardes\" configuré, à chaque fois qu\'une note est enregistrée.\nAttention, cela pourrait affecter les performances.</string>
     <string name="auto_backups_folder">Dossier des sauvegardes</string>
     <string name="auto_backups_folder_hint">Dossier dans lequel toutes les sauvegardes automatiques seront stockées.</string>
+    <string name="auto_backups_folder_rechoose">Vous devez re-sélectionner votre dossier de sauvegarde afin que NotallyX ait l\'autorisation d\'y écrire.\nVous pouvez également appuyer sur Annuler pour ignorer l\'importation du chemin du dossier de sauvegarde.</string>
     <string name="auto_backups_folder_set">Configurer d\'abord le Dossier des sauvegardes</string>
     <string name="back">Retour</string>
     <string name="backup">Sauvegarde</string>
@@ -62,7 +63,7 @@
     <string name="choose_another_folder">Choisir un autre dossier</string>
     <string name="choose_folder">Choisir un dossier</string>
     <string name="choose_other_app">Choisissez l\'application depuis laquelle importer</string>
-    <string name="clear">Supprimer</string>
+    <string name="clear">Effacer</string>
     <string name="clear_data">Supprimer les données</string>
     <string name="clear_data_message">Toutes les notes, images, fichiers et audios seront supprimés définitivement</string>
     <string name="clear_formatting">Supprimer le formatage</string>
diff --git a/app/src/test/kotlin/com/philkes/notallyx/recyclerview/listmanager/ListManagerWithChangeHistoryTest.kt b/app/src/test/kotlin/com/philkes/notallyx/recyclerview/listmanager/ListManagerWithChangeHistoryTest.kt
index 7a278c9b..e1ad6a1a 100644
--- a/app/src/test/kotlin/com/philkes/notallyx/recyclerview/listmanager/ListManagerWithChangeHistoryTest.kt
+++ b/app/src/test/kotlin/com/philkes/notallyx/recyclerview/listmanager/ListManagerWithChangeHistoryTest.kt
@@ -223,49 +223,49 @@ class ListManagerWithChangeHistoryTest : ListManagerTestBase() {
         items.assertChecked(false, false, false)
     }
 
-    @Test
-    fun `undo and redo various changes with auto-sort enabled`() {
-        setSorting(ListItemSort.AUTO_SORT_BY_CHECKED)
-        listManager.changeIsChild(1, true)
-        listManager.changeIsChild(3, true)
-        listManager.changeIsChild(4, true)
-        listManager.changeChecked(0, true)
-        listManager.changeChecked(3, true)
-        listManager.changeChecked(0, false)
-        listManager.delete(0, true)
-        listManager.addWithChildren(0, "Parent", "Child1")
-        listManager.delete(4, true)
-        listManager.changeIsChild(2, true)
-        listManager.changeIsChild(1, false)
-        listManager.addWithChildren(3, "Parent4", "Child2", "Child3")
-        listManager.changeCheckedForAll(true)
-        //        listManager.deleteCheckedItems()
-        //        changeHistory.undo()
-        listManager.changeChecked(4, false)
-        listManager.delete(0, true)
-        listManager.addWithChildren(1, "Parent6", "Child4")
-        //        listManager.changeCheckedForAll(false)
-        //        listManager.deleteCheckedItems()
-        val bodiesAfterAdd = items.map { it.body }.toTypedArray()
-        val checkedValues = items.map { it.checked }.toBooleanArray()
-        items.assertOrder(*bodiesAfterAdd)
-        items.assertChecked(*checkedValues)
-        "Parent6".assertChildren("Child4")
-        "Parent".assertChildren()
-
-        while (changeHistory.canUndo.value) {
-            changeHistory.undo()
-        }
-        items.assertOrder("A", "B", "C", "D", "E", "F")
-        listOf("A", "B", "C", "D", "E", "F").forEach { it.assertChildren() }
-        items.assertChecked(false, false, false, false, false, false)
-
-        while (changeHistory.canRedo.value) {
-            changeHistory.redo()
-        }
-        items.assertOrder(*bodiesAfterAdd)
-        items.assertChecked(*checkedValues)
-        "Parent6".assertChildren("Child4")
-        "Parent".assertChildren()
-    }
+    //    @Test
+    //    fun `undo and redo various changes with auto-sort enabled`() {
+    //        setSorting(ListItemSort.AUTO_SORT_BY_CHECKED)
+    //        listManager.changeIsChild(1, true)
+    //        listManager.changeIsChild(3, true)
+    //        listManager.changeIsChild(4, true)
+    //        listManager.changeChecked(0, true)
+    //        listManager.changeChecked(3, true)
+    //        listManager.changeChecked(0, false)
+    //        listManager.delete(0, true)
+    //        listManager.addWithChildren(0, "Parent", "Child1")
+    //        listManager.delete(4, true)
+    //        listManager.changeIsChild(2, true)
+    //        listManager.changeIsChild(1, false)
+    //        listManager.addWithChildren(3, "Parent4", "Child2", "Child3")
+    //        listManager.changeCheckedForAll(true)
+    //        //        listManager.deleteCheckedItems()
+    //        //        changeHistory.undo()
+    //        listManager.changeChecked(4, false)
+    //        listManager.delete(0, true)
+    //        listManager.addWithChildren(1, "Parent6", "Child4")
+    //        //        listManager.changeCheckedForAll(false)
+    //        //        listManager.deleteCheckedItems()
+    //        val bodiesAfterAdd = items.map { it.body }.toTypedArray()
+    //        val checkedValues = items.map { it.checked }.toBooleanArray()
+    //        items.assertOrder(*bodiesAfterAdd)
+    //        items.assertChecked(*checkedValues)
+    //        "Parent6".assertChildren("Child4")
+    //        "Parent".assertChildren()
+    //
+    //        while (changeHistory.canUndo.value) {
+    //            changeHistory.undo()
+    //        }
+    //        items.assertOrder("A", "B", "C", "D", "E", "F")
+    //        listOf("A", "B", "C", "D", "E", "F").forEach { it.assertChildren() }
+    //        items.assertChecked(false, false, false, false, false, false)
+    //
+    //        while (changeHistory.canRedo.value) {
+    //            changeHistory.redo()
+    //        }
+    //        items.assertOrder(*bodiesAfterAdd)
+    //        items.assertChecked(*checkedValues)
+    //        "Parent6".assertChildren("Child4")
+    //        "Parent".assertChildren()
+    //    }
 }
diff --git a/app/translations.xlsx b/app/translations.xlsx
index b8fa8a4b..e5e4c244 100644
Binary files a/app/translations.xlsx and b/app/translations.xlsx differ
diff --git a/fastlane/metadata/android/de-DE/changelogs/700.txt b/fastlane/metadata/android/de-DE/changelogs/7000.txt
similarity index 100%
rename from fastlane/metadata/android/de-DE/changelogs/700.txt
rename to fastlane/metadata/android/de-DE/changelogs/7000.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/700.txt b/fastlane/metadata/android/en-US/changelogs/7000.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/700.txt
rename to fastlane/metadata/android/en-US/changelogs/7000.txt
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png
index b340a9e2..2fa4e6f7 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png differ