diff --git a/main/ui/src/main/resources/localization/ar.txt b/main/ui/src/main/resources/localization/ar.txt
index 632822ef8..072ea6604 100644
--- a/main/ui/src/main/resources/localization/ar.txt
+++ b/main/ui/src/main/resources/localization/ar.txt
@@ -77,7 +77,6 @@ upgrade.version3to4.err.io = Migration failed due to an I/O Exception. See log f
 settings.prefGvfsScheme.label = WebDAV Scheme
 # upgrade.fxml
 upgrade.confirmation.label = Yes, I've made sure that synchronization has finished
-initialize.messageLabel.notEmpty = المحفظة غير فارغة
 unlock.label.savePassword = حفظ كلمة المرور
 unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
 unlocked.label.mountFailed = Connecting drive failed
@@ -101,4 +100,7 @@ unlock.errorMessage.unlockFailed = Unlock failed. See log file for details.
 unlocked.moreOptions.mount = Mount Drive
 unlocked.moreOptions.unmount = Eject Drive
 upgrade.version5toX.title = Vault Version Upgrade
-upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
\ No newline at end of file
+upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
+main.createVault.nonEmptyDir.title = Creating vault failed
+main.createVault.nonEmptyDir.header = Chosen directory is not empty
+main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/bg.txt b/main/ui/src/main/resources/localization/bg.txt
index ccb5fffd3..14bfe5e6b 100644
--- a/main/ui/src/main/resources/localization/bg.txt
+++ b/main/ui/src/main/resources/localization/bg.txt
@@ -1,35 +1,35 @@
 app.name = Криптоматор
 # main.fxml
-main.emptyListInstructions = Натиснете тук за да добавите сейф
-main.directoryList.contextMenu.remove = Премахнете от листа
-main.directoryList.contextMenu.changePassword = Сменете парола
-main.addDirectory.contextMenu.new = Създайте нов сейф
-main.addDirectory.contextMenu.open = Отворете съществуващ сейф
+main.emptyListInstructions = Натиснете тук за добавяне на сейф
+main.directoryList.contextMenu.remove = Премахване от листата
+main.directoryList.contextMenu.changePassword = Смяна на парола
+main.addDirectory.contextMenu.new = Създаване на нов сейф
+main.addDirectory.contextMenu.open = Отворяне на съществуващ сейф
 # welcome.fxml
-welcome.checkForUpdates.label.currentlyChecking = Проверете за нови версии
-welcome.newVersionMessage = Version %1$s can be downloaded.\nThis is %2$s.
+welcome.checkForUpdates.label.currentlyChecking = Проверка за обновления...
+welcome.newVersionMessage = Версия %1$s може да бъде свалена.\nТази е %2$s.
 # initialize.fxml
 initialize.label.password = Парола
-initialize.label.retypePassword = Повторете Паролата
-initialize.button.ok = Създайте Сейф
+initialize.label.retypePassword = Повторете паролата
+initialize.button.ok = Създаване на сейф
 initialize.messageLabel.alreadyInitialized = Сейфа е вече активен
 initialize.messageLabel.initializationFailed = Неуспешно активиране на сейф. Проверете лог файловете за повече информация.
 # notfound.fxml
 notfound.label = Сейфа не може да бъде намерен. Може би е бил преместен?
 # upgrade.fxml
-upgrade.button = Обновете версията на Сейф
-upgrade.version3dropBundleExtension.msg = This vault needs to be migrated to a newer format.\n"%1$s" will be renamed to "%2$s".\nPlease make sure synchronization has finished before proceeding.
-upgrade.version3dropBundleExtension.err.alreadyExists = Автоматичната миграция е неуспешна. "%s" вече съществува.
+upgrade.button = Обновете сейфа
+upgrade.version3dropBundleExtension.msg = Този сейф трябва да бъде променен към новия формат.\n"%1$s" ще бъде преименуван в "%2$s".\nМоля, уверете се, че синхронизацията е преключила преди да продължите.
+upgrade.version3dropBundleExtension.err.alreadyExists = Автоматичната промяна е неуспешна. "%s" вече съществува.
 # unlock.fxml
 unlock.label.password = Парола
 unlock.label.mountName = Име на диск
 unlock.label.winDriveLetter = Инициали на диск
-unlock.label.downloadsPageLink = Покажи всички версии на Криптоматор
+unlock.label.downloadsPageLink = Всички версии на Криптоматор
 unlock.label.advancedHeading = Опции за напреднали
-unlock.button.unlock = Отключи Сейф
-unlock.button.advancedOptions.show = Покажи повече опции
-unlock.button.advancedOptions.hide = Покажи по-малко опции
-unlock.choicebox.winDriveLetter.auto = Автоматично наименование на Диска
+unlock.button.unlock = Отключване на сейф
+unlock.button.advancedOptions.show = Повече опции
+unlock.button.advancedOptions.hide = По-малко опции
+unlock.choicebox.winDriveLetter.auto = Автоматично наименование на диска
 unlock.errorMessage.wrongPassword = Неправилна парола
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Неподържана версия. Този сейф е бил създаден със стара версия на Криптоматор.
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Неподържана версия. Този сейф е бил създаден с по-нова версия на Криптоматор.
@@ -38,67 +38,69 @@ unlock.messageLabel.startServerFailed = Неуспешно стартиране
 changePassword.label.oldPassword = Стара парола
 changePassword.label.newPassword = Нова парола
 changePassword.label.retypePassword = Повторете паролата
-changePassword.label.downloadsPageLink = All Cryptomator versions
+changePassword.label.downloadsPageLink = Всички версии на Криптоматор
 changePassword.button.change = Смени паролата
 changePassword.errorMessage.wrongPassword = Неправилна парола
 changePassword.errorMessage.decryptionFailed = Неуспешно декриптиране
 # unlocked.fxml
-unlocked.button.lock = Заключи Сейфа
-unlocked.moreOptions.reveal = Покажи 
-unlocked.moreOptions.copyUrl = Copy WebDAV URL
+unlocked.button.lock = Заключване на Сейфа
+unlocked.moreOptions.reveal = Покажи диска
+unlocked.moreOptions.copyUrl = Копиране адреса на WebDAV
 unlocked.label.revealFailed = Командата е неуспешна
-unlocked.label.unmountFailed = Ejecting drive failed
-unlocked.label.statsEncrypted = encrypted
-unlocked.label.statsDecrypted = decrypted
-unlocked.ioGraph.yAxis.label = Throughput (MiB/s)
+unlocked.label.unmountFailed = Изваждането на диска е неуспешно
+unlocked.label.statsEncrypted = криптирано
+unlocked.label.statsDecrypted = декрептирано
+unlocked.ioGraph.yAxis.label = Скорост (MB/s)
 # settings.fxml
-settings.version.label = Version %s
-settings.checkForUpdates.label = Check for Updates
-settings.port.label = WebDAV Port
-settings.port.prompt = 0 \= Choose automatically
-settings.requiresRestartLabel = * Cryptomator needs to restart
+settings.version.label = Версия %s
+settings.checkForUpdates.label = Проверка за обновления
+settings.port.label = WebDAV порт
+settings.port.prompt = 0 \= Автоматично затваряне
+settings.requiresRestartLabel = * Криптоматор трябва да се рестартира
 # tray icon
-tray.menu.open = Open
-tray.menu.quit = Quit
-tray.infoMsg.title = Still Running
-tray.infoMsg.msg = Cryptomator is still alive. Quit it from the tray icon.
-tray.infoMsg.msg.osx = Cryptomator is still alive. Quit it from the menu bar icon.
-initialize.messageLabel.passwordStrength.0 = Very weak
-initialize.messageLabel.passwordStrength.1 = Weak
-initialize.messageLabel.passwordStrength.2 = Fair
-initialize.messageLabel.passwordStrength.3 = Strong
-initialize.messageLabel.passwordStrength.4 = Very strong
-initialize.label.doNotForget = IMPORTANT\: If you forget your password, there is no way to recover your data.
-main.directoryList.remove.confirmation.title = Remove Vault
-main.directoryList.remove.confirmation.header = Do you really want to remove this vault?
-main.directoryList.remove.confirmation.content = The vault will only be removed from the list. To permanently delete it, please delete the vault from your filesystem.
-upgrade.version3to4.msg = This vault needs to be migrated to a newer format.\nEncrypted folder names will be updated.\nPlease make sure synchronization has finished before proceeding.
-upgrade.version3to4.err.io = Migration failed due to an I/O Exception. See log file for details.
-settings.prefGvfsScheme.label = WebDAV Scheme
+tray.menu.open = Отворяне
+tray.menu.quit = Излизане
+tray.infoMsg.title = Все още върви
+tray.infoMsg.msg = Криптоматор все още върви. Излезте от иконата в трея.
+tray.infoMsg.msg.osx = Криптоматор все още върви. Излезте от иконата в менюто.
+initialize.messageLabel.passwordStrength.0 = Прекалено слаба
+initialize.messageLabel.passwordStrength.1 = Слаба
+initialize.messageLabel.passwordStrength.2 = Добра
+initialize.messageLabel.passwordStrength.3 = Силна
+initialize.messageLabel.passwordStrength.4 = Много силна
+initialize.label.doNotForget = ВАЖНО\: Ако забравите паролата, няма начин да възстановите данните.
+main.directoryList.remove.confirmation.title = Премахване на сейф
+main.directoryList.remove.confirmation.header = Наистина ли искате да премахнете този сейф?
+main.directoryList.remove.confirmation.content = Този сейф ще бъде премахнат само от листа. За да го изтриете напълно, моля, изтрийте сейфа от файл системата.
+upgrade.version3to4.msg = Този сейф трябва да бъде преместен към по-нов формат.\nКриптираните имена на папки ще бъдат обновени.\nМоля, проверете дали сихронизацията е приключила преди да продължите.
+upgrade.version3to4.err.io = Преместването е отменено поради грешка в диска. Вижте лог файла за детайли.
+settings.prefGvfsScheme.label = WebDAV схема
 # upgrade.fxml
-upgrade.confirmation.label = Yes, I've made sure that synchronization has finished
-initialize.messageLabel.notEmpty = Vault not empty
-unlock.label.savePassword = Save Password
-unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
-unlocked.label.mountFailed = Connecting drive failed
-unlock.savePassword.delete.confirmation.title = Delete Saved Password
-unlock.savePassword.delete.confirmation.header = Do you really want to delete the saved password of this vault?
-unlock.savePassword.delete.confirmation.content = The saved password of this vault will be immediately deleted from your system keychain. If you'd like to save your password again, you'd have to unlock your vault with the "Save Password" option enabled.
-settings.debugMode.label = Debug Mode *
-upgrade.version3dropBundleExtension.title = Vault Version 3 Upgrade (Drop Bundle Extension)
-upgrade.version3to4.title = Vault Version 3 to 4 Upgrade
-upgrade.version4to5.title = Vault Version 4 to 5 Upgrade
-upgrade.version4to5.msg = This vault needs to be migrated to a newer format.\nEncrypted files will be updated.\nPlease make sure synchronization has finished before proceeding.\n\nNote\: Modification date of all files will be changed to the current date/time in the process.
-upgrade.version4to5.err.io = Migration failed due to an I/O Exception. See log file for details.
-settings.port.apply = Apply
-unlock.label.mountAfterUnlock = Mount Drive
-unlock.label.revealAfterMount = Reveal Drive
-unlocked.lock.force.confirmation.title = Locking of %1$s failed
-unlocked.lock.force.confirmation.header = Do you want to force locking?
-unlocked.lock.force.confirmation.content = This may be because other programs are still accessing files in the vault or because some other problem occurred.\n\nPrograms still accessing the files may not work correctly and data not already written by those programs may be lost.
-unlock.label.unlockAfterStartup = Auto-Unlock on Start (Experimental)
-unlock.errorMessage.unlockFailed = Unlock failed. See log file for details.
-unlocked.moreOptions.mount = Mount Drive
-unlocked.moreOptions.unmount = Eject Drive
-upgrade.version5toX.title = Vault Version Upgrade
-upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
\ No newline at end of file
+upgrade.confirmation.label = Да, сигурен съм, че сихронизацията е приключила
+unlock.label.savePassword = Запазване на парола
+unlock.errorMessage.unauthenticVersionMac = Неуспешна оторизация на MAC версията
+unlocked.label.mountFailed = Връзката с диска неуспешна
+unlock.savePassword.delete.confirmation.title = Изтриване на запазената парола
+unlock.savePassword.delete.confirmation.header = Неистина ли искате да изтриете запазената парола за този сейф?
+unlock.savePassword.delete.confirmation.content = Запазената парола за този сейф ще бъде незабавно премахната от Вашата система. Ако желаете да запазите паролата отново, трябва да отключите сейса с пусната опция "Запазване на павола".
+settings.debugMode.label = Режим за отстраняване на грешки *
+upgrade.version3dropBundleExtension.title = Обновяване до сейф версия 3
+upgrade.version3to4.title = Обновяване на сейф от 3-та до 4-та версия
+upgrade.version4to5.title = Обновяване на сейф от 4-та до 5-та версия
+upgrade.version4to5.msg = Този сейф трябва да бъде променен към по-нов формат.\nКриптираните файлове ще бъдат обновени.\nМоля, проверете дали сихронизацията е приключила преди да продължите.\n\nЗабележка\: Датата на промяна на всички файлове ще бъде обновена до момента.
+upgrade.version4to5.err.io = Преместването провалено поради грешка в диска. Вижте лог файла за детайли.
+settings.port.apply = Прилагане
+unlock.label.mountAfterUnlock = Закачане на диска
+unlock.label.revealAfterMount = Показване на диска
+unlocked.lock.force.confirmation.title = Заключването на %1$s провалено
+unlocked.lock.force.confirmation.header = Желаете ли принудително заключване?
+unlocked.lock.force.confirmation.content = Това е може би защото други програми все още използват файловете в сейфа или защото има някакъв друг проблем.\n\nПрограмите, имащи достъп до файловете, може да не работят правилно и информацията, незаписана от тези програми, може да бъде изгубена.
+unlock.label.unlockAfterStartup = Автоматично отключване при стартиране (Експериментално)
+unlock.errorMessage.unlockFailed = Грешка при отключване. Вижте лог файла за детайли.
+unlocked.moreOptions.mount = Закачане на диск
+unlocked.moreOptions.unmount = Изваждане на диск
+upgrade.version5toX.title = Обновяване на версията на сейфа
+upgrade.version5toX.msg = Този сейф трябва да бъде обновен до по-нов формат.\nМоля, уверете се, че сихронизацията е приключила, преди да продължите.
+main.createVault.nonEmptyDir.title = Creating vault failed
+main.createVault.nonEmptyDir.header = Chosen directory is not empty
+main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/da.txt b/main/ui/src/main/resources/localization/da.txt
index 6d7716201..9b24ba6fc 100644
--- a/main/ui/src/main/resources/localization/da.txt
+++ b/main/ui/src/main/resources/localization/da.txt
@@ -77,7 +77,6 @@ upgrade.version3to4.err.io = Migrering fejlede pga. en I/O fejl. Se logfilen for
 settings.prefGvfsScheme.label = WebDAV Scheme
 # upgrade.fxml
 upgrade.confirmation.label = Ja, jeg har sikret mig at al synkronisering er gennemført.
-initialize.messageLabel.notEmpty = Vault er ikke tom
 unlock.label.savePassword = Gem adgangskode
 unlock.errorMessage.unauthenticVersionMac = Kunne ikke autentificere versions-MAC
 unlocked.label.mountFailed = Montering af drev fejlede
@@ -101,4 +100,7 @@ unlock.errorMessage.unlockFailed = Unlock failed. See log file for details.
 unlocked.moreOptions.mount = Mount Drive
 unlocked.moreOptions.unmount = Eject Drive
 upgrade.version5toX.title = Vault Version Upgrade
-upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
\ No newline at end of file
+upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
+main.createVault.nonEmptyDir.title = Creating vault failed
+main.createVault.nonEmptyDir.header = Chosen directory is not empty
+main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/de.txt b/main/ui/src/main/resources/localization/de.txt
index df234f088..c402c51fa 100644
--- a/main/ui/src/main/resources/localization/de.txt
+++ b/main/ui/src/main/resources/localization/de.txt
@@ -77,7 +77,6 @@ upgrade.version3to4.err.io = Migration aufgrund eines I/O-Fehlers fehlgeschlagen
 settings.prefGvfsScheme.label = WebDAV Schema
 # upgrade.fxml
 upgrade.confirmation.label = Ja, die Synchronisation ist abgeschlossen
-initialize.messageLabel.notEmpty = Tresor ist nicht leer
 unlock.label.savePassword = Passwort speichern
 unlock.errorMessage.unauthenticVersionMac = Versions-MAC konnte nicht authentifiziert werden.
 unlocked.label.mountFailed = Verbinden des Laufwerks fehlgeschlagen
@@ -101,4 +100,7 @@ unlock.errorMessage.unlockFailed = Entsperren fehlgeschlagen. Siehe Log-Datei f
 unlocked.moreOptions.mount = Laufwerk verbinden
 unlocked.moreOptions.unmount = Laufwerk auswerfen
 upgrade.version5toX.title = Upgrade Tresor-Version 5 zu X
-upgrade.version5toX.msg = Dieser Tresor muss auf ein neueres Format aktualisiert werden.\nStellen Sie sicher, dass keine Synchronisation stattfindet, bevor Sie fortfahren.
\ No newline at end of file
+upgrade.version5toX.msg = Dieser Tresor muss auf ein neueres Format aktualisiert werden.\nStellen Sie sicher, dass keine Synchronisation stattfindet, bevor Sie fortfahren.
+main.createVault.nonEmptyDir.title = Erstellung des Tresors fehlgeschlagen
+main.createVault.nonEmptyDir.header = Ausgewählter Ordner ist nicht leer
+main.createVault.nonEmptyDir.content = Der ausgewählte Ordner enthält bereits Dateien (möglicherweise unsichtbar). Ein Tresor kann nur innerhalb eines leeren Ordners erstellt werden.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/es.txt b/main/ui/src/main/resources/localization/es.txt
index ee108a227..332232c07 100644
--- a/main/ui/src/main/resources/localization/es.txt
+++ b/main/ui/src/main/resources/localization/es.txt
@@ -1,6 +1,6 @@
 app.name = Cryptomator
 # main.fxml
-main.emptyListInstructions = Haz clic aquí para añadir una caja fuerte
+main.emptyListInstructions = Haga clic aquí para añadir una caja fuerte
 # should it be imperative?
 main.directoryList.contextMenu.remove = Eliminar de la lista
 main.directoryList.contextMenu.changePassword = Cambiar la contraseña
@@ -14,13 +14,13 @@ initialize.label.password = Contraseña
 initialize.label.retypePassword = Repetir contraseña
 initialize.button.ok = Crear caja fuerte
 initialize.messageLabel.alreadyInitialized = La caja fuerte ya está inicializada
-initialize.messageLabel.initializationFailed = No se pudo inicializar la caja fuerte. Ver archivo de registro para detalles.
+initialize.messageLabel.initializationFailed = No se ha podido inicializar la caja fuerte. Consulte el archivo de registro para más información.
 # notfound.fxml
-notfound.label = No se pudo encontrar la caja fuerte. Se movió a otro lugar?
+notfound.label = No se ha encontrado la caja fuerte. ¿Se movió a otro lugar?
 # upgrade.fxml
 upgrade.button = Actualizar caja fuerte
-upgrade.version3dropBundleExtension.msg = Este caja fuerte se debe actualizar a un nuevo formato.\n"%1$s" se renombra a "%2$s".\nPor favor aseguranse que la sincronización ya se terminó antes de continuar.
-upgrade.version3dropBundleExtension.err.alreadyExists = Migración automática ha fallado.\n"%s" ya existe.
+upgrade.version3dropBundleExtension.msg = Este caja fuerte se debe actualizar a un formato más moderno.\n"%1$s" se renombrará a "%2$s".\nAsegúrese de que la sincronización ha terminado antes de iniciar el proceso.
+upgrade.version3dropBundleExtension.err.alreadyExists = Error en la migración automática.\n"%s" ya existe.
 # unlock.fxml
 unlock.label.password = Contraseña
 unlock.label.mountName = Nombre de la unidad
@@ -32,9 +32,9 @@ unlock.button.advancedOptions.show = Más opciones
 unlock.button.advancedOptions.hide = Menos opciones
 unlock.choicebox.winDriveLetter.auto = Asignar automáticamente
 unlock.errorMessage.wrongPassword = Contraseña incorrecta
-unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Caja fuerte no soportada. Ésta caja se ha creado con una versión anterior de Cryptomator.
-unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Caja fuerte no soportada. Ésta caja se ha creado con una versión nueva de Cryptomator.
-unlock.messageLabel.startServerFailed = Iniciación del servidor de WebDAV ha fallado.
+unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Caja fuerte no soportada. Esta caja se ha creado con una versión anterior de Cryptomator.
+unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Caja fuerte no soportada. Esta caja se ha creado con una versión más moderna de Cryptomator.
+unlock.messageLabel.startServerFailed = Error al iniciar el servidor de WebDAV.
 # change_password.fxml
 changePassword.label.oldPassword = Contraseña antigua
 # Can also use "current password" = "contraseña actual"
@@ -43,65 +43,67 @@ changePassword.label.retypePassword = Repetir contraseña
 changePassword.label.downloadsPageLink = Todas las versiones de Cryptomator
 changePassword.button.change = Cambiar contraseña
 changePassword.errorMessage.wrongPassword = Contraseña incorrecta
-changePassword.errorMessage.decryptionFailed = Decifración ha fallado
+changePassword.errorMessage.decryptionFailed = Error en el descifrado
 # unlocked.fxml
-unlocked.button.lock = Encerrar caja fuerte
+unlocked.button.lock = Bloquear caja fuerte
 unlocked.moreOptions.reveal = Revelar unidad
 unlocked.moreOptions.copyUrl = Copiar URL de WebDAV
-unlocked.label.revealFailed = Comando ha fallado
-unlocked.label.unmountFailed = Expulsar el disco ha fallado
+unlocked.label.revealFailed = La orden ha fallado
+unlocked.label.unmountFailed = Error al expulsar la unidad
 unlocked.label.statsEncrypted = cifrado
-unlocked.label.statsDecrypted = decifrado
-unlocked.ioGraph.yAxis.label = Procesamiento (MiB/s)
+unlocked.label.statsDecrypted = descifrado
+unlocked.ioGraph.yAxis.label = Rendimiento (MiB/s)
 # settings.fxml
 settings.version.label = Versión %s
 settings.checkForUpdates.label = Comprobar actualizaciones
 settings.port.label = Puerto WebDAV
 settings.port.prompt = 0 \= Elegir automáticamente
-settings.requiresRestartLabel = * Cryptomator se necesita reiniciar
+settings.requiresRestartLabel = * Cryptomator necesita reiniciarse
 # tray icon
 tray.menu.open = Abrir
 tray.menu.quit = Salir
 tray.infoMsg.title = Todavía en ejecución
-tray.infoMsg.msg = Cryptomator todavía esta en ejecución. Para salir usa el icono del tray.
-tray.infoMsg.msg.osx = Cryptomator todavía esta en ejecución. Para salir usa el icono de la barra del menú.
+tray.infoMsg.msg = Cryptomator todavía está en ejecución. Para salir use el icono de la bandeja.
+tray.infoMsg.msg.osx = Cryptomator todavía está en ejecución. Para salir use el icono de la barra del menú.
 initialize.messageLabel.passwordStrength.0 = Muy débil
 initialize.messageLabel.passwordStrength.1 = Débil
 initialize.messageLabel.passwordStrength.2 = Suficiente
 initialize.messageLabel.passwordStrength.3 = Fuerte
 initialize.messageLabel.passwordStrength.4 = Muy fuerte
-initialize.label.doNotForget = IMPORTANTE\: Si olivdas tú contraseña, no hay ninguna manera de recuperar tus datos.
+initialize.label.doNotForget = IMPORTANTE\: Si olvida la contraseña, no habrá ninguna manera de recuperar los datos.
 main.directoryList.remove.confirmation.title = Borrar caja fuerte
-main.directoryList.remove.confirmation.header = ¿Quieres de verdad borrar esta caja fuerte?
-main.directoryList.remove.confirmation.content = La caja fuerte solo se borra de la lista. Para eliminarla permanente por favor elimina los datos de tú sistema de archivos.
-upgrade.version3to4.msg = Este caja fuerte se debe migrar a un formato más reciente.\nLos nombres de las carpetas cifradas se actualizan.\nPor favor asegurarse de que la sincronización ha terminado antes de seguir.
-upgrade.version3to4.err.io = Migración ha fallado por causa de una excepción I/O. Para detalles revisa el archivo de registro.
+main.directoryList.remove.confirmation.header = ¿Quiere de realmente eliminar esta caja fuerte?
+main.directoryList.remove.confirmation.content = La caja fuerte solo se elimina de la lista. Para borrarla permanente elimine los datos de su sistema de archivos.
+upgrade.version3to4.msg = Este caja fuerte se debe migrar a un formato más moderno.\nLos nombres de las carpetas cifradas se actualizarán.\nAsegúrese de que la sincronización ha terminado antes de continuar.
+upgrade.version3to4.err.io = Error en la migración debido a una excepción de E/S. Consulte el archivo de registro para más información.
 # or esequema WEBDAV but I think sistema sounds better
-settings.prefGvfsScheme.label = Esquema WebDAV
+settings.prefGvfsScheme.label = Esquema de WebDAV
 # upgrade.fxml
 upgrade.confirmation.label = Sí, me he asegurado de que la sincronización ha terminado
-initialize.messageLabel.notEmpty = Caja fuerte no está vacia
 unlock.label.savePassword = Guardar contraseña
 unlock.errorMessage.unauthenticVersionMac = No se pudo autentificar la versión de MAC.
 unlocked.label.mountFailed = Error al montar la unidad
 unlock.savePassword.delete.confirmation.title = Borrar contraseña guardada
-unlock.savePassword.delete.confirmation.header = ¿Quieres borrar la contraseña guardada de esta unidad?
-unlock.savePassword.delete.confirmation.content = La contraseña guardada de esta caja fuerte, será borrada inmediatamente del sistema de claves. Si quieres guardar tu contraseña de nuevo, tienes que volver a desbloquear la caja fuerte marcando la opción de "Guardar contraseña".
+unlock.savePassword.delete.confirmation.header = ¿Quiere realmente borrar la contraseña guardada de esta unidad?
+unlock.savePassword.delete.confirmation.content = La contraseña guardada de esta caja fuerte, será borrada inmediatamente del sistema de claves. Si quiere guardar su contraseña de nuevo, tiene que volver a desbloquear la caja fuerte marcando la opción de "Guardar contraseña".
 settings.debugMode.label = Modo depuración *
 upgrade.version3dropBundleExtension.title = Actualizar caja fuerte a la versión 3 (Drop Bundle Extension)
 upgrade.version3to4.title = Actualizar caja fuerte de versión 3 a 4
-upgrade.version4to5.title = Actualizar caja fuerte de versión 3 a 4
-upgrade.version4to5.msg = Esta caja fuerte tiene que ser migrada a un formato nuevo.\nLos archivos encriptados se actualizarán.\nPor favor, asegúrate de que la sincronización ha terminado antes de empezar con el proceso.\n\nNota\: Las fechas de modificación de todos los archivos, se cambiarán a la fecha actual.
-upgrade.version4to5.err.io = La migración ha fallado por una excepción E/S. Consulta el log para ver más detalles.
+upgrade.version4to5.title = Actualizar caja fuerte de versión 4 a 5
+upgrade.version4to5.msg = Esta caja fuerte tiene que ser migrada a un formato más moderno.\nLos archivos cifrados se actualizarán.\nAsegúrese de que la sincronización ha terminado antes de iniciar el proceso.\n\nNota\: las fechas de modificación de todos los archivos, se cambiarán a la fecha actual.
+upgrade.version4to5.err.io = Error en la migración debido a una excepción E/S. Consulte el archivo de registro para más información.
 settings.port.apply = Aplicar
 unlock.label.mountAfterUnlock = Montar unidad
 unlock.label.revealAfterMount = Revelar unidad
-unlocked.lock.force.confirmation.title = Locking of %1$s failed
-unlocked.lock.force.confirmation.header = Do you want to force locking?
-unlocked.lock.force.confirmation.content = This may be because other programs are still accessing files in the vault or because some other problem occurred.\n\nPrograms still accessing the files may not work correctly and data not already written by those programs may be lost.
-unlock.label.unlockAfterStartup = Auto-Unlock on Start (Experimental)
-unlock.errorMessage.unlockFailed = Unlock failed. See log file for details.
-unlocked.moreOptions.mount = Mount Drive
-unlocked.moreOptions.unmount = Eject Drive
-upgrade.version5toX.title = Vault Version Upgrade
-upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
\ No newline at end of file
+unlocked.lock.force.confirmation.title = Error al bloquear %1$s
+unlocked.lock.force.confirmation.header = ¿Quiere forzar el bloqueo?
+unlocked.lock.force.confirmation.content = Esto puede ser debido a que otros programas estén todavía accediendo a la caja fuerte o porque se ha producido algún otro problema.\n\nLos programas que estén todavía accediendo a los archivos pueden no funcionar correctamente y se pueden perder los datos pendientes de escribir por estos programas.
+unlock.label.unlockAfterStartup = Autodesbloqueo al arrancar (experimental)
+unlock.errorMessage.unlockFailed = Error al desbloquear. Consulte el archivo de registro para más información.
+unlocked.moreOptions.mount = Montar unidad
+unlocked.moreOptions.unmount = Expulsar unidad
+upgrade.version5toX.title = Actualizar la versión de la caja fuerte
+upgrade.version5toX.msg = Esta caja fuerte debe ser migrada a un formato más moderno.\nAsegúrese de que la sincronización ha terminado antes de iniciar el proceso.
+main.createVault.nonEmptyDir.title = Creating vault failed
+main.createVault.nonEmptyDir.header = Chosen directory is not empty
+main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/fr.txt b/main/ui/src/main/resources/localization/fr.txt
index c670f64cf..6ffedfa9a 100644
--- a/main/ui/src/main/resources/localization/fr.txt
+++ b/main/ui/src/main/resources/localization/fr.txt
@@ -80,7 +80,6 @@ upgrade.version3to4.err.io = La migration a échoué à cause d'une erreur d'ent
 settings.prefGvfsScheme.label = Schéma d'URI WebDAV
 # upgrade.fxml
 upgrade.confirmation.label = Oui, je suis certain que la synchronisation est terminée
-initialize.messageLabel.notEmpty = Le coffre n'est pas vide
 unlock.label.savePassword = Se souvenir du mot de passe
 unlock.errorMessage.unauthenticVersionMac = Impossible d'authentifier la version MAC
 unlocked.label.mountFailed = Echec de connexion au lecteur
@@ -96,12 +95,15 @@ upgrade.version4to5.err.io = Migration échouée due à une erreur de lecture. L
 settings.port.apply = Appliquer
 unlock.label.mountAfterUnlock = Monter un lecteur
 unlock.label.revealAfterMount = Voir le lecteur
-unlocked.lock.force.confirmation.title = Locking of %1$s failed
-unlocked.lock.force.confirmation.header = Do you want to force locking?
-unlocked.lock.force.confirmation.content = This may be because other programs are still accessing files in the vault or because some other problem occurred.\n\nPrograms still accessing the files may not work correctly and data not already written by those programs may be lost.
-unlock.label.unlockAfterStartup = Auto-Unlock on Start (Experimental)
-unlock.errorMessage.unlockFailed = Unlock failed. See log file for details.
-unlocked.moreOptions.mount = Mount Drive
-unlocked.moreOptions.unmount = Eject Drive
-upgrade.version5toX.title = Vault Version Upgrade
-upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
\ No newline at end of file
+unlocked.lock.force.confirmation.title = Le vérouillage de %1$s a ćhoué
+unlocked.lock.force.confirmation.header = Voulez-vous forcer le vérouillage ?
+unlocked.lock.force.confirmation.content = Cela peut être car d'autres programmes sont entrain d'accéder à des fichiers dans le coffre ou car d'autres problème se sont produits.\n\nLes programmes accédant aux fichiers pourraient ne pas fonctionner normalement et les données pas encore sauvegardées par ces programmes pourraient être perdues.
+unlock.label.unlockAfterStartup = Déverouiller automatiquement au démarrage (Experimental)
+unlock.errorMessage.unlockFailed = Le déverouillage a échoué. Regarder les logs pour plus d'informations.
+unlocked.moreOptions.mount = Monter le disque
+unlocked.moreOptions.unmount = Ejecter le disque
+upgrade.version5toX.title = Mise à niveau de la version du coffre
+upgrade.version5toX.msg = Ce coffre doit être converti dans un format plus récent. Veuillez-vous assurez que la synchronisation est finie avant de continuer.
+main.createVault.nonEmptyDir.title = Creating vault failed
+main.createVault.nonEmptyDir.header = Chosen directory is not empty
+main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/hu.txt b/main/ui/src/main/resources/localization/hu.txt
index 74220d4ff..6875c4361 100644
--- a/main/ui/src/main/resources/localization/hu.txt
+++ b/main/ui/src/main/resources/localization/hu.txt
@@ -77,7 +77,6 @@ upgrade.version3to4.err.io = Migráció meghíusúlt egy I/O kivétel miatt. Ké
 settings.prefGvfsScheme.label = WebDAV séma
 # upgrade.fxml
 upgrade.confirmation.label = Igen, meggyőződtem a szinkronizáció befejeztéről
-initialize.messageLabel.notEmpty = A széf nem üres
 unlock.label.savePassword = Jelszó mentése
 unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
 unlocked.label.mountFailed = Meghajtó csatlakoztatása sikertelen
@@ -101,4 +100,7 @@ unlock.errorMessage.unlockFailed = Unlock failed. See log file for details.
 unlocked.moreOptions.mount = Mount Drive
 unlocked.moreOptions.unmount = Eject Drive
 upgrade.version5toX.title = Vault Version Upgrade
-upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
\ No newline at end of file
+upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
+main.createVault.nonEmptyDir.title = Creating vault failed
+main.createVault.nonEmptyDir.header = Chosen directory is not empty
+main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/it.txt b/main/ui/src/main/resources/localization/it.txt
index 59fa69cce..1752f8bb3 100644
--- a/main/ui/src/main/resources/localization/it.txt
+++ b/main/ui/src/main/resources/localization/it.txt
@@ -77,7 +77,6 @@ upgrade.version3to4.err.io = Migrazione fallita a causa di una eccezione I/O. Ve
 settings.prefGvfsScheme.label = Schema WebDAV
 # upgrade.fxml
 upgrade.confirmation.label = Si, sono sicuro che la sincronizzazione e' terminata
-initialize.messageLabel.notEmpty = Vault non vuoto
 unlock.label.savePassword = Salva Password
 unlock.errorMessage.unauthenticVersionMac = Non riesco ad autenticare la versione MAC.
 unlocked.label.mountFailed = Tentativo di connessione drive fallito
@@ -101,4 +100,7 @@ unlock.errorMessage.unlockFailed = Unlock failed. See log file for details.
 unlocked.moreOptions.mount = Mount Drive
 unlocked.moreOptions.unmount = Eject Drive
 upgrade.version5toX.title = Vault Version Upgrade
-upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
\ No newline at end of file
+upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
+main.createVault.nonEmptyDir.title = Creating vault failed
+main.createVault.nonEmptyDir.header = Chosen directory is not empty
+main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/ja.txt b/main/ui/src/main/resources/localization/ja.txt
index 7cbd3e1dc..f64da90b9 100644
--- a/main/ui/src/main/resources/localization/ja.txt
+++ b/main/ui/src/main/resources/localization/ja.txt
@@ -1,104 +1,106 @@
 app.name = Cryptomator
 # main.fxml
-main.emptyListInstructions = ここをクリックして金庫を追加する
-main.directoryList.contextMenu.remove = リストから削除する
-main.directoryList.contextMenu.changePassword = パスワード変更
-main.addDirectory.contextMenu.new = 新しい金庫を作成する
+main.emptyListInstructions = ここをクリックして金庫を追加
+main.directoryList.contextMenu.remove = リストから削除
+main.directoryList.contextMenu.changePassword = パスワードの変更
+main.addDirectory.contextMenu.new = 新しい金庫を作成
 main.addDirectory.contextMenu.open = 既存の金庫を開く
 # welcome.fxml
-welcome.checkForUpdates.label.currentlyChecking = アップデートを確認中...
-welcome.newVersionMessage = バージョン%1$sがダウンロードできます。\n現在のバージョンは%2$sです。
+welcome.checkForUpdates.label.currentlyChecking = アップデートを確認しています...
+welcome.newVersionMessage = バージョン %1$s がダウンロード可能です。\n現在のバージョンは %2$s です。
 # initialize.fxml
 initialize.label.password = パスワード
-initialize.label.retypePassword = パスワード再入力
+initialize.label.retypePassword = パスワードの再入力
 initialize.button.ok = 金庫を作成
-initialize.messageLabel.alreadyInitialized = 金庫がすでに初期化されています。
+initialize.messageLabel.alreadyInitialized = 金庫は既に初期化されています。
 initialize.messageLabel.initializationFailed = 金庫の初期化ができませんでした。詳細はログファイルをご覧ください。
 # notfound.fxml
-notfound.label = 金庫が見つかりませんでした。動かされたのですか？
+notfound.label = 金庫が見つかりません。移動しましたか?
 # upgrade.fxml
-upgrade.button = 金庫をアップグレードする
-upgrade.version3dropBundleExtension.msg = この金庫を新しい形式に移行する必要があります。\n"%1$s"は"%2$s"に変更されます。\n続行する前に同期が完了していることをご確認ください。
-upgrade.version3dropBundleExtension.err.alreadyExists = 自動移行が失敗しました。\n"%s"はすでに存在します。
+upgrade.button = 金庫をアップグレード
+upgrade.version3dropBundleExtension.msg = この金庫を新しい形式に移行する必要があります。\n"%1$s" は "%2$s" に変更されます。\n続行する前に同期が完了していることをご確認ください。
+upgrade.version3dropBundleExtension.err.alreadyExists = 自動移行が失敗しました。\n"%s" はすでに存在します。
 # unlock.fxml
 unlock.label.password = パスワード
 unlock.label.mountName = ドライブ名
 unlock.label.winDriveLetter = ドライブ文字
-unlock.label.downloadsPageLink = 全てのCryptomatorバージョン
+unlock.label.downloadsPageLink = すべての Cryptomator バージョン
 unlock.label.advancedHeading = 詳細オプション
-unlock.button.unlock = 金庫を解除する
-unlock.button.advancedOptions.show = その他のオプション
-unlock.button.advancedOptions.hide = 基本オプション
-unlock.choicebox.winDriveLetter.auto = 自動に割り当てる
-unlock.errorMessage.wrongPassword = 間違ったパスワード
-unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = サポートされていない金庫です。この金庫は古いバージョンのCryptomatorから作成されました。
-unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = サポートされていない金庫です。この金庫は新しいバージョンのCryptomatorから作成されました。
-unlock.messageLabel.startServerFailed = WebDAVサーバーの起動失敗
+unlock.button.unlock = 金庫を解錠
+unlock.button.advancedOptions.show = オプションを表示
+unlock.button.advancedOptions.hide = オプションを非表示
+unlock.choicebox.winDriveLetter.auto = 自動的に割り当てる
+unlock.errorMessage.wrongPassword = パスワードが無効です
+unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = サポートされない金庫です。この金庫は古いバージョンの Cryptomator から作成されました。
+unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = サポートされない金庫です。この金庫は新しいバージョンの Cryptomator から作成されました。
+unlock.messageLabel.startServerFailed = WebDAV サーバーの起動に失敗しました。
 # change_password.fxml
 changePassword.label.oldPassword = 古いパスワード
 changePassword.label.newPassword = 新しいパスワード
-changePassword.label.retypePassword = 二回目のパスワード(確認用)
-changePassword.label.downloadsPageLink = 全てのCryptomatorのバージョン
+changePassword.label.retypePassword = パスワードの再入力
+changePassword.label.downloadsPageLink = すべての Cryptomator バージョン
 changePassword.button.change = パスワードの変更
-changePassword.errorMessage.wrongPassword = 違うパスワード
-changePassword.errorMessage.decryptionFailed = 解読不可
+changePassword.errorMessage.wrongPassword = パスワードが無効です
+changePassword.errorMessage.decryptionFailed = 復号に失敗しました。
 # unlocked.fxml
 unlocked.button.lock = 金庫の施錠
-unlocked.moreOptions.reveal = 金庫ドライブの表示
-unlocked.moreOptions.copyUrl = WebDAVのURLのコピー
+unlocked.moreOptions.reveal = ドライブの表示
+unlocked.moreOptions.copyUrl = WebDAV URL のコピー
 unlocked.label.revealFailed = 入力エラー
-unlocked.label.unmountFailed = 外部出力の排出エラー
-unlocked.label.statsEncrypted = 暗号化
-unlocked.label.statsDecrypted = 解読
-unlocked.ioGraph.yAxis.label = 情報処理量
+unlocked.label.unmountFailed = ドライブの取り出しに失敗
+unlocked.label.statsEncrypted = 暗号化済み
+unlocked.label.statsDecrypted = 復号済み
+unlocked.ioGraph.yAxis.label = スループット (MiB/s)
 # settings.fxml
-settings.version.label = バージョンの%s
+settings.version.label = バージョン %s
 settings.checkForUpdates.label = 最新版のチェック
-settings.port.label = WebDAVの移動
-settings.port.prompt = 0＝自動的に選択します
-settings.requiresRestartLabel = Cryptomatorの再起動が必要です
+settings.port.label = WebDAV ポート
+settings.port.prompt = 0 \= 自動的に選択
+settings.requiresRestartLabel = *Cryptomatorの再起動が必要
 # tray icon
 tray.menu.open = 開く
 tray.menu.quit = 閉じる
-tray.infoMsg.title = バックグラウンドで稼働中
-tray.infoMsg.msg = Cryptomatorはまだ稼働しています。終了はトレイアイコンからしてください。
-tray.infoMsg.msg.osx = Cryptomatorはまだ稼働しています。終了はメヌーバーアイコンからしてください。
+tray.infoMsg.title = バックグラウンドで実行中
+tray.infoMsg.msg = まだ Cryptomator は実行中です。トレイアイコンのアイコンから閉じてください。
+tray.infoMsg.msg.osx = まだ Cryptomator は実行中です。メニューバーのアイコンから閉じてください。
 initialize.messageLabel.passwordStrength.0 = 非常に弱い
 initialize.messageLabel.passwordStrength.1 = 弱い
 initialize.messageLabel.passwordStrength.2 = 普通
 initialize.messageLabel.passwordStrength.3 = 強い
 initialize.messageLabel.passwordStrength.4 = 非常に強い
-initialize.label.doNotForget = 重要：パスワードを忘れましたら、あなたのデータは復旧できません。
-main.directoryList.remove.confirmation.title = 金庫の削除
-main.directoryList.remove.confirmation.header = 本当にこの金庫を取り除きたいですか？
-main.directoryList.remove.confirmation.content = 金庫はリストのみで削除されます。永久に削除するなら、ファイルシステムからファイルを削除してください。
-upgrade.version3to4.msg = この金庫は新しいフォーマットに移行する必要があります。暗号化されたフォルダの名前は更新されます。進行する前に同期が完了していることをご確認ください。
-upgrade.version3to4.err.io = I/O例外のため移行が失敗しました。詳細はログをご確認ください。
-settings.prefGvfsScheme.label = WebDAVスキーム
+initialize.label.doNotForget = 重要\: パスワードを忘れると、データの復旧はできません。
+main.directoryList.remove.confirmation.title = 金庫を削除
+main.directoryList.remove.confirmation.header = この金庫を本当に削除しますか?
+main.directoryList.remove.confirmation.content = 金庫はリストのみで削除されます。完全に削除するには、ファイルシステムからファイルを削除してください。
+upgrade.version3to4.msg = この金庫は新しいフォーマットに移行する必要があります。\n暗号化されたフォルダの名前は更新されます。\n続行する前に同期が完了していることをご確認ください。
+upgrade.version3to4.err.io = I/O の例外で移行に失敗しました。詳細はログをご確認ください。
+settings.prefGvfsScheme.label = WebDAV スキーム
 # upgrade.fxml
 upgrade.confirmation.label = はい、同期が完了していることを確認しました。
-initialize.messageLabel.notEmpty = 金庫が空いていません。
-unlock.label.savePassword = パスワード保存
-unlock.errorMessage.unauthenticVersionMac = バージョンMACを認証できません。
-unlocked.label.mountFailed = ドライブの接続に失敗しました。
-unlock.savePassword.delete.confirmation.title = 保存されたパスワードを削除
-unlock.savePassword.delete.confirmation.header = あなたは本当にこの金庫の保存されたパスワードを削除しますか？
-unlock.savePassword.delete.confirmation.content = この金庫の保存されたパスワードはあなたのシステムキーチェーンから直ちに削除されます。もしまたパスワードを保存したい際には、”パスワード保存”オプションを有効にした上に金庫を解除する必要があります。
-settings.debugMode.label = デバッグモード
-upgrade.version3dropBundleExtension.title = 金庫バージョン3アップグレード(Drop Bundle Extension)
-upgrade.version3to4.title = 金庫バージョン3から4にアップグレード
-upgrade.version4to5.title = 金庫バージョン4から5にアップグレード
-upgrade.version4to5.msg = この金庫は新しいフォーマットに移行する必要があります。暗号化されたファイルは更新されます。進行する前に同期が完了していることをご確認ください。\n\n注意：すべてのファイルの変更日は、現在の日付・時刻に変わります。
-upgrade.version4to5.err.io = I/O例外のため移行が失敗しました。詳細はログをご確認ください。
+unlock.label.savePassword = パスワードを保存
+unlock.errorMessage.unauthenticVersionMac = MAC バージョンを認証できません。
+unlocked.label.mountFailed = ドライブの接続に失敗
+unlock.savePassword.delete.confirmation.title = 保存済みのパスワードを削除
+unlock.savePassword.delete.confirmation.header = 本当にこの金庫の保存済みパスワードを削除しますか?
+unlock.savePassword.delete.confirmation.content = この金庫の保存済みパスワードは、直ちにシステムのキーチェーンから削除されます。もう一度パスワードを保存するには、"Save Password" オプションを有効にして金庫を解錠する必要があります。
+settings.debugMode.label = デバッグモード *
+upgrade.version3dropBundleExtension.title = 金庫をバージョン 3 にアップグレード(Drop Bundle Extension)
+upgrade.version3to4.title = 金庫をバージョン 3 から 4 にアップグレード
+upgrade.version4to5.title = 金庫をバージョン 4 から 5 にアップグレード
+upgrade.version4to5.msg = この金庫は新しいフォーマットに移行する必要があります。\n暗号化されたファイルは更新されます。\n続行する前に同期が完了していることをご確認ください。\n\n注意：すべてのファイルの変更日は、現在の日付・時刻に変わります。
+upgrade.version4to5.err.io = I/O の例外で移行に失敗しました。詳細はログをご確認ください。
 settings.port.apply = 適用
 unlock.label.mountAfterUnlock = ドライブをマウント
-unlock.label.revealAfterMount = ドライブを明らかにする
-unlocked.lock.force.confirmation.title = Locking of %1$s failed
-unlocked.lock.force.confirmation.header = Do you want to force locking?
-unlocked.lock.force.confirmation.content = This may be because other programs are still accessing files in the vault or because some other problem occurred.\n\nPrograms still accessing the files may not work correctly and data not already written by those programs may be lost.
-unlock.label.unlockAfterStartup = Auto-Unlock on Start (Experimental)
-unlock.errorMessage.unlockFailed = Unlock failed. See log file for details.
-unlocked.moreOptions.mount = Mount Drive
-unlocked.moreOptions.unmount = Eject Drive
-upgrade.version5toX.title = Vault Version Upgrade
-upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
\ No newline at end of file
+unlock.label.revealAfterMount = ドライブの表示
+unlocked.lock.force.confirmation.title = %1$s の施錠に失敗しました
+unlocked.lock.force.confirmation.header = 強制的にロックしますか？
+unlocked.lock.force.confirmation.content = これは恐らく他のプログラムがこの金庫のファイルをまだアクセスしているか、あるいは別の問題が発生したためです。\n\nまだファイルにアクセスしているプログラムが正しく動作しない可能性があり、それらのプログラムによってまだ書き込まれていないデータが失われる可能性があります。
+unlock.label.unlockAfterStartup = 起動時に解錠 (実験的)
+unlock.errorMessage.unlockFailed = 施錠に失敗しました。詳細をログファイルで確認してください。
+unlocked.moreOptions.mount = ドライブのマウント
+unlocked.moreOptions.unmount = ドライブの取り出し
+upgrade.version5toX.title = 金庫のバージョンをアップグレード
+upgrade.version5toX.msg = この金庫を新しいバージョンに移行する必要があります。\n進行する前に同期が完了していることをご確認ください。
+main.createVault.nonEmptyDir.title = Creating vault failed
+main.createVault.nonEmptyDir.header = Chosen directory is not empty
+main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/ko.txt b/main/ui/src/main/resources/localization/ko.txt
index 04ac14cee..04bcbaef0 100644
--- a/main/ui/src/main/resources/localization/ko.txt
+++ b/main/ui/src/main/resources/localization/ko.txt
@@ -30,7 +30,7 @@ unlock.button.unlock = 보관함 해제
 unlock.button.advancedOptions.show = 더 많은 옵션
 unlock.button.advancedOptions.hide = 기본 옵션
 unlock.choicebox.winDriveLetter.auto = 자동으로 할당
-unlock.errorMessage.wrongPassword = 틀린 비밀번호
+unlock.errorMessage.wrongPassword = 잘못된 비밀번호
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = 지원되지 않는 보관함. 이 보관함은 이전 버전의 Cryptomator에서 생성되었습니다.
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = 지원되지 않는 보관함. 이 보관함은 상위 버전의 Cryptomator에서 생성되었습니다.
 unlock.messageLabel.startServerFailed = WedDAV 서버 시작 실패
@@ -40,14 +40,14 @@ changePassword.label.newPassword = 새로운 비밀번호
 changePassword.label.retypePassword = 비밀번호 재입력
 changePassword.label.downloadsPageLink = 모든 Cryptomator 버전
 changePassword.button.change = 비밀번호 변경
-changePassword.errorMessage.wrongPassword = 틀린 비밀번호
-changePassword.errorMessage.decryptionFailed = 복호화 실패
+changePassword.errorMessage.wrongPassword = 잘못된 비밀번호
+changePassword.errorMessage.decryptionFailed = 암호화 해제 실패
 # unlocked.fxml
 unlocked.button.lock = 보관함 잠그기
 unlocked.moreOptions.reveal = 드라이브 표시
 unlocked.moreOptions.copyUrl = WebDAV 주소 복사
 unlocked.label.revealFailed = 명령 실패
-unlocked.label.unmountFailed = 드라이브 추출 실패
+unlocked.label.unmountFailed = 드라이브 꺼내기 실패
 unlocked.label.statsEncrypted = 암호화
 unlocked.label.statsDecrypted = 복호화
 unlocked.ioGraph.yAxis.label = 처리량 (MiB/s)
@@ -61,8 +61,8 @@ settings.requiresRestartLabel = * Cryptomator 재시작 필요
 tray.menu.open = 열기
 tray.menu.quit = 종료
 tray.infoMsg.title = 계속 실행 중입니다.
-tray.infoMsg.msg = Cryptomator가 계속 실행 중입니다. 종료하실려면 트레이 아이콘에서 해주세요.
-tray.infoMsg.msg.osx = Cryptomator가 계속 실행중입니다. 종료하실려면 메뉴 바 아이콘에서 해주세요.
+tray.infoMsg.msg = Cryptomator가 계속 실행 중입니다. 종료는 트레이 아이콘에서 해주세요.
+tray.infoMsg.msg.osx = Cryptomator가 계속 실행중입니다. 종료는 메뉴바 아이콘에서 해주세요.
 initialize.messageLabel.passwordStrength.0 = 매우 약함
 initialize.messageLabel.passwordStrength.1 = 약함
 initialize.messageLabel.passwordStrength.2 = 괜찮음
@@ -71,34 +71,36 @@ initialize.messageLabel.passwordStrength.4 = 매우 강력함
 initialize.label.doNotForget = 중요\: 만약 비밀번호를 잊으셨다면, 여러분의 데이터를 복구할 수 없습니다.
 main.directoryList.remove.confirmation.title = 보관함 삭제
 main.directoryList.remove.confirmation.header = 정말 이 보관함을 삭제하시겠습니까?
-main.directoryList.remove.confirmation.content = 보관함이 목록에서만 제거되었습니다. 데이터를 완전히 제거하시려면, 여러분의 파일시스템이서 제거해 주시기 바랍니다.
-upgrade.version3to4.msg = 이 보관함은 새로운 형식으로 바뀔 필요가 있습니다. 암호화된 폴더 이름이 업데이트 될 것입니다. 진행하기 전에 동기화가 완료되었는지 확인하기 바랍니다.
-upgrade.version3to4.err.io = 입출력 예외 문제로 마이그레이션이 실패하였습니다. 자세한 사항은 로그 파일을 확인하세요.
-settings.prefGvfsScheme.label = WebDAV sceme
+main.directoryList.remove.confirmation.content = 보관함이 목록에서만 제거되었습니다. 데이터를 완전히 제거하시려면, 사용자의 파일시스템이서 제거해 주시기 바랍니다.
+upgrade.version3to4.msg = 이 보관함은 새로운 형식으로 이전되어야 합니다. 암호화된 폴더 이름이 업데이트 될 것입니다. 진행하기 전에 동기화가 완료되었는지 확인하기 바랍니다.
+upgrade.version3to4.err.io = I/O 예외 문제로 마이그레이션이 실패하였습니다. 자세한 사항은 로그 파일을 확인하세요.
+settings.prefGvfsScheme.label = WebDAV 스키마
 # upgrade.fxml
 upgrade.confirmation.label = 네. 동기화가 완료되었음을 확인하였습니다.
-initialize.messageLabel.notEmpty = 보관함이 비어있지 않음
 unlock.label.savePassword = 비밀번호 저장
-unlock.errorMessage.unauthenticVersionMac = 인증할 수 없는 버전의 맥입니다
+unlock.errorMessage.unauthenticVersionMac = 인증할 수 없는 버전의 MAC(Message Authentication Code)입니다
 unlocked.label.mountFailed = 드라이브 연결 실패
 unlock.savePassword.delete.confirmation.title = 저장된 비밀번호 삭제
 unlock.savePassword.delete.confirmation.header = 정말로 이 보관함의 저장된 비밀번호를 지우시겠습니까?
 unlock.savePassword.delete.confirmation.content = 이 보관함의 저장된 비밀번호는 당신의 시스템 키체인에서 즉시 삭제될 것입니다. 다시 비밀번호를 저장하고 싶으시다면, 보관함을 열 때 "비밀번호 저장" 옵션을 활성화해야 합니다
-settings.debugMode.label = 디버그 모드
+settings.debugMode.label = 디버그 모드 *
 upgrade.version3dropBundleExtension.title = 버전 3 보관함 업그레이드 (Drop Bundle Extension)
 upgrade.version3to4.title = 보관함 버전 3에서 4로 업그레이드
 upgrade.version4to5.title = 보관함 버전 4에서 5로 업그레이드
-upgrade.version4to5.msg = 이 보관함은 새로운 포맷으로 이전되어야 합니다.\n암호화된 파일들은 업데이트 될 것입니다.\n진행하기 전에 동기화가 완료되었는지 확인해주세요.\n\n참고\: 모든 파일의  수정 날짜는 과정 진행 중에 현재 날짜/시간으로 바뀔 것입니다.
+upgrade.version4to5.msg = 이 보관함은 새로운 형식으로 이전되어야 합니다.\n암호화된 파일들은 업데이트 될 것입니다.\n진행하기 전에 동기화가 완료되었는지 확인해주세요.\n\n참고\: 모든 파일의  수정 날짜는 과정 진행 중에 현재 날짜/시간으로 바뀔 것입니다.
 upgrade.version4to5.err.io = I/O 예외에 의해 마이그레이션 실패. 자세한 사항은 로그 파일을 참조하세요.
 settings.port.apply = 적용
 unlock.label.mountAfterUnlock = 드라이브 마운트
 unlock.label.revealAfterMount = 드라이브 공개
-unlocked.lock.force.confirmation.title = Locking of %1$s failed
-unlocked.lock.force.confirmation.header = Do you want to force locking?
-unlocked.lock.force.confirmation.content = This may be because other programs are still accessing files in the vault or because some other problem occurred.\n\nPrograms still accessing the files may not work correctly and data not already written by those programs may be lost.
-unlock.label.unlockAfterStartup = Auto-Unlock on Start (Experimental)
-unlock.errorMessage.unlockFailed = Unlock failed. See log file for details.
-unlocked.moreOptions.mount = Mount Drive
-unlocked.moreOptions.unmount = Eject Drive
-upgrade.version5toX.title = Vault Version Upgrade
-upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
\ No newline at end of file
+unlocked.lock.force.confirmation.title = %1$s 잠그기 실패
+unlocked.lock.force.confirmation.header = 강제로 잠그시겠습니까?
+unlocked.lock.force.confirmation.content = 이는 다른 프로그램이 보관함 내의 파일을 접근하고 있거나, 다른 문제가 발생했기 때문일 수 있습니다.\n\n파일을 접근하고 있는 프로그램이 제대로 동작하지 않을 수 있으며, 프로그램이 쓰지 않은 데이터는 손실될 수 있습니다.
+unlock.label.unlockAfterStartup = 시작 시 자동 잠금 해제 (실험적)
+unlock.errorMessage.unlockFailed = 잠금 해제 실패. 자세한 사항은 로그 파일을 참조하세요.
+unlocked.moreOptions.mount = 드라이브 마운트
+unlocked.moreOptions.unmount = 드라이브 꺼내기
+upgrade.version5toX.title = 보관함 버전 업그레이드
+upgrade.version5toX.msg = 이 보관함은 새로운 버전으로 이전되어야 합니다.\n진행하기 전에 동기화가 완료되었는지 확인해주세요.
+main.createVault.nonEmptyDir.title = Creating vault failed
+main.createVault.nonEmptyDir.header = Chosen directory is not empty
+main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/lv.txt b/main/ui/src/main/resources/localization/lv.txt
index 428a4cec1..fb442519b 100644
--- a/main/ui/src/main/resources/localization/lv.txt
+++ b/main/ui/src/main/resources/localization/lv.txt
@@ -78,7 +78,6 @@ upgrade.version3to4.err.io = Migrācija neizdevās dēļ I/O izņēmuma. Sīkāk
 settings.prefGvfsScheme.label = WebDAV shēma
 # upgrade.fxml
 upgrade.confirmation.label = Jā, esmu pārliecinājies, ka sinhronizācija ir pabeigta.
-initialize.messageLabel.notEmpty = Glabātuve nav tukša
 unlock.label.savePassword = Saglabāt paroli
 unlock.errorMessage.unauthenticVersionMac = Nevar autentificēt versijas MAC
 unlocked.label.mountFailed = Diska pievienošana neizdevās
@@ -102,4 +101,7 @@ unlock.errorMessage.unlockFailed = Unlock failed. See log file for details.
 unlocked.moreOptions.mount = Mount Drive
 unlocked.moreOptions.unmount = Eject Drive
 upgrade.version5toX.title = Vault Version Upgrade
-upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
\ No newline at end of file
+upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
+main.createVault.nonEmptyDir.title = Creating vault failed
+main.createVault.nonEmptyDir.header = Chosen directory is not empty
+main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/nl.txt b/main/ui/src/main/resources/localization/nl.txt
index a69d55d9e..8a0350354 100644
--- a/main/ui/src/main/resources/localization/nl.txt
+++ b/main/ui/src/main/resources/localization/nl.txt
@@ -79,7 +79,6 @@ upgrade.version3to4.err.io = I/O Exception\: migratie mislukt. Zie logbestand vo
 settings.prefGvfsScheme.label = WebDAV schema
 # upgrade.fxml
 upgrade.confirmation.label = Ja, ik heb geverifieerd dat de synchronisatie voltooid is
-initialize.messageLabel.notEmpty = Kluis niet leeg
 unlock.label.savePassword = Wachtwoord Opslaan
 unlock.errorMessage.unauthenticVersionMac = MAC authenticatie mislukt
 unlocked.label.mountFailed = Verbinden van schijf mislukt
@@ -103,4 +102,7 @@ unlock.errorMessage.unlockFailed = Unlock failed. See log file for details.
 unlocked.moreOptions.mount = Mount Drive
 unlocked.moreOptions.unmount = Eject Drive
 upgrade.version5toX.title = Vault Version Upgrade
-upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
\ No newline at end of file
+upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
+main.createVault.nonEmptyDir.title = Creating vault failed
+main.createVault.nonEmptyDir.header = Chosen directory is not empty
+main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/pl.txt b/main/ui/src/main/resources/localization/pl.txt
index 8874db83a..3a9eefb6d 100644
--- a/main/ui/src/main/resources/localization/pl.txt
+++ b/main/ui/src/main/resources/localization/pl.txt
@@ -77,7 +77,6 @@ upgrade.version3to4.err.io = Błąd aktualizacji z powodu problemów z odczytem/
 settings.prefGvfsScheme.label = Schemat WebDAV
 # upgrade.fxml
 upgrade.confirmation.label = Tak, synchronizacja plików na pewno została ukończona.
-initialize.messageLabel.notEmpty = Krypta nie jest pusta
 unlock.label.savePassword = Zapisz hasło
 unlock.errorMessage.unauthenticVersionMac = Nie udało się uwierzytelnić wersji MAC
 unlocked.label.mountFailed = Błąd podłączanie dysku.
@@ -101,4 +100,7 @@ unlock.errorMessage.unlockFailed = Błąd odblokowywania. Szczegóły błędu zn
 unlocked.moreOptions.mount = Podłącz dysk
 unlocked.moreOptions.unmount = Odłącz dysk
 upgrade.version5toX.title = Aktualizacja wersji krypty
-upgrade.version5toX.msg = Krypta wymaga aktualizacji do nowszej wersji.\nZanim kontynuujesz, upewnij się, że synchronizacja plików została ukończona.
\ No newline at end of file
+upgrade.version5toX.msg = Krypta wymaga aktualizacji do nowszej wersji.\nZanim kontynuujesz, upewnij się, że synchronizacja plików została ukończona.
+main.createVault.nonEmptyDir.title = Creating vault failed
+main.createVault.nonEmptyDir.header = Chosen directory is not empty
+main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/pt.txt b/main/ui/src/main/resources/localization/pt.txt
index a017e8729..e57b61a19 100644
--- a/main/ui/src/main/resources/localization/pt.txt
+++ b/main/ui/src/main/resources/localization/pt.txt
@@ -77,7 +77,6 @@ upgrade.version3to4.err.io = Falha na migração devido a um erro de E/S. Veja o
 settings.prefGvfsScheme.label = Esquema WebDAV
 # upgrade.fxml
 upgrade.confirmation.label = Sim, tenho certeza de que a sincronização foi concluída
-initialize.messageLabel.notEmpty = Cofre não vazio
 unlock.label.savePassword = Armazenar senha
 unlock.errorMessage.unauthenticVersionMac = Não foi possível autenticar a versão do MAC.
 unlocked.label.mountFailed = Falha ao conectar o drive
@@ -101,4 +100,7 @@ unlock.errorMessage.unlockFailed = Unlock failed. See log file for details.
 unlocked.moreOptions.mount = Mount Drive
 unlocked.moreOptions.unmount = Eject Drive
 upgrade.version5toX.title = Vault Version Upgrade
-upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
\ No newline at end of file
+upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
+main.createVault.nonEmptyDir.title = Creating vault failed
+main.createVault.nonEmptyDir.header = Chosen directory is not empty
+main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/pt_BR.txt b/main/ui/src/main/resources/localization/pt_BR.txt
index 285afcf59..4f9b7fea5 100644
--- a/main/ui/src/main/resources/localization/pt_BR.txt
+++ b/main/ui/src/main/resources/localization/pt_BR.txt
@@ -77,7 +77,6 @@ upgrade.version3to4.err.io = A migração falhou devido a uma falha de entrada e
 settings.prefGvfsScheme.label = Esquema WebDAV
 # upgrade.fxml
 upgrade.confirmation.label = Sim, tenho certeza que a sincronização tá terminada.
-initialize.messageLabel.notEmpty = Cofre não vazio
 unlock.label.savePassword = Salvar senha
 unlock.errorMessage.unauthenticVersionMac = Não pude autenticar a versão da MAC
 unlocked.label.mountFailed = Conexão do volume falhou
@@ -101,4 +100,7 @@ unlock.errorMessage.unlockFailed = Unlock failed. See log file for details.
 unlocked.moreOptions.mount = Mount Drive
 unlocked.moreOptions.unmount = Eject Drive
 upgrade.version5toX.title = Vault Version Upgrade
-upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
\ No newline at end of file
+upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
+main.createVault.nonEmptyDir.title = Creating vault failed
+main.createVault.nonEmptyDir.header = Chosen directory is not empty
+main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/ru.txt b/main/ui/src/main/resources/localization/ru.txt
index 5ec99da70..3f350022d 100644
--- a/main/ui/src/main/resources/localization/ru.txt
+++ b/main/ui/src/main/resources/localization/ru.txt
@@ -79,7 +79,6 @@ upgrade.version3to4.err.io = Преобразование не выполнен
 settings.prefGvfsScheme.label = Схема WebDAV
 # upgrade.fxml
 upgrade.confirmation.label = Да, синхронизация точно завершена
-initialize.messageLabel.notEmpty = Хранилище не пусто
 unlock.label.savePassword = Сохранить пароль
 unlock.errorMessage.unauthenticVersionMac = Не удалось идентифицировать версию MAC.
 unlocked.label.mountFailed = Ошибка подключения к диску
@@ -102,5 +101,8 @@ unlock.label.unlockAfterStartup = Автоблокировка при старт
 unlock.errorMessage.unlockFailed = Ошибка разблокировки. См. подробности в отчёте.
 unlocked.moreOptions.mount = Смонтировать диск
 unlocked.moreOptions.unmount = Извлечь диск
-upgrade.version5toX.title = Vault Version Upgrade
-upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
\ No newline at end of file
+upgrade.version5toX.title = Обновление версии хранилища
+upgrade.version5toX.msg = Это хранилище нужно преобразовать в новый формат. Прежде чем продолжить, убедитесь, что завершена синхронизация.
+main.createVault.nonEmptyDir.title = Creating vault failed
+main.createVault.nonEmptyDir.header = Chosen directory is not empty
+main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/sk.txt b/main/ui/src/main/resources/localization/sk.txt
index 46abf1f4b..93ba9c62b 100644
--- a/main/ui/src/main/resources/localization/sk.txt
+++ b/main/ui/src/main/resources/localization/sk.txt
@@ -80,7 +80,6 @@ upgrade.version3to4.err.io = Migrácia zlyhala kvôli I/O Exception. Skontrolujt
 settings.prefGvfsScheme.label = WebDAV Schéma
 # upgrade.fxml
 upgrade.confirmation.label = Áno, som si istý že synchronizácia je hotová
-initialize.messageLabel.notEmpty = Trezor nie je prázdny
 unlock.label.savePassword = Uložiť heslo
 unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
 unlocked.label.mountFailed = Connecting drive failed
@@ -104,4 +103,7 @@ unlock.errorMessage.unlockFailed = Unlock failed. See log file for details.
 unlocked.moreOptions.mount = Mount Drive
 unlocked.moreOptions.unmount = Eject Drive
 upgrade.version5toX.title = Vault Version Upgrade
-upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
\ No newline at end of file
+upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
+main.createVault.nonEmptyDir.title = Creating vault failed
+main.createVault.nonEmptyDir.header = Chosen directory is not empty
+main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/th.txt b/main/ui/src/main/resources/localization/th.txt
new file mode 100644
index 000000000..504daa7bb
--- /dev/null
+++ b/main/ui/src/main/resources/localization/th.txt
@@ -0,0 +1,106 @@
+app.name = Cryptomator
+# main.fxml
+main.emptyListInstructions = คลิกเพื่อเพิ่มกล่องข้อมูล
+main.directoryList.contextMenu.remove = ลบออกจากรายการ
+main.directoryList.contextMenu.changePassword = เปลี่ยนรหัสผ่าน
+main.addDirectory.contextMenu.new = สร้างกล่องข้อมูลใหม่
+main.addDirectory.contextMenu.open = เปิดกล่องข้อมูลที่มีอยู่
+# welcome.fxml
+welcome.checkForUpdates.label.currentlyChecking = ตรวจหาอัพเดท...
+welcome.newVersionMessage = เวอร์ชั่น %1$s พร้อมให้ดาวโหลดแล้ว\nเวอร์ชั่นที่ใช้อยู่คือ %2$s
+# initialize.fxml
+initialize.label.password = รหัสผ่าน
+initialize.label.retypePassword = ยืนยันรหัสผ่าน
+initialize.button.ok = สร้างกล่องข้อมูล
+initialize.messageLabel.alreadyInitialized = กล่องข้อมูลสร้างเสร็จแล้ว
+initialize.messageLabel.initializationFailed = ไม่สามารถสร้างกล่องข้อมูลได้ ดูรายละเอียดได้ใน Log ไฟล์
+# notfound.fxml
+notfound.label = ไม่พบกล่องข้อมูล กล่องอาจถูกย้าย?
+# upgrade.fxml
+upgrade.button = อัพเกรดกล่องข้อมูล
+upgrade.version3dropBundleExtension.msg = กล่องข้อมูลต้องการอัพเกรดเป็นเวอร์ชั่นใหม่\n"%1$s" จะถูกเปลี่ยนชื่อเป็น "%2$s"\nกรุณารอการอัพเกรดให้เสร็จสิ้นก่อนเริ่มใช้งาน
+upgrade.version3dropBundleExtension.err.alreadyExists = การอัพเกรดล้มเหลว\nสำเร็จไป "%s"
+# unlock.fxml
+unlock.label.password = รหัสผ่าน
+unlock.label.mountName = ชื่อไดรฟ์
+unlock.label.winDriveLetter = เลือกไดรฟ์
+unlock.label.downloadsPageLink = เวอร์ชั่น Cryptomator ทั้งหมด
+unlock.label.advancedHeading = ตั้งค่าขั้นสูง
+unlock.button.unlock = ปลดล็อคกล่องข้อมูล
+unlock.button.advancedOptions.show = ตั้งค่าเพิ่มเติม
+unlock.button.advancedOptions.hide = ย่อเมนู
+unlock.choicebox.winDriveLetter.auto = เลือกไดรฟ์อัตโนมัติ
+unlock.errorMessage.wrongPassword = รหัสผ่านไม่ถูกต้อง
+unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = ไม่รองรับกล่องข้อมูลนี้ อาจเป็นกล่องข้อมูลของเวอชั่นเก่า
+unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = ไม่รองรับกล่องข้อมูลนี้ อาจเป็นกล่องข้อมูลของเวอชั่นใหม่กว่า
+unlock.messageLabel.startServerFailed = WebDAV เซฟเวอร์เริ่มต้นล้มเหลว
+# change_password.fxml
+changePassword.label.oldPassword = รหัสผ่านเดิม
+changePassword.label.newPassword = รหัสผ่านใหม่
+changePassword.label.retypePassword = ยืนยันรหัสผ่านใหม่
+changePassword.label.downloadsPageLink = เวอร์ชั่น Cryptomator ทั้งหมด
+changePassword.button.change = เปลี่ยนรหัสผ่าน
+changePassword.errorMessage.wrongPassword = รหัสผ่านไม่ถูกต้อง
+changePassword.errorMessage.decryptionFailed = การถอดรหัสล้มเหลว
+# unlocked.fxml
+unlocked.button.lock = ล็อคกล่องข้อมูล
+unlocked.moreOptions.reveal = โชว์ไดรฟ์
+unlocked.moreOptions.copyUrl = คัดลอก WebDEV ลิ้งค์
+unlocked.label.revealFailed = คำสั่งล้มเหลว
+unlocked.label.unmountFailed = Eject ไดรว์ล้มเหลว
+unlocked.label.statsEncrypted = เข้ารหัสแล้ว
+unlocked.label.statsDecrypted = ถอดรหัสแล้ว
+unlocked.ioGraph.yAxis.label = ความเร็วอ่านเขียน (MiB/s)
+# settings.fxml
+settings.version.label = เวอร์ชั่น %s
+settings.checkForUpdates.label = ค้นหาอัพเดท
+settings.port.label = WebDAV Port
+settings.port.prompt = 0 \= เลือกอัตโนมัติ
+settings.requiresRestartLabel = * ต้องรีสตาร์ท Cryptomator ใหม่
+# tray icon
+tray.menu.open = เปิด
+tray.menu.quit = ออก
+tray.infoMsg.title = กำลังทำงาน
+tray.infoMsg.msg = Cryptomator กำลังทำงาน คลิ้กออกตรง tray icon
+tray.infoMsg.msg.osx = Cryptomator กำลังทำงาน คลิ้กออกตรงแถบเมนู
+initialize.messageLabel.passwordStrength.0 = คาดเดาง่ายมาก
+initialize.messageLabel.passwordStrength.1 = คาดเดาง่าย
+initialize.messageLabel.passwordStrength.2 = ปลอดภัย
+initialize.messageLabel.passwordStrength.3 = คาดเดายาก
+initialize.messageLabel.passwordStrength.4 = คาดเดายากมาก
+initialize.label.doNotForget = คำเตือน\!\!\!\: ถ้าคุณลืมรหัสผ่าน คุณจะไม่สามารถเข้าถึงและกู้ข้อมูลได้
+main.directoryList.remove.confirmation.title = ลบกล่องข้อมูล
+main.directoryList.remove.confirmation.header = คุณต้องการลบกล่องข้อมูลใช่หรือไม่ ?
+main.directoryList.remove.confirmation.content = กล่องข้อมูลแค่ถูกลบออกจากรายการ หากต้องการลบข้อมูล ต้องไปลบในที่อยู่ไฟล์ของคุณ
+upgrade.version3to4.msg = กล่องข้อมูลต้องการอัพเกรดเป็นเวอร์ชั่นใหม่\nชื่อโฟลเดอร์จะถูกอัพเดท\nกรุณารอการอัพเกรดให้เสร็จสิ้นก่อนเริ่มใช้งาน
+upgrade.version3to4.err.io = อัพเกรดล้มเหลวเนื่องจากข้อยกเว้น I/O ดูรายละเอียดได้ใน Log ไฟล์
+settings.prefGvfsScheme.label = WebDAV Scheme
+# upgrade.fxml
+upgrade.confirmation.label = ใช่ ฉันมั่นใจว่าอัพเกรดเสร็จเรียบร้อยแล้ว
+unlock.label.savePassword = เซฟรหัสผ่าน
+unlock.errorMessage.unauthenticVersionMac = ไม่ตรวจพบเวอร์ชั่นของ MAC
+unlocked.label.mountFailed = เชื่อมต่อไดรฟ์ล้มเหลว
+unlock.savePassword.delete.confirmation.title = ลบรหัสผ่านที่เซฟ
+unlock.savePassword.delete.confirmation.header = คุณต้องการลบลบรหัสผ่านที่เซฟไว้กับกล่องข้อมูลใช่หรือไม่ ?
+unlock.savePassword.delete.confirmation.content = รหัสผ่านที่เซฟถูกลบจาก system keychain แล้ว ถ้าคุณต้องการเซฟรหัสผ่านใหม่อีกครั้ง ให้คุณคลิ้กเลือก "เซฟรหัสผ่าน"
+settings.debugMode.label = โหมด Debug *
+upgrade.version3dropBundleExtension.title = อัพเกรดกล่องข้อมูลเวอร์ชั่น 3  (Drop Bundle Extension)
+upgrade.version3to4.title = อัพเกรดกล่องข้อมูลเวอร์ชั่น 3 ไปยัง 4
+upgrade.version4to5.title = อัพเกรดกล่องข้อมูลเวอร์ชั่น 4 ไปยัง 5
+upgrade.version4to5.msg = กล่องข้อมูลนี้ต้องการอัพเกรดเป็นเวอร์ชั่นใหม่\nไฟล์เข้ารหัสจะได้รับการอัพเกรด\nกรุณารอการอัพเกรดให้เสร็จสิ้นก่อนเริ่มใช้งาน\n\nเพิ่มเติม\: วันที่ Modification ของไฟล์จะถูกเปลี่ยนเป็นเวลา ณ ปัจจุบัน
+upgrade.version4to5.err.io = อัพเกรดล้มเหลวเนื่องจากข้อยกเว้น I/O ดูรายละเอียดได้ใน Log ไฟล์
+settings.port.apply = ตกลง
+unlock.label.mountAfterUnlock = เมาท์ไดรฟ์
+unlock.label.revealAfterMount = ไปยังไดรฟ์
+unlocked.lock.force.confirmation.title = ล็อค %1$s ล้มเหลว
+unlocked.lock.force.confirmation.header = คุณต้องการล็อคแบบ Force หรือไม่ ?
+unlocked.lock.force.confirmation.content = เนื่องจากบางโปรแกรมกำลังเรียกใช้ไฟล์ในกล่องข้อมูลอยู่ในขณะนี้ หรือเนื่องจากปัญหาอื่นๆ\n\nโปรแกรมที่เรียกใช้ไฟล์อาจทำงานได้ไม่สมบูรณ์ ข้อมูลอาจสูญหายได้
+unlock.label.unlockAfterStartup = ปลดล็อคอัตโนมัติตอนเปิดคอม (Experimental)
+unlock.errorMessage.unlockFailed = ปลดล็อคล้มเหลว ดูรายละเอียดได้ใน Log ไฟล์
+unlocked.moreOptions.mount = เมาท์ไดรฟ์
+unlocked.moreOptions.unmount = Eject ไดรฟ์
+upgrade.version5toX.title = อัพเกรดเวอร์ชั่นกล่องข้อมูล
+upgrade.version5toX.msg = กล่องข้อมูลต้องการอัพเกรดเป็นเวอร์ชั่นใหม่\nกรุณารอการอัพเกรดให้เสร็จสิ้นก่อนเริ่มใช้งาน
+main.createVault.nonEmptyDir.title = การสร้างกล่องข้อมูลล้มเหลว
+main.createVault.nonEmptyDir.header = โฟลเดอร์ที่เลือกมีไฟล์อยู่
+main.createVault.nonEmptyDir.content = โฟลเดอที่เลือกมีไฟล์อยู่ (อาจจะซ่อนอยู่)\nกล่องข้อมูลสามารถสร้างได้จากโฟลเดอร์เปล่าเท่านั้น
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/tr.txt b/main/ui/src/main/resources/localization/tr.txt
index d47a2f111..b9161d056 100644
--- a/main/ui/src/main/resources/localization/tr.txt
+++ b/main/ui/src/main/resources/localization/tr.txt
@@ -77,7 +77,6 @@ upgrade.version3to4.err.io = Format değiştirme işlemi I/O Hatası dolayısı
 settings.prefGvfsScheme.label = WebDAV Scheme
 # upgrade.fxml
 upgrade.confirmation.label = Yes, I've made sure that synchronization has finished
-initialize.messageLabel.notEmpty = Vault not empty
 unlock.label.savePassword = Save Password
 unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
 unlocked.label.mountFailed = Connecting drive failed
@@ -101,4 +100,7 @@ unlock.errorMessage.unlockFailed = Unlock failed. See log file for details.
 unlocked.moreOptions.mount = Mount Drive
 unlocked.moreOptions.unmount = Eject Drive
 upgrade.version5toX.title = Vault Version Upgrade
-upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
\ No newline at end of file
+upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
+main.createVault.nonEmptyDir.title = Creating vault failed
+main.createVault.nonEmptyDir.header = Chosen directory is not empty
+main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/uk.txt b/main/ui/src/main/resources/localization/uk.txt
index e8d311912..bded4a268 100644
--- a/main/ui/src/main/resources/localization/uk.txt
+++ b/main/ui/src/main/resources/localization/uk.txt
@@ -77,7 +77,6 @@ upgrade.version3to4.err.io = Перетворення невдале через
 settings.prefGvfsScheme.label = WebDAV Scheme
 # upgrade.fxml
 upgrade.confirmation.label = Yes, I've made sure that synchronization has finished
-initialize.messageLabel.notEmpty = Vault not empty
 unlock.label.savePassword = Save Password
 unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
 unlocked.label.mountFailed = Connecting drive failed
@@ -101,4 +100,7 @@ unlock.errorMessage.unlockFailed = Unlock failed. See log file for details.
 unlocked.moreOptions.mount = Mount Drive
 unlocked.moreOptions.unmount = Eject Drive
 upgrade.version5toX.title = Vault Version Upgrade
-upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
\ No newline at end of file
+upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
+main.createVault.nonEmptyDir.title = Creating vault failed
+main.createVault.nonEmptyDir.header = Chosen directory is not empty
+main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/zh.txt b/main/ui/src/main/resources/localization/zh.txt
index 5f841293b..e563ce3e2 100644
--- a/main/ui/src/main/resources/localization/zh.txt
+++ b/main/ui/src/main/resources/localization/zh.txt
@@ -1,106 +1,108 @@
 app.name = Cryptomator
 # main.fxml
-main.emptyListInstructions = 单击此处添加保管库
-main.directoryList.contextMenu.remove = 从列表中删除
-main.directoryList.contextMenu.changePassword = 更改密码
-main.addDirectory.contextMenu.new = 创建新保管库
-main.addDirectory.contextMenu.open = 打开现有保管库
+main.emptyListInstructions = 点按这里添加资料库
+main.directoryList.contextMenu.remove = 从列表中移除
+main.directoryList.contextMenu.changePassword = 变更密码
+main.addDirectory.contextMenu.new = 新建资料库
+main.addDirectory.contextMenu.open = 使用现有资料库
 # welcome.fxml
-welcome.checkForUpdates.label.currentlyChecking = 正在检查更新……
-welcome.newVersionMessage = 发现新版本版本%1$s\n当前版本%2$s
+welcome.checkForUpdates.label.currentlyChecking = 检查更新中……
+welcome.newVersionMessage = 新版本 %1$s 已发布\n当前版本%2$s
 # initialize.fxml
 initialize.label.password = 密码
-initialize.label.retypePassword = 确认密码
-initialize.button.ok = 创建保管库
-initialize.messageLabel.alreadyInitialized = 保管库已初始化
-initialize.messageLabel.initializationFailed = 无法初始化保管库。 有关详情，请参阅日志文件。
+initialize.label.retypePassword = 重新输入密码
+initialize.button.ok = 新建资料库
+initialize.messageLabel.alreadyInitialized = 已新建资料库
+initialize.messageLabel.initializationFailed = 无法创建资料库。请查看日志来获得详细信息。
 # notfound.fxml
-notfound.label = 找不到保险柜。 是否已被移动？
+notfound.label = 找不到这个资料库，是否已移动到别的地方？
 # upgrade.fxml
-upgrade.button = 升级保险柜
-upgrade.version3dropBundleExtension.msg = 此保管库需要迁移到较新的格式。\n"%1$s"将重命名为"%2$s"。\n请确保同步已完成，然后再继续。
-upgrade.version3dropBundleExtension.err.alreadyExists = 自动迁移失败。\n"%s"已存在
+upgrade.button = 升级资料库
+upgrade.version3dropBundleExtension.msg = 此资料库需要升级至最新版本，\n"%1$s" 将重命名为 "%2$s"。\n请确保同步完成后再继续操作。
+upgrade.version3dropBundleExtension.err.alreadyExists = 自动迁移失败。\n「%s」已存在。
 # unlock.fxml
 unlock.label.password = 密码
 unlock.label.mountName = 驱动器名称
 unlock.label.winDriveLetter = 驱动器号
-unlock.label.downloadsPageLink = 所有Cryptomator版本
+unlock.label.downloadsPageLink = 所有 Cryptomator 版本
 unlock.label.advancedHeading = 高级选项
-unlock.button.unlock = 保险柜解锁
+unlock.button.unlock = 解锁资料库
 unlock.button.advancedOptions.show = 更多选项
 unlock.button.advancedOptions.hide = 更少选项
 unlock.choicebox.winDriveLetter.auto = 自动分配
 unlock.errorMessage.wrongPassword = 密码错误
-unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = 不支持的保管库。 此保管库由旧版本的Cryptomator创建。
-unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = 不支持的保管库。 此保管库由较新版本的Cryptomator创建。
-unlock.messageLabel.startServerFailed = 启动WebDAV服务器失败。
+unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = 此资料库属于过时版本的 Cryptomator，无法在此版本中使用。
+unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = 此资料库属于较新版本的 Cryptomator，无法在此版本中使用。
+unlock.messageLabel.startServerFailed = 无法启动 WebDAV 服务器。
 # change_password.fxml
-changePassword.label.oldPassword = 旧密码
+changePassword.label.oldPassword = 原密码
 changePassword.label.newPassword = 新密码
-changePassword.label.retypePassword = 确认新密码
-changePassword.label.downloadsPageLink = 所有Cryptomator版本
-changePassword.button.change = 更改密码
+changePassword.label.retypePassword = 再次输入新密码
+changePassword.label.downloadsPageLink = 所有 Cryptomator 版本
+changePassword.button.change = 更换密码
 changePassword.errorMessage.wrongPassword = 密码错误
 changePassword.errorMessage.decryptionFailed = 解密失败
 # unlocked.fxml
-unlocked.button.lock = 保险柜上锁
-unlocked.moreOptions.reveal = 显示驱动器
-unlocked.moreOptions.copyUrl = 复制WebDAV地址(URL)
-unlocked.label.revealFailed = 命令失败
-unlocked.label.unmountFailed = 弹出驱动器失败
-unlocked.label.statsEncrypted = 加密
-unlocked.label.statsDecrypted = 解密
-unlocked.ioGraph.yAxis.label = 吞吐量(Mib/s)
+unlocked.button.lock = 锁定资料库
+unlocked.moreOptions.reveal = 打开驱动器
+unlocked.moreOptions.copyUrl = 复制 WebDAV 网址
+unlocked.label.revealFailed = 指令无法执行
+unlocked.label.unmountFailed = 无法弹出驱动器
+unlocked.label.statsEncrypted = 已加密
+unlocked.label.statsDecrypted = 已解密
+unlocked.ioGraph.yAxis.label = 吞吐量 (Mib/s)
 # settings.fxml
-settings.version.label = 版本%s
+settings.version.label = 版本 %s
 settings.checkForUpdates.label = 检查更新
 # What's the "*" mean?
-settings.port.label = WebDAV 端口 *
-settings.port.prompt = 0 \=自动选择
-settings.requiresRestartLabel = * Cryptomator需要重新启动
+settings.port.label = WebDAV 端口*
+settings.port.prompt = 0 \= 自动选择
+settings.requiresRestartLabel = * Cryptomator 需要重启
 # tray icon
 tray.menu.open = 打开
 tray.menu.quit = 退出
 tray.infoMsg.title = 仍在运行
-tray.infoMsg.msg = Cryptomator仍在运行。 从托盘图标中退出。
-tray.infoMsg.msg.osx = Cryptomator仍在运行。 从菜单栏图标中退出。
-initialize.messageLabel.passwordStrength.0 = 非常简单
-initialize.messageLabel.passwordStrength.1 = 简单
-initialize.messageLabel.passwordStrength.2 = 平均水平
-initialize.messageLabel.passwordStrength.3 = 强壮
-initialize.messageLabel.passwordStrength.4 = 非常强壮
-initialize.label.doNotForget = 重要信息：如果您忘记了密码，将无法恢复您的数据。
-main.directoryList.remove.confirmation.title = 移除保险柜
-main.directoryList.remove.confirmation.header = 您确定要删除此保管库吗？
-main.directoryList.remove.confirmation.content = 文件库将仅从列表中删除。 要永久删除它，请从文件系统中删除这些文件。
-upgrade.version3to4.msg = 此保管库需要迁移到较新的格式。\n加密的文件夹名称将更新。\n请确保同步已完成，然后再继续。
-upgrade.version3to4.err.io = 由于I/O异常，迁移失败。有关详情，请参阅日志文件。
-settings.prefGvfsScheme.label = WebDAV方案
+tray.infoMsg.msg = Cryptomator 仍在运行。 从托盘图标中退出。
+tray.infoMsg.msg.osx = Cryptomator 仍在运行。 从菜单栏图标中退出。
+initialize.messageLabel.passwordStrength.0 = 非常弱
+initialize.messageLabel.passwordStrength.1 = 略弱
+initialize.messageLabel.passwordStrength.2 = 可接受
+initialize.messageLabel.passwordStrength.3 = 较强
+initialize.messageLabel.passwordStrength.4 = 非常强
+initialize.label.doNotForget = 重要：若忘记此密码，数据将无法找回。
+main.directoryList.remove.confirmation.title = 移除资料库
+main.directoryList.remove.confirmation.header = 确定要移除此资料库吗？
+main.directoryList.remove.confirmation.content = 资料库将仅从列表中移除，如需永久删除，请从文件系统中删除这些文件。
+upgrade.version3to4.msg = 此资料库需要升级至最新版本，\n已加密的文件夹名称将更新。\n请确保同步完成后再继续操作。
+upgrade.version3to4.err.io = 由于 I/O 异常，迁移失败。请查看日志来获得详细信息。
+settings.prefGvfsScheme.label = WebDAV 格式
 # upgrade.fxml
-upgrade.confirmation.label = 是的，我确保同步已完成
-initialize.messageLabel.notEmpty = 保险柜非空
+upgrade.confirmation.label = 没错，同步已完成。
 unlock.label.savePassword = 保存密码
 # This Mac means Mac(Apple) or Mac address?
-unlock.errorMessage.unauthenticVersionMac = 无法验证消息验证代码的版本。
-unlocked.label.mountFailed = 连接设备失败
-unlock.savePassword.delete.confirmation.title = 删除已保存的密码
-unlock.savePassword.delete.confirmation.header = 您真的要删除此密码库已保存的密码吗?
-unlock.savePassword.delete.confirmation.content = 此密码库保存的密码将立即从系统钥匙串中删除。如果您想再次保存密码，则必须通过启用“保存密码”选项启用您的密码库。
+unlock.errorMessage.unauthenticVersionMac = 无法确认消息认证码版本。
+unlocked.label.mountFailed = 无法连接到驱动器
+unlock.savePassword.delete.confirmation.title = 删除已储存的密码
+unlock.savePassword.delete.confirmation.header = 真的要删除为此资料库储存的密码吗?
+unlock.savePassword.delete.confirmation.content = 此资料库储存的密码将立即从系统钥匙串中删除。如果您想再次保存密码，则必须通过启用“保存密码”选项启用您的密码库。
 settings.debugMode.label = 调试模式 *
-upgrade.version3dropBundleExtension.title = 升级Vault版本3（Drop Bundle Extension）
-upgrade.version3to4.title = Vault Version 3 to 4 Upgrade
-upgrade.version4to5.title = Vault Version 4 to 5 Upgrade
-upgrade.version4to5.msg = This vault needs to be migrated to a newer format.\nEncrypted files will be updated.\nPlease make sure synchronization has finished before proceeding.\n\nNote\: Modification date of all files will be changed to the current date/time in the process.
-upgrade.version4to5.err.io = Migration failed due to an I/O Exception. See log file for details.
-settings.port.apply = Apply
-unlock.label.mountAfterUnlock = Mount Drive
-unlock.label.revealAfterMount = Reveal Drive
-unlocked.lock.force.confirmation.title = Locking of %1$s failed
-unlocked.lock.force.confirmation.header = Do you want to force locking?
-unlocked.lock.force.confirmation.content = This may be because other programs are still accessing files in the vault or because some other problem occurred.\n\nPrograms still accessing the files may not work correctly and data not already written by those programs may be lost.
-unlock.label.unlockAfterStartup = Auto-Unlock on Start (Experimental)
-unlock.errorMessage.unlockFailed = Unlock failed. See log file for details.
-unlocked.moreOptions.mount = Mount Drive
-unlocked.moreOptions.unmount = Eject Drive
-upgrade.version5toX.title = Vault Version Upgrade
-upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
\ No newline at end of file
+upgrade.version3dropBundleExtension.title = 升级资料库到第三版（移除 Bundle Extension）
+upgrade.version3to4.title = 升级资料库到第四版
+upgrade.version4to5.title = 升级资料库到第五版
+upgrade.version4to5.msg = 此资料库需要升级至最新版本，\n已加密的数据将被更新。\n请确保同步完成后再继续操作。
+upgrade.version4to5.err.io = 升级因 I/O 错误失败。请查看日志来获得详细信息。
+settings.port.apply = 应用
+unlock.label.mountAfterUnlock = 装载驱动器
+unlock.label.revealAfterMount = 显示驱动器
+unlocked.lock.force.confirmation.title = 无法锁定 %1$s
+unlocked.lock.force.confirmation.header = 要强制锁定吗？
+unlocked.lock.force.confirmation.content = 此错误可能是因为其他应用程序仍在使用此资料库中的文件，或遇到了其他问题。\n\n如强制锁定，正在使用文件的应用程序可能会出错并丢失部分还没有保存的资料。
+unlock.label.unlockAfterStartup = 启动时自动解锁（试验功能）
+unlock.errorMessage.unlockFailed = 无法解锁。请查看日志来获得详细信息。
+unlocked.moreOptions.mount = 装载驱动器
+unlocked.moreOptions.unmount = 弹出驱动器
+upgrade.version5toX.title = 资料库版本升级
+upgrade.version5toX.msg = 此资料库需要升级至最新版本，\n请确保同步完成后再继续操作。
+main.createVault.nonEmptyDir.title = Creating vault failed
+main.createVault.nonEmptyDir.header = Chosen directory is not empty
+main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/zh_HK.txt b/main/ui/src/main/resources/localization/zh_HK.txt
index d861d623d..5c1aa3ea2 100644
--- a/main/ui/src/main/resources/localization/zh_HK.txt
+++ b/main/ui/src/main/resources/localization/zh_HK.txt
@@ -77,7 +77,6 @@ upgrade.version3to4.err.io = 由於I/O的例外，轉移失敗。取得詳細資
 settings.prefGvfsScheme.label = WebDAV的格式
 # upgrade.fxml
 upgrade.confirmation.label = 是的，請確認同步已完成。
-initialize.messageLabel.notEmpty = 檔案庫不是空的
 unlock.label.savePassword = 儲存密碼
 unlock.errorMessage.unauthenticVersionMac = 無法認證消息驗證碼版本。
 unlocked.label.mountFailed = Connecting drive failed
@@ -101,4 +100,7 @@ unlock.errorMessage.unlockFailed = Unlock failed. See log file for details.
 unlocked.moreOptions.mount = Mount Drive
 unlocked.moreOptions.unmount = Eject Drive
 upgrade.version5toX.title = Vault Version Upgrade
-upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
\ No newline at end of file
+upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
+main.createVault.nonEmptyDir.title = Creating vault failed
+main.createVault.nonEmptyDir.header = Chosen directory is not empty
+main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/zh_TW.txt b/main/ui/src/main/resources/localization/zh_TW.txt
index 2cc8145e0..c319ba295 100644
--- a/main/ui/src/main/resources/localization/zh_TW.txt
+++ b/main/ui/src/main/resources/localization/zh_TW.txt
@@ -77,7 +77,6 @@ upgrade.version3to4.err.io = 由於 I/O 的例外，轉移失敗。取得詳細
 settings.prefGvfsScheme.label = WebDAV 格式
 # upgrade.fxml
 upgrade.confirmation.label = 是的，請確認同步已完成。
-initialize.messageLabel.notEmpty = 檔案庫不是空的
 unlock.label.savePassword = 儲存密碼
 unlock.errorMessage.unauthenticVersionMac = 無法認證消息驗證碼版本。
 unlocked.label.mountFailed = 連線到磁碟失敗
@@ -97,8 +96,11 @@ unlocked.lock.force.confirmation.title = %1$s 鎖定失敗
 unlocked.lock.force.confirmation.header = 你想要強制鎖定？
 unlocked.lock.force.confirmation.content = 這可能是因為其他軟體仍在存取這個檔案庫，或者發生其他問題。\n\n仍然在存取檔案的軟體可能無法正常運作，而且會造成寫入的資料遺失。
 unlock.label.unlockAfterStartup = 啟動時，自動解鎖（實驗中）
-unlock.errorMessage.unlockFailed = Unlock failed. See log file for details.
-unlocked.moreOptions.mount = Mount Drive
-unlocked.moreOptions.unmount = Eject Drive
-upgrade.version5toX.title = Vault Version Upgrade
-upgrade.version5toX.msg = This vault needs to be migrated to a newer format.\nPlease make sure synchronization has finished before proceeding.
\ No newline at end of file
+unlock.errorMessage.unlockFailed = 解鎖失敗。詳請查看日誌檔。
+unlocked.moreOptions.mount = 掛載硬碟
+unlocked.moreOptions.unmount = 退出硬碟
+upgrade.version5toX.title = 檔案庫版本升級
+upgrade.version5toX.msg = 這個檔案庫需要轉移到新的格式。\n進行前，請確認已經完成所有同步。
+main.createVault.nonEmptyDir.title = Creating vault failed
+main.createVault.nonEmptyDir.header = Chosen directory is not empty
+main.createVault.nonEmptyDir.content = The selected directory already contains files (possibly hidden). A vault can only be created in an empty directory.
\ No newline at end of file
diff --git a/main/ui/src/test/java/org/cryptomator/ui/l10n/LocalizationTest.java b/main/ui/src/test/java/org/cryptomator/ui/l10n/LocalizationTest.java
index cae1e955c..dbe8089c9 100644
--- a/main/ui/src/test/java/org/cryptomator/ui/l10n/LocalizationTest.java
+++ b/main/ui/src/test/java/org/cryptomator/ui/l10n/LocalizationTest.java
@@ -32,7 +32,7 @@ public class LocalizationTest {
 	private static final String RESOURCE_FOLDER_PATH = "/localization/";
 	private static final String REF_FILE_NAME = "en.txt";
 	private static final String[] LANG_FILE_NAMES = {"ar.txt", "bg.txt", "da.txt", "de.txt", "es.txt", "fr.txt", "hu.txt", "it.txt", "ja.txt", //
-			"ko.txt", "lv.txt", "nl.txt", "pl.txt", "pt.txt", "pt_BR.txt", "ru.txt", "sk.txt", "tr.txt", "uk.txt", "zh_HK.txt", "zh_TW.txt", "zh.txt"};
+			"ko.txt", "lv.txt", "nl.txt", "pl.txt", "pt.txt", "pt_BR.txt", "ru.txt", "sk.txt", "th.txt", "tr.txt", "uk.txt", "zh_HK.txt", "zh_TW.txt", "zh.txt"};
 
 	/*
 	 * @see Formatter