[debian-edu-commits] debian-edu/ 24/50: Imported Upstream version 1.14

Unit 193 unit193-guest at moszumanska.debian.org
Wed Dec 21 05:05:58 UTC 2016


This is an automated email from the git hooks/post-receive script.

unit193-guest pushed a commit to branch master
in repository veracrypt.

commit f3b50d629d0efac5a3399e04191eda570a39b61c
Author: Unit 193 <unit193 at ubuntu.com>
Date:   Sat Sep 19 16:50:40 2015 -0400

    Imported Upstream version 1.14
---
 Translations/Language.ar.xml                     |  24 +-
 Translations/Language.be.xml                     |  24 +-
 Translations/Language.bg.xml                     |  24 +-
 Translations/Language.ca.xml                     |  22 +-
 Translations/Language.cs.xml                     |  24 +-
 Translations/Language.da.xml                     |  24 +-
 Translations/Language.de.xml                     |  24 +-
 Translations/Language.el.xml                     |  24 +-
 Translations/Language.es.xml                     |  22 +-
 Translations/Language.et.xml                     |  24 +-
 Translations/Language.eu.xml                     |  22 +-
 Translations/Language.fa.xml                     |  24 +-
 Translations/Language.fi.xml                     |  22 +-
 Translations/Language.fr.xml                     | 174 ++---
 Translations/Language.hu.xml                     |  24 +-
 Translations/Language.id.xml                     |  24 +-
 Translations/Language.it.xml                     |  24 +-
 Translations/Language.ja.xml                     |  24 +-
 Translations/Language.ka.xml                     |  24 +-
 Translations/Language.ko.xml                     |  24 +-
 Translations/Language.lv.xml                     |  24 +-
 Translations/Language.my.xml                     |  24 +-
 Translations/Language.nl.xml                     |  24 +-
 Translations/Language.nn.xml                     | 210 ++++---
 Translations/Language.pl.xml                     |  22 +-
 Translations/Language.pt-br.xml                  |  24 +-
 Translations/Language.ru.xml                     |  24 +-
 Translations/Language.sk.xml                     |  24 +-
 Translations/Language.sl.xml                     |  24 +-
 Translations/Language.sv.xml                     |  22 +-
 Translations/Language.tr.xml                     |  24 +-
 Translations/Language.uk.xml                     |  24 +-
 Translations/Language.uz.xml                     |  24 +-
 Translations/Language.vi.xml                     |  24 +-
 Translations/Language.zh-cn.xml                  |  22 +-
 Translations/Language.zh-hk.xml                  |  22 +-
 Translations/Language.zh-tw.xml                  |  24 +-
 src/Boot/Windows/BootCommon.h                    |   2 +-
 src/Boot/Windows/BootDefs.h                      |   6 +-
 src/Boot/Windows/BootMain.cpp                    |   9 +-
 src/Boot/Windows/BootSector.asm                  |   5 +-
 src/Boot/Windows/Makefile                        |   4 +
 src/Build/Resources/MacOSX/Info.plist.xml        |   2 +-
 src/Common/Apidrvr.h                             |   7 +
 src/Common/BootEncryption.cpp                    | 107 +++-
 src/Common/BootEncryption.h                      |   4 +-
 src/Common/Common.h                              |   1 +
 src/Common/Common.rc                             |  36 +-
 src/Common/Crypto.c                              |   4 +-
 src/Common/Dlgcode.c                             | 343 ++++++++--
 src/Common/Dlgcode.h                             |   6 +
 src/Common/Format.c                              |  24 +-
 src/Common/Format.h                              |   4 +-
 src/Common/Keyfiles.c                            |  31 +-
 src/Common/Keyfiles.h                            |   3 +-
 src/Common/Language.c                            |   4 +-
 src/Common/Language.xml                          |  26 +-
 src/Common/Password.c                            |   6 +-
 src/Common/Password.h                            |   2 +-
 src/Common/Resource.h                            |   4 +-
 src/Common/Tcdefs.h                              |   8 +-
 src/Driver/Driver.rc                             |   8 +-
 src/Driver/Ntdriver.c                            | 143 ++++-
 src/Driver/Ntdriver.h                            |   3 +
 src/Driver/Ntvol.c                               |   3 +
 src/ExpandVolume/DlgExpandVolume.cpp             |   6 +-
 src/ExpandVolume/ExpandVolume.rc                 |   8 +-
 src/ExpandVolume/WinMain.cpp                     |  23 +-
 src/Format/Format.rc                             |  19 +-
 src/Format/Resource.h                            |   3 +-
 src/Format/Tcformat.c                            | 518 ++++++++++++---
 src/Format/Tcformat.h                            |   2 +-
 src/Main/CommandLineInterface.cpp                |  15 +-
 src/Main/Forms/Forms.cpp                         |  15 +-
 src/Main/Forms/Forms.h                           |   2 +
 src/Main/Forms/TrueCrypt.fbp                     | 103 ++-
 src/Main/Forms/VolumePasswordPanel.cpp           |  39 +-
 src/Main/Forms/VolumePasswordPanel.h             |   1 +
 src/Main/Forms/VolumePimWizardPage.cpp           |  50 +-
 src/Main/Forms/VolumePimWizardPage.h             |   4 +-
 src/Main/UserInterface.cpp                       |  14 +-
 src/Main/UserPreferences.h                       |   2 +
 src/Mount/Favorites.cpp                          |  28 +-
 src/Mount/Favorites.h                            |   6 +-
 src/Mount/Hotkeys.c                              |  76 ++-
 src/Mount/Mount.c                                | 768 ++++++++++++++++-------
 src/Mount/Mount.h                                |   2 +-
 src/Mount/Mount.rc                               | 103 +--
 src/Mount/Resource.h                             |  10 +-
 src/Readme.txt                                   |   1 +
 src/Release/Setup Files/VeraCrypt User Guide.pdf | Bin 2873305 -> 2970461 bytes
 src/Setup/MacOSX/veracrypt.pkgproj               |   4 +-
 src/Setup/Setup.c                                | 193 +++++-
 src/Setup/Setup.h                                |   6 +
 src/Setup/Setup.rc                               |   8 +-
 src/Signing/sign.bat                             |   2 +-
 src/Signing/sign_test.bat                        |   2 +-
 97 files changed, 3078 insertions(+), 968 deletions(-)

diff --git a/Translations/Language.ar.xml b/Translations/Language.ar.xml
index 2b44c0a..7455344 100644
--- a/Translations/Language.ar.xml
+++ b/Translations/Language.ar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="ar" name="العربية" en-name="Arabic" version="0.1.0" translators="Ahmad Gharbeia, Khaled Hosny" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="ar" key="IDC_QUICKFORMAT">‮تهيئة سريعة</control>
     <control lang="ar" key="IDC_SHOW_PASSWORD">‮أ&ظهر كلمة السر</control>
     <control lang="ar" key="IDC_SHOW_PASSWORD_SINGLE">‮أ&ظهر كلمة السر</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="ar" key="IDC_SINGLE_BOOT">‮إقلاع أحادي</control>
     <control lang="ar" key="IDC_STD_VOL">‮مجلد تروكربت عادي</control>
     <control lang="ar" key="IDC_SYSENC_HIDDEN">‮م&خفيّ</control>
@@ -98,6 +99,7 @@
     <control lang="ar" key="IDT_SYSENC_KEYS_GEN_INFO">‮المفاتيح و البذرة و بيانات أخرى تم توليدها جميعا بنجاح. إن أردت توليد مفاتيح جديدة فانقر 'ارجع' ثم 'اللاحق'. و إلا فانقر 'اللاحق' للمواصلة.</control>
     <control lang="ar" key="IDT_SYS_DEVICE">‮يعمّي القسم\\السواقة المنصّب فيها ويندوز. من يريد تشغيل النظام و النفاذ إلى الملفات سيكون عليه إدخال كلمة السر في كل مرة قبل إقلاع ويندوز، كما يمكن اختياريا إنشاء نظام مخفي.</control>
     <control lang="en" key="IDT_SYS_PARTITION">Select this option to encrypt the partition where the currently running Windows operating system is installed.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="ar" key="IDT_WIPE_MODE">‮طور المحو:</control>
     <control lang="ar" key="IDCLOSE">‮أغلق</control>
     <control lang="ar" key="IDC_ALLOW_ESC_PBA_BYPASS">‮اسمح بتجاوز الاستيثاق عند الاستيثاق بضغط مفتاح Esc (هذا يفعّل مدير الإقلاع)</control>
@@ -111,6 +113,7 @@
     <control lang="ar" key="IDC_CACHE">‮خزِّن كلمات السر و الم&لفات المفاتيح مؤقتا في الذاكرة</control>
     <control lang="ar" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">‮اخرج عندما لا توجد مجلدات موصولة</control>
     <control lang="ar" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">‮أ&نهِ جلسة الأمارة (اخرج) بعد وصل مجلد بنجاح</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="ar" key="IDC_COPY_WIZARD">‮اشمل مُساعد تروكرِبت لإنشاء المجلدات</control>
     <control lang="ar" key="IDC_CREATE">‮أنشئ</control>
     <control lang="ar" key="IDC_CREATE_VOLUME">‮أ&نشئ مجلدا</control>
@@ -254,7 +257,7 @@
     <control lang="ar" key="IDM_UNMOUNT_VOLUME">‮افصل المجلد</control>
     <control lang="ar" key="IDM_VERIFY_RESCUE_DISK">‮اختبر قرص الإنقاذ</control>
     <control lang="ar" key="IDM_VERSION_HISTORY">‮تأريخ الإصدارات</control>
-    <control lang="en" key="IDM_VOLUME_EXPANDER">توسعة المجلد</control>
+    <control lang="ar" key="IDM_VOLUME_EXPANDER">توسعة المجلد</control>
     <control lang="ar" key="IDM_VOLUME_PROPERTIES">‮خصائص المجلد</control>
     <control lang="ar" key="IDM_VOLUME_WIZARD">‮مرشد إنشاء المجلدات</control>
     <control lang="ar" key="IDM_WEBSITE">‮موقع تروكرِبت على الوب</control>
@@ -271,6 +274,8 @@
     <control lang="ar" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">‮اعرض هذه الرسالة في شاشة استيثاق ما قبل الإقلاع (بحد أقصى 24 حرفا):</control>
     <control lang="ar" key="IDT_DEFAULT_MOUNT_OPTIONS">‮خيارات الوصل المبدئية</control>
     <control lang="ar" key="IDT_DISMOUNT_ACTION">‮خيارات أزرار الاختصار</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="en" key="IDT_FAVORITE_LABEL">Label of selected favorite volume:</control>
     <control lang="ar" key="IDT_FILE_SETTINGS">‮تضبيطات الملف</control>
     <control lang="ar" key="IDT_HOTKEY_KEY">‮الزر المخصص:</control>
@@ -537,6 +542,15 @@
     <string lang="ar" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">‮ملاحظة: إن أردت نقل ملفات بأمان من نظام التشغيل التمويهي إلى النظام المخفي فاتبع هذه الخطوات: ‮1) أقلع النظام التمويه. ‮2) احفظ المفات في مجلد غير معمى أو مجلد تروكربت خارجي\\عادي. ‮3) أقلع النظام المخفي. ‮4) إن كنت حفظت الملفات في مجلد تروكربت فأوصله (و سيوصل للقراءة فقط). ‮5) انسخ الملفات إلى قسم النظام المخفي أو إلى مجلد مخفي غيره.</string>
     <string lang="ar" key="CONFIRM_RESTART">‮تنبغي إعادة بدء حاسوبك. ‮ ‮أتود فعل ذلك الآن؟</string>
     <string lang="ar" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">‮طرأ عطل أثناء جلب حالة تعمية النظام.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="ar" key="INIT_SYS_ENC">‮تعذّر استبداء مكونات التطبيق لتعمية النظام.</string>
     <string lang="ar" key="INIT_RAND">‮فشل استبداء مُولِّد الأرقام العشوائيّة!</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="ar" key="SELECT_KEYFILE">‮اختر الملف المفتاح</string>
     <string lang="ar" key="SELECT_KEYFILE_PATH">‮اختر مسار البحث عن الملفات المفتاح. تنبيه: لاحظ المسار و حسب هو ما سيُحفظ و ليس أسماء الملفات.</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="ar" key="SERPENT_HELP">‮صممها رُس أندرسُن و إلي بيهام و لارس نودسٍن، و نشرت في ‪1998‬. مفتاح بطول ‪256‬ بتة؛ كتلة ‪128‬ بتة؛ تعمل في طور ‪XTS‬. كان ‪Serpent‬ أحد الواصلين لنهائيات ‪AES‬.</string>
     <string lang="en" key="SIZE_HELP">Please specify the size of the container you want to create.\n\nIf you create a dynamic (sparse-file) container, this parameter will specify its maximum possible size.\n\nNote that the minimum possible size of a FAT volume is 292 KB. The minimum possible size of an NTFS volume is 3792 KB.</string>
     <string lang="en" key="SIZE_HELP_HIDDEN_HOST_VOL">Please specify the size of the outer volume to be created (you will first create the outer volume and then a hidden volume within it). The minimum possible size of a volume within which a hidden volume is intended to be created is 340 KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="ar" key="INCONSISTENCY_RESOLVED">‮تم حل عدم الاتساق. ‮ ‮ ‮(إن أبلغت عن علة بهذا الشأن فرجاءً ضمِّن البيانات التقنية التالية في البلاغ: ‪%hs‬)</string>
     <string lang="ar" key="UNEXPECTED_STATE">‮عطل: حالة غير متوقعة. ‮ ‮ ‮(إن أبلغت عن علة ذات علاقة بهذا فرجاء ضمِّن التقرير البيانات التقنية التالية: ‮‪%hs‬)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="ar" key="NOTHING_TO_RESUME">‮لا توجد صيرورة/مهمة لمعاودتها.</string>
     <string lang="ar" key="HIDVOL_PROT_BKG_TASK_WARNING">‮تحذير: عُطِّلت مهمة تروكرِبت الخلفية. بعد أن تغلق تروكرِبت لن تُبلغ إن أحيل دون تلف في مجلد مخفي ‮ ‮ملاحظة: يمكنك إغلاق المهمة الخلفية في أي وقت بالنقر باليمين على أيقونة تروكرِبت في اللوحة و اختيار 'اخرج'. ‮ ‮أأفعِّل مهمة تروكرِبت الخلفية؟</string>
     <string lang="ar" key="LANG_PACK_VERSION">‮إصدارة حزمة اللغة:	‪%s‬</string>
     <string lang="ar" key="CHECKING_FS">‮يجري فحص نظام الملفات في مجلد تروكرِبت الموصول معرفا بالحرف ‪%hs‬…</string>
@@ -1086,14 +1100,13 @@
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
     <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="ar" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">‮لا يمكن حاليا استخدام الملفات المفاتيح عند تعمية النظام.</string>
     <string lang="ar" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">تنبيه: تعذَّر على تروكربت استعادة النسق الأصلي للوحة المفاتيح مما قد يؤدي إلى أن تُدخلَ كلمة السر على نحو غير صحيح.</string>
     <string lang="ar" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">‮عطل: تعذّر ضبط هيئة لوحة المفاتيح لتروكربت إلى التوزيع القياسي للولايات المتحدة. ‮ ‮لاحظ أن كلمة السر يجب أن تدخل في بيئة ما قبل الإقلاع (قبل أن يبدأ ويندوز) حيث لا يتاح سوى لوحات مفاتيح ويندوز الولايات المتحدة. لذا يجب أن تدخل كلمة السر دوما باستخدام هيئة لوحة مفاتيح الولايات المتحدة القياسية.</string>
     <string lang="ar" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">‮حيث أن تروكربت قد غير هيئة لوحة المفاتيح إلى الهيئة القياسية في الولايات المتحدة فليس ممكنا إدخل محارف بطريق ضغط الأزرار مع زر ‪Alt‬. مع هذا يمكنك إدخال معظم تلك المحارف بطريق ضغط المفتاح المناسب مع مفتاح ‪Shift‬.</string>
     <string lang="ar" key="KEYB_LAYOUT_CHANGE_PREVENTED">‮حال تروكربت دون تغيير هيئة لوجة المفاتيح.</string>
     <string lang="ar" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">‮ملاحظة: ستحتاج إلى أن تدخل كلمة السر في بيئة ما قبل الإقلاع (قبل أن يبدأ ويندوز) حيث لا يتاح سوى لوحات مفاتيح ويندوز الولايات المتحدة. لذا يجب أن تدخل كلمة السر دوما باستخدام هيئة لوحة مفاتيح الولايات المتحدة القياسية. لكن لاحظ أنك لا تحتاج إلى لوحة مفاتيح حقيقية على هيئة الولايات المتحدة إذا أن تروكربت يتحقق من أن كلمة السر يمكن إدخالها كما ينبغي (الآن و في بيئة قبل الإقلاع) حتى لو لم تكن لديك لوحة مفاتيح حقيقية على هيئة الولا [...]
-    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (TRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the TRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the TRD allows you to permanently decrypt the partition/drive before Windows  [...]
+    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (VRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the VRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the VRD allows you to permanently decrypt the partition/drive before Windows  [...]
     <string lang="en" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">After you click OK, Microsoft Windows Disc Image Burner will be launched. Please use it to burn the VeraCrypt Rescue Disk ISO image to a CD or DVD.\n\nAfter you do so, return to the VeraCrypt Volume Creation Wizard and follow its instructions.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn it to a CD or DVD.\n\n%lsAfter you burn the Rescue Disk, click Next to verify that it has been correctly burned.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you should either burn the image to a CD/DVD or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
@@ -1290,6 +1303,7 @@
     <string lang="en" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">WARNING: This setting may degrade performance.\n\nAre you sure you want to use this setting?</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="ar" key="TEST">‮اختبر</string>
     <string lang="ar" key="KEYFILE">‮ملف مفتاح</string>
     <string lang="ar" key="VKEY_08">Backspace</string>
diff --git a/Translations/Language.be.xml b/Translations/Language.be.xml
index 9b8d708..425e2bf 100644
--- a/Translations/Language.be.xml
+++ b/Translations/Language.be.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="be" name="Беларуская" en-name="Belarusian" version="0.1.0" translators="Aleg Azarousky" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="be" key="IDC_QUICKFORMAT">Хуткае фарматаванне</control>
     <control lang="be" key="IDC_SHOW_PASSWORD">Паказаць пароль</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&Display password</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="be" key="IDC_SINGLE_BOOT">Адзінкавая загрузка</control>
     <control lang="be" key="IDC_STD_VOL">Звычайны том VeraCrypt</control>
     <control lang="en" key="IDC_SYSENC_HIDDEN">Hi&dden</control>
@@ -98,6 +99,7 @@
     <control lang="be" key="IDT_SYSENC_KEYS_GEN_INFO">Ключы, 'соль' і іншыя дадзеныя паспяхова згенераваныя. Калі вы жадаеце згенераваць новыя ключы, націсніце 'Назад', а затым 'Далей'. Калі ж не, то націсніце 'Далей' для працягу.</control>
     <control lang="en" key="IDT_SYS_DEVICE">Encrypts the partition/drive where Windows is installed. Anyone who wants to gain access and use the system, read and write files, etc., will need to enter the correct password each time before Windows boots. Optionally, creates a hidden system.</control>
     <control lang="en" key="IDT_SYS_PARTITION">Select this option to encrypt the partition where the currently running Windows operating system is installed.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="be" key="IDT_WIPE_MODE">Рэжым ачысткі:</control>
     <control lang="be" key="IDCLOSE">Зачыніць</control>
     <control lang="en" key="IDC_ALLOW_ESC_PBA_BYPASS">Allow pre-boot &authentication to be bypassed by pressing the Esc key (enables boot manager)</control>
@@ -111,6 +113,7 @@
     <control lang="be" key="IDC_CACHE">Кэшаваць паролі і ключавыя файлы ў памяці</control>
     <control lang="be" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Выйсці, калі няма змантаваных тамоў</control>
     <control lang="en" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Close token session (log out) after a volume is successfully mounted</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="be" key="IDC_COPY_WIZARD">З майстрам стварэння тамоў VeraCrypt</control>
     <control lang="be" key="IDC_CREATE">Стварыць</control>
     <control lang="be" key="IDC_CREATE_VOLUME">Стварыць том</control>
@@ -271,6 +274,8 @@
     <control lang="en" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Display this custom message in the pre-boot authentication screen (24 characters maximum):</control>
     <control lang="be" key="IDT_DEFAULT_MOUNT_OPTIONS">Прадвызначаныя налады мантавання</control>
     <control lang="be" key="IDT_DISMOUNT_ACTION">Дадатковыя налады</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="en" key="IDT_FAVORITE_LABEL">Label of selected favorite volume:</control>
     <control lang="be" key="IDT_FILE_SETTINGS">Налады файла</control>
     <control lang="be" key="IDT_HOTKEY_KEY">Клавіша:</control>
@@ -537,6 +542,15 @@
     <string lang="en" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Note: If you need to securely transfer files from the decoy system to the hidden system, follow these steps:\n1) Start the decoy system.\n2) Save the files to an unencrypted volume or to an outer/normal VeraCrypt volume.\n3) Start the hidden system.\n4) If you saved the files to a VeraCrypt volume, mount it (it will be automatically mounted as read-only).\n5) Copy the files to the hidden system partition or to another hid [...]
     <string lang="be" key="CONFIRM_RESTART">Патрабуецца перазагрузіць кампутар.\n\nЖадаеце перазагрузіць яго зараз?</string>
     <string lang="be" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Памылка атрымання стану сістэмнага шыфравання.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="be" key="INIT_SYS_ENC">Немагчыма ініцыялізаваць кампаненты прыкладання для сістэмнага шыфравання.</string>
     <string lang="be" key="INIT_RAND">Памылка ініцыялізацыі генератара выпадковых лікаў.</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="be" key="SELECT_KEYFILE">Абярыце ключавы файл</string>
     <string lang="be" key="SELECT_KEYFILE_PATH">Абярыце шлях пошуку ключавых файлаў. УВАГА: Запамінаецца толькі шлях, але не імёны файлаў.</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="be" key="SERPENT_HELP">Аўтары: Ross Anderson, Eli Biham і Lars Knudsen. Апублікаваны ў 1998 г. 256-бітны ключ, 128-бітны блок. Рэжым працы -- XTS. Алгарытм Serpent -- адзін з фіналістаў AES.</string>
     <string lang="en" key="SIZE_HELP">Please specify the size of the container you want to create.\n\nIf you create a dynamic (sparse-file) container, this parameter will specify its maximum possible size.\n\nNote that the minimum possible size of a FAT volume is 292 KB. The minimum possible size of an NTFS volume is 3792 KB.</string>
     <string lang="en" key="SIZE_HELP_HIDDEN_HOST_VOL">Please specify the size of the outer volume to be created (you will first create the outer volume and then a hidden volume within it). The minimum possible size of a volume within which a hidden volume is intended to be created is 340 KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="be" key="INCONSISTENCY_RESOLVED">Неадпаведнасць ухілена.\n\n\n(Калі вы паведамляеце пра датычную гэтага памылку, дадайце да сваёй справаздачы наступную тэхнічную інфармацыю: %hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="be" key="NOTHING_TO_RESUME">Няма працэсу/задання для аднаўлення.</string>
     <string lang="be" key="HIDVOL_PROT_BKG_TASK_WARNING">УВАГА: Фонавы працэс VeraCrypt адключаны. Пры выхадзе з VeraCrypt вы не будзеце апавешчаныя аб прадухіленні пашкоджання ўтоенага тома.\n\nНататка: фонавы працэс можна закрыць у любы момант, пстрыкнуўшы правай кнопкай мышы на значку VeraCrypt у сістэмным латку і абраўшы 'Выйсці'.\n\nУключыць фонавы працэс VeraCrypt?</string>
     <string lang="be" key="LANG_PACK_VERSION">Версія моўнага модуля: %s</string>
     <string lang="be" key="CHECKING_FS">Праверка файлавай сістэмы тома VeraCrypt, змантаванага як %hs...</string>
@@ -1085,15 +1099,14 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</string>
     <string lang="be" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Памылка! Немагчыма ўсталяваць раскладку клавіятуры для VeraCrypt у стандартную амерыканскую (US).\n\nЗвярніце ўвагу, што пароль уводзіцца ДА загрузкі Windows, калі любыя раскладкі клавіятуры, адрозныя ад амерыканскай, яшчэ недаступныя. Таму пароль заўсёды павінен уводзіцца пры стандартнай амерыканскай раскладцы.</string>
     <string lang="en" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">As VeraCrypt temporarily changed the keyboard layout to the standard US keyboard layout, it is not possible to type characters by pressing keys while the right Alt key is held down. However, you can type most of such characters by pressing appropriate keys while the Shift key is held down.</string>
     <string lang="en" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCrypt prevented change of keyboard layout.</string>
     <string lang="en" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Note: The password will need to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout. However, it is important to note that you do NOT need a real US keyboard. VeraCrypt automatically ensures that you can safely type the password (right now and in the pre-boot environment) even if yo [...]
-    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (TRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the TRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the TRD allows you to permanently decrypt the partition/drive before Windows  [...]
+    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (VRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the VRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the VRD allows you to permanently decrypt the partition/drive before Windows  [...]
     <string lang="en" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">After you click OK, Microsoft Windows Disc Image Burner will be launched. Please use it to burn the VeraCrypt Rescue Disk ISO image to a CD or DVD.\n\nAfter you do so, return to the VeraCrypt Volume Creation Wizard and follow its instructions.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn it to a CD or DVD.\n\n%lsAfter you burn the Rescue Disk, click Next to verify that it has been correctly burned.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you should either burn the image to a CD/DVD or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
@@ -1290,6 +1303,7 @@
     <string lang="en" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">WARNING: This setting may degrade performance.\n\nAre you sure you want to use this setting?</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="be" key="TEST">Тэст</string>
     <string lang="be" key="KEYFILE">Ключавы файл</string>
     <string lang="be" key="VKEY_08">Backspace</string>
diff --git a/Translations/Language.bg.xml b/Translations/Language.bg.xml
index 92f59e3..d0a2544 100644
--- a/Translations/Language.bg.xml
+++ b/Translations/Language.bg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="bg" name="Български" en-name="Bulgarian" version="0.1.0" translators="Lachezar Gorchev" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="bg" key="IDC_QUICKFORMAT">Бърз формат</control>
     <control lang="bg" key="IDC_SHOW_PASSWORD">Видима &парола</control>
     <control lang="bg" key="IDC_SHOW_PASSWORD_SINGLE">Видима &парола</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="bg" key="IDC_SINGLE_BOOT">Една ОС (Single-boot)</control>
     <control lang="bg" key="IDC_STD_VOL">Стандартен VeraCrypt том</control>
     <control lang="bg" key="IDC_SYSENC_HIDDEN">Скри&т</control>
@@ -98,6 +99,7 @@
     <control lang="bg" key="IDT_SYSENC_KEYS_GEN_INFO">Ключовете, солта, и други данни са генерирани успешно. Ако желаете да генерирате нови ключове, натиснете Назад и след това Напред. В противен случай, натиснете Напред за да продължите.</control>
     <control lang="bg" key="IDT_SYS_DEVICE">Криптиране на дяла/устройството където Windows е инсталиран. Всеки, който иска да  получи достъп и да използва системата, да чете и записва файлове, и т.н., ще трябва да въведе правилната парола всеки път преди Windows да стартира. Може да създава скрит том.</control>
     <control lang="en" key="IDT_SYS_PARTITION">Select this option to encrypt the partition where the currently running Windows operating system is installed.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="bg" key="IDT_WIPE_MODE">Изчистващ режим:</control>
     <control lang="bg" key="IDCLOSE">Затваряне</control>
     <control lang="bg" key="IDC_ALLOW_ESC_PBA_BYPASS">Позволява pre-boot &автентикацията да бъде прескочена при натискане на клавиш Esc (активира boot мениджъра)</control>
@@ -111,6 +113,7 @@
     <control lang="bg" key="IDC_CACHE">Кеширане на паролите и ключ-файлов&ете в паметта</control>
     <control lang="bg" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Изход когато няма монтирани томове</control>
     <control lang="en" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Close token session (log out) after a volume is successfully mounted</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="bg" key="IDC_COPY_WIZARD">Включване на VeraCrypt Помощник за създаване на томове</control>
     <control lang="bg" key="IDC_CREATE">Създаване</control>
     <control lang="bg" key="IDC_CREATE_VOLUME">&Създаване на том</control>
@@ -271,6 +274,8 @@
     <control lang="bg" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Показване на това потребителско съобщение на екрана за pre-boot автентикация (най-много 24 знака):</control>
     <control lang="bg" key="IDT_DEFAULT_MOUNT_OPTIONS">Подразбиращи се опции при монтиране</control>
     <control lang="bg" key="IDT_DISMOUNT_ACTION">Опции на системните клавиши</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="en" key="IDT_FAVORITE_LABEL">Label of selected favorite volume:</control>
     <control lang="bg" key="IDT_FILE_SETTINGS">Настройка на файловете</control>
     <control lang="bg" key="IDT_HOTKEY_KEY">Клавиш за присвояване:</control>
@@ -537,6 +542,15 @@
     <string lang="bg" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Забележка: Ако искате да осъществите подсигурен трансфер на файлове от заблуждаващата система на скритата система, следвайте тези стъпки:\n1) Стартирайте заблуждаващата система.\n2) Запишете файловете върху некриптиран том или върху външен/нормален VeraCrypt том.\n3) Стартирайте скритата система.\n4) Ако сте записали файловете върху VeraCrypt том, монтирайте го (автоматично ще бъде монтиран 'само за четене').\n5) Копирайт [...]
     <string lang="bg" key="CONFIRM_RESTART">Вашият компютър трябва да бъде рестартиран.\n\nЖелаете ли да го рестартирате сега?</string>
     <string lang="bg" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Грешка при опит за получаване на статуса на системното криптиране.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="bg" key="INIT_SYS_ENC">Компонентите за систено криптиране не могат да бъдат инициализирани .</string>
     <string lang="bg" key="INIT_RAND">Неуспешно инициализиране на генератора за случайни числа!</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="bg" key="SELECT_KEYFILE">Изберете ключ-файл</string>
     <string lang="bg" key="SELECT_KEYFILE_PATH">Изберете път за търсене на ключ-файлове. ВНИМАНИЕ: Имайте предвид, че само пътят ще бъде запомнен, не и имената на файловете в него!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="bg" key="SERPENT_HELP">Разработен от Ross Anderson, Eli Biham, и Lars Knudsen. Публикуван през 1998. 256-битов ключ, 128-битов блок. Режима на работа е XTS. Serpent е един от финалистите на AES.</string>
     <string lang="en" key="SIZE_HELP">Please specify the size of the container you want to create.\n\nIf you create a dynamic (sparse-file) container, this parameter will specify its maximum possible size.\n\nNote that the minimum possible size of a FAT volume is 292 KB. The minimum possible size of an NTFS volume is 3792 KB.</string>
     <string lang="en" key="SIZE_HELP_HIDDEN_HOST_VOL">Please specify the size of the outer volume to be created (you will first create the outer volume and then a hidden volume within it). The minimum possible size of a volume within which a hidden volume is intended to be created is 340 KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="bg" key="INCONSISTENCY_RESOLVED">Проблем с неконсистентност е решен.\n\n\n(Ако докладвате бъг във връзка с това, моля включете следната техническа информация в доклада за бъга: %hs)</string>
     <string lang="bg" key="UNEXPECTED_STATE">Грешка: Неочаквано състояние.\n\n\n(Ако докладвате за проблем във връзка с това, моля включете следната техническа информация в доклада:\n%hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="bg" key="NOTHING_TO_RESUME">Няма процес/задача за продължаване.</string>
     <string lang="bg" key="HIDVOL_PROT_BKG_TASK_WARNING">ВНИМАНИЕ: Фоновият процес на VeraCrypt е забранен. След като затворите VeraCrypt, няма да има нотификация в случай, че е предовратена повреда в скрития том.\n\nЗабележка: Можете да спрете фоновата задача по всяко време като натиснете десен бутон върху VeraCrypt системната иконата и изберете 'Изход'.\n\nДа се включи ли  фоновият процес на VeraCrypt?</string>
     <string lang="bg" key="LANG_PACK_VERSION">Версия на езиковия пакет:  %s</string>
     <string lang="bg" key="CHECKING_FS">Проверка на файловата система на VeraCrypt тома монтиран като %hs...</string>
@@ -1085,15 +1099,14 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="bg" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">За сега ключ-файлове не се поддържат за системно криптиране.</string>
     <string lang="bg" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Внимание: VeraCrypt не може да възстанови оригиналната подредба на клавиатурата. Заради това може да въведете някоя парола грешно.</string>
     <string lang="bg" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Грешка: Подредбата на клавиатурата за VeraCrypt не може да се зададе да бъде стандартна US клавиатурна подредба.\n\nЗабележете, че паролата трябва да бъде въведена в pre-boot средата (преди стартирането на Windows), където не-US Windows клавиатурни подредби не са достъпни. Поради тази причина, паролата винаги трябва да бъде въвеждана, като се използва стандартна US клавиатурна подредба.</string>
     <string lang="bg" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">Тъй като VeraCrypt временно е сменил клавиатурната подредба на стандартна US клавиатурна подредба, не е възможно да въвеждате символи чрез натискане на клавиши докато десният Alt клавиш е задържан натиснат. Както и да е, можете да въвеждате повечето такива символи, като натискате съответните клавиши докато Shift клавиша е задържан натиснат.</string>
     <string lang="bg" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCrypt предотврати смяна на клавиатурната подредба.</string>
     <string lang="bg" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Бележка: Паролата трябва да бъде въведена в pre-boot средата (преди стартирането на Windows), където не-US Windows клавиатурна подредба не е достъпна. Поради това, паролата винаги трябва да бъде въвеждане, като се използва стандартн US клавиатурна подредба. Както и да е, важно е да знаете, че НЕ ви е необходима истинска US клавиатура. VeraCrypt автоматично се уверява в това, че можете безопасно да въведете паролата (точно сега и [...]
-    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (TRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the TRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the TRD allows you to permanently decrypt the partition/drive before Windows  [...]
+    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (VRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the VRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the VRD allows you to permanently decrypt the partition/drive before Windows  [...]
     <string lang="en" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">After you click OK, Microsoft Windows Disc Image Burner will be launched. Please use it to burn the VeraCrypt Rescue Disk ISO image to a CD or DVD.\n\nAfter you do so, return to the VeraCrypt Volume Creation Wizard and follow its instructions.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn it to a CD or DVD.\n\n%lsAfter you burn the Rescue Disk, click Next to verify that it has been correctly burned.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you should either burn the image to a CD/DVD or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
@@ -1290,6 +1303,7 @@
     <string lang="en" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">WARNING: This setting may degrade performance.\n\nAre you sure you want to use this setting?</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="bg" key="TEST">Тест</string>
     <string lang="bg" key="KEYFILE">Ключ-файл (КФ)</string>
     <string lang="bg" key="VKEY_08">Backspace</string>
diff --git a/Translations/Language.ca.xml b/Translations/Language.ca.xml
index 80b8cf8..b52c2bd 100644
--- a/Translations/Language.ca.xml
+++ b/Translations/Language.ca.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="ca" name="Català" en-name="Catalan" version="0.1.0" translators="CESICAT, Centre de Seguretat de la Informació de Catalunya" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="ca" key="IDC_QUICKFORMAT">Format ràpid</control>
     <control lang="ca" key="IDC_SHOW_PASSWORD">&Veure contrasenya</control>
     <control lang="ca" key="IDC_SHOW_PASSWORD_SINGLE">&Veure contrasenya</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="ca" key="IDC_SINGLE_BOOT">Arrencada simple</control>
     <control lang="ca" key="IDC_STD_VOL">Volum normal</control>
     <control lang="ca" key="IDC_SYSENC_HIDDEN">&Ocult</control>
@@ -98,6 +99,7 @@
     <control lang="ca" key="IDT_SYSENC_KEYS_GEN_INFO">Les claus i la resta de dades s'han generat satisfactòriament. Si vol generar unes noves claus, faci clic a Enrere i després a Següent. Si no, faci clic a Següent per continuar.</control>
     <control lang="ca" key="IDT_SYS_DEVICE">Xifrar la partició/unitat on hi ha el sistema operatiu instal·lat. Tothom que vulgui accedir i utilitzar el sistema, llegir i escriure fitxers, etc., haurà d'introduïr la contrasenya cada vegada que s'inicii el Windows. Opcionalment, crea un sistema ocult.</control>
     <control lang="ca" key="IDT_SYS_PARTITION">Seleccioni aquesta opció per xifrar la partició on hi ha instal·lat el sistema operatiu Windows actual.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="ca" key="IDT_WIPE_MODE">Tipus de neteja:</control>
     <control lang="ca" key="IDCLOSE">Tancar</control>
     <control lang="ca" key="IDC_ALLOW_ESC_PBA_BYPASS">Permet saltar-se l'&autenticació abans d'arrencar prement la tecla Esc (activa el gestor d'arrencada)</control>
@@ -111,6 +113,7 @@
     <control lang="ca" key="IDC_CACHE">&Recordar contrasenyes i fitxers de claus</control>
     <control lang="ca" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Sortir quan no hi hagi volums muntats</control>
     <control lang="ca" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">Tancar la sessió del testimoni després de muntar un volum</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="ca" key="IDC_COPY_WIZARD">Inclou l'assistent de creació de volums VeraCrypt</control>
     <control lang="ca" key="IDC_CREATE">Crear</control>
     <control lang="ca" key="IDC_CREATE_VOLUME">C&rear un volum</control>
@@ -271,6 +274,8 @@
     <control lang="ca" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Mostrar aquest missatge personalitzat a la pantalla d'autenticació prearrencada (com a màxim 24 caràcters):</control>
     <control lang="ca" key="IDT_DEFAULT_MOUNT_OPTIONS">Opcions de muntatge per defecte</control>
     <control lang="ca" key="IDT_DISMOUNT_ACTION">Opcions de les dreceres de teclat</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="ca" key="IDT_FAVORITE_LABEL">Etiqueta del volum seleccionat:</control>
     <control lang="ca" key="IDT_FILE_SETTINGS">Configuració dels fitxers</control>
     <control lang="ca" key="IDT_HOTKEY_KEY">Tecla a assignar:</control>
@@ -537,6 +542,15 @@
     <string lang="ca" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Nota: Si necessita transferir fitxers de manera segura des del sistema esquer cap al sistema ocult, segueixi aquests passos:\n1) Engegui el sistema esquer.\n2) Guardi els fitxers en un volum no xifrat o a un volum de VeraCrypt extern/normal.\n3) Engegi el sistema ocult.\n4) Si ha guardat els fitxers en un volum VeraCrypt, munti'l (es muntarà automàticament en mode només lectura).\n5) Copii els fitxers cap a la partició de [...]
     <string lang="ca" key="CONFIRM_RESTART">És necessari reiniciar l'ordinador.\n\nVol fer-ho ara?</string>
     <string lang="ca" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">S'ha produït un error quan s'intentava obtenir l'estat de xifratge del sistema.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="ca" key="INIT_SYS_ENC">No s'han pogut inicialitzar els components de l'aplicació per xifrar el sistema.</string>
     <string lang="ca" key="INIT_RAND">No s'ha pogut inicialitzar el generador de números aleatòris!</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="ca" key="SELECT_KEYFILE">Seleccioni fitxers de claus</string>
     <string lang="ca" key="SELECT_KEYFILE_PATH">Seleccioni la ruta de cerca dels fitxers de claus. ATENCIÓ: Només es guardarà la ruta, no els noms dels fitxers!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="ca" key="SERPENT_HELP">Dissenyat per Ross Anderson, Eli Biham i Lars Knudsen. Publicat el 1998. Clau de 256 bits, bloc de 128 bits. Mode XTS. Va ser un dels finalistes d'AES.</string>
     <string lang="ca" key="SIZE_HELP">Si us plau, especifiqui la mida del nou contenidor.\n\nSi crea un contenidor dinàmic (fitxer ampliable), aquest paràmetre ha d'especificat la seva mida màxima.\n\nTingui en compte que la mida mínima d'un volum FAT és de 292 KB. La mida mínima possible d'un volum NTFS és de 3792 KB.</string>
     <string lang="ca" key="SIZE_HELP_HIDDEN_HOST_VOL">Si us plau, especifiqui la mida del volum exterior a crear (primer es crea el volum exterior i després el volum ocult a dins). La mida mínima possible d'un volum que hagi de contenir un volum ocult és de 340KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="ca" key="INCONSISTENCY_RESOLVED">S'ha resolt la inconsistència.\n\n\n(Si reporta un error relacionat amb això, si us plau inclogui la següent informació tècnica:\n%hs)</string>
     <string lang="ca" key="UNEXPECTED_STATE">Estat inesperat.\n\n\n(Si reporta un error relacionat amb això, si us plau inclogui la següent informació tècnica:\n%hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="ca" key="NOTHING_TO_RESUME">No hi ha cap procés o tasca per continuar.</string>
     <string lang="ca" key="HIDVOL_PROT_BKG_TASK_WARNING">ATENCIÓ: La tasca en segon pla del VeraCrypt està desactivada. Després de sortir del VeraCrypt, no rebrà notificacions si s'evita el dany a un volum ocult.\n\nNota: Es pot aturar la tasca en segon pla del VeraCrypt fent clic amb el botó dret a l'icona a la safata i seleccionant 'Sortir'.\n\nVol activar la tasca en segon pla del VeraCrypt?</string>
     <string lang="ca" key="LANG_PACK_VERSION">Versió del paquet d'idioma:  %s</string>
     <string lang="ca" key="CHECKING_FS">Comprovant el sistema de fitxers del volum VeraCrypt muntat com %hs...</string>
@@ -1085,8 +1099,7 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="ca" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Els fitxers de claus no estan suportats per al xifrat del sistema.</string>
     <string lang="ca" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">ATENCIÓ: El VeraCrypt no ha pogut restaurar la disposició de teclat orignal. Això pot provocar que introdueixi la contrasenya incorrectament.</string>
     <string lang="ca" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Error: No s'ha pogut establir la disposició de teclat estàndard als EUA pel VeraCrypt.\n\nTingui en compte que la contrasenya s'haurà d'esciure a l'entorn de prearrencada (abans que arrenqui el windows) on no hi haurà altres disposicions de teclat disponibles. Per tant, la contrasenya s'ha d'escriure sempre amb la disposició de teclat estàndard als EUA.</string>
@@ -1290,6 +1303,7 @@
     <string lang="ca" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">ATENCIÓ: Aquesta configuració pot afectar al rendiment.\n\n Segur que vol utilitzar-la?</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="ca" key="TEST">Prova</string>
     <string lang="ca" key="KEYFILE">Fitxer de claus</string>
     <string lang="ca" key="VKEY_08">Retrocés</string>
diff --git a/Translations/Language.cs.xml b/Translations/Language.cs.xml
index aa45bd0..b405491 100644
--- a/Translations/Language.cs.xml
+++ b/Translations/Language.cs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="cs" name="Čeština" en-name="Czech" version="1.0.0" translators="Vítek Moser" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="cs" key="IDC_QUICKFORMAT">Rychle zformátovat</control>
     <control lang="cs" key="IDC_SHOW_PASSWORD">&Ukázat heslo</control>
     <control lang="cs" key="IDC_SHOW_PASSWORD_SINGLE">&Zobrazit heslo</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="cs" key="IDC_SINGLE_BOOT">Jednoduché bootování</control>
     <control lang="cs" key="IDC_STD_VOL">Standardní svazek VeraCrypt</control>
     <control lang="cs" key="IDC_SYSENC_HIDDEN">S&krytý</control>
@@ -98,6 +99,7 @@
     <control lang="cs" key="IDT_SYSENC_KEYS_GEN_INFO">Klíče, sůl (=náhodná data), a další data byla úspěšně vygenerována. Chcete-li vygenerovat nové klíče, vyberte Zpět a poté Další. Jinak klikněte na Další pro pokračování.</control>
     <control lang="cs" key="IDT_SYS_DEVICE">Zašifruje oddíl/disk, kde jsou nainstalovány Windows. Kdokoliv kdo bude chtít získat přístup a používat systém, číst a zapisovat soubory atd., musí zadat správné heslo před každým naběhnutím Windows. Volitelně lze vytvořit skrytý systém.</control>
     <control lang="cs" key="IDT_SYS_PARTITION">Zvolte tuto možnost pro zašifrování oddílu, kde je aktuálně nainstalován operační systém Windows.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="cs" key="IDT_WIPE_MODE">Čistící mód:</control>
     <control lang="cs" key="IDCLOSE">Zavřít</control>
     <control lang="cs" key="IDC_ALLOW_ESC_PBA_BYPASS">Povolit přeskočení před-bootovací &autentifikace stisknutím klávesy Esc (zapne boot manažera)</control>
@@ -111,6 +113,7 @@
     <control lang="cs" key="IDC_CACHE">Ukládat &hesla a soub. klíče do mezipaměti</control>
     <control lang="cs" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Skončit pokud neexistuje žádný připoj. svazek</control>
     <control lang="cs" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Zavřít relaci tokenu (odhlášení) po úspěšném odpojení svazku</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="cs" key="IDC_COPY_WIZARD">Zahrnout průvodce vytvořením svazku VeraCrypt</control>
     <control lang="cs" key="IDC_CREATE">Vytvořit</control>
     <control lang="cs" key="IDC_CREATE_VOLUME">V&ytvořit svazek</control>
@@ -271,6 +274,8 @@
     <control lang="cs" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Zobrazit volitelný text na obrazovce s před-bootovací autentifikací (maximálně 24 znaků):</control>
     <control lang="cs" key="IDT_DEFAULT_MOUNT_OPTIONS">Výchozí předvolby připojení</control>
     <control lang="cs" key="IDT_DISMOUNT_ACTION">Předvolby klávesových zkratek</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="cs" key="IDT_FAVORITE_LABEL">Jmenovka vybraného oblíbeného svazku:</control>
     <control lang="cs" key="IDT_FILE_SETTINGS">Nastavení souboru</control>
     <control lang="cs" key="IDT_HOTKEY_KEY">Klávesa k přiřazení:</control>
@@ -537,6 +542,15 @@
     <string lang="cs" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Poznámka: Pokud potřebujete bezpečně přesunout soubory z klamného systému do skrytého systému, dbejte následujících kroků: 1) Spusťte klamný systém. 2) Uložte soubory na nezašifrovaný svazek nebo na vnější/normální svazek VeraCrypt. 3) Spusťte skrytý systém. 4) Uložili jste-li soubory na svazek VeraCrypt, připojte ho (bude automaticky připojen jen pro čtení). 5) Zkopírujte soubory do skrytého systémového oddílu nebo na ji [...]
     <string lang="cs" key="CONFIRM_RESTART">Váš počítač musí být restartován.\n\nChcete nyní provést restart?</string>
     <string lang="cs" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Nastala chyba při získávání informací o stavu zašifrovaného systému.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="cs" key="INIT_SYS_ENC">Nelze inicializovat aplikační komponenty pro systémové šifrování.</string>
     <string lang="cs" key="INIT_RAND">Selhala inicializace generátoru náhodných čísel!</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="cs" key="SELECT_KEYFILE">Vyberte souborový klíč</string>
     <string lang="cs" key="SELECT_KEYFILE_PATH">Zvolte cestu pro hledání souborového klíče. UPOZORNĚNÍ: Zapamatována bude pouze cesta, nikoliv název souboru!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="cs" key="SERPENT_HELP">Navrhnuta Rossem Andersonem, Elim Bihamem a Larsem Knudsenem. Zveřejněna v roce 1998. 256-bitový klíč, 128-bitové bloky. Operační mód je XTS. Serpent byla jedním z finalistů AES.</string>
     <string lang="cs" key="SIZE_HELP">Definujte, prosím, velikost svazku, který chcete vytvořit.\n\nVytvoříte-li dynamický (rozptýlený soubor) svaze, tento parametr určí jeho maximální možnou velikost.\n\nMinimální možná velikost FAT svazku je 292 KB. Minimální možná velikost NTFS svazku je 3792 KB.</string>
     <string lang="cs" key="SIZE_HELP_HIDDEN_HOST_VOL">Definujte, prosím, velikost vnějšího svazku, který se má vytvořit (nejdříve vytvoříte vnější svazek a pak skrytý uvnitř něj). Minimální možná velikost svazku, v němž má být vytvořen svazek skrytý, je 340 KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="cs" key="INCONSISTENCY_RESOLVED">Nekonzistence vyřešena.\n\n\n(Pokud chcete ohlásit chybu ve spojitosti s touto událostí, přiložte prosím tuto technickou informaci do zprávy o chybě: %hs)</string>
     <string lang="cs" key="UNEXPECTED_STATE">Chyba: Neočekávaný stav.\n\n\n(Pokud budete chtít nahlásit chybu spojenou s tímto problémem, nezapomeňte do zprávy přiložit následující technické informace:\n%hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="cs" key="NOTHING_TO_RESUME">Není žádný proces/úkol k obnovení.</string>
     <string lang="cs" key="HIDVOL_PROT_BKG_TASK_WARNING">UPOZORNĚNÍ: VeraCrypt služba na pozadí je vypnuta. Po ukončení programu VeraCrypt nebudete upozorněni, zda bylo zabráněno poškození skrytého svazku.\n\nPoznámka: Službu na pozadí můžete kdykoliv zavřít kliknutím pravého tlačítka myši na ikonu programu VeraCrypt v pravém dolním rohu a vyberte 'Konec'.\n\nPovolit VeraCrypt službu na pozadí?</string>
     <string lang="cs" key="LANG_PACK_VERSION">Verze jazykového balíčku:  %s</string>
     <string lang="cs" key="CHECKING_FS">Kontroluji systém souborů na svazku VeraCrypt připojeném jako %hs…</string>
@@ -1085,15 +1099,14 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="cs" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Souborové klíče aktuálně nejsou podporovány pro šifrování systémů.</string>
     <string lang="cs" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Varování: VeraCrypt nemohl obnovit původní nastavení klávesnice. To může způsobit, že heslo bude zadáno nesprávně.</string>
     <string lang="cs" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Chyba: Nelze nastavit rozvržení klávesnice na typickou americkou klávesnici.\n\nHeslo musí být nastaveno v před-bootovacím prostředí (před startem Windows), kde nejsou ne-americké klávesnice k dispozici. Proto musí být heslo vždy nastaveno s použitím rozvržení kláves jako na americké klávesnici.</string>
     <string lang="cs" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">Protože VeraCrypt dočasně změnil nastavení klávesnice na standardní US rozmístění kláves, není možné psát znaky při stisknuté pravé klávese Alt. Většinu takových znaků ale můžete napsat stisknutím vhodných kláves při podržené klávese Shift.</string>
     <string lang="cs" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCrypt zabránil změně nastavení klávesnice.</string>
     <string lang="cs" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Poznámka: Heslo bude nutné zadat v před-bootovacím prostředí (než se spustí Windows) kde nejsou k dispozici ne-US klávesnice. Proto musí být heslo vždy zadáno s použitím standardní US klávesnice. Je nutné zdůraznit, že nepotřebujete opravdovou US klávesnici. VeraCrypt automaticky zajistí, abyste mohli bezpečně zadat heslo (nyní a v před-bootovacím prostředí) i když nemáte pravou US klávesnici.</string>
-    <string lang="cs" key="RESCUE_DISK_INFO">Před tím, než budete moci zašifrovat oddíl/disk, musíte vytvořit Záchranný disk VeraCrypt (TRD), který slouží k následujícím účelům:\n\n- Pokud dojde k poškození bootovacího zavaděče VeraCryptu, hlavního klíče nebo jiných kritických dat, s TRD je budete moci obnovit (stále ale budete muset uvést správné heslo).\n\n- Pokud dojde k poškození Windows a nenaběhnou, s pomocí TRD budete moci natrvalo dešifrovat oddíl/disk ještě před startem Windows. [...]
+    <string lang="cs" key="RESCUE_DISK_INFO">Před tím, než budete moci zašifrovat oddíl/disk, musíte vytvořit Záchranný disk VeraCrypt (VRD), který slouží k následujícím účelům:\n\n- Pokud dojde k poškození bootovacího zavaděče VeraCryptu, hlavního klíče nebo jiných kritických dat, s VRD je budete moci obnovit (stále ale budete muset uvést správné heslo).\n\n- Pokud dojde k poškození Windows a nenaběhnou, s pomocí VRD budete moci natrvalo dešifrovat oddíl/disk ještě před startem Windows. [...]
     <string lang="cs" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">Jakmile kliknete na OK, program Microsoft Windows Disc Image Burner bude spuštěn. Použijte ho, prosím, k vypálení obrazu Záchranného disku VeraCrypt na CD nebo DVD.\n\nAž tak učiníte, vraťte se do Průvodce vytvořením svazku VeraCrypt a pokračujte dle instrukcí.</string>
     <string lang="cs" key="RESCUE_DISK_BURN_INFO">Obraz záchranného disku byl vytvořen a uložen do tohoto souboru:\n%hs\n\nTeď jej musíte vypálit na CD nebo DVD.\n\n%lsPo vypálení Záchranného disku klikněte na Další pro ověření, že byl vypálen správně.</string>
     <string lang="cs" key="RESCUE_DISK_BURN_INFO_NO_CHECK">Obraz záchranného disku byl vytvořen a uložen do tohoto souboru:\n%hs\n\nNyní byste měli obraz disku buď vypálit na CD/DVD nebo jej přesunout do bezpečného umístění pro pozdější použití.\n\n%lsKlikněte na Další pro pokračování.</string>
@@ -1289,6 +1302,7 @@
     <string lang="cs" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">VAROVÁNÍ: Tato volba může ovlivnit výkonnost.\n\nJste si jisti, že chcete použít toto nastavení?</string>
     <string lang="cs" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Varování: Svazek VeraCrypt byl automaticky odpojen</string>
     <string lang="cs" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Před tím, než fyzicky odpojíte nebo vypnete zařízení, které obsahuje připojený svazek, měli byste tento svazek nejdříve odpojit v VeraCryptu.\n\nNeočekávané a nenadále odpojení je většinou způsobeno náhle selhávajícím kabelem, diskem (šuplíkem) apod.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="cs" key="TEST">Test</string>
     <string lang="cs" key="KEYFILE">Souborový klíč</string>
     <string lang="cs" key="VKEY_08">Backspace</string>
diff --git a/Translations/Language.da.xml b/Translations/Language.da.xml
index bd4ba1b..1a7b4d0 100644
--- a/Translations/Language.da.xml
+++ b/Translations/Language.da.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="da" name="Dansk" en-name="Danish" version="0.1.0" translators="Lasse Bond" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="da" key="IDC_QUICKFORMAT">Ekspres Formatering</control>
     <control lang="da" key="IDC_SHOW_PASSWORD">&Vis kodeord</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&Display password</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="da" key="IDC_SINGLE_BOOT">Single-boot</control>
     <control lang="da" key="IDC_STD_VOL">Standard VeraCrypt bind</control>
     <control lang="da" key="IDC_SYSENC_HIDDEN">Skj&ult</control>
@@ -98,6 +99,7 @@
     <control lang="da" key="IDT_SYSENC_KEYS_GEN_INFO">Nøgler, salt, og anden data er blevet oprettet med succes. Hvis du ønsker at oprette nye nøgler, klik på Tilbage og så Næste. Ellers klik på Næste for at fortsætte.</control>
     <control lang="da" key="IDT_SYS_DEVICE">Krypterer partitionen/drevet hvor Windows er installeret. Enhver der ønsker at få adgang og bruge systemet, læse og skrive filer, osv., er nødt til at indtaste det korrekte kodeord hver gang inden Windows booter op. Valgfrit, oprettes et skjult system.</control>
     <control lang="en" key="IDT_SYS_PARTITION">Select this option to encrypt the partition where the currently running Windows operating system is installed.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="da" key="IDT_WIPE_MODE">Udviske tilstand:</control>
     <control lang="da" key="IDCLOSE">Luk</control>
     <control lang="en" key="IDC_ALLOW_ESC_PBA_BYPASS">Allow pre-boot &authentication to be bypassed by pressing the Esc key (enables boot manager)</control>
@@ -111,6 +113,7 @@
     <control lang="da" key="IDC_CACHE">Gem kodeord og nøgl&efiler i hukommelsen</control>
     <control lang="da" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Afslut når alle tilsluttede bind afbrydes</control>
     <control lang="en" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Close token session (log out) after a volume is successfully mounted</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="da" key="IDC_COPY_WIZARD">Anvend VeraCrypt Bind Oprettelsesguide</control>
     <control lang="da" key="IDC_CREATE">Opret</control>
     <control lang="da" key="IDC_CREATE_VOLUME">&Opret Bind</control>
@@ -271,6 +274,8 @@
     <control lang="en" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Display this custom message in the pre-boot authentication screen (24 characters maximum):</control>
     <control lang="da" key="IDT_DEFAULT_MOUNT_OPTIONS">Standard Tilslutning Funktioner</control>
     <control lang="da" key="IDT_DISMOUNT_ACTION">Genvejstast Funktioner</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="en" key="IDT_FAVORITE_LABEL">Label of selected favorite volume:</control>
     <control lang="da" key="IDT_FILE_SETTINGS">Fil Indstillinger</control>
     <control lang="da" key="IDT_HOTKEY_KEY">Tildel tast:</control>
@@ -537,6 +542,15 @@
     <string lang="da" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Bemærk: Hvis du har behov for at overføre filer sikkert fra aflednings systemet til det skjulte system, følg disse trin: 1) Start aflednings systemet. 2) Gem filerne til et ukrypteret bind eller til et normalt/ydre VeraCrypt bind. 3) Start det skjulte system. 4) Hvis du har gemt filerne til et VeraCrypt bind, tilslut det (det vil automatisk blive tilsluttet som læs-kun). 5) Kopier filerne til den skjulte system partition  [...]
     <string lang="da" key="CONFIRM_RESTART">Din computer skal genstartes.\n\nØnsker du at genstarte den nu?</string>
     <string lang="da" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">En fejl opstod under læsning af system krypterings status.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="da" key="INIT_SYS_ENC">Kan ikke initialisere applikations komponenter for system kryptering.</string>
     <string lang="da" key="INIT_RAND">Kunne ikke initialisere tilfældigheds nummergenerator!</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="da" key="SELECT_KEYFILE">Vælg nøglefil</string>
     <string lang="da" key="SELECT_KEYFILE_PATH">Vælg en nøglefil søgesti. ADVARSEL: Bemærk at kun stien vil blive husket, ikke filnavne!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="da" key="SERPENT_HELP">Designet af Ross Anderson, Eli Biham, og Lars Knudsen. Udgivet i 1998. 256-bit nøgle, 128-bit blok. Driftstilstand er XTS. Serpent var en af AES finalisterne.</string>
     <string lang="en" key="SIZE_HELP">Please specify the size of the container you want to create.\n\nIf you create a dynamic (sparse-file) container, this parameter will specify its maximum possible size.\n\nNote that the minimum possible size of a FAT volume is 292 KB. The minimum possible size of an NTFS volume is 3792 KB.</string>
     <string lang="en" key="SIZE_HELP_HIDDEN_HOST_VOL">Please specify the size of the outer volume to be created (you will first create the outer volume and then a hidden volume within it). The minimum possible size of a volume within which a hidden volume is intended to be created is 340 KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="da" key="INCONSISTENCY_RESOLVED">Uoverensstemmelse løst.\n\n\n(Hvis du ønsker at rapportere en fejl i denne forbindelse, inkluder venligst følgende tekniske information i fejlrapporten: %hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="da" key="NOTHING_TO_RESUME">Der er ingen proces/opgave at genoptage.</string>
     <string lang="da" key="HIDVOL_PROT_BKG_TASK_WARNING">ADVARSEL: VeraCrypt baggrundsopgaver er slået fra. Efter du afslutter VeraCrypt, vil du ikke blive gjort opmærksom på om skade på det skjulte bind er undgået.\n\nBemærk: Du kan nårsomhelst lukke baggrundsopgaver ned ved at højreklikke på VeraCrypt ikonet i systembakken, og klikke på 'Afslut'.\n\nAktiver VeraCrypt Baggrundsopgaver?</string>
     <string lang="da" key="LANG_PACK_VERSION">Sprogpakke version:  %s</string>
     <string lang="da" key="CHECKING_FS">Kontrollerer fil systemet på VeraCrypt bindet tilsluttet som %hs...</string>
@@ -1085,15 +1099,14 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="da" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Advarsel: VeraCrypt kunne ikke gendanne det originale keyboard layout. Dette kan medføre at du indtaster et kodeord ukorrekt.</string>
     <string lang="da" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Fejl: Kan ikke indstille keyboard layoutet for VeraCrypt til standard US keyboard layout.\n\nBemærk at kodeordet skal indtastes i før-boot miljøet (før Windows starter) hvor ikke-US Windows keyboard layouts ikke er tilgængelige. Derfor skal kodeordet altid skrives ved brug af standard US keyboard layout.</string>
     <string lang="da" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">Da VeraCrypt midlertidigt har ændret keyboard layout til standard US keyboard layout, det er ikke muligt at indtaste karakterer ved trykke på taster mens den højre Alt tast holdes nede. Derimod kan du indtaste de fleste af disse karakterer, ved at trykke de passende taster mens Shift tasten holdes nede.</string>
     <string lang="da" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCrypt forhindrede ændring af keyboard layout.</string>
     <string lang="da" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Bemærk: Kodeordet skal indtastes i før-boot miljøet (før Windows starter) hvor ikke-US Windows keyboard layouts ikke er tilgængelige. Derfor, bør kodeordet altid indtastes ved brug af standard US keyboard layout. Derimod er det vigtigt at bemærke at du IKKE behøver et rigtigt US keyboard. VeraCrypt sikrer automatisk at du roligt kan indtaste kodeordet (lige nu og i før-boot miljøet) selv om du ikke har et rigtigt US keyboard.</string>
-    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (TRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the TRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the TRD allows you to permanently decrypt the partition/drive before Windows  [...]
+    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (VRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the VRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the VRD allows you to permanently decrypt the partition/drive before Windows  [...]
     <string lang="en" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">After you click OK, Microsoft Windows Disc Image Burner will be launched. Please use it to burn the VeraCrypt Rescue Disk ISO image to a CD or DVD.\n\nAfter you do so, return to the VeraCrypt Volume Creation Wizard and follow its instructions.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn it to a CD or DVD.\n\n%lsAfter you burn the Rescue Disk, click Next to verify that it has been correctly burned.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you should either burn the image to a CD/DVD or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
@@ -1290,6 +1303,7 @@
     <string lang="en" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">WARNING: This setting may degrade performance.\n\nAre you sure you want to use this setting?</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="da" key="TEST">Test</string>
     <string lang="da" key="KEYFILE">Nøglefil</string>
     <string lang="da" key="VKEY_08">Backspace</string>
diff --git a/Translations/Language.de.xml b/Translations/Language.de.xml
index f7ee6a1..01c3bfe 100644
--- a/Translations/Language.de.xml
+++ b/Translations/Language.de.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="de" name="Deutsch" en-name="German" version="1.1.0" translators="Harry Haller, Alexander Schorg, Simon Frankenberger, David Arndt, H. Sauer" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="de" key="IDC_QUICKFORMAT">Schnell-Formatierung</control>
     <control lang="de" key="IDC_SHOW_PASSWORD">Kennwort an&zeigen</control>
     <control lang="de" key="IDC_SHOW_PASSWORD_SINGLE">&Passwort anzeigen</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="de" key="IDC_SINGLE_BOOT">Ein Betriebssystem</control>
     <control lang="de" key="IDC_STD_VOL">Standard VeraCrypt-Volume</control>
     <control lang="de" key="IDC_SYSENC_HIDDEN">V&ersteckt</control>
@@ -98,6 +99,7 @@
     <control lang="de" key="IDT_SYSENC_KEYS_GEN_INFO">Die Schlüssel, Salt-Wert, und andere Daten wurden erfolgreich erstellt. Wenn Sie neue Schlüssel erstellen möchten, klicken Sie auf 'Zurück' und dann auf 'Weiter'. Andernfalls klicken Sie auf 'Weiter'.</control>
     <control lang="de" key="IDT_SYS_DEVICE">Partition/ Laufwerk verschlüsseln auf dem Windows installiert ist. Jeder der Zugang zum System erlangen möchte, muss das korrekte Kennwort bei jedem Start von Windows eingeben. Eine Alternative dazu ist das Erstellen eines versteckten Systems.</control>
     <control lang="de" key="IDT_SYS_PARTITION">Wählen Sie diese Option um die Partition zu verschlüsseln auf der das derzeit laufende Windows installiert ist.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="de" key="IDT_WIPE_MODE">Lösch-Modus:</control>
     <control lang="de" key="IDCLOSE">Schließen</control>
     <control lang="de" key="IDC_ALLOW_ESC_PBA_BYPASS">Erlauben, die Pre-Boot &Authentifikation durch drücken v. Esc zu überspringen (aktiviert Boot-Manager)</control>
@@ -111,6 +113,7 @@
     <control lang="de" key="IDC_CACHE">Kennwort u. Schlüsseldat. im &Cache halten</control>
     <control lang="de" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">&Beenden wenn alle Vol. getrennt wurden</control>
     <control lang="de" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">Schließe Token-&Sitzung nachdem ein Volume erfolgreich eingebunden wurde</control>
+    <control lang="de" key="IDC_COPY_EXPANDER">Volume-Erweiterer kopieren</control>
     <control lang="de" key="IDC_COPY_WIZARD">Assistent für die Erstellung von VeraCrypt-Volume mit kopieren</control>
     <control lang="de" key="IDC_CREATE">Erstellen</control>
     <control lang="de" key="IDC_CREATE_VOLUME">Volume &erstellen</control>
@@ -271,6 +274,8 @@
     <control lang="de" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Zeige diese benutzerdefinierte Nachricht im Pre-Boot Authentifikations-Bildschirm an (max. 24 Zeichen):</control>
     <control lang="de" key="IDT_DEFAULT_MOUNT_OPTIONS">Voreinstellungen beim Einbinden</control>
     <control lang="de" key="IDT_DISMOUNT_ACTION">Einstellungen für Tastenkombinationen</control>
+    <control lang="de" key="IDT_DRIVER_OPTIONS">Treiberkonfiguration</control>
+    <control lang="de" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Aktivieren erweiterten Plattensteuercodes Unterstützung</control>
     <control lang="de" key="IDT_FAVORITE_LABEL">Bezeichnung des gewählten Favoriten-Volumes:</control>
     <control lang="de" key="IDT_FILE_SETTINGS">Dateieinstellungen</control>
     <control lang="de" key="IDT_HOTKEY_KEY">Taste:</control>
@@ -537,6 +542,15 @@
     <string lang="de" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Hinweis: Wenn Sie Dateien sicher von dem Köder-System zum versteckten System übertragen wollen, dann folgen Sie diesen Schritten: 1) Starten Sie das Köder-System. 2) Speichern Sie die Dateien auf ein unverschl. Datenträger oder in ein äußeres/normales VeraCrypt Volume. 3) Starten Sie das versteckte System. 4) Wenn Sie die Dateien auf ein VeraCrypt Volume gespeichert haben, mounten Sie es (es wird automatisch als schreibge [...]
     <string lang="de" key="CONFIRM_RESTART">Ihr Computer muss Neu gestartet werden.\n\nMöchten Sie jetzt Neu starten?</string>
     <string lang="de" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Beim Status abrufen für die Systemverschlüsselung ist ein Fehler aufgetreten.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="de" key="INIT_SYS_ENC">Die Anwendungskomponenten konnten nicht Initialisiert werden.</string>
     <string lang="de" key="INIT_RAND">Der Zufallszahlengenerator konnte nicht initialisiert werden!\n\n\n(Sollten Sie in diesem Zusammenhang einen Fehler melden, so bitten wir Sie folgende technische Informationen dem Fehlerbericht hinzuzufügen: %hs, Letzter Fehler = 0x%.8X)</string>
     <string lang="de" key="CAPI_RAND">Windows Crypto API ist fehlgeschlagen!\n\n\n(Sollten Sie in diesem Zusammenhang einen Fehler melden, so bitten wir Sie folgende technische Informationen dem Fehlerbericht hinzuzufügen: %hs, Letzter Fehler = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="de" key="SELECT_KEYFILE">Schlüsseldatei auswählen</string>
     <string lang="de" key="SELECT_KEYFILE_PATH">Suchpfad für Schlüsseldatei auswählen. WARNUNG: Es wird lediglich der Pfad nicht aber die Dateinamen berücksichtigt!</string>
     <string lang="de" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Wählen Sie den Ordner, in den die Schlüsseldateien gespeichert werden sollen.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="de" key="SERPENT_HELP">Entwickelt von Ross Anderson, Eli Biham, und Lars Knudsen. 1998 herausgegeben. 256-bit Schlüssellänge, 128-bit Blockgröße. Arbeitet im XTS-Modus. Serpent war einer der AES Finalisten.</string>
     <string lang="de" key="SIZE_HELP">Bitte geben Sie die Größe des zu erstellenden Containers an.\n\nWenn sie einen dynamischen (Sparse-Datei) Container erstellen, dann gibt dieser Wert seine maximal mögliche Größe an.\n\nHinweis: die Mindestgröße eines FAT Volume ist 292 KB. Die Mindestgröße eines NTFS Volume ist 3792 KB.</string>
     <string lang="de" key="SIZE_HELP_HIDDEN_HOST_VOL">Bitte geben Sie die Größe des zu erstellenden äußeren Volumes (Sie erstellen erst ein äußeres Volume und dann darin ein Verstecktes Volume). Die Mindestgröße eines Volume innerhalb welchem ein verstecktes Volume erstellt werden kann ist 340 KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="de" key="INCONSISTENCY_RESOLVED">Inkonsistenz aufgelöst.\n\n\n(Sollten Sie in diesem Zusammenhang  einen Fehler melden, so bitten wir Sie folgende techn. Informationen im Fehlerbericht zu berücksichtigen: %hs)</string>
     <string lang="de" key="UNEXPECTED_STATE">Fehler: unerwarteter Zustand.\n\n\nWenn Sie einen Fehler in Zusammenhang mit diesem melden, dann beziehen Sie die folgenden technischen Informationen mit in den Fehlerbericht ein: %hs)</string>
     <string lang="de" key="NO_SYS_ENC_PROCESS_TO_RESUME">Es gibt keinen unterbrochenen Ver-/Entschlüsselungsprozess der Systempartition/Laufwerk, der fortgesetzt werden kann.\n\nHinweis: Falls Sie einen unterbrochenen Ver-/Entschlüsselungsprozess einer Nicht-System Partition fortsetzen möchten, wählen Sie 'Volume' > 'Unterbrochenen Prozess fortsetzen'.</string>
-    <string lang="de" key="NOTHING_TO_RESUME">Es ist kein Prozess/Task zum Fortsetzen vorhanden.</string>
     <string lang="de" key="HIDVOL_PROT_BKG_TASK_WARNING">WARNUNG: Der VeraCrypt-Hintergrunddienst ist deaktiviert. Nach dem Beenden von VeraCrypt werden Sie nicht benachrichtigt sobald eine Beschädigung eines versteckten Volume verhindert werden konnte.\n\nHinweis: Sie können den Hintergrunddienst jederzeit mit einen Klick der rechten Maus- taste auf das VeraCrypt-Symbol im Infobereich (= Systemtray), und durch Auswählen von "Beenden" beenden.\n\nSoll der VeraCrypt-Hintergrunddienst akti [...]
     <string lang="de" key="LANG_PACK_VERSION">Sprachpaket-Version:  %s</string>
     <string lang="de" key="CHECKING_FS">Es wird das Dateisystem des als %hs eingebundenen VeraCrypt-Volume überprüft...</string>
@@ -1085,15 +1099,14 @@
     <string lang="de" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">Dieser Algorithmus ist im TrueCrypt Modus nicht vothanden.</string>
     <string lang="de" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) wird nicht im TrueCrypt Modus unterstützt.</string>	  
     <string lang="de" key="PIM_REQUIRE_LONG_PASSWORD">Das Passwort muss 20 oder mehr Zeichen haben, um den festgelegten PIM verwenden zu können.\nKürzere Passwörter können nur verwendet werden, wenn der PIM Wert 485 oder größer ist.</string>
-    <string lang="de" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Das Pre-boot authentication Passwort muss 20 oder mehr Zeichen haben, um den festgelegten PIM verwenden zu können.\n Kürzere Passwörter können nur verwendet werden, wenn der PIM Wert 98 oder größer ist.</string>
-    <string lang="de" key="UNSUPPORTED_TRUECRYPT_FORMAT">Das Volume wurde mit TrueCrypt %x.%x erstellt, aber VeraCrypt unterstützt nur TrueCrypt Volume, die mit TrueCrypt 6.x/7x erstellt wurden.</string>
+    <string lang="de" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Das Pre-boot authentication Passwort muss 20 oder mehr Zeichen haben, um den festgelegten PIM verwenden zu können.\n Kürzere Passwörter können nur verwendet werden, wenn der PIM Wert 98 oder größer ist.</string>    
     <string lang="de" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Schlüsseldateien werden derzeit nicht für die Systemverschlüsselung unterstützt.</string>
     <string lang="de" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warnung: VeraCrypt konnte das ursprüngliche Tastaturlayout nicht wiederherstellen. Dadurch könnten Sie das Passwort falsch eingeben.</string>
     <string lang="de" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Fehler: Es kann das Tastaturlayout für VeraCrypt nicht auf das Standard-US-Tastaturlayout festgelegt werden.\n\nBeachten Sie, dass das Kennwort in der Pre-Boot Umgebung eingegeben werden muss (bevor Windows startet), wo Nicht-US Windows Tastaturlayouts nicht verfügbar sind. Daher muss das Kennwort immer unter Verwendung des Standard-US-Tastaturlayout eingegeben werden.</string>
     <string lang="de" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">Da VeraCrypt vorübergehend das Tastaturlayout auf Standard-US-Tastaturlayout geändert hat, ist es nicht möglich bei gedrückter rechter ALT-Taste  Zeichen einzugeben. Jedoch können Sie die meisten solcher Zeichen schreiben, indem Sie bei gedrückter Umschalt-Taste die passenden Tasten drücken.</string>
     <string lang="de" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCrypt verhinderte die Änderung des Tastaturlayouts.</string>
     <string lang="de" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Hinweis: Sie müssen das Kennwort in der Pre-Boot Umgebung eingegeben (bevor Windows startet), in der Nicht-US Windows Tastaturlayouts nicht verfügbar sind. Daher muss immer unter Verwendung des Standard-US-Tastaturlayout das Kennwort eingegeben werden. Allerdings ist es wichtig zu beachten, dass Sie keine echte US-Tastatur brauchen. VeraCrypt stellt automatisch sicher, dass Sie das Kennwort problemlos eingeben können (jetzt und  [...]
-    <string lang="de" key="RESCUE_DISK_INFO">Bevor sie die Partition/das Laufwerk verschlüsseln können müssen Sie eine VeraCrypt Rettungs-CD (TRD) erstellen, die für die folgenden Fälle notwendig ist:\n\n- Wenn der VeraCrypt Bootloader, der Hauptschlüssel oder andere kritische Daten beschädigt werden, erlaubt die TRD diese Daten wieder herzustellen (Sie benötigen trotzdem das korrekte Passwort).\n- Wenn Windows beschädigt wird und nicht starten kann ermöglicht die TRD es die Partition/da [...]
+    <string lang="de" key="RESCUE_DISK_INFO">Bevor sie die Partition/das Laufwerk verschlüsseln können müssen Sie eine VeraCrypt Rettungs-CD (VRD) erstellen, die für die folgenden Fälle notwendig ist:\n\n- Wenn der VeraCrypt Bootloader, der Hauptschlüssel oder andere kritische Daten beschädigt werden, erlaubt die VRD diese Daten wieder herzustellen (Sie benötigen trotzdem das korrekte Passwort).\n- Wenn Windows beschädigt wird und nicht starten kann ermöglicht die VRD es die Partition/da [...]
     <string lang="de" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">Nachdem sie OK geklickt haben wird das Microsoft Windows ISO-Brennprogramm gestartet. Bitte benutzen Sie es um das VeraCrypt Rettungs-CD Abbild (Image) auf eine CD oder DVD zu brennen.\n\nNachdem Sie das getan haben, kehren Sie bitte zum Assistent zum Erstellen eines VeraCrypt-Volume zurück und folgen Sie den Anweisungen.</string>
     <string lang="de" key="RESCUE_DISK_BURN_INFO">Das VeraCrypt Rettungs-CD Abbild (Image) wurde erfolgreich erstellt und an folgendem Ort gespeichert:\n%hs\nJetzt müssen Sie es auf eine CD oder DVD brennen.\n\n%lsNachdem Sie das getan haben, klicken Sie bitte "Weiter" um die Korrektheit der Rettungs-CD zu überprüfen.</string>
     <string lang="de" key="RESCUE_DISK_BURN_INFO_NO_CHECK">Das VeraCrypt Rettungs-CD Abbild (Image) wurde erfolgreich erstellt und an folgendem Ort gespeichert:\n%hs\nJetzt sollten Sie es entweder auf eine CD oder DVD brennen oder für die spätere Verwendung an einen sichern Ort verschieben.\n\n%lsKlicken Sie "Weiter" um fortzufahren.</string>
@@ -1290,6 +1303,7 @@
     <string lang="de" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">WARNUNG: Diese Einstellung kann die Leistung verringern.\n\nSind Sie Sicher, dass Sie diese Einstellungen vornehmen möchten?</string>
     <string lang="de" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">WARNUNG: VeraCrypt-Volume wurde automatisch getrennt.</string>
     <string lang="de" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Bevor Sie ein Gerät mit einem eingebundenen VeraCrypt Volume entfernen oder ausschalten sollten Sie immer zuerst das VeraCrypt Volume trennen.\n\nEine unerwartete plötzliche Trennung wird normalerweise durch versagende Kabel, Festplatten usw. verursacht.</string>
+    <string lang="de" key="UNSUPPORTED_TRUECRYPT_FORMAT">Das Volume wurde mit TrueCrypt %x.%x erstellt, aber VeraCrypt unterstützt nur TrueCrypt Volume, die mit TrueCrypt 6.x/7x erstellt wurden.</string>
     <string lang="de" key="TEST">Test</string>
     <string lang="de" key="KEYFILE">Schlüsseldatei</string>
     <string lang="de" key="VKEY_08">Rücktaste</string>
diff --git a/Translations/Language.el.xml b/Translations/Language.el.xml
index cc2ff3d..b4609bb 100644
--- a/Translations/Language.el.xml
+++ b/Translations/Language.el.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="el" name="Ελληνικά" en-name="Greek" version="0.1.0" translators="Βασίλης Κοσμίδης" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="el" key="IDC_QUICKFORMAT">Γρήγορη διαμόρφωση</control>
     <control lang="el" key="IDC_SHOW_PASSWORD">Εμφάνιση &κωδικού</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&Display password</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="el" key="IDC_SINGLE_BOOT">Μονής εκκίνησης</control>
     <control lang="el" key="IDC_STD_VOL">Απλός τόμος VeraCrypt</control>
     <control lang="en" key="IDC_SYSENC_HIDDEN">Hi&dden</control>
@@ -98,6 +99,7 @@
     <control lang="el" key="IDT_SYSENC_KEYS_GEN_INFO">Τα κλειδια και άλλα δεδομένα δημιουργηθήκαν επιτυχώς. Αν θέλετε να δημιουργήσετε νέα κλειδια πιέστε Πίσω και μετά Επόμενο. Αλλιώς πιέστε Επόμενο για να συνεχίσετε.</control>
     <control lang="en" key="IDT_SYS_DEVICE">Encrypts the partition/drive where Windows is installed. Anyone who wants to gain access and use the system, read and write files, etc., will need to enter the correct password each time before Windows boots. Optionally, creates a hidden system.</control>
     <control lang="en" key="IDT_SYS_PARTITION">Select this option to encrypt the partition where the currently running Windows operating system is installed.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="el" key="IDT_WIPE_MODE">Μέθοδος εκκαθάρισης:</control>
     <control lang="el" key="IDCLOSE">Κλείσιμο</control>
     <control lang="en" key="IDC_ALLOW_ESC_PBA_BYPASS">Allow pre-boot &authentication to be bypassed by pressing the Esc key (enables boot manager)</control>
@@ -111,6 +113,7 @@
     <control lang="el" key="IDC_CACHE">Αποθήκευση κωδικών και αρχείων-κλει&διών στη μνήμη</control>
     <control lang="el" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Έξοδος όταν δεν υπάρχουν φορτωμένοι τόμοι</control>
     <control lang="en" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Close token session (log out) after a volume is successfully mounted</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="el" key="IDC_COPY_WIZARD">Να περιλάβει και τον Οδηγό δημιουργίας τόμου VeraCrypt</control>
     <control lang="el" key="IDC_CREATE">Δημιουργία</control>
     <control lang="el" key="IDC_CREATE_VOLUME">&Δημιουργία τόμου</control>
@@ -271,6 +274,8 @@
     <control lang="en" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Display this custom message in the pre-boot authentication screen (24 characters maximum):</control>
     <control lang="el" key="IDT_DEFAULT_MOUNT_OPTIONS">Εξ'ορισμού επιλογές φόρτωσης</control>
     <control lang="el" key="IDT_DISMOUNT_ACTION">Επιλογές συντομεύσεων</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="en" key="IDT_FAVORITE_LABEL">Label of selected favorite volume:</control>
     <control lang="el" key="IDT_FILE_SETTINGS">Ρυθμίσεις αρχείων</control>
     <control lang="el" key="IDT_HOTKEY_KEY">Καθορισμός πλήκτρου:</control>
@@ -537,6 +542,15 @@
     <string lang="en" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Note: If you need to securely transfer files from the decoy system to the hidden system, follow these steps:\n1) Start the decoy system.\n2) Save the files to an unencrypted volume or to an outer/normal VeraCrypt volume.\n3) Start the hidden system.\n4) If you saved the files to a VeraCrypt volume, mount it (it will be automatically mounted as read-only).\n5) Copy the files to the hidden system partition or to another hid [...]
     <string lang="el" key="CONFIRM_RESTART">Ο υπολογιστής σας πρέπει να επανεκκινηθεί.\n\nΘέλετε αυτό να γίνει τώρα;</string>
     <string lang="el" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Ένα σφάλμα συνέβη κατά τη λήψη της κατάστασης κρυπτογράφησης του συστήματος.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="el" key="INIT_SYS_ENC">Αδυναμία αρχικοποίησης των στοιχείων της εφαρμογής για κρυπτογράφηση του συστήματος.</string>
     <string lang="el" key="INIT_RAND">Αποτυχία αρχικοποίησης της γεννήτριας τυχαίων αριθμών!</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="el" key="SELECT_KEYFILE">Επιλέξτε αρχείο-κλειδί</string>
     <string lang="el" key="SELECT_KEYFILE_PATH">Επιλέξτε διαδρομή αναζήτησης αρχείου-κλειδιού. ΠΡΟΣΟΧΗ: Μόνο η διαδρομή θα απομνημονευθεί, όχι τα αρχεία!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="el" key="SERPENT_HELP">Σχεδιασμένος από τους Ross Anderson, Eli Biham και Lars Knudsen. Δημοσιεύτηκε το 1998. Κλειδί 256-bit, μπλοκ 128-bit. Κατάσταση λειτουργίας XTS. Ο Serpent ήταν ένας από τους φιναλίστ του AES.</string>
     <string lang="en" key="SIZE_HELP">Please specify the size of the container you want to create.\n\nIf you create a dynamic (sparse-file) container, this parameter will specify its maximum possible size.\n\nNote that the minimum possible size of a FAT volume is 292 KB. The minimum possible size of an NTFS volume is 3792 KB.</string>
     <string lang="en" key="SIZE_HELP_HIDDEN_HOST_VOL">Please specify the size of the outer volume to be created (you will first create the outer volume and then a hidden volume within it). The minimum possible size of a volume within which a hidden volume is intended to be created is 340 KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="el" key="INCONSISTENCY_RESOLVED">Ασυνέπεια αποκαταστάθηκε.\n\n\n(Αν αναφέρετε ένα σφάλμα σχετικό με αυτή, παρακαλώ συμπεριλάβετε στην αναφορά σφάλματος τις ακόλουθες τεχνικές πληροφορίες: %hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="el" key="NOTHING_TO_RESUME">Δεν υπάρχει διαδικασία/εργασία προς επαναφορά.</string>
     <string lang="el" key="HIDVOL_PROT_BKG_TASK_WARNING">ΠΡΟΣΟΧΗ: Η εργασία στο παρασκήνιο του VeraCrypt είναι απενεργοποιημένη. Αν κλείσετε το VeraCrypt δε θα ειδοποιηθήτε αν αποτραπεί ζημιά σε κρυφό τόμο.\n\nΣημείωση: Μπορείτε να κλείσετε την εργασία στο παρασκήνιο όποτε θέλετε με δεξί κλικ στο εικονίδιο του χώρου ειδοποιήσεων και επιλέγοντας "Έξοδος".\n\nΕνεργοποίηση της εργασίας στο παρασκήνιο του VeraCrypt;</string>
     <string lang="el" key="LANG_PACK_VERSION">Έκδοση αρχείου γλώσσας:  %s</string>
     <string lang="el" key="CHECKING_FS">Έλεγχος του συστήματος αρχείων στον τόμο VeraCrypt που φορτώθηκε ως %hs...</string>
@@ -1085,15 +1099,14 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="el" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Προειδοποίηση: Το VeraCrypt δεν μπόρεσε να επαναφέρει την αρχική διάταξη του πληκτρολογίου. Αυτό μπορεί να προκαλέσει εσφαλμένη εισαγωγή κωδικού.</string>
     <string lang="el" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Σφάλμα: Αδυναμία ορισμού διάταξης πληκτρολογίου για το VeraCrypt σε Η.Π.Α..\n\nΣημειώστε ότι ο κωδικός πρέπει να πληκτρολογηθεί στο περιβάλλον πριν την εκκίνηση των Windows όπου μη-Η.Π.Α. διατάξεις πληκτρολογίου δεν είναι διαθέσιμες. Γι'αυτό ο κωδικός πρέπει πάντα να πληκτρολογείται με χρήση διάταξης πληκτρολογίου Η.Π.Α.</string>
     <string lang="el" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">Καθώς το VeraCrypt άλλαξε προσωρινά τη διάταξη του πληκτρολογίου σε Η.Π.Α., δεν είναι δυνατόν να πληκτρολογήσετε με το δεξί Alt πατημένο. Ωστόσο, μπορείτε να πληκτρολογήσετε τους περισσότερους τέτοιους χαρακτήρες έχοντας πατημένο το Shift.</string>
     <string lang="el" key="KEYB_LAYOUT_CHANGE_PREVENTED">Το VeraCrypt απέτρεψε την αλλαγή της διάταξης του πληκτρολογίου.</string>
     <string lang="el" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Σημείωση: Ο κωδικός πρέπει να πληκτρολογηθεί στο προ-εκκίνησης περιβάλλον (πριν εκκινήσουν τα Windows) όπου μη-Η.Π.Α. διατάξεις πληκτρολογίου δεν είναι διαθέσιμες. Γι'αυτό ο κωδικός πρέπει πάντα να πληκτρολογείται χρησιμοποιώντας διάταξη πληκτρολογίου Η.Π.Α. Ωστόσο σημειώστε ότι ΔΕ χρειάζεστε ένα πραγματικό πληκτρολόγιο Η.Π.Α. Το VeraCrypt διασφαλίζει αυτόματα ότι μπορείτε να τυπώσετε ασφαλώς τον κωδικό (τώρα και στο προ-εκκίνησ [...]
-    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (TRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the TRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the TRD allows you to permanently decrypt the partition/drive before Windows  [...]
+    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (VRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the VRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the VRD allows you to permanently decrypt the partition/drive before Windows  [...]
     <string lang="en" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">After you click OK, Microsoft Windows Disc Image Burner will be launched. Please use it to burn the VeraCrypt Rescue Disk ISO image to a CD or DVD.\n\nAfter you do so, return to the VeraCrypt Volume Creation Wizard and follow its instructions.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn it to a CD or DVD.\n\n%lsAfter you burn the Rescue Disk, click Next to verify that it has been correctly burned.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you should either burn the image to a CD/DVD or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
@@ -1289,6 +1302,7 @@
     <string lang="en" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">WARNING: This setting may degrade performance.\n\nAre you sure you want to use this setting?</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="el" key="TEST">Έλεγχος</string>
     <string lang="el" key="KEYFILE">Αρχείο-κλειδί</string>
     <string lang="el" key="VKEY_08">Backspace</string>
diff --git a/Translations/Language.es.xml b/Translations/Language.es.xml
index 78b92f0..46a4603 100644
--- a/Translations/Language.es.xml
+++ b/Translations/Language.es.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="es" name="Español" en-name="Spanish" version="1.0.0" translators="Juan Antonio Auñón Ochando" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="es" key="IDC_QUICKFORMAT">Formato Rápido</control>
     <control lang="es" key="IDC_SHOW_PASSWORD">&Mostrar contraseña </control>
     <control lang="es" key="IDC_SHOW_PASSWORD_SINGLE">&Mostrar contraseña</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="es" key="IDC_SINGLE_BOOT">Arranque simple</control>
     <control lang="es" key="IDC_STD_VOL">Volumen VeraCrypt común</control>
     <control lang="es" key="IDC_SYSENC_HIDDEN">&Oculto</control>
@@ -98,6 +99,7 @@
     <control lang="es" key="IDT_SYSENC_KEYS_GEN_INFO">Las claves, sal y otros datos han sido generados con éxito. Si quiere generar nuevas claves, presione Volver y luego Siguiente. Si no, presione Siguiente para continuar.</control>
     <control lang="es" key="IDT_SYS_DEVICE">Cifra la partición/unidad donde Windows está instalado. Cualquiera que quiera acceder al sistema, leer y escribir archivos, etc. tendrá que introducir la contraseña antes de arrancar Windows. Opcionalmente, crea un sistema oculto.</control>
     <control lang="es" key="IDT_SYS_PARTITION">Seleccione esta opción para cifrar la partición donde está instalado el sistema operativo Windows que hay ahora mismo en ejecución.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="es" key="IDT_WIPE_MODE">Modo de borrado seguro:</control>
     <control lang="es" key="IDCLOSE">Cerrar</control>
     <control lang="es" key="IDC_ALLOW_ESC_PBA_BYPASS">Permitir esquivar &autenticación de pre-arranque pulsando Esc (habilita el administrador de arranque)</control>
@@ -111,6 +113,7 @@
     <control lang="es" key="IDC_CACHE">Guardar contras&eñas y archivos en caché</control>
     <control lang="es" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Salir cuando no haya volúmenes montados</control>
     <control lang="es" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Cerrar sesión de token (log out) después de montar un volumen con éxito</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="es" key="IDC_COPY_WIZARD">Incluir el Asistente de Creación de Volúmenes VeraCrypt</control>
     <control lang="es" key="IDC_CREATE">Crear</control>
     <control lang="es" key="IDC_CREATE_VOLUME">&Crear Volumen</control>
@@ -271,6 +274,8 @@
     <control lang="es" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Mostrar este mensaje personalizado en la pantalla de pre-arranque (24 caracteres max.):</control>
     <control lang="es" key="IDT_DEFAULT_MOUNT_OPTIONS">Opciones de Montaje Predeterminadas</control>
     <control lang="es" key="IDT_DISMOUNT_ACTION">Opciones de Atajos de Teclado</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="es" key="IDT_FAVORITE_LABEL">Etiqueta del volumen favorito seleccionado:</control>
     <control lang="es" key="IDT_FILE_SETTINGS">Opciones del Archivo</control>
     <control lang="es" key="IDT_HOTKEY_KEY">Tecla a asignar:</control>
@@ -537,6 +542,15 @@
     <string lang="es" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Nota: Si necesita transferir archivos con seguridad desde el sistema señuelo al sistema oculto, siga estos pasos:\n1) Inicie el sistema señuelo.\n2) Guarde los archivos a un volumen no cifrado o a un volumen VeraCrypt externo/normal.\n3) Inicie el sistema oculto.\n4) Si guardó los acrhivos a un volumen VeraCrypt, móntelo (será automáticamente montado como sólo lectura).\n5) Copie los archivos a la partición del sistema oc [...]
     <string lang="es" key="CONFIRM_RESTART">Su ordenador debe ser reiniciado.\n\n¿Desea reiniciarlo ahora?</string>
     <string lang="es" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Ha ocurrido un error al obtener el estado del cifrado del sistema.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="es" key="INIT_SYS_ENC">No se pueden inicializar componentes de la aplicación para el cifrado del sistema.</string>
     <string lang="es" key="INIT_RAND">¡Fallo al inicializar el generador de números aleatorios!</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="es" key="SELECT_KEYFILE">Seleccione Archivo-llave</string>
     <string lang="es" key="SELECT_KEYFILE_PATH">Seleccione ruta de búsqueda de archivos-llave. AVISO: ¡Sólo se recordará la ruta, no el nombre de los archivos!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="es" key="SERPENT_HELP">Diseñado por Ross Anderson, Eli Biham, y Lars Knudsen. Publicado en 1998. Clave de 256-bit, bloque de 128-bit. Modo de operación XTS. Serpent fue uno de los finalistas AES.</string>
     <string lang="es" key="SIZE_HELP">Especifique el tamaño del contenedor que desea crear.\n\nSi crea un contenedor dinámico (archivo disperso), este parámetro especificará su máximo tamaño posible.\n\nTenga en cuenta que el mínimo tamaño posible de un volumen FAT es 292 KB. De un volumen NTFS, el mínimo es 3792 KB.</string>
     <string lang="es" key="SIZE_HELP_HIDDEN_HOST_VOL">Especifique el tamaño del volumen externo (primero creará un volumen externo y luego un volumen oculto en su interior). El mínimo tamaño posible para un volumen en el que se pretenda crear un volumen oculto es 340 KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="es" key="INCONSISTENCY_RESOLVED">Inconsistencia resuelta.\n\n\n(Si reporta un error relacionado con esto, incluya en el reporte la siguiente información técnica:\n%hs)</string>
     <string lang="es" key="UNEXPECTED_STATE">Error: Estado inesperado.\n\n\n(Si reporta un error relacionado con esto, incluya en el reporte la siguiente información técnica:\n%hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="es" key="NOTHING_TO_RESUME">No hay ningún proceso/tarea por retomar.</string>
     <string lang="es" key="HIDVOL_PROT_BKG_TASK_WARNING">AVISO: VeraCrypt en Segundo Plano está deshabilitado. Tras cerrar VeraCrypt, no será notificado si se impiden daños en el volumen oculto.\n\nNota: Puede cerrar el Segundo Plano en cualquier momento haciendo click derecho en el icono de VeraCrypt en el área de notificación y seleccionando 'Salir'.\n\n¿Habilitar VeraCrypt en Segundo Plano?</string>
     <string lang="es" key="LANG_PACK_VERSION">Versión del paquete: %s</string>
     <string lang="es" key="CHECKING_FS">Comprobando el sistema de archivos del volumen VeraCrypt montado como %hs...</string>
@@ -1085,8 +1099,7 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="es" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Los archivos-llave no están soportados actualmente para el cifrado del sistema.</string>
     <string lang="es" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Aviso: VeraCrypt no pudo restaurar la disposición de teclado original. Esto puede hacer que ud. introduzca incorrectamente la contraseña.</string>
     <string lang="es" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Error: No se puede establecer la disposición del teclado para VeraCrypt al estándar de EEUU.\n\nRecuerde que la contraseña necesita ser escrita en el entorno de pre-arranque (antes de que Windows se inicie) donde no están disponibles disposiciones de teclado distintas a la de EEUU. Por tanto, la contraseña debe ser escrita siempre usando la disposición de teclado EEUU estándar.</string>
@@ -1290,6 +1303,7 @@
     <string lang="es" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">AVISO: Esta configuración puede perjudicar el rendimiento.\n\n¿Seguro que desea aplicarla?</string>
     <string lang="es" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Aviso: volumen VeraCrypt auto-desmontado</string>
     <string lang="es" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Antes de eliminar o desactivar un dispositivo que contenga un volumen montado, debería desmontar el volumen en VeraCrypt primero.\n\nLos desmontajes espontáneos inesperados a menudo son causados por cables que fallan intermitentemente, carcasas defectuosas, etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="es" key="TEST">Probar</string>
     <string lang="es" key="KEYFILE">Archivo-llave</string>
     <string lang="es" key="VKEY_08">Retroceso</string>
diff --git a/Translations/Language.et.xml b/Translations/Language.et.xml
index c06d3db..f6c8dd3 100644
--- a/Translations/Language.et.xml
+++ b/Translations/Language.et.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="et" name="Eesti" en-name="Estonian" version="0.1.0" translators="Maiko Mõtsar" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="et" key="IDC_QUICKFORMAT">Kiire formaatimine</control>
     <control lang="et" key="IDC_SHOW_PASSWORD">Kuva salasõna</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&Display password</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="en" key="IDC_SINGLE_BOOT">Single-boot</control>
     <control lang="en" key="IDC_STD_VOL">Standard VeraCrypt volume</control>
     <control lang="en" key="IDC_SYSENC_HIDDEN">Hi&dden</control>
@@ -98,6 +99,7 @@
     <control lang="en" key="IDT_SYSENC_KEYS_GEN_INFO">The keys, salt, and other data have been successfully generated. If you want to generate new keys, click Back and then Next. Otherwise, click Next to continue.</control>
     <control lang="en" key="IDT_SYS_DEVICE">Encrypts the partition/drive where Windows is installed. Anyone who wants to gain access and use the system, read and write files, etc., will need to enter the correct password each time before Windows boots. Optionally, creates a hidden system.</control>
     <control lang="en" key="IDT_SYS_PARTITION">Select this option to encrypt the partition where the currently running Windows operating system is installed.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="en" key="IDT_WIPE_MODE">Wipe mode:</control>
     <control lang="et" key="IDCLOSE">Sulge</control>
     <control lang="en" key="IDC_ALLOW_ESC_PBA_BYPASS">Allow pre-boot &authentication to be bypassed by pressing the Esc key (enables boot manager)</control>
@@ -111,6 +113,7 @@
     <control lang="et" key="IDC_CACHE">Hoia salasõnu ja võtmefaile mälus</control>
     <control lang="et" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Välju haagitud konteinerite puudumisel</control>
     <control lang="en" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Close token session (log out) after a volume is successfully mounted</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="et" key="IDC_COPY_WIZARD">Lisa VeraCrypti konteineriloomise nõustaja</control>
     <control lang="et" key="IDC_CREATE">Loo</control>
     <control lang="et" key="IDC_CREATE_VOLUME">Loo konteiner</control>
@@ -271,6 +274,8 @@
     <control lang="en" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Display this custom message in the pre-boot authentication screen (24 characters maximum):</control>
     <control lang="et" key="IDT_DEFAULT_MOUNT_OPTIONS">Vaikimisi haakevalikud</control>
     <control lang="et" key="IDT_DISMOUNT_ACTION">Kiirklahvide valikud</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="en" key="IDT_FAVORITE_LABEL">Label of selected favorite volume:</control>
     <control lang="et" key="IDT_FILE_SETTINGS">Faili seaded</control>
     <control lang="et" key="IDT_HOTKEY_KEY">Määratud klahv:</control>
@@ -537,6 +542,15 @@
     <string lang="en" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Note: If you need to securely transfer files from the decoy system to the hidden system, follow these steps:\n1) Start the decoy system.\n2) Save the files to an unencrypted volume or to an outer/normal VeraCrypt volume.\n3) Start the hidden system.\n4) If you saved the files to a VeraCrypt volume, mount it (it will be automatically mounted as read-only).\n5) Copy the files to the hidden system partition or to another hid [...]
     <string lang="en" key="CONFIRM_RESTART">Your computer must be restarted.\n\nDo you want to restart it now?</string>
     <string lang="en" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">An error occurred when obtaining the system encryption status.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="en" key="INIT_SYS_ENC">Cannot initialize application components for system encryption.</string>
     <string lang="et" key="INIT_RAND">Juhunumbri generaatori initsialiseerimine ebaõnnestus!</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="et" key="SELECT_KEYFILE">Vali võtmefail</string>
     <string lang="et" key="SELECT_KEYFILE_PATH">Vali võtmefailide failitee. HOIATUS: pea meeles, et meelde jäetakse ainult failitee, mitte failinimed!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="en" key="SERPENT_HELP">Designed by Ross Anderson, Eli Biham, and Lars Knudsen. Published in 1998. 256-bit key, 128-bit block. Mode of operation is XTS. Serpent was one of the AES finalists.</string>
     <string lang="en" key="SIZE_HELP">Please specify the size of the container you want to create.\n\nIf you create a dynamic (sparse-file) container, this parameter will specify its maximum possible size.\n\nNote that the minimum possible size of a FAT volume is 292 KB. The minimum possible size of an NTFS volume is 3792 KB.</string>
     <string lang="en" key="SIZE_HELP_HIDDEN_HOST_VOL">Please specify the size of the outer volume to be created (you will first create the outer volume and then a hidden volume within it). The minimum possible size of a volume within which a hidden volume is intended to be created is 340 KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="en" key="INCONSISTENCY_RESOLVED">Inconsistency resolved.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="en" key="NOTHING_TO_RESUME">There is no process/task to resume.</string>
     <string lang="et" key="HIDVOL_PROT_BKG_TASK_WARNING">HOIATUS: VeraCrypti taustakäsk on keelatud. Peale VeraCryptist väljumist ei teavitata sind kui peidetud konteineri vigastust on välditud.\n\nMärkus: võid taustakäsu alati välja lilitada parem-klikkides TrueCrykti süsteemisalve ikoonil ja valides 'Välju'.\n\nLuba VeraCrypti taustakäsk?</string>
     <string lang="et" key="LANG_PACK_VERSION">Keelepaki versioon:  %s</string>
     <string lang="et" key="CHECKING_FS">Kontrollin failisüsteemi TruCrypti konteineris haagitud kui %hs...</string>
@@ -1085,15 +1099,14 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</string>
     <string lang="en" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Error: Cannot set the keyboard layout for VeraCrypt to the standard US keyboard layout.\n\nNote that the password needs to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout.</string>
     <string lang="en" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">As VeraCrypt temporarily changed the keyboard layout to the standard US keyboard layout, it is not possible to type characters by pressing keys while the right Alt key is held down. However, you can type most of such characters by pressing appropriate keys while the Shift key is held down.</string>
     <string lang="en" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCrypt prevented change of keyboard layout.</string>
     <string lang="en" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Note: The password will need to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout. However, it is important to note that you do NOT need a real US keyboard. VeraCrypt automatically ensures that you can safely type the password (right now and in the pre-boot environment) even if yo [...]
-    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (TRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the TRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the TRD allows you to permanently decrypt the partition/drive before Windows  [...]
+    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (VRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the VRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the VRD allows you to permanently decrypt the partition/drive before Windows  [...]
     <string lang="en" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">After you click OK, Microsoft Windows Disc Image Burner will be launched. Please use it to burn the VeraCrypt Rescue Disk ISO image to a CD or DVD.\n\nAfter you do so, return to the VeraCrypt Volume Creation Wizard and follow its instructions.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn it to a CD or DVD.\n\n%lsAfter you burn the Rescue Disk, click Next to verify that it has been correctly burned.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you should either burn the image to a CD/DVD or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
@@ -1290,6 +1303,7 @@
     <string lang="en" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">WARNING: This setting may degrade performance.\n\nAre you sure you want to use this setting?</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="en" key="TEST">Test</string>
     <string lang="et" key="KEYFILE">Võtmefail</string>
     <string lang="et" key="VKEY_08">Tagasivõtuklahv</string>
diff --git a/Translations/Language.eu.xml b/Translations/Language.eu.xml
index 6e8c8bc..b6264b9 100644
--- a/Translations/Language.eu.xml
+++ b/Translations/Language.eu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="eu" name="Euskara" en-name="Basque" version="1.0.0" translators="Ander Genua" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="eu" key="IDC_QUICKFORMAT">Formatu Azkarra</control>
     <control lang="eu" key="IDC_SHOW_PASSWORD">&Pasahitza erakutsi</control>
     <control lang="eu" key="IDC_SHOW_PASSWORD_SINGLE">&Pasahitza erakutsi</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="eu" key="IDC_SINGLE_BOOT">Hasieraketa-bakarra</control>
     <control lang="eu" key="IDC_STD_VOL">VeraCrypt-en ohiko liburukia</control>
     <control lang="eu" key="IDC_SYSENC_HIDDEN">&Izkutukoa</control>
@@ -98,6 +99,7 @@
     <control lang="eu" key="IDT_SYSENC_KEYS_GEN_INFO">Gakoak eta beste datuak ondo sortu dira. Gako berriak sortu nahi badituzu, Atzera eta gero Hurrengoa sakatu itzazu. Bestela Hurrengoa sakatu jarraitzeko.</control>
     <control lang="eu" key="IDT_SYS_DEVICE">Windows instalatuta dagoen partizio edo unitatea zifratzen du. Sisteman sartu eta erabili nahi duen edonork; fitxategiak irakurri, idatzi, e.a.; pasahitz zuzena sartu beharko du Windows hasieratzen den bakoitzean. Aukeran, ezkutuko sistema ere sortzen du.</control>
     <control lang="eu" key="IDT_SYS_PARTITION">Aukera hau hautatu orain martxan dagoen Windows sistema eragilea instalatuta dagoen partizioa zifratzeko.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="eu" key="IDT_WIPE_MODE">Garbiketa modua:</control>
     <control lang="eu" key="IDCLOSE">Itxi</control>
     <control lang="eu" key="IDC_ALLOW_ESC_PBA_BYPASS">Hasieraketa aurreko kautotzea alde batera utzi Esc tekla sakatuz (hasieraketa kudeatzailea gaitzen du)</control>
@@ -111,6 +113,7 @@
     <control lang="eu" key="IDC_CACHE">Pasahitzak eta gako-fitxategiak memorian &Katxeatu</control>
     <control lang="eu" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Muntatutako bolumenik ez dagoenean irten</control>
     <control lang="eu" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Agiri sesioa itxi (irten) bolumena ondo muntatu eta gero</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="eu" key="IDC_COPY_WIZARD">VeraCrypt-en bolumenak sortzeko laguntzailea erantsi</control>
     <control lang="eu" key="IDC_CREATE">Sortu</control>
     <control lang="eu" key="IDC_CREATE_VOLUME">&Bolumena Sortu</control>
@@ -271,6 +274,8 @@
     <control lang="eu" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Mezu hau hasieraketa aurreko kautotze pantailan erakutsi (24 karaktere gehienez):</control>
     <control lang="eu" key="IDT_DEFAULT_MOUNT_OPTIONS">Lehenetsitako muntaketa aukerak</control>
     <control lang="eu" key="IDT_DISMOUNT_ACTION">Tekla berezien aukerak</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="eu" key="IDT_FAVORITE_LABEL">Aukeratutako gogoko bolumenaren etiketa:</control>
     <control lang="eu" key="IDT_FILE_SETTINGS">Fitxategien aukerak</control>
     <control lang="eu" key="IDT_HOTKEY_KEY">Esleitzeko Gakoa:</control>
@@ -539,6 +544,15 @@
     <string lang="eu" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Oharra: Amu sistematik ezkutuko sistemara fitxategiak sekurtasunez mugitu behar badituzu, hurrengo pausoak jarraitu itzazu:\n1) Amu sistema abiatu.\n2) Fitxategiak zifratu gabeko bolumen batera edo kanpoko/ohiko VeraCrypt bolumen batera kopiatu itzazu.\n3) Ezkutuko sistema abiatu.\n4)Fitxategiak TrueCryp bolumen batera kopiatu badituzu, muntatu ezazu (automatikoki irakurtzeko bakarrik muntatuko da).\n5) Fitxategiak ezkutu [...]
     <string lang="eu" key="CONFIRM_RESTART">Zure ordenagailua berpiztu behar da.\n\nOrain berpiztu nahi al duzu?</string>
     <string lang="eu" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Errore bat jazo da sistemaren enkripzio egoera irakurtzen ari zenean.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="eu" key="INIT_SYS_ENC">Ezin izan dira aplikazioaren osagaiak hasieratu sistema zifratzeko.</string>
     <string lang="eu" key="INIT_RAND">Ausazko zenbakien sortzailea hasieratzerakoan hutse egin du!</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -649,6 +663,7 @@
     <string lang="eu" key="SELECT_KEYFILE">Gako-fitxategia Aukeratu</string>
     <string lang="eu" key="SELECT_KEYFILE_PATH">Gako-fitxategiak bilatzeko helbidea aukeratu. KONTUZ: Ohartu zaitez bakarrik helbidea gogoratuko dela, ez fitxategien izenak!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="eu" key="SERPENT_HELP">Ross Anderson, Eli Biham eta Lars Knudsen diseinatuta. 1998an argitaratuta. 256 biteko blokea. XTS eragiketa modua. Serpent AES-eko finalista bat izan zen.</string>
     <string lang="eu" key="SIZE_HELP">Mesedez, sortuko den edukiontziaren tamaina aukeratu ezazu.\n\nEdukiontzi dinamiko bat (fitxategi mehatza) sortzen ari bazara, balio honek gehienezko tamaina adieraziko du.\n\nOhartu zaitez FAT moduan formatatuta badago bolumenaren gutxienezko tamaina 292 KB dela. NTFS moduan formatatuta badago, bolumenaren gutxienezko tamaina 3792 KB da.</string>
     <string lang="eu" key="SIZE_HELP_HIDDEN_HOST_VOL">Mesedez, sortuko den kanpoko bolumenaren tamaina aukeratu ezazu (lehendabizi kanpoko bolumena sortuko duzu eta, gero, bertan ezkutuko bolumena sortuko duzu). Ezkutuko bolumen bat ostatuko duen kanpoko bolumen baten gutxienezko tamaina 340 KB da.</string>
@@ -1035,7 +1050,6 @@
     <string lang="eu" key="INCONSISTENCY_RESOLVED">Datuen hutsala konpondu da.\n\n\n(Akats honen berri ematen baduzu, mesedez hurrengo informazioa gehitu ezazu akatsaren txostenean:\n%hs)</string>
     <string lang="eu" key="UNEXPECTED_STATE">Errorea: ustekabeko egoera.\n\n\n(Akats honi buruz txosten bat bidaltzen baduzu, mesedez, hurrengo informazio teknikoa erantsi iezaiozu akatsaren txostenari:\n%hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="eu" key="NOTHING_TO_RESUME">Ez dago jarraitzeko prozesu edo lanik.</string>
     <string lang="eu" key="HIDVOL_PROT_BKG_TASK_WARNING">KONTUZ: TruekCrypt-en Ezkutuko Ataza ezgaituta dago.VeraCrypt-etik atera eta gero informatuko zaizu ezkutuko bolumenaren kaltea eragotzi den.\n\nOharra: VeraCrypt-en Ezkutuko Ataza edozein momentutan gelditu dezakezu VeraCrypt erreteiluko ikonoan eskubiko klik eginez eta 'Irten' aukeratuz.\n\n VeraCrypt-en Ezkutuko Ataza gaitu?</string>
     <string lang="eu" key="LANG_PACK_VERSION">Hizkuntza paketearen bertsioa: %s</string>
     <string lang="eu" key="CHECKING_FS">%hs bezala muntatutako VeraCrypt bolumenaren fitxategi sistema egiaztatzen...</string>
@@ -1087,8 +1101,7 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="eu" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Momentuz ezin dira gako-fitxategiak erabili sistema zifratzeko.</string>
     <string lang="eu" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Kontuz: VeraCrypt-ek ezin izan du teklatua diseinu originaera leheneratu. Honek pasahitza gaizki sartzea ekar dezake.</string>
     <string lang="eu" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Errorea: Ezin da VeraCrypt-entzat teklatuaren diseinua aldatu EB teklatu estandar diseinura.\n\nOhartu zaitez pasahitza hasieraketa aurreko ingurunean (Windows hasi aurretik) sartu behar dela eta bertan EB-etako teklatu diseinuak ez daudela eskuragarri. Horregatik, pasahitza beti sartu behar da EB-etako teklatu estandarraren diseinuarekin.</string>
@@ -1292,6 +1305,7 @@
     <string lang="eu" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">KONTUZ: Ezarpen honek errendimenduari kalte egin diezaioke.\n\nZiur zaude ezarpen hau erabili nahi duzula?</string>
     <string lang="eu" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Kontuz: VeraCrypt bolumena auto-desmuntatuta</string>
     <string lang="eu" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Bolumena daukan gailua fisikoki kendu edo itzali bahino lehen, VeraCrypt bolumena beti desmuntatu beharko zenuke.\n\nOrokorrean, ustekabeko desmuntaketak normalean noizbehinka huts egiten duten kabletan, kontrolatzaileatan, e.a. izaten daukate jatorria.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="eu" key="TEST">Frogatu</string>
     <string lang="eu" key="KEYFILE">Gako-fitxategia</string>
     <string lang="eu" key="VKEY_08">Ezabatu</string>
diff --git a/Translations/Language.fa.xml b/Translations/Language.fa.xml
index 5daa7b3..39be000 100644
--- a/Translations/Language.fa.xml
+++ b/Translations/Language.fa.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="fa" name="فارسي" en-name="Persian" version="0.1.0" translators="Ali Bitazar, Rodabeh Sarmadi" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="fa" key="IDC_QUICKFORMAT">Quick Format</control>
     <control lang="fa" key="IDC_SHOW_PASSWORD">نمايش كلمه عبور</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&Display password</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="en" key="IDC_SINGLE_BOOT">Single-boot</control>
     <control lang="en" key="IDC_STD_VOL">Standard VeraCrypt volume</control>
     <control lang="en" key="IDC_SYSENC_HIDDEN">Hi&dden</control>
@@ -98,6 +99,7 @@
     <control lang="en" key="IDT_SYSENC_KEYS_GEN_INFO">The keys, salt, and other data have been successfully generated. If you want to generate new keys, click Back and then Next. Otherwise, click Next to continue.</control>
     <control lang="en" key="IDT_SYS_DEVICE">Encrypts the partition/drive where Windows is installed. Anyone who wants to gain access and use the system, read and write files, etc., will need to enter the correct password each time before Windows boots. Optionally, creates a hidden system.</control>
     <control lang="en" key="IDT_SYS_PARTITION">Select this option to encrypt the partition where the currently running Windows operating system is installed.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="en" key="IDT_WIPE_MODE">Wipe mode:</control>
     <control lang="en" key="IDCLOSE">Close</control>
     <control lang="en" key="IDC_ALLOW_ESC_PBA_BYPASS">Allow pre-boot &authentication to be bypassed by pressing the Esc key (enables boot manager)</control>
@@ -111,6 +113,7 @@
     <control lang="fa" key="IDC_CACHE">كليدفايل و كلمه عبور را در حافظه نگه دارد</control>
     <control lang="en" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Exit when there are no mounted volumes</control>
     <control lang="en" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Close token session (log out) after a volume is successfully mounted</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="en" key="IDC_COPY_WIZARD">Include VeraCrypt Volume Creation Wizard</control>
     <control lang="fa" key="IDC_CREATE">بساز</control>
     <control lang="fa" key="IDC_CREATE_VOLUME">&ساخت پارتيشن</control>
@@ -271,6 +274,8 @@
     <control lang="en" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Display this custom message in the pre-boot authentication screen (24 characters maximum):</control>
     <control lang="en" key="IDT_DEFAULT_MOUNT_OPTIONS">Default Mount Options</control>
     <control lang="en" key="IDT_DISMOUNT_ACTION">Hot Key Options</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="en" key="IDT_FAVORITE_LABEL">Label of selected favorite volume:</control>
     <control lang="en" key="IDT_FILE_SETTINGS">File Settings</control>
     <control lang="en" key="IDT_HOTKEY_KEY">Key to assign:</control>
@@ -537,6 +542,15 @@
     <string lang="en" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Note: If you need to securely transfer files from the decoy system to the hidden system, follow these steps:\n1) Start the decoy system.\n2) Save the files to an unencrypted volume or to an outer/normal VeraCrypt volume.\n3) Start the hidden system.\n4) If you saved the files to a VeraCrypt volume, mount it (it will be automatically mounted as read-only).\n5) Copy the files to the hidden system partition or to another hid [...]
     <string lang="en" key="CONFIRM_RESTART">Your computer must be restarted.\n\nDo you want to restart it now?</string>
     <string lang="en" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">An error occurred when obtaining the system encryption status.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="en" key="INIT_SYS_ENC">Cannot initialize application components for system encryption.</string>
     <string lang="en" key="INIT_RAND">Failed to initialize the random number generator!</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="en" key="SELECT_KEYFILE">Select Keyfile</string>
     <string lang="en" key="SELECT_KEYFILE_PATH">Select a keyfile search path. WARNING: Note that only the path will be remembered, not the filenames!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="en" key="SERPENT_HELP">Designed by Ross Anderson, Eli Biham, and Lars Knudsen. Published in 1998. 256-bit key, 128-bit block. Mode of operation is XTS. Serpent was one of the AES finalists.</string>
     <string lang="en" key="SIZE_HELP">Please specify the size of the container you want to create.\n\nIf you create a dynamic (sparse-file) container, this parameter will specify its maximum possible size.\n\nNote that the minimum possible size of a FAT volume is 292 KB. The minimum possible size of an NTFS volume is 3792 KB.</string>
     <string lang="en" key="SIZE_HELP_HIDDEN_HOST_VOL">Please specify the size of the outer volume to be created (you will first create the outer volume and then a hidden volume within it). The minimum possible size of a volume within which a hidden volume is intended to be created is 340 KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="en" key="INCONSISTENCY_RESOLVED">Inconsistency resolved.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="en" key="NOTHING_TO_RESUME">There is no process/task to resume.</string>
     <string lang="en" key="HIDVOL_PROT_BKG_TASK_WARNING">WARNING: VeraCrypt Background Task is disabled. After you exit VeraCrypt, you will not be notified if damage to hidden volume is prevented.\n\nNote: You may shut down the Background Task anytime by right-clicking the VeraCrypt tray icon and selecting 'Exit'.\n\nEnable VeraCrypt Background Task?</string>
     <string lang="en" key="LANG_PACK_VERSION">Language pack version:  %s</string>
     <string lang="en" key="CHECKING_FS">Checking the file system on the VeraCrypt volume mounted as %hs...</string>
@@ -1085,15 +1099,14 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</string>
     <string lang="en" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Error: Cannot set the keyboard layout for VeraCrypt to the standard US keyboard layout.\n\nNote that the password needs to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout.</string>
     <string lang="en" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">As VeraCrypt temporarily changed the keyboard layout to the standard US keyboard layout, it is not possible to type characters by pressing keys while the right Alt key is held down. However, you can type most of such characters by pressing appropriate keys while the Shift key is held down.</string>
     <string lang="en" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCrypt prevented change of keyboard layout.</string>
     <string lang="en" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Note: The password will need to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout. However, it is important to note that you do NOT need a real US keyboard. VeraCrypt automatically ensures that you can safely type the password (right now and in the pre-boot environment) even if yo [...]
-    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (TRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the TRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the TRD allows you to permanently decrypt the partition/drive before Windows  [...]
+    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (VRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the VRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the VRD allows you to permanently decrypt the partition/drive before Windows  [...]
     <string lang="en" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">After you click OK, Microsoft Windows Disc Image Burner will be launched. Please use it to burn the VeraCrypt Rescue Disk ISO image to a CD or DVD.\n\nAfter you do so, return to the VeraCrypt Volume Creation Wizard and follow its instructions.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn it to a CD or DVD.\n\n%lsAfter you burn the Rescue Disk, click Next to verify that it has been correctly burned.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you should either burn the image to a CD/DVD or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
@@ -1290,6 +1303,7 @@
     <string lang="en" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">WARNING: This setting may degrade performance.\n\nAre you sure you want to use this setting?</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="en" key="TEST">Test</string>
     <string lang="en" key="KEYFILE">Keyfile</string>
     <string lang="en" key="VKEY_08">Backspace</string>
diff --git a/Translations/Language.fi.xml b/Translations/Language.fi.xml
index b984cc7..5b1b6ab 100644
--- a/Translations/Language.fi.xml
+++ b/Translations/Language.fi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="fi" name="Suomi" en-name="Finnish" version="0.1.0" translators="Matti Ruhanen" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="fi" key="IDC_QUICKFORMAT">Nopea Alustus</control>
     <control lang="fi" key="IDC_SHOW_PASSWORD">&Näytä Salasana</control>
     <control lang="fi" key="IDC_SHOW_PASSWORD_SINGLE">&Näytä salasana</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="fi" key="IDC_SINGLE_BOOT">Single-boot</control>
     <control lang="fi" key="IDC_STD_VOL">Standardi VeraCrypt taltio</control>
     <control lang="fi" key="IDC_SYSENC_HIDDEN">Pii&lotettu</control>
@@ -98,6 +99,7 @@
     <control lang="fi" key="IDT_SYSENC_KEYS_GEN_INFO">Avaimet ja muut datat on nyt onnistuneesti luotu. Jos haluat luoda uuden avaimen, paina Takaisin ja sitten Seuraava. Muutoin, paina Seuraava jatkaaksesi.</control>
     <control lang="fi" key="IDT_SYS_DEVICE">Salaa järjestelmäasema/osio, jolle Windows on asennettu, esim. C:-asema. Tämän jälkeen tietokoneen käynnistys edellyttää aina salasanan antamista.</control>
     <control lang="fi" key="IDT_SYS_PARTITION">Valitse tämä valinta salataksesi osion missä Windows käyttöjärjestelmä on asennettuna.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="fi" key="IDT_WIPE_MODE">Tyhjennys Tila:</control>
     <control lang="fi" key="IDCLOSE">Sulje</control>
     <control lang="fi" key="IDC_ALLOW_ESC_PBA_BYPASS">Salli esikäynnistys &autentikointi ohitetaan painamalla Esc näppäintä (aktivoi käynnistys managerin)</control>
@@ -111,6 +113,7 @@
     <control lang="fi" key="IDC_CACHE">Välimuisti salasanat ja avaintie&dostot muistissa</control>
     <control lang="fi" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Poistu sitten kun ei ole yhdistettyjä taltioita</control>
     <control lang="fi" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Sulje näennäinen yhteys (kirjaudu ulos) kun taltio on onnistuneesti yhdistetty</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="fi" key="IDC_COPY_WIZARD">Sisällytä Opastettu VeraCrypt Taltion Luonti</control>
     <control lang="fi" key="IDC_CREATE">Luo</control>
     <control lang="fi" key="IDC_CREATE_VOLUME">L&uo Taltio</control>
@@ -271,6 +274,8 @@
     <control lang="fi" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Näytä tämä käyttäjän sanoma esikäynnistys autentikointi ikkunassa (Maksimi 24 merkkiä):</control>
     <control lang="fi" key="IDT_DEFAULT_MOUNT_OPTIONS">Oletus yhteys valinnat</control>
     <control lang="fi" key="IDT_DISMOUNT_ACTION">Pikanäppäin Valinnat</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="en" key="IDT_FAVORITE_LABEL">Label of selected favorite volume:</control>
     <control lang="fi" key="IDT_FILE_SETTINGS">Tiedosto Asetukset</control>
     <control lang="fi" key="IDT_HOTKEY_KEY">Määriteltävä näppäin:</control>
@@ -537,6 +542,15 @@
     <string lang="fi" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Huomioi: Jos tarvitset turvallisesti siirtää tiedostoja houkutuslintuna olevalta järjestelmältä piilotetulle järjestelmälle, seuraa näitä vaiheita: 1) Käynnistä houkutuslintuna oleva järjestelmä. 2) Tallenna tiedostot salaamattomaan taltioon tai ulkoiseen/tavalliseen VeraCrypt taltioon. 3) Käynnistä piilotettu järjestelmä. 4) Jos et tallenna tiedostoa VeraCrypt taltiolle, kytke se (automaattinen kytkentä vain lukutilassa) [...]
     <string lang="fi" key="CONFIRM_RESTART">Tietokone tulee uudelleen käynnistää.\n\nHaluatko käynnistää sen nyt?</string>
     <string lang="fi" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Virhe tapahtui kun haettiin järjestelmän salakirjoitus arvoa.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="fi" key="INIT_SYS_ENC">Sovelluksen komponentteja ei voida alustaa järjestelmän salakirjoitusta varten.</string>
     <string lang="fi" key="INIT_RAND">Satunnaisnumeron luonnin alustus epäonnistui!</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="fi" key="SELECT_KEYFILE">Valitse Avaintiedosto</string>
     <string lang="fi" key="SELECT_KEYFILE_PATH">Valitse avaintiedoston haku polku. VAROITUS: Huomioi, että ainoastaan polku muistetaan, ei tiedostonimeä!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="fi" key="SERPENT_HELP">Suunnittelu Ross Anderson, Eli Biham ja Lars Knudsen. Julkaistu 1998. 256-bitin avain, 128-bitin lohko. Toiminta tila on XTS. Serpent oli yksi AES finalisti.</string>
     <string lang="en" key="SIZE_HELP">Please specify the size of the container you want to create.\n\nIf you create a dynamic (sparse-file) container, this parameter will specify its maximum possible size.\n\nNote that the minimum possible size of a FAT volume is 292 KB. The minimum possible size of an NTFS volume is 3792 KB.</string>
     <string lang="en" key="SIZE_HELP_HIDDEN_HOST_VOL">Please specify the size of the outer volume to be created (you will first create the outer volume and then a hidden volume within it). The minimum possible size of a volume within which a hidden volume is intended to be created is 340 KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="fi" key="INCONSISTENCY_RESOLVED">Epäjohdonmukaisesti ratkaistu.\n\n\n(Jos raportoit viasta yhdistäessäsi näin, sisällytä seuraavat tekniset tiedot vikaraporttiin: %hs)</string>
     <string lang="fi" key="UNEXPECTED_STATE">Virhe: Odottamaton tila.\n\n\n(Jos raportoit virheestä yhteydessä tähän, ole hyvä ja sisällytä seuraavat tekniset tiedot virhe raporttiin: %hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="fi" key="NOTHING_TO_RESUME">Ei ole uudelleen aloitettavaa prosessia/tehtävää.</string>
     <string lang="fi" key="HIDVOL_PROT_BKG_TASK_WARNING">VAROITUS: VeraCrypt taustatehtävä on pois käytöstä. Poistuessasi VeraCrypt ohjelmasta, sinulle ilmoitetaan jos piilotetun taltion tuhot on torjuttu.\n\nTiedotus: Voit sulkea taustatehtävät milloin vain hiiren oikealla näppäimellä tai VeraCrypt palkin kuvakkeesta valitsemalla 'Poistu'.\n\nAktivoi VeraCrypt taustatehtävät?</string>
     <string lang="fi" key="LANG_PACK_VERSION">Kielipaketin versio:  %s</string>
     <string lang="fi" key="CHECKING_FS">Tarkistetaan tiedostojärjestelmää joka on VeraCrypt yhdistetty %hs taltio..</string>
@@ -1085,8 +1099,7 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="fi" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Avaintiedostot eivät ole nykyisin tuettuna järjestelmä salaukselle.</string>
     <string lang="fi" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Varoitus: VeraCrypt ei voi palauttaa alkuperäistä näppäimistä ulkoasua. Tämä saattaa johtaa sinun antamasta väärästä salasanasta.</string>
     <string lang="fi" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Virhe: Ei voida asettaa näppäimistö ulkoasua VeraCrypt standardi US näppäin ulkoasuksi.\n\nHuomioi, että salasana täytyy kirjoittaa esikäynnistys ympäristössä (ennen kuin Windows käynnistyy) kun ei-US Windows näppäimistö ulkoasu ei ole saatavana. Siksi salasana tulee aina kirjoittaa käyttäen standardia näppäin asetusta.</string>
@@ -1290,6 +1303,7 @@
     <string lang="en" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">WARNING: This setting may degrade performance.\n\nAre you sure you want to use this setting?</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="fi" key="TEST">Testi</string>
     <string lang="fi" key="KEYFILE">Avaintiedosto</string>
     <string lang="fi" key="VKEY_08">Takaisin</string>
diff --git a/Translations/Language.fr.xml b/Translations/Language.fr.xml
index 5936e9b..04a62f7 100644
--- a/Translations/Language.fr.xml
+++ b/Translations/Language.fr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="fr" name="Français" en-name="French" version="0.3.0" translators="Stéphane S., Olivier M., Thierry T" />
     <!-- Fonts -->
@@ -11,25 +11,25 @@
     <!-- Controls -->
     <control lang="fr" key="IDCANCEL">Annuler</control>
     <control lang="fr" key="IDC_ALL_USERS">Installer pour tous les utilisateurs</control>
-    <control lang="fr" key="IDC_BROWSE">Parcourir...</control>
+    <control lang="fr" key="IDC_BROWSE">&Parcourir...</control>
     <control lang="fr" key="IDC_DESKTOP_ICON">Icône de VeraCrypt sur le Bureau</control>
     <control lang="fr" key="IDC_DONATE">Faire un don...</control>
     <control lang="fr" key="IDC_FILE_TYPE">Associer l'extension '.tc' à VeraCrypt</control>
     <control lang="fr" key="IDC_OPEN_CONTAINING_FOLDER">Ouvrir le dossier de destination après l'installation</control>
     <control lang="fr" key="IDC_PROG_GROUP">Ajouter VeraCrypt au menu Démarrer</control>
     <control lang="fr" key="IDC_SYSTEM_RESTORE">Créer un point de restauration système</control>
-    <control lang="fr" key="IDC_UNINSTALL">Désinstaller</control>
-    <control lang="fr" key="IDC_WIZARD_MODE_EXTRACT_ONLY">Extraire</control>
-    <control lang="fr" key="IDC_WIZARD_MODE_INSTALL">Installer</control>
+    <control lang="fr" key="IDC_UNINSTALL">&Désinstaller</control>
+    <control lang="fr" key="IDC_WIZARD_MODE_EXTRACT_ONLY">&Extraire</control>
+    <control lang="fr" key="IDC_WIZARD_MODE_INSTALL">&Installer</control>
     <control lang="fr" key="IDD_INSTL_DLG">Assistant d'installation de VeraCrypt</control>
     <control lang="fr" key="IDD_UNINSTALL">Désinstaller VeraCrypt</control>
-    <control lang="fr" key="IDHELP">Aide</control>
+    <control lang="fr" key="IDHELP">&Aide</control>
     <control lang="fr" key="IDT_EXTRACT_DESTINATION">Sélectionner ou saisir l'emplacement où vous désirez extraire les fichiers :</control>
     <control lang="fr" key="IDT_INSTALL_DESTINATION">Sélectionner ou saisir l'emplacement où vous désirez installer le programme VeraCrypt. Si le dossier spécifié n'existe pas, il sera automatiquement créé.</control>
     <control lang="fr" key="IDT_UNINSTALL_DIR">Cliquer sur 'Désinstaller' pour supprimer VeraCrypt de votre système.</control>
     <control lang="fr" key="IDC_ABORT_BUTTON">Arrêter</control>
     <control lang="fr" key="IDC_BENCHMARK">&Benchmark</control>
-    <control lang="fr" key="IDC_CIPHER_TEST">Tester</control>
+    <control lang="fr" key="IDC_CIPHER_TEST">&Tester</control>
     <control lang="fr" key="IDC_DEVICE_TRANSFORM_MODE_FORMAT">Créer un volume chiffré et le formater</control>
     <control lang="fr" key="IDC_DEVICE_TRANSFORM_MODE_INPLACE">Chiffrer la partition en place</control>
     <control lang="fr" key="IDC_DISPLAY_KEYS">Afficher les clés générées (une partie)</control>
@@ -38,33 +38,34 @@
     <control lang="fr" key="IDC_FILE_CONTAINER">Créer un fichier conteneur chiffré</control>
     <control lang="fr" key="IDC_GB">&Go</control>
     <control lang="fr" key="IDC_HIDDEN_SYSENC_INFO_LINK">Plus d'infos</control>
-    <control lang="fr" key="IDC_HIDDEN_VOL">Volume VeraCrypt caché </control>
+    <control lang="fr" key="IDC_HIDDEN_VOL">Volume VeraCrypt &caché </control>
     <control lang="fr" key="IDC_HIDDEN_VOL_HELP">Plus d'infos sur les volumes cachés</control>
     <control lang="fr" key="IDC_HIDVOL_WIZ_MODE_DIRECT">Mode direct</control>
     <control lang="fr" key="IDC_HIDVOL_WIZ_MODE_FULL">Mode normal</control>
-    <control lang="fr" key="IDC_KB">Ko</control>
-    <control lang="fr" key="IDC_KEYFILES_ENABLE">Fichiers clés</control>
+    <control lang="fr" key="IDC_KB">&Ko</control>
+    <control lang="fr" key="IDC_KEYFILES_ENABLE">&Utiliser fichiers clés</control>
     <control lang="fr" key="IDC_KEYFILES_RANDOM_SIZE">Taille aléatoire ( 64 <-> 1048576 )</control>
-    <control lang="fr" key="IDC_KEY_FILES">Fichiers clés...</control>
+    <control lang="fr" key="IDC_KEY_FILES">&Fichiers clés...</control>
     <control lang="fr" key="IDC_LINK_HASH_INFO">Infos : algorithmes de hachage</control>
     <control lang="fr" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">Plus d'infos</control>
     <control lang="fr" key="IDC_LINK_PIM_INFO">Plus d'info sur le PIM</control>
-    <control lang="fr" key="IDC_MB">Mo</control>
+    <control lang="fr" key="IDC_MB">&Mo</control>
     <control lang="fr" key="IDC_MORE_INFO_ON_CONTAINERS">Plus d'infos</control>
     <control lang="fr" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">Plus d'infos sur le système de chiffrement</control>
     <control lang="fr" key="IDC_MORE_INFO_SYS_ENCRYPTION">Plus d'infos</control>
     <control lang="fr" key="IDC_MULTI_BOOT">Amorçage multiple</control>
     <control lang="fr" key="IDC_NONSYS_DEVICE">Chiffrer une partition/un disque non système</control>
-    <control lang="fr" key="IDC_NO_HISTORY">Ne jamais enregistrer l'historique</control>
+    <control lang="fr" key="IDC_NO_HISTORY">&Ne jamais enregistrer l'historique</control>
     <control lang="fr" key="IDC_OPEN_OUTER_VOLUME">Ouvrir le volume externe</control>
     <control lang="fr" key="IDC_PAUSE">&Pause</control>
     <control lang="fr" key="IDC_PIM_ENABLE">Saisir un PIM</control>
     <control lang="fr" key="IDC_QUICKFORMAT">Formatage rapide</control>
-    <control lang="fr" key="IDC_SHOW_PASSWORD">Afficher le mot de passe</control>
+    <control lang="fr" key="IDC_SHOW_PASSWORD">&Afficher le mot de passe</control>
     <control lang="fr" key="IDC_SHOW_PASSWORD_SINGLE">&Afficher le mot de passe</control>
+    <control lang="fr" key="IDC_SHOW_PIM">&Afficher le PIM</control>
     <control lang="fr" key="IDC_SINGLE_BOOT">Amorçage</control>
     <control lang="fr" key="IDC_STD_VOL">Volume VeraCrypt standard</control>
-    <control lang="fr" key="IDC_SYSENC_HIDDEN">Caché</control>
+    <control lang="fr" key="IDC_SYSENC_HIDDEN">&Caché</control>
     <control lang="fr" key="IDC_SYSENC_NORMAL">Normal</control>
     <control lang="fr" key="IDC_SYS_DEVICE">Chiffrer la partition ou l'intégralité du disque système</control>
     <control lang="fr" key="IDC_SYS_PARTITION">Chiffrer la partition système Windows</control>
@@ -72,7 +73,7 @@
     <control lang="fr" key="IDD_VOL_CREATION_WIZARD_DLG">Assistant de création de volume VeraCrypt</control>
     <control lang="fr" key="IDT_CLUSTER">Cluster </control>
     <control lang="fr" key="IDT_COLLECTING_RANDOM_DATA_NOTE">IMPORTANT : Déplacez votre souris dans cette fenêtre aussi aléatoirement que possible. Plus longtemps vous la bougez, mieux c'est. Cela accroît significativement la force cryptographique des clés de chiffrement. Cliquez sur 'Suivant' pour poursuivre.</control>
-    <control lang="fr" key="IDT_CONFIRM">Confirmer :</control>
+    <control lang="fr" key="IDT_CONFIRM">&Confirmer :</control>
     <control lang="fr" key="IDT_DONE">Fait à</control>
     <control lang="fr" key="IDT_DRIVE_LETTER">Lettre de lecteur :</control>
     <control lang="fr" key="IDT_ENCRYPTION_ALGO">Algorithme de chiffrement</control>
@@ -98,12 +99,13 @@
     <control lang="fr" key="IDT_SYSENC_KEYS_GEN_INFO">Les clés, le sel et d'autres données ont été générés avec succès. Si vous désirez générer de nouvelles clés, cliquez sur 'Précédent' puis 'Suivant'. Sinon cliquez sur 'Suivant' pour poursuivre.</control>
     <control lang="fr" key="IDT_SYS_DEVICE">Chiffre la partition/le disque où est installé Windows. Qui veut accéder au système, lire/écrire des fichiers, etc., devra entrer le bon mot de passe à chaque fois que Windows démarre. Crée un système caché (optionnel).</control>
     <control lang="fr" key="IDT_SYS_PARTITION">Sélectionnez cette option pour chiffrer la partition où le système d'exploitation Windows en cours d'utilisation est installé.</control>
+    <control lang="fr" key="IDT_VOLUME_LABEL">Label du volume dans Windows:</control>
     <control lang="fr" key="IDT_WIPE_MODE">Mode de nettoyage :</control>
     <control lang="fr" key="IDCLOSE">Fermer</control>
     <control lang="fr" key="IDC_ALLOW_ESC_PBA_BYPASS">Permet de contourner l'&authentification de pré-amorçage en appuyant sur la touche Esc (active le gestionnaire de démarrage)</control>
     <control lang="fr" key="IDC_AUTORUN_DISABLE">Ne rien faire</control>
-    <control lang="fr" key="IDC_AUTORUN_MOUNT">Montage automatique d'un volume VeraCrypt (ci-dessous)</control>
-    <control lang="fr" key="IDC_AUTORUN_START">Exécuter VeraCrypt</control>
+    <control lang="fr" key="IDC_AUTORUN_MOUNT">&Montage automatique d'un volume VeraCrypt (ci-dessous)</control>
+    <control lang="fr" key="IDC_AUTORUN_START">&Exécuter VeraCrypt</control>
     <control lang="fr" key="IDC_AUTO_DETECT_PKCS11_MODULE">&Détecter bibliothèque</control>
     <control lang="fr" key="IDC_BOOT_LOADER_CACHE_PASSWORD">&Cache du mot de passe d'authentification de pré-amorçage dans le pilote mémoire (pour le montage de volumes non-système)</control>
     <control lang="fr" key="IDC_BROWSE_DIRS">Parcourir...</control>
@@ -111,6 +113,7 @@
     <control lang="fr" key="IDC_CACHE">Mots de passe et fichiers clés en cache</control>
     <control lang="fr" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Quitter quand il n'y a aucun volume monté</control>
     <control lang="fr" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Fermer la session de jeton de sécurité (déconnexion) après un montage de volume réussi</control>
+    <control lang="fr" key="IDC_COPY_EXPANDER">Inclure l'outil d'agrandissement de volume VeraCrypt</control>
     <control lang="fr" key="IDC_COPY_WIZARD">Inclure l'assistant de création de volume VeraCrypt</control>
     <control lang="fr" key="IDC_CREATE">Créer</control>
     <control lang="fr" key="IDC_CREATE_VOLUME">Créer un volume</control>
@@ -118,7 +121,7 @@
     <control lang="fr" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accélérer le chiffrement/déchiffrement AES en utilisant les instructions AES du processeur (si disponible)</control>
     <control lang="fr" key="IDC_ENABLE_KEYFILES">Fichiers clés</control>
     <control lang="fr" key="IDC_ENABLE_NEW_KEYFILES">Fichiers clés</control>
-    <control lang="fr" key="IDC_EXIT">Quitter</control>
+    <control lang="fr" key="IDC_EXIT">&Quitter</control>
     <control lang="fr" key="IDC_FAVORITES_HELP_LINK">Aide sur les volumes favoris</control>
     <control lang="fr" key="IDC_FAVORITE_DISABLE_HOTKEY">Ne pas monter le volume sélectionné quand le &raccourci de "Monter les volumes favoris" est pressé</control>
     <control lang="fr" key="IDC_FAVORITE_MOUNT_ON_ARRIVAL">Monter le volume sélectionné quand son appareil hôte est &connecté</control>
@@ -137,15 +140,15 @@
     <control lang="fr" key="IDC_HK_MOD_SHIFT">Maj</control>
     <control lang="fr" key="IDC_HK_MOD_WIN">Win</control>
     <control lang="fr" key="IDC_HOTKEY_ASSIGN">Affecter</control>
-    <control lang="fr" key="IDC_HOTKEY_REMOVE">Supprimer</control>
+    <control lang="fr" key="IDC_HOTKEY_REMOVE">Enlever</control>
     <control lang="fr" key="IDC_KEYFILES">Fichiers clés...</control>
     <control lang="fr" key="IDC_LIMIT_ENC_THREAD_POOL">Ne pas utiliser le nombre de processeurs suivant pour le chiffrement/déchiffrement :</control>
-    <control lang="fr" key="IDC_MORE_INFO_ON_HW_ACCELERATION">Plus d'informations</control>
-    <control lang="fr" key="IDC_MORE_INFO_ON_THREAD_BASED_PARALLELIZATION">Plus d'informations</control>
+    <control lang="fr" key="IDC_MORE_INFO_ON_HW_ACCELERATION">Plus d'infos</control>
+    <control lang="fr" key="IDC_MORE_INFO_ON_THREAD_BASED_PARALLELIZATION">Plus d'infos</control>
     <control lang="fr" key="IDC_MORE_SETTINGS">Plus de paramètres...</control>
-    <control lang="fr" key="IDC_MOUNTALL">Montage automatique</control>
-    <control lang="fr" key="IDC_MOUNT_OPTIONS">Options...</control>
-    <control lang="fr" key="IDC_MOUNT_READONLY">Monter le volume en lecture seule</control>
+    <control lang="fr" key="IDC_MOUNTALL">Montage &automatique</control>
+    <control lang="fr" key="IDC_MOUNT_OPTIONS">Opti&ons...</control>
+    <control lang="fr" key="IDC_MOUNT_READONLY">Monter le volume en lecture &seule</control>
     <control lang="fr" key="IDC_NEW_KEYFILES">Fichiers clés...</control>
     <control lang="fr" key="IDC_OLD_PIM_HELP">(Vide or 0 pour valeur par défaut)</control>
     <control lang="fr" key="IDC_PIM_HELP">(Vide or 0 pour valeur par défaut)</control>	
@@ -168,18 +171,18 @@
     <control lang="fr" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Vider le cache des mots de passe en quittant</control>
     <control lang="fr" key="IDC_PRESERVE_TIMESTAMPS">Preserve les modifications d'horodatage des conteneurs de fichiers</control>
     <control lang="fr" key="IDC_RESET_HOTKEYS">Réinitialiser</control>
-    <control lang="fr" key="IDC_SELECT_DEVICE">Périphérique...</control>
-    <control lang="fr" key="IDC_SELECT_FILE">Fichier...</control>
-    <control lang="fr" key="IDC_SELECT_PKCS11_MODULE">Bibliothèque...</control>
+    <control lang="fr" key="IDC_SELECT_DEVICE">&Périphérique...</control>
+    <control lang="fr" key="IDC_SELECT_FILE">&Fichier...</control>
+    <control lang="fr" key="IDC_SELECT_PKCS11_MODULE">&Bibliothèque...</control>
     <control lang="fr" key="IDC_SHOW_PASSWORD_CHPWD_NEW">Afficher mot de passe</control>
     <control lang="fr" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Afficher mot de passe</control>
-    <control lang="fr" key="IDC_TRAVEL_OPEN_EXPLORER">Ouvrir l'Explorateur pour le volume monté</control>
-    <control lang="fr" key="IDC_TRAV_CACHE_PASSWORDS">Mot de passe en cache</control>
+    <control lang="fr" key="IDC_TRAVEL_OPEN_EXPLORER">Ouvrir l'&Explorateur pour le volume monté</control>
+    <control lang="fr" key="IDC_TRAV_CACHE_PASSWORDS">Mot de passe en &cache</control>
     <control lang="fr" key="IDC_TRUECRYPT_MODE">Mode TrueCrypt</control>
-    <control lang="fr" key="IDC_UNMOUNTALL">Tout démonter</control>
-    <control lang="fr" key="IDC_VOLUME_PROPERTIES">Propriétés du volume</control>
-    <control lang="fr" key="IDC_VOLUME_TOOLS">Outils pour le volume</control>
-    <control lang="fr" key="IDC_WIPE_CACHE">Vider le cache</control>
+    <control lang="fr" key="IDC_UNMOUNTALL">&Tout démonter</control>
+    <control lang="fr" key="IDC_VOLUME_PROPERTIES">&Propriétés du volume</control>
+    <control lang="fr" key="IDC_VOLUME_TOOLS">&Outils pour le volume</control>
+    <control lang="fr" key="IDC_WIPE_CACHE">&Vider le cache</control>
     <control lang="fr" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Paramèters montage</control>
     <control lang="fr" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Volumes favoris</control>
     <control lang="fr" key="IDD_HOTKEYS_DLG">VeraCrypt - Raccourcis système</control>
@@ -216,7 +219,7 @@
     <control lang="fr" key="IDM_ENCRYPT_SYSTEM_DEVICE">Chiffrer la partition/le disque système...</control>
     <control lang="fr" key="IDM_FAQ">Foire aux questions</control>
     <control lang="fr" key="IDM_HELP">Guide de l'utilisateur</control>
-    <control lang="fr" key="IDM_HOMEPAGE">Site web </control>
+    <control lang="fr" key="IDM_HOMEPAGE">&Site web </control>
     <control lang="fr" key="IDM_HOTKEY_SETTINGS">Raccourcis...</control>
     <control lang="fr" key="IDM_KEYFILE_GENERATOR">Générateur de fichier clé</control>
     <control lang="fr" key="IDM_LANGUAGE">Langue...</control>
@@ -254,7 +257,7 @@
     <control lang="fr" key="IDM_UNMOUNT_VOLUME">Démonter le volume</control>
     <control lang="fr" key="IDM_VERIFY_RESCUE_DISK">Vérifier le disque de secours</control>
     <control lang="fr" key="IDM_VERSION_HISTORY">Historique</control>
-    <control lang="en" key="IDM_VOLUME_EXPANDER">Agrandir un volume</control>
+    <control lang="fr" key="IDM_VOLUME_EXPANDER">Agrandir un volume</control>
     <control lang="fr" key="IDM_VOLUME_PROPERTIES">Propriétés du volume</control>
     <control lang="fr" key="IDM_VOLUME_WIZARD">Assistant de création de volume</control>
     <control lang="fr" key="IDM_WEBSITE">Site web VeraCrypt</control>
@@ -271,6 +274,8 @@
     <control lang="fr" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Afficher ce message dans l'écran d'authentification de pré-amorçage (24 caractères maximum) :</control>
     <control lang="fr" key="IDT_DEFAULT_MOUNT_OPTIONS">Options de montage par défaut</control>
     <control lang="fr" key="IDT_DISMOUNT_ACTION">Options de raccourci</control>
+    <control lang="fr" key="IDT_DRIVER_OPTIONS">Configuration du pilote</control>
+    <control lang="fr" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Activer le support des codes de contrôle étendus pour disques</control>
     <control lang="fr" key="IDT_FAVORITE_LABEL">Label du volume favoris sélectionné :</control>
     <control lang="fr" key="IDT_FILE_SETTINGS">Paramètres de fichier</control>
     <control lang="fr" key="IDT_HOTKEY_KEY">Touche :</control>
@@ -293,33 +298,33 @@
     <control lang="fr" key="IDT_TRAVEL_ROOT">Créer des fichiers pour le disque nomade sur (racine du disque nomade) :</control>
     <control lang="fr" key="IDT_VOLUME">Volume</control>
     <control lang="fr" key="IDT_WINDOWS_RELATED_SETTING">Windows</control>
-    <control lang="fr" key="IDC_ADD_KEYFILE_PATH">Ajouter un chemin</control>
-    <control lang="fr" key="IDC_AUTO">Auto-tests</control>
+    <control lang="fr" key="IDC_ADD_KEYFILE_PATH">Ajouter un &chemin</control>
+    <control lang="fr" key="IDC_AUTO">&Auto-tests</control>
     <control lang="fr" key="IDC_CONTINUE">&Continuer</control>
-    <control lang="fr" key="IDC_DECRYPT">Déchiffrer</control>
+    <control lang="fr" key="IDC_DECRYPT">&Déchiffrer</control>
     <control lang="fr" key="IDC_DELETE">&Effacer</control>
-    <control lang="fr" key="IDC_ENCRYPT">Chiffrer</control>
+    <control lang="fr" key="IDC_ENCRYPT">&Chiffrer</control>
     <control lang="fr" key="IDC_EXPORT">&Exporter...</control>
     <control lang="fr" key="IDC_GENERATE_AND_SAVE_KEYFILE">Générer et sauvegarder le fichier clé...</control>
-    <control lang="fr" key="IDC_GENERATE_KEYFILE">Générer aléatoirement un fichier clé</control>
+    <control lang="fr" key="IDC_GENERATE_KEYFILE">&Générer aléatoirement un fichier clé</control>
     <control lang="fr" key="IDC_GET_LANG_PACKS">Télécharger un fichier de langue</control>
     <control lang="fr" key="IDC_HW_AES_LABEL_LINK">AES accéléré matériellement :</control>
     <control lang="fr" key="IDC_IMPORT_KEYFILE">&Importer un fichier clé dans un jeton...</control>
     <control lang="fr" key="IDC_KEYADD">Ajouter &fichiers...</control>
-    <control lang="fr" key="IDC_KEYFILES_ENABLE_HIDVOL_PROT">Utiliser les fichiers clés</control>
-    <control lang="fr" key="IDC_KEYFILES_HIDVOL_PROT">Fichiers clés...</control>
-    <control lang="fr" key="IDC_KEYREMOVE">Supprimer</control>
-    <control lang="fr" key="IDC_KEYREMOVEALL">Tout supprimer</control>
+    <control lang="fr" key="IDC_KEYFILES_ENABLE_HIDVOL_PROT">&Utiliser les fichiers clés</control>
+    <control lang="fr" key="IDC_KEYFILES_HIDVOL_PROT">Fichiers &clés...</control>
+    <control lang="fr" key="IDC_KEYREMOVE">&Supprimer</control>
+    <control lang="fr" key="IDC_KEYREMOVEALL">&Tout supprimer</control>
     <control lang="fr" key="IDC_LINK_HIDVOL_PROTECTION_INFO">Qu'est-ce que la protection d'un volume caché ?</control>
     <control lang="fr" key="IDC_LINK_KEYFILES_INFO">Plus d'infos sur les fichiers clés</control>
-    <control lang="fr" key="IDC_MOUNT_REMOVABLE">Monter le volume comme un média amovible</control>
-    <control lang="fr" key="IDC_MOUNT_SYSENC_PART_WITHOUT_PBA">Monter la partition avec chiffr. syst. sans authentification au pré-amorçage</control>
+    <control lang="fr" key="IDC_MOUNT_REMOVABLE">Monter le volume comme un &média amovible</control>
+    <control lang="fr" key="IDC_MOUNT_SYSENC_PART_WITHOUT_PBA">Monter la partition &avec chiffr. syst. sans authentification au pré-amorçage</control>
     <control lang="fr" key="IDC_PARALLELIZATION_LABEL_LINK">Parallélisation :</control>
-    <control lang="fr" key="IDC_PERFORM_BENCHMARK">Test</control>
+    <control lang="fr" key="IDC_PERFORM_BENCHMARK">Évaluer</control>
     <control lang="fr" key="IDC_PRINT">&Imprimer </control>
-    <control lang="fr" key="IDC_PROTECT_HIDDEN_VOL">Empêcher les dommages causés en écrivant dans le volume externe</control>
-    <control lang="fr" key="IDC_RESET">Réinitialiser</control>
-    <control lang="fr" key="IDC_SHOW_PASSWORD_MO">Afficher mot de passe</control>
+    <control lang="fr" key="IDC_PROTECT_HIDDEN_VOL">&Empêcher les dommages causés en écrivant dans le volume externe</control>
+    <control lang="fr" key="IDC_RESET">&Réinitialiser</control>
+    <control lang="fr" key="IDC_SHOW_PASSWORD_MO">&Afficher mot de passe</control>
     <control lang="fr" key="IDC_TOKEN_FILES_ADD">Ajouter &Fichiers jeton...</control>
     <control lang="fr" key="IDC_USE_EMBEDDED_HEADER_BAK">Utiliser l'en-tête de sauvegarde incorporé dans le &volume s'il est disponible</control>
     <control lang="fr" key="IDC_XTS_MODE_ENABLED">Mode XTS</control>
@@ -341,7 +346,7 @@
     <control lang="fr" key="IDT_BOX_BENCHMARK_INFO">La vitesse est affectée par la charge du CPU ainsi que par les caractéristiques du périphérique de stockage.\n\nCes tests ont lieu en RAM.</control>
     <control lang="fr" key="IDT_BUFFER_SIZE">Tampon :</control>
     <control lang="fr" key="IDT_CIPHER">Chiffrement :</control>
-    <control lang="fr" key="IDT_HIDDEN_PROT_PASSWD">Mot de passe du volume caché :\n(s'il est vide, celui en cache sera utilisé)</control>
+    <control lang="fr" key="IDT_HIDDEN_PROT_PASSWD">&Mot de passe du volume caché :\n(s'il est vide, celui en cache sera utilisé)</control>
     <control lang="fr" key="IDT_HIDDEN_VOL_PROTECTION">Protection du volume caché</control>
     <control lang="fr" key="IDT_KEY">Taille de la clé :</control>
     <control lang="fr" key="IDT_KEYFILE_GENERATOR_NOTE">IMPORTANT : Déplacez aléatoirement la souris dans cette fenêtre. Plus longtemps vous le faites, mieux c'est. Cela accroît significativement la force cryptographique du fichier clé.</control>
@@ -351,7 +356,7 @@
     <control lang="fr" key="IDT_KEYFILES_SIZE">Taille fichiers clé (en Octets):</control>
     <control lang="fr" key="IDT_KEYFILES_BASE_NAME">Nom de base fichiers clé:</control>
     <control lang="fr" key="IDT_LANGPACK_AUTHORS">Traduit par :</control>
-    <control lang="fr" key="IDT_PLAINTEXT">Taille :</control>
+    <control lang="fr" key="IDT_PLAINTEXT">Taille text en clair :</control>
     <control lang="fr" key="IDT_PLAINTEXT_SIZE_UNIT">bits</control>
     <control lang="fr" key="IDT_POOL_CONTENTS">Réserve de nombres aléatoires</control>
     <control lang="fr" key="IDT_PRF">Mélange PRF :</control>
@@ -376,7 +381,7 @@
     <control lang="fr" key="MENU_HELP">&Aide</control>
     <control lang="fr" key="MENU_WEBSITE">   &Site Web   </control>
     <!-- Strings -->
-    <string lang="fr" key="ABOUTBOX">À propos...</string>
+    <string lang="fr" key="ABOUTBOX">À &propos...</string>
     <string lang="fr" key="ACCESSMODEFAIL">L'attribut lecture seule sur votre ancien volume n'a pas pû être changé. Vérifiez les permissions d'accès.</string>
     <string lang="fr" key="ACCESS_DENIED">Erreur : Accès refusé.\n\nLa partition à laquelle vous essayez d'accéder fait soit zéro secteur de long, soit il s'agit du périphérique d'amorçage.</string>
     <string lang="fr" key="ADMINISTRATOR">Administrateur</string>
@@ -499,9 +504,9 @@
     <string lang="fr" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Volume complètement chiffré</string>
     <string lang="fr" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume complètement déchiffré</string>
     <string lang="fr" key="NONSYS_INPLACE_ENC_FINISHED_INFO">IMPORTANT : POUR MONTER CE VOLUME VERACRYPT NOUVELLEMENT CREE ET ACCEDER AUX DONNEES STOCKEES DESSUS, cliquez sur « Montage automatique des périphériques » DAN LA FENETRE PRINCIPALE DE VERACRYPT. Après avoir entré le bon mot de passe (et/ou fourni le bon fichier clé), le volume sera monté sur l'unité logique que vous avez sélectionné dans la liste de la fenêtre principale de VeraCrypt (et vous serez en mesure d'accéder aux donn [...]
-    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
+    <string lang="fr" key="NONSYS_INPLACE_DEC_FINISHED_INFO">Le volume VeraCrypt a été déchiffré avec succès.</string>
+    <string lang="fr" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">Le volume VeraCrypt a été déchiffré avec succès.\n\nVeuillez sélectionner la lettre de lecteur que vous souhaitez affecter au volume décrypté puis cliquez sur Terminer.\n\nIMPORTANT: Jusqu'à ce qu'une lettre de lecteur soit affectée au volume décrypté, vous ne serez pas en mesure d'accéder aux données stockées sur le volume.</string>
+    <string lang="fr" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Attention: Pour être en mesure d'accéder aux données décryptées, une lettre de lecteur doit être attribuée au volume déchiffré. Cependant, aucune lettre de lecteur n'est actuellement disponible.\n\nVeuillez libérer une lettre de lecteur (par exemple, par la déconnexion d'un lecteur flash USB ou d'un disque dur externe), puis cliquez sur OK.</string>
     <string lang="fr" key="FORMAT_FINISHED_INFO">Le volume VeraCrypt a été créé avec succès.</string>
     <string lang="fr" key="FORMAT_FINISHED_TITLE">Volume créé</string>
     <string lang="fr" key="FORMAT_HELP">IMPORTANT : Déplacez votre souris dans cette fenêtre aussi aléatoirement que possible. Plus longtemps vous la bougez, mieux c'est. Cela accroît significativement la force cryptographique des clés de chiffrement. Puis cliquez sur 'Formater' pour créer le volume.</string>
@@ -537,6 +542,15 @@
     <string lang="fr" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Remarque : Si vous devez transférer des fichiers de façon sécurisée du système leurre vers le système caché, suivez les étapes suivantes : 1) Démarrez le système leurre. 2) Enregistrez les fichiers dans un volume non chiffré ou dans un volume VeraCrypt externe/normal. 3) Démarrez le système caché. 4) Si vous avez enregistré les fichiers dans un volume VeraCrypt, montez-le (il sera automatiquement monté en lecture seule).  [...]
     <string lang="fr" key="CONFIRM_RESTART">Votre ordinateur doit être redémarré.\n\nVoulez-vous le redémarrer maintenant ?</string>
     <string lang="fr" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Une erreur s'est produite en récupérant l'état du chiffrement du système.</string>
+    <string lang="fr" key="ERR_PASSWORD_MISSING">Aucun mot de passe spécifié en ligne de commande. Le volume ne peut pas être créé.</string>
+    <string lang="fr" key="ERR_SIZE_MISSING">Aucune taille de volume spécifiée en ligne de commande. Le volume ne peut pas être créé.</string>
+    <string lang="fr" key="ERR_NTFS_INVALID_VOLUME_SIZE">La taille du volume spécifiée en ligne de commande n'est pas compatible avec NTFS.</string>
+    <string lang="fr" key="ERR_FAT_INVALID_VOLUME_SIZE">La taille du volume spécifiée en ligne de commande n'est pas compatible avec FAT32.</string>
+    <string lang="fr" key="ERR_DYNAMIC_NOT_SUPPORTED">Le système de fichiers sur le lecteur cible ne supporte pas la création de fichiers fragmentés qui sont nécessaires pour les volumes dynamiques.</string>
+    <string lang="fr" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Seuls les conteneurs fichiers peuvent être créés en ligne de commande.</string>
+    <string lang="fr" key="ERR_CONTAINER_SIZE_TOO_BIG">La taille du fichier conteneur spécifiée en ligne de commande est supérieure à l'espace libre disponible sur le disque. Le volume ne peut pas être créé.</string>
+    <string lang="fr" key="ERR_VOLUME_SIZE_TOO_SMALL">La taille de volume spécifiée en ligne de commande est trop petite. Le volume ne peut pas être créé.</string>
+    <string lang="fr" key="ERR_VOLUME_SIZE_TOO_BIG">La taille de volume spécifiée en ligne de commande est trop grande. Le volume ne peut pas être créé.</string>
     <string lang="fr" key="INIT_SYS_ENC">Impossible d'initialiser les composants de l'application pour le chiffrement du système.</string>
     <string lang="fr" key="INIT_RAND">L'initialisation du générateur de nombre aléatoire a échoué !\n\n\n(Si vous rapportez un bogue en rapport à cela, n'oubliez pas d'inclure les informations techniques suivantes dans le rapport de bogue : %hs, code d'erreur : 0x%.8X)</string>
     <string lang="fr" key="CAPI_RAND">L'API Crypto Windows a échoué !\n\n\n(Si vous rapportez un bogue en rapport à cela, n'oubliez pas d'inclure les informations techniques suivantes dans le rapport de bogue : %hs, code d'erreur : 0x%.8X)</string>
@@ -549,11 +563,11 @@
     <string lang="fr" key="MAX_HIDVOL_SIZE_GB">Taille maximale du volume caché pour ce volume : %.2f Go.</string>
     <string lang="fr" key="MOUNTED_NOPWCHANGE">Le mot de passe/le fichier clé du volume ne peut pas être changé quand celui-ci est monté. Démontez le volume en premier.</string>
     <string lang="fr" key="MOUNTED_NO_PKCS5_PRF_CHANGE">L'algorithme de dérivation de la clé d'en-tête ne peut pas être changé quand le volume est monté. Démontez le volume en premier.</string>
-    <string lang="fr" key="MOUNT_BUTTON">Monter</string>
+    <string lang="fr" key="MOUNT_BUTTON">&Monter</string>
     <string lang="fr" key="NEW_VERSION_REQUIRED">Ce volume nécessite une nouvelle version de VeraCrypt.</string>
     <string lang="fr" key="VOL_CREATION_WIZARD_NOT_FOUND">Erreur : Assistant de création de volume introuvable.\n\nAssurez-vous que le fichier 'VeraCrypt Format.exe' est dans le répertoire duquel a été exécuté 'VeraCrypt.exe'. S'il n'y est pas, réinstallez VeraCrypt ou localisez 'VeraCrypt Format.exe' sur votre disque et exécutez-le.</string>
-    <string lang="en" key="VOL_EXPANDER_NOT_FOUND">Erreur : Programme d'agrandissement de volume introuvable.\n\nAssurez-vous que le fichier 'VeraCryptExpander.exe' est dans le répertoire duquel a été exécuté 'VeraCrypt.exe'. S'il n'y est pas, réinstallez VeraCrypt ou localisez 'VeraCryptExpander.exe' sur votre disque et exécutez-le.</string>
-    <string lang="fr" key="NEXT">Suivant ></string>
+    <string lang="fr" key="VOL_EXPANDER_NOT_FOUND">Erreur : Programme d'agrandissement de volume introuvable.\n\nAssurez-vous que le fichier 'VeraCryptExpander.exe' est dans le répertoire duquel a été exécuté 'VeraCrypt.exe'. S'il n'y est pas, réinstallez VeraCrypt ou localisez 'VeraCryptExpander.exe' sur votre disque et exécutez-le.</string>
+    <string lang="fr" key="NEXT">&Suivant ></string>
     <string lang="fr" key="FINALIZE">&Terminer</string>
     <string lang="fr" key="INSTALL">&Installer</string>
     <string lang="fr" key="EXTRACT">E&xtraire</string>
@@ -647,6 +661,7 @@
     <string lang="fr" key="SELECT_KEYFILE">Sélectionner un fichier clé</string>
     <string lang="fr" key="SELECT_KEYFILE_PATH">Sélectionnez un chemin de recherche pour le fichier clé. AVERTISSEMENT : Notez que seul l'emplacement sera retenu, pas les noms de fichier.</string>
     <string lang="fr" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Sélectionnez un répertorie où les fichiers clé seront créés.</string>
+    <string lang="fr" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">Le conteneur courant a été sélectionné comme fichier clé. Il va être ignoré comme tel.</string>
     <string lang="fr" key="SERPENT_HELP">Conçu par Ross Anderson, Eli Biham et Lars Knudsen. Publié en 1998. Clé de 256 bits, bloc de 128 bits. Le mode opératoire est XTS. Serpent était l'un des finalistes de AES.</string>
     <string lang="fr" key="SIZE_HELP">Veuillez spécifier la taille du conteneur que vous voulez créer.\n\nSi vous créez un conteneur (fichier fragmenté) dynamique, ce paramètre représente la taille maximale possible.\n\nNotez que la taille minimum d'un volume FAT est 292 Ko. La taille minimum d'un volume NTFS est 3792 Ko</string>
     <string lang="fr" key="SIZE_HELP_HIDDEN_HOST_VOL">Veuillez spécifier la taille du volume extérieur à créer (vous allez tout d'abord créer le volume extérieur, puis un volume caché dedans). La taille minimum d'un volume dans lequel un volume caché est créé est 340 Ko.</string>
@@ -675,7 +690,7 @@
     <string lang="fr" key="UNKNOWN">Inconnu</string>
     <string lang="fr" key="ERR_UNKNOWN">Une erreur non spécifiée ou inconnue est survenue (%d).</string>
     <string lang="fr" key="UNMOUNTALL_LOCK_FAILED">Certains volumes contiennent des fichiers ou des dossiers en cours d'utilisation par une application ou par le système.\n\nForcer le démontage ?</string>
-    <string lang="fr" key="UNMOUNT_BUTTON">Démonter</string>
+    <string lang="fr" key="UNMOUNT_BUTTON">&Démonter</string>
     <string lang="fr" key="UNMOUNT_FAILED">Le démontage a échoué !</string>
     <string lang="fr" key="UNMOUNT_LOCK_FAILED">Le volume contient des fichiers ou des dossiers utilisés par des applications ou par le système.\n\nForcer le démontage ?</string>
     <string lang="fr" key="NO_VOLUME_MOUNTED_TO_DRIVE">Aucun volume n'est monté sur l'unité logique spécifiée.</string>
@@ -738,10 +753,10 @@
     <string lang="fr" key="TWO_SYSTEMS_IN_ONE_PARTITION_REMARK">Remarque : Il n'est pas pratique (et cela n'est pas autorisé) d'installer des système d'exploitation dans deux volumes VeraCrypt qui sont intégrés dans une seule partition parce qu'utiliser le système d'exploitation externe nécessiterait d'écrire régulièrement dans la zone du système d'exploitation caché (et si de telles opérations d'écriture ne pouvaient utiliser la fonction de protection du volume caché, il en résulterait  [...]
     <string lang="fr" key="FOR_MORE_INFO_ON_PARTITIONS">Pour plus d'infos sur la façon de créer et gérer des partitions, consultez la documentation de votre système d'exploitation ou contactez le technicien du SAV de votre ordinateur.</string>
     <string lang="fr" key="SYSTEM_PARTITION_NOT_ACTIVE">Erreur : Le système d'exploitation actuellement utilisé n'est pas installé sur la partition d'amorçage (la 1ère partition active). Ce n'est pas supporté.</string>
-    <string lang="en" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">You indicated that you intend to store files larger than 4 GB in this VeraCrypt volume. However, you chose the FAT file system, on which files larger than 4 GB cannot be stored.\n\nAre you sure you want to format the volume as FAT?</string>
-    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
-    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
-    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="fr" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">Vous avez indiqué que vous avez l'intention de stocker des fichiers de plus de 4 Go dans ce volume VeraCrypt. Cependant, vous avez choisi le système de fichiers FAT, sur lequel des fichiers de plus de 4 Go ne peuvent pas être stockés.\n\nEtes-vous sûr que vous voulez formater le volume en FAT?</string>
+    <string lang="fr" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Erreur: VeraCrypt ne supporte pas le décryptage sur place des volumes non-système existants créés par VeraCrypt 1.0b ou antérieur.\n\nREMARQUE: Vous pouvez toujours déchiffrer les fichiers stockés sur le volume en les copiant/déplaçant vers un volume non chiffré.</string>
+    <string lang="fr" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Erreur: VeraCrypt ne peut pas déchiffrer sur place un volume VeraCrypt caché.\n\nREMARQUE: Vous pouvez toujours déchiffrer les fichiers stockés sur le volume en les copiant/déplaçant vers un volume non chiffré.</string>
+    <string lang="fr" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Attention: Notez que VeraCrypt ne peut pas déchiffrer sur place un volume qui contient un volume caché VeraCrypt (le volume caché serait alors écrasé avec les données pseudo-aléatoires).\n\nVeuillez confirmer que le volume que vous êtes sur le point de décrypter ne contient pas de volume caché.\n\nREMARQUE: Si le volume contient un volume caché mais cela ne vous dérange pas de perdre le volume caché, alors vous pouvez sélecti [...]
     <string lang="fr" key="VOL_CONTAINS_NO_HIDDEN_VOL">Le volume ne contient aucun volume caché. Continuer.</string>
     <string lang="fr" key="VOL_CONTAINS_A_HIDDEN_VOL">Le volume contient un volume caché. Annuler.</string>
     <string lang="fr" key="CANT_ACCESS_VOL">Erreur : Impossible d'accéder au volume !\n\nAssurez-vous que le volume existe, qu'il est n'est pas monté ou utilisé par le système ou une application, que vous avez la permission en lecture/écriture pour le volume et qu'il n'est pas protégé en écriture.</string>
@@ -896,10 +911,10 @@
     <string lang="fr" key="PROGRESS_STATUS_WAITING">En attente</string>
     <string lang="fr" key="PROGRESS_STATUS_PREPARING">Préparation</string>
     <string lang="fr" key="PROGRESS_STATUS_RESIZING">Redimensionnement</string>
-    <string lang="fr" key="PROGRESS_STATUS_ENCRYPTING">Chiffrement</string>
-    <string lang="fr" key="PROGRESS_STATUS_DECRYPTING">Déchiffrement</string>
+    <string lang="fr" key="PROGRESS_STATUS_ENCRYPTING">Cryptage</string>
+    <string lang="fr" key="PROGRESS_STATUS_DECRYPTING">Décryptage</string>
     <string lang="fr" key="PROGRESS_STATUS_FINALIZING">Finalisation</string>
-    <string lang="fr" key="PROGRESS_STATUS_PAUSED">Pause</string>
+    <string lang="fr" key="PROGRESS_STATUS_PAUSED">En pause</string>
     <string lang="fr" key="PROGRESS_STATUS_FINISHED">Terminé</string>
     <string lang="fr" key="PROGRESS_STATUS_ERROR">Erreur</string>
     <string lang="fr" key="FAVORITE_DISCONNECTED_DEV">Périphérique déconnecté</string>
@@ -1022,7 +1037,7 @@
     <string lang="fr" key="CONFIRM_EXIT_UNIVERSAL">Quitter ?</string>
     <string lang="fr" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt n'a pas assez d'information pour déterminer s'il faut chiffrer ou déchiffrer.</string>
     <string lang="fr" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">VeraCrypt n'a pas assez d'information pour déterminer s'il faut chiffrer ou déchiffrer.\n\nNote : Si vous avez déchiffré la partition/le disque système dans l'environnement de pré-amorçage, vous aurez peut-être à finaliser le processus en cliquant 'Déchiffrer'.</string>
-    <string lang="en" key="NONSYS_INPLACE_ENC_REVERSE_INFO">Note: When you are encrypting a non-system partition/volume in place and an error persistently prevents you from finishing the process, you will not be able to mount the volume (and access data stored on it) until you entirely DECRYPT the volume (i.e. reverse the process).\n\nIf you need to do so, follow these steps:\n1) Exit this wizard.\n2) In the main VeraCrypt window, select 'Volumes' > 'Resume Interrupted Process'.\n3) S [...]
+    <string lang="fr" key="NONSYS_INPLACE_ENC_REVERSE_INFO">REMARQUE: Lorsque vous chiffrez 'sur place' une partition ou un volume non système et qu'une erreur vous empêche de façon persistante de terminer le processus, alors vous ne serez pas en mesure de monter le volume (et d'accéder aux données stockées dedans) jusqu'à ce que vous décryptiez le volume entièrement (c'est à dire inverser le processus).\n\nSi vous avez besoin de le faire, procédez comme suit:\n1) quitter l'assistant.\n2 [...]
     <string lang="fr" key="NONSYS_INPLACE_ENC_DEFER_CONFIRM">Vous souhaitez interrompre et reporter le processus de chiffrement de la partition ou du volume? \n\nRemarque : N'oubliez pas que le volume ne peut pas être monté jusqu'à ce qu'il ait été entièrement chiffré. Vous pourrez reprendre le processus de chiffrement et au point où il s'est arrêté. Vous pouvez le faire, par exemple, en sélectionnant « Volumes » > « Reprendre le rocessus interrompu » de la barre de menus de la fenêtr [...]
     <string lang="fr" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Voulez-vous interrompre et repousser le processus de chiffrement de la partition/du disque système ?\n\nNote : Vous pourrez reprendre le processus et il continuera à partir de l'endroit où il s'est arrêté. Vous pouvez le faire en sélectionnant 'Système' > 'Reprendre le processus interrompu' depuis les menus de la fenêtre principale de VeraCrypt. Si vous désirez arrêter totalement le processus de chiffrement ou l'inverser, sél [...]
     <string lang="fr" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Voulez-vous interrompre et repousser le processus de déchiffrement de la partition/du disque système?\n\nNote : Vous pourrez reprendre le processus et il continuera à partir de l'endroit où il s'est arrêté. Vous pouvez le faire en sélectionnant 'Système' > 'Reprendre le processus interrompu' depuis les menus de la fenêtre principale de VeraCrypt. Si vous désirez arrêter totalement le processus de déchiffrement (et démarrer le [...]
@@ -1032,8 +1047,7 @@
     <string lang="fr" key="FAILED_TO_START_WIPING">Erreur: Impossible de démarrer le processus de nettoyage.</string>
     <string lang="fr" key="INCONSISTENCY_RESOLVED">Incohérence résolue.\n\n\n(Si vous avez rapporté un bogue en rapport avec cette incohérence, n'oubliez pas d'inclure les informations techniques suivantes dans le rapport de bogue : %hs)</string>
     <string lang="fr" key="UNEXPECTED_STATE">Erreur : État inattendu.\n\n\n (si vous signalez un bogue à cet effet, veuillez inclure les informations techniques suivantes dans le raport :\n%hs)</string>
-    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="fr" key="NOTHING_TO_RESUME">Il n'y a aucun processus/aucune tâche à reprendre.</string>
+    <string lang="fr" key="NO_SYS_ENC_PROCESS_TO_RESUME">Il n'y a aucun processus de chiffrement/déchiffrement de la partition ou disque système qui peut être repris.\n\nRemarque: Si vous voulez reprendre un processus interrompu de chiffrement/déchiffrement d'une partition ou volume non système, sélectionnez 'Volumes'>'Reprendre un processus interrompu'.</string>
     <string lang="fr" key="HIDVOL_PROT_BKG_TASK_WARNING">AVERTISSEMENT : La tâche de fond VeraCrypt est désactivée. Après avoir quitté VeraCrypt, vous ne serez pas notifié si des dommages sur le volume caché sont évités.\n\nNote : Vous pouvez fermer la tâche de fond à tout moment en cliquant droit sur l'icône VeraCrypt et en sélectionnant 'Quitter'.\n\nActiver la tâche de fond VeraCrypt ?</string>
     <string lang="fr" key="LANG_PACK_VERSION">Version du fichier de langue : %s</string>
     <string lang="fr" key="CHECKING_FS">Vérification du système de fichiers sur le volume VeraCrypt monté sous %hs...</string>
@@ -1085,15 +1099,14 @@
     <string lang="fr" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">Cet algorithme n'est pas supporté pour le mode TrueCrypt.</string>
     <string lang="fr" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">Le PIM n'est pas supporté pour le mode TrueCrypt.</string>	  
     <string lang="fr" key="PIM_REQUIRE_LONG_PASSWORD">Mot de passe doit contenir au moins 20 caractères pour pouvoir utiliser cette valeur de PIM.\nLes mots de passe plus courts ne peuvent être utilisés que si la PIM est égal à 485 ou supérieur.</string>
-    <string lang="fr" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Le mot de passe de pré-amorçage doit contenir au moins 20 caractères pour pouvoir utiliser cette valeur de PIM.\nLes mots de passe plus courts ne peuvent être utilisés que si la PIM est égal à 98 ou supérieur.</string>
-    <string lang="fr" key="UNSUPPORTED_TRUECRYPT_FORMAT">Ce volume a été créé par TrueCrypt %x.%x mais VeraCrypt supporte seulement les volumes TrueCrypt créés avec les version 6.x/7.x de TrueCrypt</string>
+    <string lang="fr" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Le mot de passe de pré-amorçage doit contenir au moins 20 caractères pour pouvoir utiliser cette valeur de PIM.\nLes mots de passe plus courts ne peuvent être utilisés que si la PIM est égal à 98 ou supérieur.</string>    
     <string lang="fr" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Les fichiers clés ne sont actuellement pas pris en charge pour le chiffrement du système.</string>
     <string lang="fr" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Avertissement : VeraCrypt n'a pas pu restaurer la disposition originale du clavier. Cela peut vous faire saisir votre mot de passe de manière erronée .</string>
     <string lang="fr" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Erreur : Impossible de paramétrer la disposition du clavier pour VeraCrypt en clavier Américain standard.\n\nNotez que le mot de passe doit être saisi dans un environnement de pré-amorçage (avant que Windows ne démarre) où seul le clavier américain est disponible. Aussi le mot de passe doit toujours être saisi en utilisant la disposition du clavier américain.</string>
     <string lang="fr" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">Comme VeraCrypt a temporairement changé la disposition du clavier en clavier Américain, il n'est pas possible de taper des caractères tant que la touche droite ALT est maintenue enfoncée. Cependant vous pouvez saisir la plupart de ces caractères en appuyant la touche appropriée tandis que la touche Maj est maintenue enfoncée.</string>
     <string lang="fr" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCrypt a empêché la modification de la disposition du clavier.</string>
     <string lang="fr" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Note : Le mot de passe devra être saisi dans l'environnement de pré-amorçage (avant le démarrage de windows) où les dispositions de clavier non-américain ne sont pas disponibles. Aussi, le mot de passe doit toujours être saisi en utilisant la disposition du clavier Américain. Mais il est important de noter qu'il n'est PAS nécessaire de posséder un vrai clavier américain. VeraCrypt assure automatiquement que vous pouvez saisir en [...]
-    <string lang="fr" key="RESCUE_DISK_INFO">Avant de pouvoir chiffrer la partition/disque, vous devez créer un disque de sauvegarde VeraCrypt (TRD), dont les buts sont :\n\n- Si le chargeur de démarrage de VeraCrypt, la clé principale ou d'autres données critiques sont endommagées, le TRD permet de les restaurer (remarquez que vous devrez toujours entrer le mot de passe correct).\n\n- Si Windows est endommagé et ne peut pas démarrer, TRD vous permet toujours de déchiffrer la partition/d [...]
+    <string lang="fr" key="RESCUE_DISK_INFO">Avant de pouvoir chiffrer la partition/disque, vous devez créer un disque de sauvegarde VeraCrypt (VRD), dont les buts sont :\n\n- Si le chargeur de démarrage de VeraCrypt, la clé principale ou d'autres données critiques sont endommagées, le VRD permet de les restaurer (remarquez que vous devrez toujours entrer le mot de passe correct).\n\n- Si Windows est endommagé et ne peut pas démarrer, VRD vous permet toujours de déchiffrer la partition/d [...]
     <string lang="fr" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">Après avoir cliqué sur OK, le logiciel de gravage d'image Microsoft sera lancé. Utilisez-le pour graver l'image ISO du disque de récupération VeraCrypt sur un CD ou un DVD.\n\nAprès cela, revenez à l'assistant de création de volumes VeraCrypt et suivez les instructions.</string>
     <string lang="fr" key="RESCUE_DISK_BURN_INFO">L'image de la disque de secours a été créée et stockée dans le fichier : \n%hs\n\nMainteant vous avez besoin de le graver sur un CD ou un DVD.\n\n%lsAprès l'avoir gravé, cliquez sur suivant pour vérifier qu'il a été gravé correctement.</string>
     <string lang="fr" key="RESCUE_DISK_BURN_INFO_NO_CHECK">L'image de la disque de secours a été créée et stockée dans le fichier : \n%hs\n\nVous devriez maintenant graver l'image sur un CD/DVD ou la déplacer vers un emplacement sécurisé pour une utilisation ultérieure.\n\n%lsCliquez sur "Suivant" pour continuer.</string>
@@ -1171,7 +1184,7 @@
     <string lang="fr" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">Le pré-test a été terminé avec succès.\n\nAVERTISSEMENT : Si l'alimentation est interrompue soudainement alors que les données existantes en place sont entrain d'être chiffrées, ou lorsque le système d'exploitation plante pendant que VeraCrypt chiffre les données existantes en place, certaines parties des données seront endommagées ou perdues. Par conséquent, avant de commencer à chiffrer, veuillez vous assurer que vous dispo [...]
     <string lang="fr" key="SYSENC_ENCRYPTION_PAGE_INFO">Pour interrompre le processus de chiffrement ou de déchiffrement, vous pouvez cliquez sur Pause ou Reporter à tout moment, quitter cet Assistant, redémarrer ou éteindre votre ordinateur et ensuite reprendre le processus, qui se poursuivra à partir du point où il a été arrêté. Pour éviter les ralentissements lorsque le système ou les applications écrivent ou lisent des données depuis le lecteur système, VeraCrypt attend automatiqueme [...]
     <string lang="fr" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nPour interrompre le processus de chiffrement ou de déchiffrement, vous pouvez cliquez sur Pause ou Reporter à tout moment, quitter cet Assistant, redémarrer ou éteindre votre ordinateur et ensuite reprendre le processus, qui se poursuivra à partir du point où il a été arrêté. Notez que le volume ne pourra pas être monté jusqu'à ce que le chiffrement soit entièrement terminé.</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_DECRYPTION_PAGE_INFO">\n\nYou can click Pause or Defer anytime to interrupt the process of decryption, exit this wizard, restart or shut down the computer, and then resume the process, which will continue from the point where it was stopped. Note that the volume cannot be mounted until it has been fully decrypted.</string>
+    <string lang="fr" key="NONSYS_INPLACE_DEC_DECRYPTION_PAGE_INFO">\n\nVous pouvez cliquez sur Suspendre ou Différer à tout moment pour interrompre le processus de déchiffrement, quitter cet assistant, redémarrer ou éteindre l'ordinateur, puis reprendre le processus, qui se poursuivra à partir du point où il s'est arrêté. Notez que le volume ne peut pas être monté avant d'avoir été entièrement déchiffré.</string>
     <string lang="fr" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Système cache démarré</string>
     <string lang="fr" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Système original</string>
     <string lang="fr" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows génère divers fichiers journaux, fichiers temporaires, etc., sur la partition système. Il enregistre également le contenu de la RAM lors de l'hibernation et le fichiers d'échange situés sur la partition système. Par conséquent, si une personne a analysé les fichiers stockés sur la partition hébergeant le système d'origine (dont le système caché est un clone), il pourrait trouver, par exemple, que vous avez utilisé l'assistant [...]
@@ -1228,8 +1241,8 @@
     <string lang="fr" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">Vous avez sélectionné le partition/disque système (ou la partition de démarrage), mais le mode assistant sélectionné ne convient que pour les partitions/disques non-système.\n\nVous voulez configurer l'authentification de pré-amorçage (ce qui signifie que vous devrez entrer votre mot de passe chaque fois que Windows démarre) et chiffrer la partition/disque système ?</string>
     <string lang="fr" key="CONFIRM_DECRYPT_SYS_DEVICE">Êtes-vous sûr de vouloir déchiffrer définitivement la partition/le disque système ?</string>
     <string lang="fr" key="CONFIRM_DECRYPT_SYS_DEVICE_CAUTION">ATTENTION : Si vous déchiffrez définitivement la partition/le disque système, des données non chiffrées y seront écritent.\n\nÊtes-vous vraiment sûr de vouloir déchiffrer définitivement la partition/le disque système ?</string>
-    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">Are you sure you want to permanently decrypt the following volume?</string>
-    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the VeraCrypt volume, unencrypted data will be written to the disk.\n\nAre you really sure you want to permanently decrypt the selected volume?</string>
+    <string lang="fr" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">Êtes-vous sûr de vouloir déchiffrer de façon permanente le volume suivant?</string>
+    <string lang="fr" key="CONFIRM_DECRYPT_NON_SYS_DEVICE_CAUTION">ATTENTION: Si vous décryptez de manière permanente le volume VeraCrypt, les données non chiffrées seront écrites sur le disque.\n\nÊtes vous vraiment sûr que vous voulez déchiffrer de manière permanente le volume sélectionné.?</string>
     <string lang="fr" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">AVERTISSEMENT : Si vous utilisez une cascade d'algorithmes de chiffrement pour le chiffrement du système, vous pouvez rencontrer les problèmes suivants :\n\n1) La taille du chargeur de démarrage de VeraCrypt est supérieur à la normale et il n'y a donc pas assez d'espace dans la première plage du disque pour une sauvegarde du chargeur de démarrage VeraCrypt. Par conséquent, chaque fois qu'il est endommagé (ce qui arrive souven [...]
     <string lang="fr" key="NOTE_CASCADE_FOR_SYS_ENCRYPTION">Si vous rencontrez un des problèmes décrits précédemment, déchiffrez la partition/le disque (s'il est chiffré) puis essayez de le chiffrer à nouveau en utilisant un algorithme sans cascade (ex : AES).</string>
     <string lang="fr" key="UPDATE_TC_IN_DECOY_OS_FIRST">AVERTISSEMENT : Pour des raisons de sécurité, vous devez mettre à jour VeraCrypt sur le système d'exploitation leurre avant de le mettre à jour sur le système d'exploitation caché.\n\nPour ce faire, démarrer le système leurre et lancez l'installation de VeraCrypt dessus. Puis démarrer le système caché et exécutez aussi l'installation dessus.\n\nRemarque : Le système leurre et le système caché partagent un chargeur de démarrage uniqu [...]
@@ -1262,7 +1275,7 @@
     <string lang="fr" key="CKR_DEVICE_MEMORY">Le jeton de sécurité n'a pas assez de mémoire, d'espace pour effectuer l'opération demandée.\n\nSi vous essayez d'importer un fichier de clé, vous devez sélectionner un fichier plus petit ou utiliser un fichier clé généré par VeraCrypt (sélectionnez « Outils » > « Générateur de fichier clé »).</string>
     <string lang="fr" key="ALL_TOKEN_SESSIONS_CLOSED">Toutes les sessions de jeton de sécurité ouvertes ont été fermées.</string>
     <string lang="fr" key="SELECT_TOKEN_KEYFILES">Sélectionnez les fichiers clés du jeton de sécurité</string>
-    <string lang="fr" key="TOKEN_SLOT_ID">Emplacement</string>
+    <string lang="fr" key="TOKEN_SLOT_ID">Connecteur</string>
     <string lang="fr" key="TOKEN_NAME">Nom du jeton</string>
     <string lang="fr" key="TOKEN_DATA_OBJECT_LABEL">Nom du fichier</string>
     <string lang="fr" key="BOOT_PASSWORD_CACHE_KEYBOARD_WARNING">IMPORTANT : Veuillez noter que le mot de passe pour l'authentification de pré-amorçage est toujours tapé à l'aide de la disposition du clavier américain standard. Par conséquent, un volume qui utilise un mot de passe tapé à l'aide de toute autre type de clavier peut être impossible à monter à l'aide d'un mot de passe d'authentification de pré-amorçage (Notez que ce n'est pas un bug dans VeraCrypt). Pour permettre un tel vol [...]
@@ -1290,6 +1303,7 @@
     <string lang="fr" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">AVERTISSEMENT : Ce paramètre peut nuire aux performances.\n\nÊtes-vous certain de vouloir utiliser ce paramètre ?</string>
     <string lang="fr" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">AVERTISSEMENT: Volume VeraCrypt auto-démonté</string>
     <string lang="fr" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Avant de retirer physiquement ou d'éteindre un appareil contenant un volume monté, vous devriez d'abord toujours démonter le volume dans VeraCrypt.\n\nLe démontage spontané inattendue est habituellement causé par un câble se déconnectant par intermittence, disques (rack), etc.</string>
+    <string lang="fr" key="UNSUPPORTED_TRUECRYPT_FORMAT">Ce volume a été créé par TrueCrypt %x.%x mais VeraCrypt supporte seulement les volumes TrueCrypt créés avec les version 6.x/7.x de TrueCrypt</string>
     <string lang="fr" key="TEST">Test</string>
     <string lang="fr" key="KEYFILE">Fichier clé</string>
     <string lang="fr" key="VKEY_08">Retour arrière</string>
@@ -1329,7 +1343,7 @@
     <string lang="fr" key="VKEY_AF">Volume +</string>
     <string lang="fr" key="VKEY_B0">Piste suivante</string>
     <string lang="fr" key="VKEY_B1">Piste précédente</string>
-    <string lang="fr" key="VKEY_B2">Arrêter</string>
+    <string lang="fr" key="VKEY_B2">Arrêter Média</string>
     <string lang="fr" key="VKEY_B3">Jouer/Pause</string>
     <string lang="fr" key="VKEY_B4">Touche démarrer courriel</string>
     <string lang="fr" key="VKEY_B5">Sélectionner touche Média</string>
@@ -1342,7 +1356,7 @@
     <string lang="fr" key="VKEY_FB">Zoom</string>
     <string lang="fr" key="VK_NUMPAD">Pavé num.</string>
     <string lang="fr" key="VK_SHIFT">Maj</string>
-    <string lang="fr" key="VK_CONTROL">Ctrl</string>
+    <string lang="fr" key="VK_CONTROL">Contrôle</string>
     <string lang="fr" key="VK_ALT">Alt</string>
     <string lang="fr" key="VK_WIN">Win</string>
     <string lang="fr" key="BYTE">o</string>
diff --git a/Translations/Language.hu.xml b/Translations/Language.hu.xml
index 30a2906..1b88c8b 100644
--- a/Translations/Language.hu.xml
+++ b/Translations/Language.hu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="hu" name="Magyar" en-name="Hungarian" version="0.1.0" translators="Nyul Balazs" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="hu" key="IDC_QUICKFORMAT">Gyorsformázás</control>
     <control lang="en" key="IDC_SHOW_PASSWORD">&Display password</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&Display password</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="en" key="IDC_SINGLE_BOOT">Single-boot</control>
     <control lang="en" key="IDC_STD_VOL">Standard VeraCrypt volume</control>
     <control lang="en" key="IDC_SYSENC_HIDDEN">Hi&dden</control>
@@ -98,6 +99,7 @@
     <control lang="en" key="IDT_SYSENC_KEYS_GEN_INFO">The keys, salt, and other data have been successfully generated. If you want to generate new keys, click Back and then Next. Otherwise, click Next to continue.</control>
     <control lang="en" key="IDT_SYS_DEVICE">Encrypts the partition/drive where Windows is installed. Anyone who wants to gain access and use the system, read and write files, etc., will need to enter the correct password each time before Windows boots. Optionally, creates a hidden system.</control>
     <control lang="en" key="IDT_SYS_PARTITION">Select this option to encrypt the partition where the currently running Windows operating system is installed.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="en" key="IDT_WIPE_MODE">Wipe mode:</control>
     <control lang="hu" key="IDCLOSE">Bezár</control>
     <control lang="en" key="IDC_ALLOW_ESC_PBA_BYPASS">Allow pre-boot &authentication to be bypassed by pressing the Esc key (enables boot manager)</control>
@@ -111,6 +113,7 @@
     <control lang="en" key="IDC_CACHE">Cache passwords and keyfil&es in memory</control>
     <control lang="hu" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Lépjen ki ha nincs csatolt kötet</control>
     <control lang="en" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Close token session (log out) after a volume is successfully mounted</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="hu" key="IDC_COPY_WIZARD">Tartalmazza a VeraCrypt Kötet Létrehozás Varázslót</control>
     <control lang="hu" key="IDC_CREATE">Létrehoz</control>
     <control lang="hu" key="IDC_CREATE_VOLUME">&Kötet létrehozása</control>
@@ -271,6 +274,8 @@
     <control lang="en" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Display this custom message in the pre-boot authentication screen (24 characters maximum):</control>
     <control lang="hu" key="IDT_DEFAULT_MOUNT_OPTIONS">Alapértelmezett csatolási beállítások</control>
     <control lang="hu" key="IDT_DISMOUNT_ACTION">Gyorsgomb beállítások</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="en" key="IDT_FAVORITE_LABEL">Label of selected favorite volume:</control>
     <control lang="hu" key="IDT_FILE_SETTINGS">Fájl beállítások</control>
     <control lang="hu" key="IDT_HOTKEY_KEY">Hozzárendelendő gomb:</control>
@@ -537,6 +542,15 @@
     <string lang="en" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Note: If you need to securely transfer files from the decoy system to the hidden system, follow these steps:\n1) Start the decoy system.\n2) Save the files to an unencrypted volume or to an outer/normal VeraCrypt volume.\n3) Start the hidden system.\n4) If you saved the files to a VeraCrypt volume, mount it (it will be automatically mounted as read-only).\n5) Copy the files to the hidden system partition or to another hid [...]
     <string lang="en" key="CONFIRM_RESTART">Your computer must be restarted.\n\nDo you want to restart it now?</string>
     <string lang="en" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">An error occurred when obtaining the system encryption status.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="en" key="INIT_SYS_ENC">Cannot initialize application components for system encryption.</string>
     <string lang="en" key="INIT_RAND">Failed to initialize the random number generator!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="hu" key="SELECT_KEYFILE">Válasszon kulcsfájlt</string>
     <string lang="en" key="SELECT_KEYFILE_PATH">Select a keyfile search path. WARNING: Note that only the path will be remembered, not the filenames!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="en" key="SERPENT_HELP">Designed by Ross Anderson, Eli Biham, and Lars Knudsen. Published in 1998. 256-bit key, 128-bit block. Mode of operation is XTS. Serpent was one of the AES finalists.</string>
     <string lang="en" key="SIZE_HELP">Please specify the size of the container you want to create.\n\nIf you create a dynamic (sparse-file) container, this parameter will specify its maximum possible size.\n\nNote that the minimum possible size of a FAT volume is 292 KB. The minimum possible size of an NTFS volume is 3792 KB.</string>
     <string lang="en" key="SIZE_HELP_HIDDEN_HOST_VOL">Please specify the size of the outer volume to be created (you will first create the outer volume and then a hidden volume within it). The minimum possible size of a volume within which a hidden volume is intended to be created is 340 KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="en" key="INCONSISTENCY_RESOLVED">Inconsistency resolved.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="en" key="NOTHING_TO_RESUME">There is no process/task to resume.</string>
     <string lang="en" key="HIDVOL_PROT_BKG_TASK_WARNING">WARNING: VeraCrypt Background Task is disabled. After you exit VeraCrypt, you will not be notified if damage to hidden volume is prevented.\n\nNote: You may shut down the Background Task anytime by right-clicking the VeraCrypt tray icon and selecting 'Exit'.\n\nEnable VeraCrypt Background Task?</string>
     <string lang="hu" key="LANG_PACK_VERSION">Nyelvi csomag verziója:  %s</string>
     <string lang="en" key="CHECKING_FS">Checking the file system on the VeraCrypt volume mounted as %hs...</string>
@@ -1085,15 +1099,14 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</string>
     <string lang="en" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Error: Cannot set the keyboard layout for VeraCrypt to the standard US keyboard layout.\n\nNote that the password needs to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout.</string>
     <string lang="en" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">As VeraCrypt temporarily changed the keyboard layout to the standard US keyboard layout, it is not possible to type characters by pressing keys while the right Alt key is held down. However, you can type most of such characters by pressing appropriate keys while the Shift key is held down.</string>
     <string lang="en" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCrypt prevented change of keyboard layout.</string>
     <string lang="en" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Note: The password will need to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout. However, it is important to note that you do NOT need a real US keyboard. VeraCrypt automatically ensures that you can safely type the password (right now and in the pre-boot environment) even if yo [...]
-    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (TRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the TRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the TRD allows you to permanently decrypt the partition/drive before Windows  [...]
+    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (VRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the VRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the VRD allows you to permanently decrypt the partition/drive before Windows  [...]
     <string lang="en" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">After you click OK, Microsoft Windows Disc Image Burner will be launched. Please use it to burn the VeraCrypt Rescue Disk ISO image to a CD or DVD.\n\nAfter you do so, return to the VeraCrypt Volume Creation Wizard and follow its instructions.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn it to a CD or DVD.\n\n%lsAfter you burn the Rescue Disk, click Next to verify that it has been correctly burned.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you should either burn the image to a CD/DVD or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
@@ -1290,6 +1303,7 @@
     <string lang="en" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">WARNING: This setting may degrade performance.\n\nAre you sure you want to use this setting?</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="en" key="TEST">Test</string>
     <string lang="en" key="KEYFILE">Keyfile</string>
     <string lang="en" key="VKEY_08">Backspace</string>
diff --git a/Translations/Language.id.xml b/Translations/Language.id.xml
index c91310e..bcef579 100644
--- a/Translations/Language.id.xml
+++ b/Translations/Language.id.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="id" name="Bahasa Indonesia" en-name="Indonesian" version="0.1.0" translators="Tajuddin N. F." />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="id" key="IDC_QUICKFORMAT">Format cepat</control>
     <control lang="id" key="IDC_SHOW_PASSWORD">&Perlihatkan password</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&Display password</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="en" key="IDC_SINGLE_BOOT">Single-boot</control>
     <control lang="en" key="IDC_STD_VOL">Standard VeraCrypt volume</control>
     <control lang="en" key="IDC_SYSENC_HIDDEN">Hi&dden</control>
@@ -98,6 +99,7 @@
     <control lang="en" key="IDT_SYSENC_KEYS_GEN_INFO">The keys, salt, and other data have been successfully generated. If you want to generate new keys, click Back and then Next. Otherwise, click Next to continue.</control>
     <control lang="en" key="IDT_SYS_DEVICE">Encrypts the partition/drive where Windows is installed. Anyone who wants to gain access and use the system, read and write files, etc., will need to enter the correct password each time before Windows boots. Optionally, creates a hidden system.</control>
     <control lang="en" key="IDT_SYS_PARTITION">Select this option to encrypt the partition where the currently running Windows operating system is installed.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="en" key="IDT_WIPE_MODE">Wipe mode:</control>
     <control lang="en" key="IDCLOSE">Close</control>
     <control lang="en" key="IDC_ALLOW_ESC_PBA_BYPASS">Allow pre-boot &authentication to be bypassed by pressing the Esc key (enables boot manager)</control>
@@ -111,6 +113,7 @@
     <control lang="id" key="IDC_CACHE">Simpan password dan fil&e kunci di memory</control>
     <control lang="id" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Keluar jika tidak ada volume tersambung</control>
     <control lang="en" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Close token session (log out) after a volume is successfully mounted</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="id" key="IDC_COPY_WIZARD">Termasuk panduan pembuat volume VeraCrypt</control>
     <control lang="id" key="IDC_CREATE">Buat</control>
     <control lang="id" key="IDC_CREATE_VOLUME">&Buat Volume Baru</control>
@@ -271,6 +274,8 @@
     <control lang="en" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Display this custom message in the pre-boot authentication screen (24 characters maximum):</control>
     <control lang="id" key="IDT_DEFAULT_MOUNT_OPTIONS">Pilihan sambungan dasar</control>
     <control lang="id" key="IDT_DISMOUNT_ACTION">Pengaturan Kunci Pintas</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="en" key="IDT_FAVORITE_LABEL">Label of selected favorite volume:</control>
     <control lang="id" key="IDT_FILE_SETTINGS">Pengaturan File</control>
     <control lang="id" key="IDT_HOTKEY_KEY">Kunci ditetapkan untuk:</control>
@@ -537,6 +542,15 @@
     <string lang="en" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Note: If you need to securely transfer files from the decoy system to the hidden system, follow these steps:\n1) Start the decoy system.\n2) Save the files to an unencrypted volume or to an outer/normal VeraCrypt volume.\n3) Start the hidden system.\n4) If you saved the files to a VeraCrypt volume, mount it (it will be automatically mounted as read-only).\n5) Copy the files to the hidden system partition or to another hid [...]
     <string lang="en" key="CONFIRM_RESTART">Your computer must be restarted.\n\nDo you want to restart it now?</string>
     <string lang="en" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">An error occurred when obtaining the system encryption status.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="en" key="INIT_SYS_ENC">Cannot initialize application components for system encryption.</string>
     <string lang="en" key="INIT_RAND">Failed to initialize the random number generator!</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="en" key="SELECT_KEYFILE">Select Keyfile</string>
     <string lang="en" key="SELECT_KEYFILE_PATH">Select a keyfile search path. WARNING: Note that only the path will be remembered, not the filenames!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="en" key="SERPENT_HELP">Designed by Ross Anderson, Eli Biham, and Lars Knudsen. Published in 1998. 256-bit key, 128-bit block. Mode of operation is XTS. Serpent was one of the AES finalists.</string>
     <string lang="en" key="SIZE_HELP">Please specify the size of the container you want to create.\n\nIf you create a dynamic (sparse-file) container, this parameter will specify its maximum possible size.\n\nNote that the minimum possible size of a FAT volume is 292 KB. The minimum possible size of an NTFS volume is 3792 KB.</string>
     <string lang="en" key="SIZE_HELP_HIDDEN_HOST_VOL">Please specify the size of the outer volume to be created (you will first create the outer volume and then a hidden volume within it). The minimum possible size of a volume within which a hidden volume is intended to be created is 340 KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="en" key="INCONSISTENCY_RESOLVED">Inconsistency resolved.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="en" key="NOTHING_TO_RESUME">There is no process/task to resume.</string>
     <string lang="en" key="HIDVOL_PROT_BKG_TASK_WARNING">WARNING: VeraCrypt Background Task is disabled. After you exit VeraCrypt, you will not be notified if damage to hidden volume is prevented.\n\nNote: You may shut down the Background Task anytime by right-clicking the VeraCrypt tray icon and selecting 'Exit'.\n\nEnable VeraCrypt Background Task?</string>
     <string lang="en" key="LANG_PACK_VERSION">Language pack version:  %s</string>
     <string lang="en" key="CHECKING_FS">Checking the file system on the VeraCrypt volume mounted as %hs...</string>
@@ -1085,15 +1099,14 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</string>
     <string lang="en" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Error: Cannot set the keyboard layout for VeraCrypt to the standard US keyboard layout.\n\nNote that the password needs to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout.</string>
     <string lang="en" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">As VeraCrypt temporarily changed the keyboard layout to the standard US keyboard layout, it is not possible to type characters by pressing keys while the right Alt key is held down. However, you can type most of such characters by pressing appropriate keys while the Shift key is held down.</string>
     <string lang="en" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCrypt prevented change of keyboard layout.</string>
     <string lang="en" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Note: The password will need to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout. However, it is important to note that you do NOT need a real US keyboard. VeraCrypt automatically ensures that you can safely type the password (right now and in the pre-boot environment) even if yo [...]
-    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (TRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the TRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the TRD allows you to permanently decrypt the partition/drive before Windows  [...]
+    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (VRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the VRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the VRD allows you to permanently decrypt the partition/drive before Windows  [...]
     <string lang="en" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">After you click OK, Microsoft Windows Disc Image Burner will be launched. Please use it to burn the VeraCrypt Rescue Disk ISO image to a CD or DVD.\n\nAfter you do so, return to the VeraCrypt Volume Creation Wizard and follow its instructions.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn it to a CD or DVD.\n\n%lsAfter you burn the Rescue Disk, click Next to verify that it has been correctly burned.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you should either burn the image to a CD/DVD or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
@@ -1290,6 +1303,7 @@
     <string lang="en" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">WARNING: This setting may degrade performance.\n\nAre you sure you want to use this setting?</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="en" key="TEST">Test</string>
     <string lang="en" key="KEYFILE">Keyfile</string>
     <string lang="en" key="VKEY_08">Backspace</string>
diff --git a/Translations/Language.it.xml b/Translations/Language.it.xml
index 31690c9..cbb7b13 100644
--- a/Translations/Language.it.xml
+++ b/Translations/Language.it.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="it" name="Italiano" en-name="Italian" version="1.0.1" translators="Maurizio Ballo, Consiglio Gaetano" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="it" key="IDC_QUICKFORMAT">Formattazione rapida</control>
     <control lang="it" key="IDC_SHOW_PASSWORD">Mostra password</control>
     <control lang="it" key="IDC_SHOW_PASSWORD_SINGLE">&Mostra password</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="it" key="IDC_SINGLE_BOOT">Boot singolo</control>
     <control lang="it" key="IDC_STD_VOL">Volume VeraCrypt standard</control>
     <control lang="it" key="IDC_SYSENC_HIDDEN">nascosto</control>
@@ -98,6 +99,7 @@
     <control lang="it" key="IDT_SYSENC_KEYS_GEN_INFO">Le chiavi, i valori ed altri dati sono stati generati con successo. Se volete generare nuove chiavi fate click su Indietro, altrimenti su Avanti per proseguire.</control>
     <control lang="it" key="IDT_SYS_DEVICE">Codifica la partizione/disco dove Windows è installato. Chi vuole avere l'accesso ed usare il sistema, leggere e scrivere file, ecc, deve digitare ogni volta la password corretta prima dell'avvio di Windows. In alternativa, crea un sistema nascosto.</control>
     <control lang="it" key="IDT_SYS_PARTITION">Selezionare questa opzione per cifrare la partizione dove è installato il sistema operativo Windows attualmente in esecuzione.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="it" key="IDT_WIPE_MODE">Modo di pulizia:</control>
     <control lang="it" key="IDCLOSE">Chiudi</control>
     <control lang="it" key="IDC_ALLOW_ESC_PBA_BYPASS">Consente di saltare l'autenticazione di &pre-bootpremendo il tasto Esc (attiva il manager di avvio)</control>
@@ -111,6 +113,7 @@
     <control lang="it" key="IDC_CACHE">Mantieni password e file chiave nella cache</control>
     <control lang="it" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Chiudi quando non ci sono volumi montati</control>
     <control lang="it" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Chiudi la sessione in corso (log out) dopo che il volume è stato montato</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="it" key="IDC_COPY_WIZARD">Includi la creazione guidata volume VeraCrypt</control>
     <control lang="it" key="IDC_CREATE">Crea</control>
     <control lang="it" key="IDC_CREATE_VOLUME">Crea un volume...</control>
@@ -271,6 +274,8 @@
     <control lang="it" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Mostra il messaggio utente nello schermo di autenticazione di per-avvio (massimo 24 caratteri):</control>
     <control lang="it" key="IDT_DEFAULT_MOUNT_OPTIONS">Opzioni di montaggio predefinite</control>
     <control lang="it" key="IDT_DISMOUNT_ACTION">Opzioni tasti rapidi</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="it" key="IDT_FAVORITE_LABEL">Etichetta del volume preferito selezionato:</control>
     <control lang="it" key="IDT_FILE_SETTINGS">Impostazioni file</control>
     <control lang="it" key="IDT_HOTKEY_KEY">Tasto:</control>
@@ -537,6 +542,15 @@
     <string lang="it" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Nota: Se volete trasferire sicuramente i file dal sistema operativo di richiamo al sistema nascosto, seguite questi passi: 1) Avviare il sistema di richiamo. 2) Salvare i file in un volume decriptato oppure in un volume VeraCrypt normale o esterno. 3) Avviare il sistema nascosto. 4) Se voi salvate i file in un volume VeraCrypt, montarlo (sarà montato automaticamente in sola lettura). 5) Copiare i file nella partizione di  [...]
     <string lang="it" key="CONFIRM_RESTART">Il vostro computer deve essere riavviato.\n\nVolete riavviarlo ora?</string>
     <string lang="it" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Si è verificato un errore nel dare lo stato di codifica del sistema.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="it" key="INIT_SYS_ENC">Impossibile inizializzare i componenti dell’applicazione per la codifica del sistema.</string>
     <string lang="it" key="INIT_RAND">Inizializzazione del generatore di numeri casuali fallita!</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="it" key="SELECT_KEYFILE">Selezionare un file chiave</string>
     <string lang="it" key="SELECT_KEYFILE_PATH">Selezionare un percorso di ricerca dei file chiave. ATTENZIONE: verrà memorizzato solo il percorso, non i file.</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="it" key="SERPENT_HELP">Concepito da Ross Anderson, Eli Biham e Lars Knudsen. Pubblicato nel 1998. Chiave a 256-bit, blocco a 128-bit. Modo operativo XTS. Serpent è uno dei finalisti AES.</string>
     <string lang="it" key="SIZE_HELP">Specificare la dimensione del contenitore da creare.\n\nSe create un contenitore dinamico (file sparsi), questo parametro specificherà la  massima dimensione possibile.\n\nNotate che la minima dimensione possibile per un volume FAT è di 292 KB. Quella per un volume NTFS è di 3792 KB.</string>
     <string lang="it" key="SIZE_HELP_HIDDEN_HOST_VOL">Specificare la dimensione del volume esterno da creare (dovete prima creare il volume esterno e quindi un volume nascosto al suo interno). La dimensione minima possibile per un volume al cui interno deve essere creato un volume è di 340 KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="it" key="INCONSISTENCY_RESOLVED">Inconsistenza risolta.\n\n\n(Se voi segnalate un errore in connessione con questo, includere le seguenti informazioni tecniche nel rapporto di errore: %hs)</string>
     <string lang="it" key="UNEXPECTED_STATE">ERRORE: Stato inatteso.\n\n\n(Se segnalate un errore in connessione con questo, includere le seguenti informazioni tecniche nel rapporto di errore: %hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="it" key="NOTHING_TO_RESUME">Non c'è nessun processo/operazione da riprendere.</string>
     <string lang="it" key="HIDVOL_PROT_BKG_TASK_WARNING">ATTENZIONE: il processo in background di VeraCrypt è disabilitato. Dopo l'uscita da VeraCrypt non si riceveranno avvisi nel caso venga evitato il danneggiamento del volume nascosto.\n\nNota: è possibile chiudere il processo in background in qualsiasi momento facendo click destro sull'icona di VeraCrypt nella barra sistema e selezionando 'Esci'.\n\nAbilitare il processo in background di VeraCrypt?</string>
     <string lang="it" key="LANG_PACK_VERSION">Versione del file di lingua:  %s</string>
     <string lang="it" key="CHECKING_FS">Controllo del file system sul volume VeraCrypt montato come %hs...</string>
@@ -1085,15 +1099,14 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="it" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">I file chiave sono attualmente non supportate dalla codifica di sistema.</string>
     <string lang="it" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">AVVERTENZA: VeraCrypt non può ripristinare la configurazione originale della tastiera. Questo può causare la digitazione errata della password.</string>
     <string lang="it" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">ERRORE: Impossibile impostare la configurazione della tastiera per VeraCrypt nel layout standard tastiera USA.\n\nNotare che la password necessita di essere digitata in ambiente di pre-boot (prima dell’avvio di Windows) dove la configurazione delle tastiere Windows non americane non sono disponibili. Pertanto, la password deve essere sempre digitata usando il layout tastiera standard USA.</string>
     <string lang="it" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">Siccome VeraCrypt ha temporaneamente modificato il layout di tastiera in quello standard americano, non è possibile digitare i caratteri premendo i tasti mentre il tasto destro Alt è tenuto premuto. Comunque, potete digitare la maggior parte di tali caratteri premendo i tasti appropriati mentre il tasto Maiusc è tenuto premuto.</string>
     <string lang="it" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCrypt ha impedito la modifica del layout della tastiera.</string>
     <string lang="it" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Nota: La password deve essere digitata in ambiente pre-boot (prima dell’avvio di Windows) dove le tastiere non americane non sono accettabili. Pertanto, la password deve essere sempre digitata usando la configurazione tastiera standard US. Quindi è importante notare che voi NON avete bisogno di disporre una reale tastiera americana. VeraCrypt assicura automaticamente che voi digitiate la password in sicurezza (sia ora che in amb [...]
-    <string lang="it" key="RESCUE_DISK_INFO">Prima che voi possiate cifrare la partizione/unità, dovete creare un disco di ripristino di VeraCrypt (TRD), che serve ai seguenti scopi:\n\n- Se il VeraCrypt Boot Loader, la chiave principale oppure altri dati critici sono danneggiati, il TRD vi consente di ripristinarli(notare, comunque, che dovete sempre inserire la password corretta).\n\n- Se Windows risulta danneggiato e non può avviarsi, il TRD vi consente di decifrare permanentemente la [...]
+    <string lang="it" key="RESCUE_DISK_INFO">Prima che voi possiate cifrare la partizione/unità, dovete creare un disco di ripristino di VeraCrypt (VRD), che serve ai seguenti scopi:\n\n- Se il VeraCrypt Boot Loader, la chiave principale oppure altri dati critici sono danneggiati, il VRD vi consente di ripristinarli(notare, comunque, che dovete sempre inserire la password corretta).\n\n- Se Windows risulta danneggiato e non può avviarsi, il VRD vi consente di decifrare permanentemente la [...]
     <string lang="it" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">Dopo aver fatto clic su OK, Microsoft Windows Disc Image Burner sarà lanciato. Prego usatelo per masterizzare il file immagine ISO del disco di ripristino di VeraCrypt su un CD oppure DVD.\n\nDopo aver fatto questo, ritornare nella procedura di creazione volume di VeraCrypt e seguire le sue istruzioni.</string>
     <string lang="it" key="RESCUE_DISK_BURN_INFO">L'immagine del disco di ripristino è stata creata e salvata in questo file:\n%hs\n\nOra avete bisogno di masterizzarla in un CD o DVD.\n\n%lsDopo averla masterizzata, fate clic su Avanti per verificare che essa sia stata masterizzata correttamente.</string>
     <string lang="it" key="RESCUE_DISK_BURN_INFO_NO_CHECK">L'immagine del disco di ripristino è stata creata e salvata in questo file:\n%hs\n\nOra voi potete sia masterizzarla su CD/DVD oppure spostarla in un percorso sicuro per un uso in seguito.\n\n%lsFate clic su Avanti per continuare.</string>
@@ -1290,6 +1303,7 @@
     <string lang="it" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">ATTENZIONE: Queste impostazioni possono ridurre le prestazioni.\n\nSiete sicuri di voler usare queste impostazioni?</string>
     <string lang="it" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Attenzione: VolumeVeraCrypt auto-smontato</string>
     <string lang="it" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Prima di rimuovere fisicamente o spegnere un dispositivo contenente un volume montato, si dovrebbe sempre smontare il volume prima su VeraCrypt.\n\nUno smontaggio inprovviso e non voluto è generalmete causato da un'intermittenza sul cavo, disco, ecc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="it" key="TEST">Prova</string>
     <string lang="it" key="KEYFILE">File chiave</string>
     <string lang="it" key="VKEY_08">Indietro</string>
diff --git a/Translations/Language.ja.xml b/Translations/Language.ja.xml
index 6df1bbf..fa9cc2f 100644
--- a/Translations/Language.ja.xml
+++ b/Translations/Language.ja.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="ja" name="日本語" en-name="Japanese" version="1.0.0" translators="OGOSHI Masayuki" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="ja" key="IDC_QUICKFORMAT">クイックフォーマット</control>
     <control lang="ja" key="IDC_SHOW_PASSWORD">パスワード表示(&D)</control>
     <control lang="ja" key="IDC_SHOW_PASSWORD_SINGLE">パスワードを表示(&D)</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="ja" key="IDC_SINGLE_BOOT">シングルブート</control>
     <control lang="ja" key="IDC_STD_VOL">VeraCrypt標準ボリューム</control>
     <control lang="ja" key="IDC_SYSENC_HIDDEN">隠し(&d)</control>
@@ -98,6 +99,7 @@
     <control lang="ja" key="IDT_SYSENC_KEYS_GEN_INFO">暗号鍵、ソルト、その他のデータの生成に成功しました。新しい暗号鍵を生成したい場合は「戻る」をクリックして「次へ」をクリックしてください。それ以外は「次へ」をクリックしてください。</control>
     <control lang="ja" key="IDT_SYS_DEVICE">Windowsがインストールされているパーティションあるいはドライブを暗号化します。このシステム上のファイルを読み書きするためには、Windowsを起動するたびに正しいパスワードを入力しなければならなくなります。隠しシステムを作ることもできます。</control>
     <control lang="ja" key="IDT_SYS_PARTITION">現在起動中のWindowsがインストールされているパーティションを暗号化する場合はこのオプションを選択してください。</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="ja" key="IDT_WIPE_MODE">ワイプモード:</control>
     <control lang="ja" key="IDCLOSE">閉じる</control>
     <control lang="ja" key="IDC_ALLOW_ESC_PBA_BYPASS">Escキーによる起動前認証のスキップを許可(ブートマネージャを有効化)(&a)</control>
@@ -111,6 +113,7 @@
     <control lang="ja" key="IDC_CACHE">パスワードやキーファイルをメモリに記憶する(&E)</control>
     <control lang="ja" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">全てアンマウントされると常駐終了</control>
     <control lang="ja" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">ボリュームのマウントに成功したときにトークンセッションを閉じる(&C)</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="ja" key="IDC_COPY_WIZARD">VeraCryptボリューム作成ウィザードを含める</control>
     <control lang="ja" key="IDC_CREATE">作成</control>
     <control lang="ja" key="IDC_CREATE_VOLUME">ボリュームの作成(&C)</control>
@@ -271,6 +274,8 @@
     <control lang="ja" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">起動前認証画面で次のメッセージを表示する(最大24文字):</control>
     <control lang="ja" key="IDT_DEFAULT_MOUNT_OPTIONS">デフォルトのマウントオプション</control>
     <control lang="ja" key="IDT_DISMOUNT_ACTION">ホットキーオプション</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="ja" key="IDT_FAVORITE_LABEL">選択したお気に入りボリュームのラベル:</control>
     <control lang="ja" key="IDT_FILE_SETTINGS">ファイルの設定</control>
     <control lang="ja" key="IDT_HOTKEY_KEY">割り当てるキー:</control>
@@ -537,6 +542,15 @@
     <string lang="ja" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">注:囮用のシステムから隠しシステムへ安全にファイルを転送したい場合は、以下の手順で行ってください。 1) 囮用OSで起動する。 2) 暗号化されていないボリューム、あるいは標準か外殻のVeraCryptボリュームにファイルを保存する。 3) 隠しOSで起動する。 4) もしそのファイルをVeraCryptボリュームに保存したのならそれをマウントする(自動的に読み取り専用になります)。 5) そのファイルを隠しシステムパーティションあるいはその他の隠しボリュームに保存する。</string>
     <string lang="ja" key="CONFIRM_RESTART">このマシンは再起動する必要があります。\n\nすぐに再起動しますか?</string>
     <string lang="ja" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">システムの暗号ステータスの取得中にエラーが見つかりました。</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="ja" key="INIT_SYS_ENC">システムを暗号化するアプリケーションコンポーネントを初期化できませんでした。</string>
     <string lang="ja" key="INIT_RAND">乱数生成機構の初期化に失敗しました!</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="ja" key="SELECT_KEYFILE">キーファイルの選択</string>
     <string lang="ja" key="SELECT_KEYFILE_PATH">キーファイルを探すフォルダを選択してください。 警告:記憶されるのはフォルダであり、ファイル名ではありません!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="ja" key="SERPENT_HELP">Ross Anderson、Eli Biham、Lars Knudsenによって開発され1998年に公開されました。256ビットキー、128ビットブロックを使用します。動作モードはXTSです。SerpentはAES制定時の最終候補の一つでした。</string>
     <string lang="ja" key="SIZE_HELP">作成するコンテナのサイズを指定してください。\n\nもしダイナミック(スパースファイル)コンテナを作成するのであれば、このパラメータは上限サイズの指定になります。\n\n下限サイズはFATボリュームの場合で292KB、NTFSボリュームの場合で3792KB となります。</string>
     <string lang="ja" key="SIZE_HELP_HIDDEN_HOST_VOL">新しい外殻ボリュームのサイズを指定してください(中に入れる隠しボリュームは後で作成します)。中に隠しボリュームを作成できる下限サイズは340KBです。</string>
@@ -1033,7 +1048,6 @@
     <string lang="ja" key="INCONSISTENCY_RESOLVED">不整合状態を解決しました。\n\n\n(もしこの問題についてバグ報告をしてくださるなら、以下の技術的情報を付け加えてくださるようお願いします: %hs)</string>
     <string lang="ja" key="UNEXPECTED_STATE">エラー:予期しない状態です。\n\n\n(この状態をバグ報告する場合、次の情報も報告に含めるようお願いいたします。: %hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="ja" key="NOTHING_TO_RESUME">再開される処理/タスクはありません。</string>
     <string lang="ja" key="HIDVOL_PROT_BKG_TASK_WARNING">警告:VeraCryptの常駐は無効になっています。VeraCryptの終了後は、隠しボリュームの保護機能が働いても告知されません。\n\n注:VeraCryptのトレイアイコンを右クリックして終了を選べば、いつでも常駐を終了できます。\n\nVeraCryptの常駐を有効にしますか?</string>
     <string lang="ja" key="LANG_PACK_VERSION">言語パックのバージョン: %s</string>
     <string lang="ja" key="CHECKING_FS">%hs ドライブとしてマウントされた VeraCryptボリュームのファイルシステムをチェック中です...</string>
@@ -1085,15 +1099,14 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="ja" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">現在、システムの暗号化でのキーファイル使用には対応していません。</string>
     <string lang="ja" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">警告:VeraCryptは元のキーボードレイアウトを復元できませんでした。そのためパスワードを正確に入力できないおそれがあります。</string>
     <string lang="ja" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">エラー:キーボードのレイアウトを標準USキーボードとして設定できません。\n\nシステム起動前に必要なパスワードがUS Windowsレイアウト以外のキーボードで入力されても無効となります。したがってパスワードは常に標準USレイアウトのキーボードで入力される必要があります。</string>
     <string lang="ja" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">VeraCryptはキーボードのレイアウトを一時的に標準USキーボードに変更するため、右ALTキーの押下が必要な文字を入力できません。ただしそのような文字の大部分はシフトキーを押下することで入力できます。</string>
     <string lang="ja" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCryptはキーボードレイアウトの変更を阻止しました。</string>
     <string lang="ja" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">注:起動前の環境下(Windowsの起動前)では、US-Windows以外のキーボードレイアウトが必要なパスワードは無効です。そのため、パスワードは常に標準USキーボードレイアウトで入力される必要があります。ただし、これは物理的にUSキーボードが必要という意味では*ありません*。VeraCryptはたとえ物理的にUSキーボードではない環境であっても、今現在でも起動前環境下でも、自動的に正しくパスワードが入力できるようにします。</string>
-    <string lang="ja" key="RESCUE_DISK_INFO">このパーティション/ドライブを暗号化する前にVeraCryptレスキューディスク(TRD)を作成する必要があります。TRDには以下の目的があります。:\n\n- VeraCryptブートローダーやマスターキー、その他重要なデータが破損した場合、TRDで復旧できます(ただし正しいパスワードの入力が必要なことには変わりありません)。\n\n- Windowsが破損して起動不能になった場合、Windowsの起動前にTRDでシステムドライブ/パーティションの暗号化を解除できます。\n\n- TRDは最初のドライブトラックに記録されていた情報をバックアップし、必要であればリストアできます。通常この部分にはシステムローダーあるいはブートマネージャーが含まれています。\n\nVeraCryptレスキューディスクのISOイメージは下記に示された場所に作成されます。</string>
+    <string lang="ja" key="RESCUE_DISK_INFO">このパーティション/ドライブを暗号化する前にVeraCryptレスキューディスク(VRD)を作成する必要があります。VRDには以下の目的があります。:\n\n- VeraCryptブートローダーやマスターキー、その他重要なデータが破損した場合、VRDで復旧できます(ただし正しいパスワードの入力が必要なことには変わりありません)。\n\n- Windowsが破損して起動不能になった場合、Windowsの起動前にVRDでシステムドライブ/パーティションの暗号化を解除できます。\n\n- VRDは最初のドライブトラックに記録されていた情報をバックアップし、必要であればリストアできます。通常この部分にはシステムローダーあるいはブートマネージャーが含まれています。\n\nVeraCryptレスキューディスクのISOイメージは下記に示された場所に作成されます。</string>
     <string lang="ja" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">OKをクリックすると、Windowsディスクイメージ書き込みツールが起動します。このツールでVeraCryptレスキューディスクのISOイメージをCDやDVDに書き込んでください。\n\n書き込み後、VeraCryptボリューム作成ウィザードに戻って、以下の手順に従ってください。</string>
     <string lang="ja" key="RESCUE_DISK_BURN_INFO">レスキューディスクのイメージファイルが次の場所に作成されました: %hs\n\nこれをCDやDVDに書き込んでください。\n\n%ls レスキューディスクの作成後、「次へ」をクリックして正しく作成されたかを確認してください。</string>
     <string lang="ja" key="RESCUE_DISK_BURN_INFO_NO_CHECK">レスキューディスクのイメージファイルが次の場所に作成されました: %hs\n\nこのディスクイメージをCDやDVDに書き込むか、後で利用するために安全な場所に移動してください。\n\n%ls「次へ」で処理を続けます。</string>
@@ -1290,6 +1303,7 @@
     <string lang="ja" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">警告:この設定はパフォーマンスを低下させます。\n\n本当にこの設定を使用しますか?</string>
     <string lang="ja" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">警告:VeraCryptボリュームの自動的アンマウント</string>
     <string lang="ja" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">マウント中のボリュームが存在するデバイスを物理的に取り外したり電源を切ったりする先に、常にまずVeraCryptボリュームをアンマウントすべきです。\n\n想定外に勝手にアンマウントされるのは、ケーブルやドライブ等が断続的につながらなくなっているのが大抵の原因です。</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="ja" key="TEST">テスト</string>
     <string lang="ja" key="KEYFILE">キーファイル</string>
     <string lang="ja" key="VKEY_08">Backspace</string>
diff --git a/Translations/Language.ka.xml b/Translations/Language.ka.xml
index 9ad8570..88ee9a2 100644
--- a/Translations/Language.ka.xml
+++ b/Translations/Language.ka.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="ka" name="ქართული" en-name="Georgian" version="0.1.0" translators="Kakha Lomiashvili" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="ka" key="IDC_QUICKFORMAT">სწრაფი ფორმატირება</control>
     <control lang="ka" key="IDC_SHOW_PASSWORD">პაროლის ჩვენება</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&Display password</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="ka" key="IDC_SINGLE_BOOT">Single-boot</control>
     <control lang="ka" key="IDC_STD_VOL">VeraCrypt-ის სტანდარტული ტომი</control>
     <control lang="en" key="IDC_SYSENC_HIDDEN">Hi&dden</control>
@@ -98,6 +99,7 @@
     <control lang="ka" key="IDT_SYSENC_KEYS_GEN_INFO">გასაღებები, "მარილი", და სხვა მონაცემები წარმატების იქნა გენერირებული. თუ ახალი გასაღებების შექმნა გსურთ, დააჭირეთ "უკან" და "შემდეგ"-ს. სხვა შემთხვევაში გასაგრძელებლად დააჭირეთ "შემდეგ"-ს.</control>
     <control lang="en" key="IDT_SYS_DEVICE">Encrypts the partition/drive where Windows is installed. Anyone who wants to gain access and use the system, read and write files, etc., will need to enter the correct password each time before Windows boots. Optionally, creates a hidden system.</control>
     <control lang="en" key="IDT_SYS_PARTITION">Select this option to encrypt the partition where the currently running Windows operating system is installed.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="ka" key="IDT_WIPE_MODE">წაშლის რეჟიმი:</control>
     <control lang="ka" key="IDCLOSE">დახურვა</control>
     <control lang="en" key="IDC_ALLOW_ESC_PBA_BYPASS">Allow pre-boot &authentication to be bypassed by pressing the Esc key (enables boot manager)</control>
@@ -111,6 +113,7 @@
     <control lang="ka" key="IDC_CACHE">პაროლების/გასაღების ფაილების ქეშირება</control>
     <control lang="ka" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">გასვლა, მიერთებული ტომების არარსებობისას</control>
     <control lang="en" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Close token session (log out) after a volume is successfully mounted</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="ka" key="IDC_COPY_WIZARD">VeraCrypt ტომების შექმნის ოსტატით</control>
     <control lang="ka" key="IDC_CREATE">შექმნა</control>
     <control lang="ka" key="IDC_CREATE_VOLUME">ტომის შექმნა</control>
@@ -271,6 +274,8 @@
     <control lang="en" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Display this custom message in the pre-boot authentication screen (24 characters maximum):</control>
     <control lang="ka" key="IDT_DEFAULT_MOUNT_OPTIONS">ტომების მიერთების საწყისი პარამეტრები</control>
     <control lang="ka" key="IDT_DISMOUNT_ACTION">დამატებითი პარამეტრები</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="en" key="IDT_FAVORITE_LABEL">Label of selected favorite volume:</control>
     <control lang="ka" key="IDT_FILE_SETTINGS">ფაილური პარამეტრები</control>
     <control lang="ka" key="IDT_HOTKEY_KEY">კლავიში:</control>
@@ -537,6 +542,15 @@
     <string lang="en" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Note: If you need to securely transfer files from the decoy system to the hidden system, follow these steps:\n1) Start the decoy system.\n2) Save the files to an unencrypted volume or to an outer/normal VeraCrypt volume.\n3) Start the hidden system.\n4) If you saved the files to a VeraCrypt volume, mount it (it will be automatically mounted as read-only).\n5) Copy the files to the hidden system partition or to another hid [...]
     <string lang="ka" key="CONFIRM_RESTART">თქვენი კომპიუტერი საჭიროებს გადატვირთვას.\n\nგსურთ ახლავე გადატვირთვა?</string>
     <string lang="ka" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">სისტემის შიფრაციის სტატუსის მიღების დროს მოხდა შეცდომა.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="ka" key="INIT_SYS_ENC">ვერ ხერხდება სისტემის შიფრაციისათვის პროგრამის კომპონენტების ინიციალიზაცია.</string>
     <string lang="ka" key="INIT_RAND">შემთხვევითი რიცხვების გენერატორის ინიციალიზაციის შეცდომა.</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="ka" key="SELECT_KEYFILE">აირჩიეთ გასაღების ფაილი</string>
     <string lang="ka" key="SELECT_KEYFILE_PATH">აირჩიეთ გასაღების ფაილების ძიების მისამართი. ყურადღება: შეინახება მხოლოდ მისამართი, და არა ფაილების სახელები.</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="ka" key="SERPENT_HELP">შემუშავებულია როს ანდერსონის, ელი ბიჰამის და ლარს კნუდსენის მიერ. გამოქვეყნდა 1998წ. 256-ბიტი გასაღები, 128-ბიტი ბლოკი. ქმედების რეჟიმი - XTS. AES-ის ფინალისტი.</string>
     <string lang="en" key="SIZE_HELP">Please specify the size of the container you want to create.\n\nIf you create a dynamic (sparse-file) container, this parameter will specify its maximum possible size.\n\nNote that the minimum possible size of a FAT volume is 292 KB. The minimum possible size of an NTFS volume is 3792 KB.</string>
     <string lang="en" key="SIZE_HELP_HIDDEN_HOST_VOL">Please specify the size of the outer volume to be created (you will first create the outer volume and then a hidden volume within it). The minimum possible size of a volume within which a hidden volume is intended to be created is 340 KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="ka" key="INCONSISTENCY_RESOLVED">გაუმართაობა აღმოფხვრილია.\n\n\n(თუ გამოგზავნით ამ შეცდომასთან დაკავშირებით ინფორმაციას, დაურთეთ შემდეგი ტექნიკური ინფორმაცია: %hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="ka" key="NOTHING_TO_RESUME">გასაგრძელებელი პროცესი/დავალება არ არის.</string>
     <string lang="ka" key="HIDVOL_PROT_BKG_TASK_WARNING">ყურადღება: VeraCrypt-ის ფონური რეჟიმი გამორთულია. VeraCrypt-ის დახურვის შემდეგ, იგი არ შეგატყობინებთ ფარული ტომის დაზიანების შემთხვევაზე.\n\nგსურთ ჩართოთ VeraCrypt-ის ფონური რეჟიმი?</string>
     <string lang="ka" key="LANG_PACK_VERSION">ენის მოდულის ვერსია: %s</string>
     <string lang="ka" key="CHECKING_FS">მიმდინარეობს %hs-ად მიერთებული ტომის ფაილური სისტემის შემოწმება...</string>
@@ -1085,15 +1099,14 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="ka" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">გაფრთხილება: VeraCrypt ვერ აღადგენს კლავიატურის ორიგინალ განლაგებას. ამან შესაძლოა პაროლის არასწორი შეტანა გამოიწვიოს.</string>
     <string lang="ka" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">შეცდომა: VeraCrypt-ისთვის კლავიატურის სტანდარტული US  განლაგების დაყენება ვერ ხერხდება.\n\nპაროლი შეტანილ უნდა იქნას ჩატვირთვის პროცესში (Windows-ის სტარტამდე), როდესაც არა-US განლაგების ჩართვა შეუძლებელია. ამიტომ პაროლი აკრეფილნ უნდა იქნას კლავიატურის სტანდარტული US განლაგებით.</string>
     <string lang="ka" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">VeraCrypt-მა კლავიატურის განლაგება დროებით სტანდარტულ US განლაგებაზე შეცვალა, ამიტომ სიმბოლოების აკრეფა მარჯვენა Alt კლავიშის დაჭერით შეუძლებელია. თუმცა ამ სიმბოლოების უმეტესობა შეგიძლიათ აკრიფოთ Shift კლავიშის დაჭერით.</string>
     <string lang="ka" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCrypt-მა დაბლოკა კლავიატურის განლაგების შეცვლა.</string>
     <string lang="ka" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">შენიშვნა: პაროლი შეტანილ უნდა იქნას ჩატვირეთვის დროს (Windows-ის სტარტამდე), სადაც არა-US კლავიატურის განლაგებები გამორთულია. ამიტომ პაროლი ყოველთვის სტანდარტული US განლაგებით უნდა იქნას შეტანილი. თუმცა, რეალური US კლავიატურის ქონა აუცილებელი არ არის. VeraCrypt ავტომატურად უქზრუნველყოფს პაროლის სწორად შეტანას ყველა შემთხვევაში.</string>
-    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (TRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the TRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the TRD allows you to permanently decrypt the partition/drive before Windows  [...]
+    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (VRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the VRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the VRD allows you to permanently decrypt the partition/drive before Windows  [...]
     <string lang="en" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">After you click OK, Microsoft Windows Disc Image Burner will be launched. Please use it to burn the VeraCrypt Rescue Disk ISO image to a CD or DVD.\n\nAfter you do so, return to the VeraCrypt Volume Creation Wizard and follow its instructions.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn it to a CD or DVD.\n\n%lsAfter you burn the Rescue Disk, click Next to verify that it has been correctly burned.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you should either burn the image to a CD/DVD or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
@@ -1290,6 +1303,7 @@
     <string lang="en" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">WARNING: This setting may degrade performance.\n\nAre you sure you want to use this setting?</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="ka" key="TEST">ტესტი</string>
     <string lang="ka" key="KEYFILE">გასაღების ფაილი</string>
     <string lang="ka" key="VKEY_08">Backspace</string>
diff --git a/Translations/Language.ko.xml b/Translations/Language.ko.xml
index fb3fa1a..b77763a 100644
--- a/Translations/Language.ko.xml
+++ b/Translations/Language.ko.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="ko" name="한국어" en-name="Korean" version="0.1.0" translators="Kim Young" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="ko" key="IDC_QUICKFORMAT">빠른 포맷</control>
     <control lang="ko" key="IDC_SHOW_PASSWORD">비밀번호 표시(&D)</control>
     <control lang="ko" key="IDC_SHOW_PASSWORD_SINGLE">비밀번호 표시(&D)</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="ko" key="IDC_SINGLE_BOOT">싱글-부트</control>
     <control lang="ko" key="IDC_STD_VOL">표준 VeraCrypt 볼륨</control>
     <control lang="ko" key="IDC_SYSENC_HIDDEN">숨김(&D)</control>
@@ -98,6 +99,7 @@
     <control lang="ko" key="IDT_SYSENC_KEYS_GEN_INFO">키, 소금(→ 패스워드 보호에서 패스워드 해시를 변환하는 데 사용되는 무작위 문자열) 및 기타 데이터를 성공적으로 생성했습니다. 새로운 키를 생성하려면 “뒤로”를 클릭한 후 “다음”을 누르세요. 계속하려면 “다음”을 클릭하세요.</control>
     <control lang="ko" key="IDT_SYS_DEVICE">윈도우가 설치되어 있는 파티션/드라이브를 암호화합니다. 시스템에 접근해서 사용하고, 파일을 읽고 쓰는 등의 작업을 하려는 사람은 윈도우가 부팅할 때마다 올바른 비밀번호를 입력해야 합니다. 숨긴 시스템을 선택적으로 만들 수 있습니다.</control>
     <control lang="ko" key="IDT_SYS_PARTITION">현재 실행 중인 윈도우 운영체제가 설치된 파티션을 암호화하려면 이 옵션을 선택합니다.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="ko" key="IDT_WIPE_MODE">지움 방식:</control>
     <control lang="ko" key="IDCLOSE">닫기</control>
     <control lang="ko" key="IDC_ALLOW_ESC_PBA_BYPASS">Esc 키를 눌러 부팅-전 인증을 건너뛸 수 있습니다(* 부트 관리자 사용)(&A)</control>
@@ -111,6 +113,7 @@
     <control lang="ko" key="IDC_CACHE">메모리에 비밀번호 및 키파일 보관</control>
     <control lang="ko" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">삽입된 볼륨이 없을 때 종료</control>
     <control lang="ko" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">볼륨이 성공적으로 삽입된 후 토큰 세션 닫기(* 로그 아웃)(&C)</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="ko" key="IDC_COPY_WIZARD">VeraCrypt 볼륨 만들기 마법사 포함</control>
     <control lang="ko" key="IDC_CREATE">만들기</control>
     <control lang="ko" key="IDC_CREATE_VOLUME">볼륨 만들기(&C)</control>
@@ -271,6 +274,8 @@
     <control lang="ko" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">부팅-전 인증 화면에 사용자 메시지 표시(* 최대 문자수는 24개):</control>
     <control lang="ko" key="IDT_DEFAULT_MOUNT_OPTIONS">기본 삽입 옵션</control>
     <control lang="ko" key="IDT_DISMOUNT_ACTION">단축키 옵션</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="en" key="IDT_FAVORITE_LABEL">Label of selected favorite volume:</control>
     <control lang="ko" key="IDT_FILE_SETTINGS">파일 설정</control>
     <control lang="ko" key="IDT_HOTKEY_KEY">할당할 키:</control>
@@ -537,6 +542,15 @@
     <string lang="ko" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">참고: 미끼용 시스템에서 숨긴 시스템으로 파일을 안전하게 전송할 필요가 있는 경우에는 다음 단계를 따릅니다. 1) 미끼용 시스템을 시작합니다. 2) 암호화되지 않은 볼륨 또는 외부/표준 VeraCrypt 볼륨에 파일을 저장합니다. 3) 숨긴 시스템을 시작합니다. 4) VeraCrypt 볼륨에 파일을 저장한 경우, 이 볼륨을 삽입합니다(→ 읽기-전용으로 자동으로 삽입됩니다). 5) 파일을 ① 숨긴 시스템 파티션 또는 ② 다른 숨긴 볼륨에 복사합니다.</string>
     <string lang="ko" key="CONFIRM_RESTART">컴퓨터를 다시 시작해야 합니다.\n\n지금 다시 시작하시겠습니까?</string>
     <string lang="ko" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">시스템 암호 상태를 얻는 동안 오류가 발생했습니다.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="ko" key="INIT_SYS_ENC">시스템 암호화를 위한 프로그램 구성요소를 초기화하지 못했습니다.</string>
     <string lang="ko" key="INIT_RAND">무작위 숫자 생성기를 초기화하는데 실패했습니다!</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="ko" key="SELECT_KEYFILE">키파일 선택</string>
     <string lang="ko" key="SELECT_KEYFILE_PATH">키파일 찾기 경로를 선택하세요. 주의: 경로만 기억되고, 파일 이름은 기억되지 않습니다!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="ko" key="SERPENT_HELP">Ross Anderson, Eli Biham, 및 Lars Knudsen에 의해 디자인됨. 1998년 발표됨. 256-비트 키, 128-비트 블록. 작업 모드는 XTS입니다. Serpent는 AES 결선작 중의 하나였습니다.</string>
     <string lang="en" key="SIZE_HELP">Please specify the size of the container you want to create.\n\nIf you create a dynamic (sparse-file) container, this parameter will specify its maximum possible size.\n\nNote that the minimum possible size of a FAT volume is 292 KB. The minimum possible size of an NTFS volume is 3792 KB.</string>
     <string lang="en" key="SIZE_HELP_HIDDEN_HOST_VOL">Please specify the size of the outer volume to be created (you will first create the outer volume and then a hidden volume within it). The minimum possible size of a volume within which a hidden volume is intended to be created is 340 KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="ko" key="INCONSISTENCY_RESOLVED">불일치가 해결되었습니다.\n\n\n이와 관련된 버그를 보고하려면, 버그 보고서에 다음과 같은 기술 정보를 포함해 주세요: %hs</string>
     <string lang="ko" key="UNEXPECTED_STATE">오류: 예기치 않은 상태.\n\n\n(이와 관련된 버그를 보고하려면, 버그 보고서에 다음과 같은 기술 정보를 포함해 주세요: %hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="ko" key="NOTHING_TO_RESUME">다시 시작할 진행/작업이 없습니다.</string>
     <string lang="ko" key="HIDVOL_PROT_BKG_TASK_WARNING">주의: VeraCrypt 백그라운드 작업의 사용이 해제되었습니다. 프로그램을 종료하면, 숨긴 볼륨의 손상이 방지된 경우에도 그 알림을 통보받지 못합니다.\n\n참고: 언제라도 VeraCrypt 트레이 아이콘을 오른쪽 클릭하고 “종료”를 선택해서 백그라운드 작업을 종료할 수 있습니다.\n\nVeraCrypt 백그라운드 작업을 지금 사용가능하게 할까요?</string>
     <string lang="ko" key="LANG_PACK_VERSION">언어팩 버전:  %s</string>
     <string lang="ko" key="CHECKING_FS">%hs로 삽입된 VeraCrypt 볼륨에 대한 파일 시스템을 체크하는 중...</string>
@@ -1085,15 +1099,14 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="ko" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">키파일이 현재 시스템 암호화에서 지원되지 않습니다.</string>
     <string lang="ko" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">주의: VeraCrypt가 원래의 키보드 레이아웃을 복구할 수 없습니다. 이 경우 비밀번호를 올바르게 입력할 수 없을지도 모릅니다.</string>
     <string lang="ko" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">오류: VeraCrypt 키보드 레이아웃을 표준 US 키보드 레이아웃에 설정할 수 없습니다.\n\n(윈도우 시작 전에) US가 아닌 윈도우 키보드 레이아웃을 사용할 수 없는 부팅-전 환경에서 비밀번호를 입력할 필요가 있다는 것을 참고하세요. 그래서 표준 US 키보드 레이아웃을 사용해서 항상 비밀번호를 입력해야 합니다.</string>
     <string lang="ko" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">VeraCrypt가 키보드 레이아웃을 표준 US 키보드 레이아웃으로 잠시 변경했기 때문에, 오른쪽 Alt 키가 눌러진 상태에서 키를 눌러 문자를 입력할 수 없습니다. 그러나 Shift 키가 눌러진 상태에서는 적당한 키를 눌러 대부분의 문자를 입력할 수 있습니다.</string>
     <string lang="ko" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCrypt가 키보드 레이아웃의 변경을 방지했습니다.</string>
     <string lang="ko" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">참고: (윈도우 시작 전에) US가 아닌 윈도우 키보드 레이아웃을 사용할 수 없는 부팅-전 환경에서 비밀번호를 입력할 필요가 있다는 것을 참고하세요. 그래서 표준 US 키보드 레이아웃을 사용해서 항상 비밀번호를 입력해야 합니다. 그러나 실제 US 키보드가 필요하지 않다는 사실을 명심하세요. 실제 US 키보드가 없는 경우일지라도, VeraCrypt는 (현재 및 부팅-전 환경에서) 사용자가 안전하게 비밀번호를 입력했는지를 자동으로 확인합니다.</string>
-    <string lang="ko" key="RESCUE_DISK_INFO">사용자가 파티션/드라이브를 암호화하기 전에, VeraCrypt 응급복구 디스크(TRD)를 먼저 만들어야 합니다. 그 목적은 다음과 같습니다:\n\n- 만약 VeraCrypt 부트 로더, 마스터 키 또는 다른 중요한 데이터가 손상된 경우, TRD를 이용해서 복구할 수 있습니다(그러나 여전히 올바른 비밀번호를 입력해야 합니다).\n\n- 만약 윈도우가 손상되어 시작이 되지 않는다면, TRD를 이용해서 윈도우의 시작 전에 파티션/드라이브를 영구적으로 암호해제할 수 있습니다.\n\n- TRD는 첫번째 드라이브 트랙(* 보통 시스템 로더나 부트 관리자를 포함하고 있음)의 내용에 대한 백업을 포함하고 있으므로 이를 이용해서 필요한 경우 복구할 수 있습니다.\n\nVeraCrypt 응급복구 디스크 ISO 이미지는 아래의 지정된 위치에서 생성됩니다.</string>
+    <string lang="ko" key="RESCUE_DISK_INFO">사용자가 파티션/드라이브를 암호화하기 전에, VeraCrypt 응급복구 디스크(VRD)를 먼저 만들어야 합니다. 그 목적은 다음과 같습니다:\n\n- 만약 VeraCrypt 부트 로더, 마스터 키 또는 다른 중요한 데이터가 손상된 경우, VRD를 이용해서 복구할 수 있습니다(그러나 여전히 올바른 비밀번호를 입력해야 합니다).\n\n- 만약 윈도우가 손상되어 시작이 되지 않는다면, VRD를 이용해서 윈도우의 시작 전에 파티션/드라이브를 영구적으로 암호해제할 수 있습니다.\n\n- VRD는 첫번째 드라이브 트랙(* 보통 시스템 로더나 부트 관리자를 포함하고 있음)의 내용에 대한 백업을 포함하고 있으므로 이를 이용해서 필요한 경우 복구할 수 있습니다.\n\nVeraCrypt 응급복구 디스크 ISO 이미지는 아래의 지정된 위치에서 생성됩니다.</string>
     <string lang="ko" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">“확인”을 클릭하면 Microsoft Windows Disc Image Burner가 실행됩니다. 이를 이용해서 VeraCrypt 응급복구 디스크 ISO 이미지를 CD 또는 DVD에 굽습니다.\n\n이 작업을 마친 후에 VeraCrypt 볼륨 만들기 마법사로 돌아가서 그 지침을 따릅니다.</string>
     <string lang="ko" key="RESCUE_DISK_BURN_INFO">응급복구 디스크 이미지가 생성되어 다음 파일에 저장되었습니다: %hs\n\n이제 이미지를 CD 또는 DVD에 구울 필요가 있습니다.\n\n%ls응급복구 디스크를 구운 후, “다음”을 클릭해서 응급복구 디스크가 올바르게 구워졌는지를 확인합니다.</string>
     <string lang="ko" key="RESCUE_DISK_BURN_INFO_NO_CHECK">응급복구 디스크 이미지가 생성되어 다음 파일에 저장되었습니다: %hs\n\n이제 응급복구 디스크를 CD/DVD에 굽거나 나중에 사용하기 위해 안전한 위치에 ISO 이미지를 이동해야 합니다.\n\n%ls계속하려면 “다음”을 클릭합니다.</string>
@@ -1290,6 +1303,7 @@
     <string lang="en" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">WARNING: This setting may degrade performance.\n\nAre you sure you want to use this setting?</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="ko" key="TEST">테스트</string>
     <string lang="ko" key="KEYFILE">키파일</string>
     <string lang="ko" key="VKEY_08">Backspace</string>
diff --git a/Translations/Language.lv.xml b/Translations/Language.lv.xml
index 81f3209..ac3941e 100644
--- a/Translations/Language.lv.xml
+++ b/Translations/Language.lv.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="lv" name="Latviešu" en-name="Latvian" version="0.1.0" translators="Edmunds Melkers" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="lv" key="IDC_QUICKFORMAT">Ātrā formatēšana</control>
     <control lang="en" key="IDC_SHOW_PASSWORD">&Display password</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&Display password</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="en" key="IDC_SINGLE_BOOT">Single-boot</control>
     <control lang="en" key="IDC_STD_VOL">Standard VeraCrypt volume</control>
     <control lang="en" key="IDC_SYSENC_HIDDEN">Hi&dden</control>
@@ -98,6 +99,7 @@
     <control lang="en" key="IDT_SYSENC_KEYS_GEN_INFO">The keys, salt, and other data have been successfully generated. If you want to generate new keys, click Back and then Next. Otherwise, click Next to continue.</control>
     <control lang="en" key="IDT_SYS_DEVICE">Encrypts the partition/drive where Windows is installed. Anyone who wants to gain access and use the system, read and write files, etc., will need to enter the correct password each time before Windows boots. Optionally, creates a hidden system.</control>
     <control lang="en" key="IDT_SYS_PARTITION">Select this option to encrypt the partition where the currently running Windows operating system is installed.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="en" key="IDT_WIPE_MODE">Wipe mode:</control>
     <control lang="lv" key="IDCLOSE">Aizvērt</control>
     <control lang="en" key="IDC_ALLOW_ESC_PBA_BYPASS">Allow pre-boot &authentication to be bypassed by pressing the Esc key (enables boot manager)</control>
@@ -111,6 +113,7 @@
     <control lang="en" key="IDC_CACHE">Cache passwords and keyfil&es in memory</control>
     <control lang="lv" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Iziet, kad vairs nav uzstādītu apgabalu</control>
     <control lang="en" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Close token session (log out) after a volume is successfully mounted</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="lv" key="IDC_COPY_WIZARD">Iekļaut VeraCrypt apgabala izveidošanas vedni</control>
     <control lang="lv" key="IDC_CREATE">Izveidot</control>
     <control lang="lv" key="IDC_CREATE_VOLUME">Izveidot apgabalu</control>
@@ -271,6 +274,8 @@
     <control lang="en" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Display this custom message in the pre-boot authentication screen (24 characters maximum):</control>
     <control lang="lv" key="IDT_DEFAULT_MOUNT_OPTIONS">Noklusētās uzstādīšanas iespējas</control>
     <control lang="lv" key="IDT_DISMOUNT_ACTION">Karsto taustiņu iespējas</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="en" key="IDT_FAVORITE_LABEL">Label of selected favorite volume:</control>
     <control lang="lv" key="IDT_FILE_SETTINGS">Datnes iestatījumi</control>
     <control lang="lv" key="IDT_HOTKEY_KEY">Karstais taustiņš:</control>
@@ -537,6 +542,15 @@
     <string lang="en" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Note: If you need to securely transfer files from the decoy system to the hidden system, follow these steps:\n1) Start the decoy system.\n2) Save the files to an unencrypted volume or to an outer/normal VeraCrypt volume.\n3) Start the hidden system.\n4) If you saved the files to a VeraCrypt volume, mount it (it will be automatically mounted as read-only).\n5) Copy the files to the hidden system partition or to another hid [...]
     <string lang="en" key="CONFIRM_RESTART">Your computer must be restarted.\n\nDo you want to restart it now?</string>
     <string lang="en" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">An error occurred when obtaining the system encryption status.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="en" key="INIT_SYS_ENC">Cannot initialize application components for system encryption.</string>
     <string lang="en" key="INIT_RAND">Failed to initialize the random number generator!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="lv" key="SELECT_KEYFILE">Izvēlieties atslēgdatni</string>
     <string lang="lv" key="SELECT_KEYFILE_PATH">Izvēlieties atslēgdatnes izvietojumu. UZMANĪBU: Tiks iegaumēts tikai izvietojums, nevis datņu nosaukums!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="en" key="SERPENT_HELP">Designed by Ross Anderson, Eli Biham, and Lars Knudsen. Published in 1998. 256-bit key, 128-bit block. Mode of operation is XTS. Serpent was one of the AES finalists.</string>
     <string lang="en" key="SIZE_HELP">Please specify the size of the container you want to create.\n\nIf you create a dynamic (sparse-file) container, this parameter will specify its maximum possible size.\n\nNote that the minimum possible size of a FAT volume is 292 KB. The minimum possible size of an NTFS volume is 3792 KB.</string>
     <string lang="en" key="SIZE_HELP_HIDDEN_HOST_VOL">Please specify the size of the outer volume to be created (you will first create the outer volume and then a hidden volume within it). The minimum possible size of a volume within which a hidden volume is intended to be created is 340 KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="en" key="INCONSISTENCY_RESOLVED">Inconsistency resolved.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="en" key="NOTHING_TO_RESUME">There is no process/task to resume.</string>
     <string lang="en" key="HIDVOL_PROT_BKG_TASK_WARNING">WARNING: VeraCrypt Background Task is disabled. After you exit VeraCrypt, you will not be notified if damage to hidden volume is prevented.\n\nNote: You may shut down the Background Task anytime by right-clicking the VeraCrypt tray icon and selecting 'Exit'.\n\nEnable VeraCrypt Background Task?</string>
     <string lang="lv" key="LANG_PACK_VERSION">Valodas pakotnes versija:  %s</string>
     <string lang="en" key="CHECKING_FS">Checking the file system on the VeraCrypt volume mounted as %hs...</string>
@@ -1085,15 +1099,14 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</string>
     <string lang="en" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Error: Cannot set the keyboard layout for VeraCrypt to the standard US keyboard layout.\n\nNote that the password needs to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout.</string>
     <string lang="en" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">As VeraCrypt temporarily changed the keyboard layout to the standard US keyboard layout, it is not possible to type characters by pressing keys while the right Alt key is held down. However, you can type most of such characters by pressing appropriate keys while the Shift key is held down.</string>
     <string lang="en" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCrypt prevented change of keyboard layout.</string>
     <string lang="en" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Note: The password will need to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout. However, it is important to note that you do NOT need a real US keyboard. VeraCrypt automatically ensures that you can safely type the password (right now and in the pre-boot environment) even if yo [...]
-    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (TRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the TRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the TRD allows you to permanently decrypt the partition/drive before Windows  [...]
+    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (VRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the VRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the VRD allows you to permanently decrypt the partition/drive before Windows  [...]
     <string lang="en" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">After you click OK, Microsoft Windows Disc Image Burner will be launched. Please use it to burn the VeraCrypt Rescue Disk ISO image to a CD or DVD.\n\nAfter you do so, return to the VeraCrypt Volume Creation Wizard and follow its instructions.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn it to a CD or DVD.\n\n%lsAfter you burn the Rescue Disk, click Next to verify that it has been correctly burned.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you should either burn the image to a CD/DVD or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
@@ -1290,6 +1303,7 @@
     <string lang="en" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">WARNING: This setting may degrade performance.\n\nAre you sure you want to use this setting?</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="en" key="TEST">Test</string>
     <string lang="en" key="KEYFILE">Keyfile</string>
     <string lang="lv" key="VKEY_08">Backspace</string>
diff --git a/Translations/Language.my.xml b/Translations/Language.my.xml
index 118374e..81f3021 100644
--- a/Translations/Language.my.xml
+++ b/Translations/Language.my.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="my" name="မြန်မာ" en-name="Burmese" version="1.0.0" translators="Zaw Myo Htet" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="my" key="IDC_QUICKFORMAT">အမြန် မော်မက်ချရန်</control>
     <control lang="my" key="IDC_SHOW_PASSWORD">စကားဝှက်ကို ပြရန်</control>
     <control lang="my" key="IDC_SHOW_PASSWORD_SINGLE">စကားဝှက်ကို ပြရန်</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="my" key="IDC_SINGLE_BOOT">Single-boot</control>
     <control lang="my" key="IDC_STD_VOL">သာမန် VeraCrypt volume</control>
     <control lang="my" key="IDC_SYSENC_HIDDEN">လျှို့ဝှက်</control>
@@ -98,6 +99,7 @@
     <control lang="my" key="IDT_SYSENC_KEYS_GEN_INFO">ကီး salt နှင့် အခြား ဒေတာများကို အောင်မြင်စွာ ထုတ်လုပ်လိုက်ပြီ။ ကီးအသစ် ထပ်လုပ်လိုပါက နောက်သို့ ခလုတ်ကို နှိပ်ပြီး ရှေ့သို့ ခလုတ်ကို ပြန်နှိပ်ပါ။ ဒါမှမဟုတ်၊ ဆက်လက် လုပ်ဆောင်ရန် ရှေ့သို့ ခလုတ်ကို နှိပ်ပါ။</control>
     <control lang="my" key="IDT_SYS_DEVICE">၀င်းဒိုးစနစ် ထည့်သွင်းထားသော အခန်းကန့်/drive ကို စာဝှက်ပါ။ ၀င်းဒိုးစနစ် မပိတ်မီ စက်ထဲ ၀င်၍ ဖိုင်များကို ဖတ်ရှုလို၊ စာရေးလိုသူ မည်သူမဆို အကြိမ်တိုင်း စကားဝှက် အမှန် ရေးထည့်ပေးရမည် ဖြစ်သည်။ လိုအပ်လျှင်၊ လျှို့ဝှက် ကွန်ပျူတာ စနစ် တစ်ခုကို ဖန်တီးပါ။</control>
     <control lang="my" key="IDT_SYS_PARTITION">လက်ရှိ အသုံးပြုနေသော ဝင်းဒိုး OS ထည့်သွင်းထားသည့် ​အခန်းကန့်ကို စာဝှက်ရန် ဒီရွေးစရာကို ရွေးပါ။</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="my" key="IDT_WIPE_MODE">ရှင်းလင်းသည့် စနစ် -</control>
     <control lang="my" key="IDCLOSE">ပိတ်ရန်</control>
     <control lang="my" key="IDC_ALLOW_ESC_PBA_BYPASS">ရှောင်ကွင်းရမည့် စက်မတက်မီ စစ်ဆေးမှု ပြုလုပ်ရန် Esc ကီး(စက်အတက် မန်နေဂျာကို ဖွင့်ထားရန်၏) ကို နှိပ်ပါ</control>
@@ -111,6 +113,7 @@
     <control lang="my" key="IDC_CACHE">စကားဝှက်များနှင့် ကီးဖိုင်များကို မှတ်ဉာဏ်ထဲတွင် ခေတ္တ သိမ်းဆည်းရန်</control>
     <control lang="my" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">အစပျိုးထာသော volumes မရှိသည့်အခါ ထွက်ပါ</control>
     <control lang="my" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">Volume တစ်ခုကို အောင်မြင်စွာ အစပျိုးပြီးသောအခါ တိုကင်ဖြင့် ဝင်ရောက်မှုကို ပိတ်ပါ</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="my" key="IDC_COPY_WIZARD">VeraCrypt Volume ဖန်တီးမှု အညွှန်းကို ထည့်သွင်းရန်</control>
     <control lang="my" key="IDC_CREATE">ဖန်တီးရန်</control>
     <control lang="my" key="IDC_CREATE_VOLUME">Volume ဖန်တီးရန်</control>
@@ -271,6 +274,8 @@
     <control lang="my" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">စက်မတက်မီ စစ်ဆေးမှု မျက်နှာပြင်တွင် ဤစိတ်ကြိုက် စာတမ်းကို ပြရန် (စာလုံးရေ အများဆုံး ၂၄ လုံးသာ) -</control>
     <control lang="my" key="IDT_DEFAULT_MOUNT_OPTIONS">မူလ အစပျိုး ရွေးစရာများ</control>
     <control lang="my" key="IDT_DISMOUNT_ACTION">အထူး ကီး ရွေးစရာများ</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="my" key="IDT_FAVORITE_LABEL">ရွေးချယ်ထားသော စိတ်ကြိုက် volume အညွှန်း -</control>
     <control lang="my" key="IDT_FILE_SETTINGS">ဖိုင် ချိန်ညှိချက်များ</control>
     <control lang="my" key="IDT_HOTKEY_KEY">သတ်မှတ်ရမည့် ကီး -</control>
@@ -538,6 +543,15 @@
     <string lang="my" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">မှတ်ချက် - အကယ်၍ မျက်လှည့် ကွန်ပျူတာစနစ်ထဲမှ ဖိုင်များကို လျှို့ဝှက် ကွန်ပျူတာစနစ်ထဲ လုံခြုံစွာ ပြောင်းရွှေ့လိုက်ပါက၊ အောက်ပါ အဆင့်များကို လိုက်နာပါ -\n၁) မျက်လှည့် ကွန်ပျူတာစနစ်ကို စဖွင့်ပါ။\n၂) ဖိုင်များကို စာဝှက်မထားသော volume တစ်ခုထဲ သိမ်းဆည်းပါ (သို့) ပြင်ပ/ပုံမှန် VeraCrypt volume တစ်ခုထဲ သိမ်းဆည်းပါ။\n၃) လျှို့ဝှက် ကွန်ပျူတာစနစ်ကို စတင်ပါ။\n၄) အကယ်၍ ဖိုင်များကို VeraCrypt volume တစ်ခုထဲ သိမ်းဆည်းထားပါက၊ ၄င်းကို အစပ [...]
     <string lang="my" key="CONFIRM_RESTART">သင့် ကွန်ပျူတာကို ပြန်ဖွင့်ဖို့ လိုအပ်သည်။\n\nကွန်ပျူတာကို ယခု ပြန်ဖွင့်လိုသလား?</string>
     <string lang="my" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">ကွန်ပျူတာစနစ်၏ စာဝှက်ခြင်း အနေအထားကို ရယူနေစဉ် ချို့ယွင်းချက် တစ်ခု ဖြစ်ပေါ်နေသည်။</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="my" key="INIT_SYS_ENC">ကွန်ပျူတာစနစ် စာဝှက်ရန်အတွက် အပ္ပလီကေးရှင်း အစိတ်အပိုင်းများကို အစပြု၍ မရပါ။</string>
     <string lang="my" key="INIT_RAND">ကျပန်း နံပါတ် ထုတ်စနစ်ကို အစပြု၍ မရပါ။</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -649,6 +663,7 @@
     <string lang="my" key="SELECT_KEYFILE">ကီးဖိုင် ရွေးရန်</string>
     <string lang="my" key="SELECT_KEYFILE_PATH">ကီးဖိုင် ရှာဖွေရေး လမ်းကြောင်း တစ်ခုကို ရွေးပါ။ သတိပေးချက် - ဖိုင်အမည်များ မပါပဲ၊ ဖိုင်လမ်းကြောင်းကိုသာ မှတ်သားမည် ဖြစ်သည်။</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="my" key="SERPENT_HELP">Ross Anderson, , Eli Biham နှင့် Lars Knudsen တို့မှ ဒီဇိုင်းဆွဲသည်။ ၁၉၉၈ ခုနှစ်၌ ပုံနှိပ်ထုတ်ဝေသည်။ 256-bit key, 128-bit block ရှိသည်။ လုပ်ဆောင်သည့် စနစ်မှာ XTS ဖြစ်သည်။ Serpent သည် AES ၏ နောက်ဆုံး ရွေးချယ်စာရင်းထဲမှ တစ်ခု ဖြစ်သည်။</string>
     <string lang="my" key="SIZE_HELP">သင် ဖန်တီးလိုသော သိမ်းဆည်းခန်း၏ အရွယ်အစားကို သတ်မှတ်ပါ။\n\nအကယ်၍ တက်ကြွ (sparse-file) သိမ်းဆည်းခန်း တစ်ခုကို သင် ဖန်တီးပါက၊ ဒီပါရာမီတာသည် ၄င်း၏ အများဆုံး အရွယ်အစားကို သတ်မှတ်ပေးမည် ဖြစ်သည်။\n\nFAT volume ၏ အနည်းဆုံး အရွယ်အစားသည် 292 KB ဖြစ်သည်။ NTFS volume ၏ အနည်းဆုံး အရွယ်အစားမှာ 3792 KB ဖြစ်သည်။</string>
     <string lang="my" key="SIZE_HELP_HIDDEN_HOST_VOL">သင် ဖန်တီးမည့် ပြင်ပ volume  ၏ အရွယ်အစားကို သတ်မှတ်ပါ (ပြင်ပ volume ကို သင် အရင် ဖန်တီးပြီး၊ ၄င်းအထဲ၌ လျှို့ဝှက် volume တစ်ခု ဖန်တီးရမည် ဖြစ်သည်)။ လျှို့ဝှက် volume  တည်ရှိသော volume ၏ အနည်းဆုံး အရွယ်အစားမှာ340 KB ဖြစ်သည်။</string>
@@ -1035,7 +1050,6 @@
     <string lang="my" key="INCONSISTENCY_RESOLVED">မကိုက်ညီသော ဖြေရှင်းချက်။\n\n\n(ဤအကြောင်းနှင့် ပါတ်သက်၍ ပရိုဂရမ် အမှား တစ်ခုကို သတင်းပို့မည် ဆိုလျှင်၊ ပရိုဂရမ် အမှား သတင်းပေးပို့ချက်၌ အောက်ပါ နည်းပညာဆိုင်ရာ အချက်အလက်များကို ထည့်သွင်းပါ -\n%hs)</string>
     <string lang="my" key="UNEXPECTED_STATE">ချို့ယွင်းချက် - မျော်လင့်မထားသော အ​ခြေအနေ။\n\n\n(ဤအကြောင်းနှင့် ပါတ်သက်၍ ပရိုဂရမ် အမှား တစ်ခုကို သတင်းပို့မည် ဆိုလျှင်၊ ပရိုဂရမ် အမှား သတင်းပေးပို့ချက်၌ အောက်ပါ နည်းပညာဆိုင်ရာ အချက်အလက်များကို ထည့်သွင်းပါ -\n%hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="my" key="NOTHING_TO_RESUME">ပြန်လည် လုပ်ဆောင်မည့် လုပ်ငန်းစဉ်/လုပ်ငန်း မရှိပါ။</string>
     <string lang="my" key="HIDVOL_PROT_BKG_TASK_WARNING">သတိပေးချက် - VeraCrypt နောက်ခံ လုပ်ဆောင်ချက်ကို ပိတ်ထားသည်။ VeraCrypt မှ ထွက်ပြီးပါက၊ လျှို့ဝှက် volume ထဲမှ ပျက်စီးမှုကို တားဆီးထားလျှင် သင့်ကို အချက်ပေးမည် မဟုတ်ပါ။\n\nမှတ်ချက် - VeraCrypt အမှိုက်ပုံး အိုင်ကွန်ကို ညာဖက် နှိပ်၊ 'ထွက်ရန်' ကို ရွေးပြီး နောက်ခံ လုပ်ဆောင်ချက်ကို သင် အချိန်မရွေး ပိတ်နိုင်သည်။\n\nVeraCrypt နောက်ခံ လုပ်ဆောင်ချက်ကို ဖွင့်လိုသလား?</string>
     <string lang="my" key="LANG_PACK_VERSION">ဘာသာစကား အထုပ် ဗားရှင်း - %s</string>
     <string lang="my" key="CHECKING_FS">%hs အနေဖြင့် အစပျိုးထားသော VeraCrypt volume မှ ဖိုင်စနစ်ကို စစ်ဆေးနေသည်...</string>
@@ -1087,15 +1101,14 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="my" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">ကီးဖိုင်များသည် လောလောဆယ် ကွန်ပျူတာစနစ် စာဝှက်ခြင်းအတွက် ထောက်ပံ့မပေးပါ။​</string>
     <string lang="my" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">သတိပေးချက် - VeraCrypt သည် မူရင်း ​ကီးဘုတ် လေးအောက်ကို နဂိုအတိုင်း ပြန်မထားနိုင်ပါ။ ဤအချက်ကြောင့် စကားဝှက်ကို မှားယွင်းစွာ ရေးထည့်မိနိုင်သည်။</string>
     <string lang="my" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">ချို့ယွင်းချက် - VeraCrypt အတွက် ကီးဘုတ် လေးအောက်ကို standard US ကီးဘုတ် လေးအောက် အဖြစ် သတ်မှတ်၍ မရပါ။\n\n US စနစ် မဟုတ်သော ဝင်းဒိုး ကီးဘုတ် လေးအောက် မရနိုင်သည့် နေရာ၌ စက်မတက်ခင် အခြေအနေ (ကွန်ပျူတာ မတက်မီ) တွင် စကားဝှက်ကို ရေးထည့်ရန် လိုအပ်သည်။ ထို့ကြာင့်၊ စကားဝှက်ကို  ဝှက်စာကို standard US ကီးဘုတ် လေးအောက် သုံးပြီး အမြဲတမ်း ရေးထည့်ရမည်။</string>
     <string lang="my" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">VeraCrypt သည် ယာယီအားဖြင့် ကီး​ဘုတ် လေးအောက်ကို standard US ကီးဘုတ် လေးအောက်အဖြစ် ပြောင်းလဲထားသောကြောင့်၊ ညာဖက် Alt ကီးကို နှိပ်ထားစဉ် အက္ခရာများကို ရေးထည့်၍ မရပါ။ သို့သော်၊ အက္ခရာ အများစုကို Shift ကီး နှိပ်ထားရင်း သင့်လျော်သော ကီးများကို ရေးထည့်နိုင်သည်။</string>
     <string lang="my" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCrypt သည် ကီးဘုတ် လေးအောက်ကို ပြောင်းခွင့် မပေးပါ။</string>
     <string lang="my" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">မှတ်ချက် - US မဟုတ်သော ၀င်းဒိုး ကီး​ဘုတ် လေးအောက် မရနိုင်​သော နေရာတွင် စကားဝှက်ကို စက်မတက်မီ အခြေအနေ (၀င်းဒိုး မတက်မီ) တွင် ရေးထည့်ရမည် ဖြစ်သည်။ ထို့ကြောင့်၊ စကားဝှက်ကို standard US ကီးဘုတ် လေးအောက် သုံးပြီး အမြဲတမ်း ရေးထည့်ရမည် ဖြစ်သည်။ သို့သော်၊ ကီးဘုတ် အစစ်ရှိရန် မလိုပါ၊ အကယ်၍ US ကီးဘုတ် လေးအောက် အစစ် မရှိလျှင်လည်း စကားဝှက်ကို လုံခြုံစွာ ရေးထည့်နိုင်ရန် VeraCrypt က အလိုအလျှောက် လုပ်ပေးမည် ဖြစ်သည်။</string>
-    <string lang="my" key="RESCUE_DISK_INFO">အခန်းကန့်/drive ကို စာဝှက်ခြင်း မပြုမီ၊ အောက်ပါ အချက်များကို လုပ်ဆောင်နိုင်ရန် VeraCrypt Rescue Disk (TRD) တစ်ခုကို သင် ဖန်တီးရမည် ဖြစ်သည်။\n\n- အကယ်၍ VeraCrypt Boot Loader ၊ မာစတာကီး (သို့) အခြား အရေးကြီးသော ဒေတာများ ပျက်စီးသွားလျှင်၊ TRD ကို အသုံးပြုပြီး နဂိုဖိုင်များကို ပြန်ထားနိုင်သည် (သို့သော်၊ စကားဝှက် အမှန်ကို သင် ရေးထည့်ရမည် ဖြစ်သည်)။\n\nအကယ်၍ ၀င်းဒိုး ပျက်သွားပြီး ဖွင့်မရပါက၊ TRD သည် ဝင်းဒိုး မစမီ အခန်းကန့်/drive ကို အမြဲတမ်း စာဝှက်ပေ [...]
+    <string lang="my" key="RESCUE_DISK_INFO">အခန်းကန့်/drive ကို စာဝှက်ခြင်း မပြုမီ၊ အောက်ပါ အချက်များကို လုပ်ဆောင်နိုင်ရန် VeraCrypt Rescue Disk (VRD) တစ်ခုကို သင် ဖန်တီးရမည် ဖြစ်သည်။\n\n- အကယ်၍ VeraCrypt Boot Loader ၊ မာစတာကီး (သို့) အခြား အရေးကြီးသော ဒေတာများ ပျက်စီးသွားလျှင်၊ VRD ကို အသုံးပြုပြီး နဂိုဖိုင်များကို ပြန်ထားနိုင်သည် (သို့သော်၊ စကားဝှက် အမှန်ကို သင် ရေးထည့်ရမည် ဖြစ်သည်)။\n\nအကယ်၍ ၀င်းဒိုး ပျက်သွားပြီး ဖွင့်မရပါက၊ VRD သည် ဝင်းဒိုး မစမီ အခန်းကန့်/drive ကို အမြဲတမ်း စာဝှက်ပေ [...]
     <string lang="my" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">'ကောင်းပြီ' ကို နှိပ်ပြီးပါက၊ Microsoft Windows Disc Image Burner ဖွင့်လာမည် ဖြစ်သည်။ VeraCrypt Rescue Disk ISO image ကို စီဒီ (သို့) ဒီဗွီဒီ၌ ကူးရန် ၄င်းကို အသုံးပြုပါ။\n\n အဲဒီနောက်၊ rueCrypt Volume ဖန်တီးမှု အညွှန်းကို ပြန်သွားပြီး ၄င်း၌ပါသော ညွန်ကြားချက်များ အတိုင်း လုပ်ဆောင်ပါ။</string>
     <string lang="my" key="RESCUE_DISK_BURN_INFO">ဆယ်တင်ရေး Disk image ကို ဖန်တီးလိုက်ပြီး ဤဖိုင်ထဲ၌ သိမ်းထားသည် -\n%hs\n\n ၎င်းကို ယခုအချိန်၌ စီဒီ/ဒီဗွီဒီထဲ ကူးရန်လိုအပ်သည်။\n\n%ls ဆယ်တင်ရေး Disk ကို ကူးပြီးပါက၊ မှန်မှန်ကန်ကန် ကူးမကူး စစ်ဆေးရန် ရှေ့သို့ ကို နှိပ်ပါ။</string>
     <string lang="my" key="RESCUE_DISK_BURN_INFO_NO_CHECK">ဆယ်တင်ရေး Disk image ကို ဖန်တီးလိုက်ပြီး ဤဖိုင်ထဲ၌ သိမ်းထားသည် -\n%hs\n\n ၎င်းကို ယခုအချိန်၌ စီဒီ/ဒီဗွီဒီထဲ ကူးထားပြီး နောက် အသုံးပြုရန် လုံခြုံသော နေရာ၌ သိမ်းထားပါ။\n\n%ls ဆက်လုပ်ရန် ရှေ့သို့ ကို နှိပ်ပါ။</string>
@@ -1292,6 +1305,7 @@
     <string lang="my" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">သတိပေးချက် - ဤချိန်ညှိချက်သည် စွမ်းဆောင်ရည်ကို နိမ့်ကျစေနိုင်သည်။\n\nဤချိန်ညှိချက်ကို သင်တကယ် အသုံးပြုလိုသလား?</string>
     <string lang="my" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">သတိပေးချက် - VeraCrypt volume ကို အလိုလို-အဆုံးသတ်ထားသည်</string>
     <string lang="my" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">အစပျိုးထားသော volume တစ်ခုပါသော device တစ်ခုကို ရုပ်ပိုင်းဆိုင်ရာ မဖယ်ရှားမီ (သို့)  စက်မပိတ်မီ၊ VeraCrypt ဖြင့် volume ကို ပထမဦးဆုံး အမြဲတမ်း အဆုံးသတ်ရမည် ဖြစ်သည်။\n\nကေဘယ်ကြိုး၊ drive (enclosure) တို့ ပြတ်တောင်းပြတ်တောင်း ဖြစ်နေမှုကြောင့် မမျှော်လင့်သော အလိုလို အဆုံးသတ်မှု ဖြစ်ပွားနေသည်။</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="my" key="TEST">စမ်းသပ်ရန်</string>
     <string lang="my" key="KEYFILE">ကီးဖိုင်</string>
     <string lang="my" key="VKEY_08">နောက်ပြန်ခလုတ်</string>
diff --git a/Translations/Language.nl.xml b/Translations/Language.nl.xml
index cef3391..26716a8 100644
--- a/Translations/Language.nl.xml
+++ b/Translations/Language.nl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="nl" name="Nederlands" en-name="Dutch" version="0.1.0" translators="Jan van der Wal" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="nl" key="IDC_QUICKFORMAT">Snel Formatteren</control>
     <control lang="nl" key="IDC_SHOW_PASSWORD">&Laat wachtwoord zien</control>
     <control lang="nl" key="IDC_SHOW_PASSWORD_SINGLE">&Toon wachtwoord</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="nl" key="IDC_SINGLE_BOOT">Single-boot</control>
     <control lang="nl" key="IDC_STD_VOL">Standaard VeraCrypt volume</control>
     <control lang="nl" key="IDC_SYSENC_HIDDEN">Ver&borgen</control>
@@ -98,6 +99,7 @@
     <control lang="nl" key="IDT_SYSENC_KEYS_GEN_INFO">De sleutels, salt, en andere data zijn met succes aangemaakt. Als u nieuwe sleutels wilt aanmaken, klik op Terug en dan op Volgende, klik Volgende om door te gaan.</control>
     <control lang="nl" key="IDT_SYS_DEVICE">Codeert de partitie/schijf waarop Windows is geïnstalleerd. Eenieder die toegang tot het systeem wil hebben, zal vóór iedere start van Windows het juiste wachtwoord moeten ingeven. Evt. kan een Verborgen Systeem worden aangemaakt.</control>
     <control lang="en" key="IDT_SYS_PARTITION">Select this option to encrypt the partition where the currently running Windows operating system is installed.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="nl" key="IDT_WIPE_MODE">Wis modus:</control>
     <control lang="nl" key="IDCLOSE">Sluiten </control>
     <control lang="nl" key="IDC_ALLOW_ESC_PBA_BYPASS">Sla de pre-boot &authenticatie over door het indrukken van de Esc key (roept de boot manager op)</control>
@@ -111,6 +113,7 @@
     <control lang="nl" key="IDC_CACHE">&Cache wachtwoorden en sleutels in geheugen</control>
     <control lang="nl" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Sluiten als er geen gekoppelde volumes zijn</control>
     <control lang="nl" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Sluit token sessie (log uit) nadat een volume met succes is gekoppeld</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="nl" key="IDC_COPY_WIZARD">Inclusief VeraCrypt Volume Aanmaak Wizard</control>
     <control lang="nl" key="IDC_CREATE">Maak aan</control>
     <control lang="nl" key="IDC_CREATE_VOLUME">Maa&k Volume</control>
@@ -271,6 +274,8 @@
     <control lang="nl" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Laat deze aangepaste boodschap zien in het pre-boot authenticatie scherm (24 karakters maximaal):</control>
     <control lang="nl" key="IDT_DEFAULT_MOUNT_OPTIONS">Standaard Koppel Opties</control>
     <control lang="nl" key="IDT_DISMOUNT_ACTION">Sneltoets Opties</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="en" key="IDT_FAVORITE_LABEL">Label of selected favorite volume:</control>
     <control lang="nl" key="IDT_FILE_SETTINGS">Bestand Instellingen</control>
     <control lang="nl" key="IDT_HOTKEY_KEY">Toe te wijzen toetsen:</control>
@@ -537,6 +542,15 @@
     <string lang="nl" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Als u veilig bestanden wilt kopieren van het lokvogel system naar het verborgen systeem, volg dan deze stappen. 1) Start het lokvogel systeem. 2) Sla de bestanden op in een ongecodeerd volume of een normaal/buiten VeraCrypt Volume. 3) Start het verborgen systeem. 4) Als u de bestanden op een TryeCrypt Volume  opsloeg, koppel dit (het wordt automatisch gekoppeld als read-only). 5) Kopieer de bestanden naar de verborgen sys [...]
     <string lang="nl" key="CONFIRM_RESTART">Uw computer moet opnieuw gestart worden.\n\nWilt u nu herstarten?</string>
     <string lang="nl" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Er trad een fout op tijdens een poging de systeem codeer status op te halen.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="nl" key="INIT_SYS_ENC">Applicatie componenten voor systeem codering kunnen niet geïnitialiseerd worden.</string>
     <string lang="nl" key="INIT_RAND">Het programma heeft de initialisatie van de random nummer generator niet kunnen voltooien!</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="nl" key="SELECT_KEYFILE">Selecteer Sleutelbestand</string>
     <string lang="nl" key="SELECT_KEYFILE_PATH">Selecteer een sleutelbestand zoekpad. WAARSCHUWING: Alleen het pad wordt onthouden, niet de bestandsnamen!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="nl" key="SERPENT_HELP">Ontworpen door Ross Anderson, Eli Biham, en Lars Knudsen. Gepubliceerd in 1998. 256-bit sleutel, 128-bit blok. Operatiemodus is XTS. Serpent was een van de AES finalisten.</string>
     <string lang="en" key="SIZE_HELP">Please specify the size of the container you want to create.\n\nIf you create a dynamic (sparse-file) container, this parameter will specify its maximum possible size.\n\nNote that the minimum possible size of a FAT volume is 292 KB. The minimum possible size of an NTFS volume is 3792 KB.</string>
     <string lang="en" key="SIZE_HELP_HIDDEN_HOST_VOL">Please specify the size of the outer volume to be created (you will first create the outer volume and then a hidden volume within it). The minimum possible size of a volume within which a hidden volume is intended to be created is 340 KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="nl" key="INCONSISTENCY_RESOLVED">Inconsistentie opgelost.\n\n\n(Indien u een programmafout in relatie hiermee wilt rapporteren, wilt u dan de volgende technische informatie meesturen in het bug rapport: %hs)</string>
     <string lang="nl" key="UNEXPECTED_STATE">Fout: Niet verwachte toestand.\n\n\n(Indien u deze fout rapporteert hiermee, neem dan a.u.b. de volgende technische informatie mee in de fout rapportage: %hs</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="nl" key="NOTHING_TO_RESUME">Er is geen proces/taak die hervat moet worden.</string>
     <string lang="nl" key="HIDVOL_PROT_BKG_TASK_WARNING">WAARSCHUWING: De VeraCrypt Achtergrond Taak is uitgeschakeld. Nadat VeraCrypt is beëindigd, zal niet worden gemeld indien schade aan een Verborgen Volume is voorkomen.\n\nNoot: U kunt op ieder moment de VeraCrypt Achtergrond Taak beëindigen door het VeraCrypt Systeem Tray Icoon rechts aan te klikken en te kiezen voor 'Sluiten'.\n\nWilt u dat de VeraCrypt Achtergrond Taak ingeschakeld wordt?</string>
     <string lang="nl" key="LANG_PACK_VERSION">Vertaling versie:  %s</string>
     <string lang="nl" key="CHECKING_FS">Controleren van het bestandssyteem op het VeraCrypt volume dat is gekoppeld als %hs...</string>
@@ -1085,15 +1099,14 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="nl" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Sleutelbestanden zijn niet ondersteund bij systeemcodering.</string>
     <string lang="nl" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Waarschuwing: VeraCrypt kon de originele toetsenbord lay-out niet terugzetten. Dit zou ertoe kunnen leiden dat u een wachtwoord verkeerd ingeeft.</string>
     <string lang="nl" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Fout: Kan de toetsenbord indeling voor VeraCrypt niet instellen op de standaard (US) toetsenbord indeling.\n\nMerk op dat het wachtwoord ingetypt moet worden in de pre-boot omgeving (voor Windows start) waar niet-standaard (US) Windows toetsenbord indelingen niet beschikbaar zijn. Daarom moet het wachtwoord altijd worden ingetypt met gebruik van de standaard (US) toetsenbord indeling.</string>
     <string lang="nl" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">Omdat VeraCrypt tijdelijk de toetsenbord lay-out veranderde naar de standaard (US) toetsenbordindeling, is het niet mogelijk karakters te typen terwijl u de rechter ALT toets ingedrukt houdt. Echter, u kunt de meeste van dit soort karakters creëren door de betreffende toets in te drukken terwijl u de SHIFT toets ingedrukt houdt.</string>
     <string lang="nl" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCrypt verhinderde het veranderen van de toetsenbord lay-out.</string>
     <string lang="nl" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Noot: Het wachtwoord moet worden ingetypt in de pre-boot omgeving (voordat Windows start) waar niet-standaard (US) Windows toetsenbord indelingen niet beschikbaar zijn. Daarom moet het wachtwoord altijd worden ingetypt met gebruik van de standaard (US) toetsenbord indeling. Echter, het is belangrijk op te merken dat u geen ECHT standaard (US) toetsenbord nodig hebt. VeraCrypt zorgt er automatisch voor dat u het wachtwoord veilig [...]
-    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (TRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the TRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the TRD allows you to permanently decrypt the partition/drive before Windows  [...]
+    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (VRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the VRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the VRD allows you to permanently decrypt the partition/drive before Windows  [...]
     <string lang="en" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">After you click OK, Microsoft Windows Disc Image Burner will be launched. Please use it to burn the VeraCrypt Rescue Disk ISO image to a CD or DVD.\n\nAfter you do so, return to the VeraCrypt Volume Creation Wizard and follow its instructions.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn it to a CD or DVD.\n\n%lsAfter you burn the Rescue Disk, click Next to verify that it has been correctly burned.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you should either burn the image to a CD/DVD or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
@@ -1290,6 +1303,7 @@
     <string lang="en" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">WARNING: This setting may degrade performance.\n\nAre you sure you want to use this setting?</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="nl" key="TEST">Test</string>
     <string lang="nl" key="KEYFILE">Sleutel</string>
     <string lang="nl" key="VKEY_08">Backspace</string>
diff --git a/Translations/Language.nn.xml b/Translations/Language.nn.xml
index 5043584..b5aa62a 100644
--- a/Translations/Language.nn.xml
+++ b/Translations/Language.nn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="nn" name="Norsk Nynorsk" en-name="Norwegian (Nynorsk)" version="0.1.0" translators="Kjell Rune Helland" />
     <!-- Fonts -->
@@ -18,7 +18,7 @@
     <control lang="en" key="IDC_OPEN_CONTAINING_FOLDER">&Open the destination location when finished</control>
     <control lang="nn" key="IDC_PROG_GROUP">Legg VeraCrypt til Start menyen</control>
     <control lang="nn" key="IDC_SYSTEM_RESTORE">Lag System Gjennopprettings Punkt</control>
-    <control lang="nn" key="IDC_UNINSTALL">Avinstaller</control>
+    <control lang="nn" key="IDC_UNINSTALL">&Avinstaller</control>
     <control lang="en" key="IDC_WIZARD_MODE_EXTRACT_ONLY">&Extract</control>
     <control lang="en" key="IDC_WIZARD_MODE_INSTALL">&Install</control>
     <control lang="en" key="IDD_INSTL_DLG">VeraCrypt Setup Wizard</control>
@@ -43,25 +43,26 @@
     <control lang="en" key="IDC_HIDVOL_WIZ_MODE_DIRECT">Direct mode</control>
     <control lang="en" key="IDC_HIDVOL_WIZ_MODE_FULL">Normal mode</control>
     <control lang="nn" key="IDC_KB">&KB</control>
-    <control lang="nn" key="IDC_KEYFILES_ENABLE">Bruk nøkkelfiler</control>
+    <control lang="nn" key="IDC_KEYFILES_ENABLE">U&Bruk nøkkelfiler</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 <-> 1048576 )</control>
     <control lang="nn" key="IDC_KEY_FILES">Nø&kkelfiler..</control>
     <control lang="nn" key="IDC_LINK_HASH_INFO">Informasjon om hash algoritmar</control>
     <control lang="nn" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">Meir informasjon</control>
     <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
-    <control lang="nn" key="IDC_MB">MB </control>
+    <control lang="nn" key="IDC_MB">&MB </control>
     <control lang="en" key="IDC_MORE_INFO_ON_CONTAINERS">More information</control>
     <control lang="en" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">More information about system encryption</control>
     <control lang="en" key="IDC_MORE_INFO_SYS_ENCRYPTION">More information</control>
-    <control lang="en" key="IDC_MULTI_BOOT">Multi-boot</control>
+    <control lang="en" key="IDC_MULTI_BOOT">Multi-Boot</control>
     <control lang="en" key="IDC_NONSYS_DEVICE">Encrypt a non-system partition/drive</control>
-    <control lang="nn" key="IDC_NO_HISTORY">Aldri lagra historie</control>
+    <control lang="nn" key="IDC_NO_HISTORY">&Aldri lagra historie</control>
     <control lang="nn" key="IDC_OPEN_OUTER_VOLUME">Opne Ytre Volum</control>
     <control lang="en" key="IDC_PAUSE">&Pause</control>
     <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
     <control lang="nn" key="IDC_QUICKFORMAT">Rask Formatering</control>
     <control lang="nn" key="IDC_SHOW_PASSWORD">&Vis passord</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&Display password</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="en" key="IDC_SINGLE_BOOT">Single-boot</control>
     <control lang="en" key="IDC_STD_VOL">Standard VeraCrypt volume</control>
     <control lang="en" key="IDC_SYSENC_HIDDEN">Hi&dden</control>
@@ -98,19 +99,21 @@
     <control lang="en" key="IDT_SYSENC_KEYS_GEN_INFO">The keys, salt, and other data have been successfully generated. If you want to generate new keys, click Back and then Next. Otherwise, click Next to continue.</control>
     <control lang="en" key="IDT_SYS_DEVICE">Encrypts the partition/drive where Windows is installed. Anyone who wants to gain access and use the system, read and write files, etc., will need to enter the correct password each time before Windows boots. Optionally, creates a hidden system.</control>
     <control lang="en" key="IDT_SYS_PARTITION">Select this option to encrypt the partition where the currently running Windows operating system is installed.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="en" key="IDT_WIPE_MODE">Wipe mode:</control>
     <control lang="nn" key="IDCLOSE">Avslutt</control>
     <control lang="en" key="IDC_ALLOW_ESC_PBA_BYPASS">Allow pre-boot &authentication to be bypassed by pressing the Esc key (enables boot manager)</control>
     <control lang="nn" key="IDC_AUTORUN_DISABLE">Ikkje gjer noko</control>
     <control lang="nn" key="IDC_AUTORUN_MOUNT">&Automatisk monter VeraCrypt volum (spesifiser under)</control>
-    <control lang="nn" key="IDC_AUTORUN_START">&Start VeraCrypt</control>
+    <control lang="en" key="IDC_AUTORUN_START">&Start VeraCrypt</control>
     <control lang="en" key="IDC_AUTO_DETECT_PKCS11_MODULE">Auto-&Detect Library</control>
     <control lang="en" key="IDC_BOOT_LOADER_CACHE_PASSWORD">&Cache pre-boot authentication password in driver memory (for mounting of non-system volumes)</control>
     <control lang="nn" key="IDC_BROWSE_DIRS">Bla gjennom...</control>
     <control lang="nn" key="IDC_BROWSE_FILES">Bla gjennom...</control>
-    <control lang="nn" key="IDC_CACHE">Hurtiglagra passord og nøkkelfiler i minne</control>
+    <control lang="nn" key="IDC_CACHE">Hurtiglagra passord og &nøkkelfiler i minne</control>
     <control lang="nn" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Avslutt når det ikkje er monterte volum</control>
     <control lang="en" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Close token session (log out) after a volume is successfully mounted</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="nn" key="IDC_COPY_WIZARD">Inkluder VeraCrypt Volum Opprettings Vegvisar</control>
     <control lang="nn" key="IDC_CREATE">Opprett</control>
     <control lang="nn" key="IDC_CREATE_VOLUME">&Opprett Volum</control>
@@ -118,7 +121,7 @@
     <control lang="en" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerate AES encryption/decryption by using the AES instructions of the processor (if available)</control>
     <control lang="nn" key="IDC_ENABLE_KEYFILES">Bruk nøkkelfiler</control>
     <control lang="nn" key="IDC_ENABLE_NEW_KEYFILES">Bruk nøkkelfiler</control>
-    <control lang="nn" key="IDC_EXIT">Avslutt</control>
+    <control lang="nn" key="IDC_EXIT">Avs&lutt</control>
     <control lang="en" key="IDC_FAVORITES_HELP_LINK">Help on favorite volumes</control>
     <control lang="en" key="IDC_FAVORITE_DISABLE_HOTKEY">Do not mount selected volume when 'Mount Favorite Volumes' &hot key is pressed</control>
     <control lang="en" key="IDC_FAVORITE_MOUNT_ON_ARRIVAL">Mount selected volume when its host device gets &connected</control>
@@ -144,11 +147,11 @@
     <control lang="en" key="IDC_MORE_INFO_ON_THREAD_BASED_PARALLELIZATION">More information</control>
     <control lang="en" key="IDC_MORE_SETTINGS">More Settings...</control>
     <control lang="nn" key="IDC_MOUNTALL">&Auto monter einheiter</control>
-    <control lang="nn" key="IDC_MOUNT_OPTIONS">Alternativ...</control>
-    <control lang="nn" key="IDC_MOUNT_READONLY">Monter volum som skriveverna</control>
+    <control lang="nn" key="IDC_MOUNT_OPTIONS">&Alternativ...</control>
+    <control lang="nn" key="IDC_MOUNT_READONLY">Monter volum &som skriveverna</control>
     <control lang="nn" key="IDC_NEW_KEYFILES">Nøkkelfiler...</control>
     <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
-    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	  
     <control lang="nn" key="IDC_PREF_BKG_TASK_ENABLE">Aktivert</control>
     <control lang="nn" key="IDC_PREF_CACHE_PASSWORDS">Snøgglagra passord i drivar minne</control>
     <control lang="nn" key="IDC_PREF_DISMOUNT_INACTIVE">Auto avmonter volum vist det ikkje er skrive/lese data til det på</control>
@@ -168,17 +171,17 @@
     <control lang="nn" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Slett snøgglagra passord ved avslutning</control>
     <control lang="en" key="IDC_PRESERVE_TIMESTAMPS">Preserve modification timestamp of file containers</control>
     <control lang="nn" key="IDC_RESET_HOTKEYS">Tilbakestill</control>
-    <control lang="nn" key="IDC_SELECT_DEVICE">Vel Eining...</control>
-    <control lang="nn" key="IDC_SELECT_FILE">Vel Fil...</control>
+    <control lang="nn" key="IDC_SELECT_DEVICE">Vel &Eining...</control>
+    <control lang="nn" key="IDC_SELECT_FILE">Vel &Fil...</control>
     <control lang="en" key="IDC_SELECT_PKCS11_MODULE">Select &Library...</control>
     <control lang="nn" key="IDC_SHOW_PASSWORD_CHPWD_NEW">Vis passord</control>
     <control lang="nn" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Vis passord</control>
-    <control lang="nn" key="IDC_TRAVEL_OPEN_EXPLORER">Opne Utforskar vindauga for montert volum</control>
+    <control lang="nn" key="IDC_TRAVEL_OPEN_EXPLORER">Opne &Utforskar vindauga for montert volum</control>
     <control lang="nn" key="IDC_TRAV_CACHE_PASSWORDS">&snøgglagra passord i drivar minne</control>
-    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
-    <control lang="nn" key="IDC_UNMOUNTALL">Avmonter Alle</control>
+	 <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="nn" key="IDC_UNMOUNTALL">&Avmonter Alle</control>
     <control lang="nn" key="IDC_VOLUME_PROPERTIES">&Volum Eigenskapar...</control>
-    <control lang="nn" key="IDC_VOLUME_TOOLS">Volum Verktøy...</control>
+    <control lang="nn" key="IDC_VOLUME_TOOLS">Volum Verk&tøy...</control>
     <control lang="nn" key="IDC_WIPE_CACHE">&Slett Snøgglager</control>
     <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="en" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Favorite Volumes</control>
@@ -205,18 +208,18 @@
     <control lang="en" key="IDM_CHANGE_SYS_PASSWORD">Change Password...</control>
     <control lang="nn" key="IDM_CLEAR_HISTORY">Slett Volum Historie</control>
     <control lang="en" key="IDM_CLOSE_ALL_TOKEN_SESSIONS">Close All Security Token Sessions</control>
-    <control lang="nn" key="IDM_CONTACT">Kontakt...</control>
+    <control lang="nn" key="IDM_CONTACT">Kontakt</control>
     <control lang="en" key="IDM_CREATE_HIDDEN_OS">Create Hidden Operating System...</control>
     <control lang="en" key="IDM_CREATE_RESCUE_DISK">Create Rescue Disk...</control>
     <control lang="nn" key="IDM_CREATE_VOLUME">Lag nytt Volum...</control>
     <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="nn" key="IDM_DEFAULT_KEYFILES">Standard Nøkkelfiler...</control>
     <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
-    <control lang="en" key="IDM_DONATE">Donate now...</control>
+	 <control lang="en" key="IDM_DONATE">Donate now...</control>
     <control lang="en" key="IDM_ENCRYPT_SYSTEM_DEVICE">Encrypt System Partition/Drive...</control>
     <control lang="nn" key="IDM_FAQ">Ofte Stilte Spørsmål</control>
     <control lang="nn" key="IDM_HELP">Brukarrettleiing</control>
-    <control lang="nn" key="IDM_HOMEPAGE">Heimeside</control>
+    <control lang="nn" key="IDM_HOMEPAGE">&Heimeside</control>
     <control lang="nn" key="IDM_HOTKEY_SETTINGS">Snøggtastar...</control>
     <control lang="nn" key="IDM_KEYFILE_GENERATOR">Nøkkelfil Generator</control>
     <control lang="nn" key="IDM_LANGUAGE">Språk...</control>
@@ -271,6 +274,8 @@
     <control lang="en" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Display this custom message in the pre-boot authentication screen (24 characters maximum):</control>
     <control lang="nn" key="IDT_DEFAULT_MOUNT_OPTIONS">Standard Monternigs Alternativ</control>
     <control lang="nn" key="IDT_DISMOUNT_ACTION">Snøggtast Alternativ</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="en" key="IDT_FAVORITE_LABEL">Label of selected favorite volume:</control>
     <control lang="nn" key="IDT_FILE_SETTINGS">Fil Innstillingar</control>
     <control lang="nn" key="IDT_HOTKEY_KEY">Nøkkel å Anngje:</control>
@@ -283,7 +288,7 @@
     <control lang="nn" key="IDT_NEW_PASSWORD">Passord:</control>
     <control lang="en" key="IDT_PARALLELIZATION_OPTIONS">Thread-Based Parallelization</control>
     <control lang="en" key="IDT_PKCS11_LIB_PATH">PKCS #11 Library Path</control>
-    <control lang="nn" key="IDT_PKCS5_PRF"> PKCS-5 PRF:</control>
+    <control lang="nn" key="IDT_PKCS5_PRF">PKCS-5 PRF:</control>
     <control lang="en" key="IDT_NEW_PKCS5_PRF">PKCS-5 PRF:</control>
     <control lang="nn" key="IDT_PW_CACHE_OPTIONS">Passord Snøgglager</control>
     <control lang="en" key="IDT_SECURITY_OPTIONS">Security Options</control>
@@ -293,12 +298,12 @@
     <control lang="en" key="IDT_TRAVEL_ROOT">Create traveler disk files at (traveler disk root directory):</control>
     <control lang="nn" key="IDT_VOLUME">Volum</control>
     <control lang="nn" key="IDT_WINDOWS_RELATED_SETTING">Windows</control>
-    <control lang="nn" key="IDC_ADD_KEYFILE_PATH">Legg til katalog...</control>
-    <control lang="nn" key="IDC_AUTO">Auto-Test Alle</control>
+    <control lang="nn" key="IDC_ADD_KEYFILE_PATH">Legg til &katalog...</control>
+    <control lang="nn" key="IDC_AUTO">&Auto-Test Alle</control>
     <control lang="en" key="IDC_CONTINUE">&Continue</control>
-    <control lang="nn" key="IDC_DECRYPT">Dekrypter</control>
+    <control lang="nn" key="IDC_DECRYPT">&Dekrypter</control>
     <control lang="en" key="IDC_DELETE">&Delete</control>
-    <control lang="nn" key="IDC_ENCRYPT">krypter</control>
+    <control lang="nn" key="IDC_ENCRYPT">&Krypter</control>
     <control lang="en" key="IDC_EXPORT">&Export...</control>
     <control lang="nn" key="IDC_GENERATE_AND_SAVE_KEYFILE">Lag og Lagra Nøkkelfil...</control>
     <control lang="nn" key="IDC_GENERATE_KEYFILE">La&g tilfeldig Nøkkelfil...</control>
@@ -306,20 +311,20 @@
     <control lang="en" key="IDC_HW_AES_LABEL_LINK">Hardware-accelerated AES:</control>
     <control lang="en" key="IDC_IMPORT_KEYFILE">&Import Keyfile to Token...</control>
     <control lang="en" key="IDC_KEYADD">Add &Files...</control>
-    <control lang="nn" key="IDC_KEYFILES_ENABLE_HIDVOL_PROT">Bruk nøkkelfiler</control>
-    <control lang="nn" key="IDC_KEYFILES_HIDVOL_PROT">Nøkkelfiler...</control>
+    <control lang="nn" key="IDC_KEYFILES_ENABLE_HIDVOL_PROT">&Bruk nøkkelfiler</control>
+    <control lang="nn" key="IDC_KEYFILES_HIDVOL_PROT">&Nøkkelfiler...</control>
     <control lang="nn" key="IDC_KEYREMOVE">Fje&rn</control>
     <control lang="nn" key="IDC_KEYREMOVEALL">Fjern &Alle</control>
     <control lang="nn" key="IDC_LINK_HIDVOL_PROTECTION_INFO">Kva er skjult volum beskytting?</control>
     <control lang="en" key="IDC_LINK_KEYFILES_INFO">More information on keyfiles</control>
-    <control lang="nn" key="IDC_MOUNT_REMOVABLE">Monter volum som flyttbart medium</control>
+    <control lang="nn" key="IDC_MOUNT_REMOVABLE">Monter volum som flyttbart &medium</control>
     <control lang="en" key="IDC_MOUNT_SYSENC_PART_WITHOUT_PBA">Mount partition &using system encryption without pre-boot authentication</control>
     <control lang="en" key="IDC_PARALLELIZATION_LABEL_LINK">Parallelization:</control>
-    <control lang="nn" key="IDC_PERFORM_BENCHMARK">"Ytingstest"</control>
+    <control lang="nn" key="IDC_PERFORM_BENCHMARK">Ytingstest</control>
     <control lang="en" key="IDC_PRINT">&Print</control>
-    <control lang="nn" key="IDC_PROTECT_HIDDEN_VOL">Vern skjult volum mot skade frå skriving til ytre volum</control>
-    <control lang="nn" key="IDC_RESET">Tilakestill</control>
-    <control lang="nn" key="IDC_SHOW_PASSWORD_MO">Vis passord</control>
+    <control lang="nn" key="IDC_PROTECT_HIDDEN_VOL">&Vern skjult volum mot skade frå skriving til ytre volum</control>
+    <control lang="nn" key="IDC_RESET">&Tilakestill</control>
+    <control lang="nn" key="IDC_SHOW_PASSWORD_MO">&Vis passord</control>
     <control lang="en" key="IDC_TOKEN_FILES_ADD">Add &Token Files...</control>
     <control lang="en" key="IDC_USE_EMBEDDED_HEADER_BAK">Use backup header embedded in &volume if available</control>
     <control lang="en" key="IDC_XTS_MODE_ENABLED">XTS mode</control>
@@ -341,7 +346,7 @@
     <control lang="nn" key="IDT_BOX_BENCHMARK_INFO">Hastighet er berørt av prosessor last og lagrings eininga sin karakteristikk.\n\n Desse testane vert gjort i minne.</control>
     <control lang="nn" key="IDT_BUFFER_SIZE">Buffer Storleik:</control>
     <control lang="nn" key="IDT_CIPHER">Kodenøkkel:</control>
-    <control lang="nn" key="IDT_HIDDEN_PROT_PASSWD">Passord til skjult volum:\n(vist tomt, vert snøggminne nytta)</control>
+    <control lang="nn" key="IDT_HIDDEN_PROT_PASSWD">P&assord til skjult volum:\n(vist tomt, vert snøggminne nytta)</control>
     <control lang="nn" key="IDT_HIDDEN_VOL_PROTECTION">Skjult Volum verning</control>
     <control lang="nn" key="IDT_KEY">Nøkkel storleik:</control>
     <control lang="en" key="IDT_KEYFILE_GENERATOR_NOTE">IMPORTANT: Move your mouse as randomly as possible within this window. The longer you move it, the better. This significantly increases the cryptographic strength of the keyfile.</control>
@@ -369,14 +374,14 @@
     <control lang="en" key="IDT_TOKEN_KEYFILE_NAME">Keyfile name:</control>
     <control lang="en" key="IDT_XTS_MODE">XTS mode</control>
     <control lang="en" key="MENU_SYSTEM_ENCRYPTION">S&ystem</control>
-    <control lang="nn" key="MENU_VOLUMES">Volum</control>
+    <control lang="nn" key="MENU_VOLUMES">&Volum</control>
     <control lang="en" key="MENU_FAVORITES">Favor&ites</control>
-    <control lang="nn" key="MENU_TOOLS">Verktøy</control>
+    <control lang="nn" key="MENU_TOOLS">Verk&tøy</control>
     <control lang="en" key="MENU_SETTINGS">Settin&gs</control>
-    <control lang="nn" key="MENU_HELP">Hjelp</control>
-    <control lang="nn" key="MENU_WEBSITE"> Heimeside </control>
+    <control lang="nn" key="MENU_HELP">&Hjelp</control>
+    <control lang="nn" key="MENU_WEBSITE"> ..Heime&side ..</control>
     <!-- Strings -->
-    <string lang="nn" key="ABOUTBOX">Om...</string>
+    <string lang="nn" key="ABOUTBOX">&Om...</string>
     <string lang="nn" key="ACCESSMODEFAIL">Skrivevernings attributten på ditt gamle volum kunne ikkje endrast. Sjekk om du har tilgang til fila.</string>
     <string lang="nn" key="ACCESS_DENIED">Feil: Ingen tilgang.\n\nPartisjonen du prøvar å opna er anten 0 sektorar lang, eller der er ein oppstarts eining.</string>
     <string lang="en" key="ADMINISTRATOR">Administrator</string>
@@ -517,7 +522,7 @@
     <string lang="en" key="HIDVOL_FORMAT_FINISHED_HELP">The hidden VeraCrypt volume has been successfully created and is ready for use. If all the instructions have been followed and if the precautions and requirements listed in the section "Security Requirements and Precautions Pertaining to Hidden Volumes" in the VeraCrypt User's Guide are followed, it should be impossible to prove that the hidden volume exists, even when the outer volume is mounted.\n\nWARNING: IF YOU DO NOT PROTECT T [...]
     <string lang="en" key="FIRST_HIDDEN_OS_BOOT_INFO">You have started the hidden operating system. As you may have noticed, the hidden operating system appears to be installed on the same partition as the original operating system. However, in reality, it is installed within the partition behind it (in the hidden volume). All read and write operations are being transparently redirected from the original system partition to the hidden volume.\n\nNeither the operating system nor applicati [...]
     <string lang="en" key="HIDVOL_HOST_FILLING_HELP_SYSENC">The outer volume has been created and mounted as drive %hc:. To this outer volume you should now copy some sensitive-looking files that you actually do NOT want to hide. They will be there for anyone forcing you to disclose the password for the first partition behind the system partition, where both the outer volume and the hidden volume (containing the hidden operating system) will reside. You will be able to reveal the passwor [...]
-    <string lang="nn" key="HIDVOL_HOST_FILLING_HELP">Eng: Outer volume has been successfully created and mounted as drive %hc:. To this volume you should now copy some sensitive-looking files that you actually do NOT want to hide. The files will be there for anyone forcing you to disclose your password. You will reveal only the password for this outer volume, not for the hidden one. The files that you really care about will be stored in the hidden volume, which will be created later on.  [...]
+    <string lang="en" key="HIDVOL_HOST_FILLING_HELP">Outer volume has been successfully created and mounted as drive %hc:. To this volume you should now copy some sensitive-looking files that you actually do NOT want to hide. The files will be there for anyone forcing you to disclose your password. You will reveal only the password for this outer volume, not for the hidden one. The files that you really care about will be stored in the hidden volume, which will be created later on. When  [...]
     <string lang="nn" key="HIDVOL_HOST_FILLING_TITLE">Innhald på Ytre Volum </string>
     <string lang="nn" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nI dei neste stega vel du alternativa for det ytre volumet (som du seinare opprettar det skjulte volumet i). </string>
     <string lang="en" key="HIDVOL_HOST_PRE_CIPHER_HELP_SYSENC">\n\nIn the next steps, you will create a so-called outer VeraCrypt volume within the first partition behind the system partition (as was explained in one of the previous steps).</string>
@@ -537,8 +542,17 @@
     <string lang="en" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Note: If you need to securely transfer files from the decoy system to the hidden system, follow these steps:\n1) Start the decoy system.\n2) Save the files to an unencrypted volume or to an outer/normal VeraCrypt volume.\n3) Start the hidden system.\n4) If you saved the files to a VeraCrypt volume, mount it (it will be automatically mounted as read-only).\n5) Copy the files to the hidden system partition or to another hid [...]
     <string lang="en" key="CONFIRM_RESTART">Your computer must be restarted.\n\nDo you want to restart it now?</string>
     <string lang="en" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">An error occurred when obtaining the system encryption status.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="en" key="INIT_SYS_ENC">Cannot initialize application components for system encryption.</string>
-    <string lang="nn" key="INIT_RAND">Klarte ikkje å initialisera den tilfeldige nummer generatoren!</string>
+    <string lang="en" key="INIT_RAND">Failed to initialize the random number generator!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="nn" key="INIT_REGISTER">Kunne ikkje initialisera programmet. Klarte ikkje å registrera Dialog klassen.</string>
     <string lang="en" key="INIT_RICHEDIT">Error: Failed to load the Rich Edit system library.</string>
@@ -549,7 +563,7 @@
     <string lang="en" key="MAX_HIDVOL_SIZE_GB">Maximum possible hidden volume size for this volume is %.2f GB.</string>
     <string lang="nn" key="MOUNTED_NOPWCHANGE">Volum passord/nøkkelfiler kan ikkje endrast så lenge volumet er montert. Demonter volumet fyrst.</string>
     <string lang="nn" key="MOUNTED_NO_PKCS5_PRF_CHANGE">Hovud nøkkel derivasjons algoritme kan ikkje endrast så lenge volumet er montert. demonter volumet fyrst.</string>
-    <string lang="nn" key="MOUNT_BUTTON">Monter</string>
+    <string lang="nn" key="MOUNT_BUTTON">&Monter</string>
     <string lang="nn" key="NEW_VERSION_REQUIRED">Ein nyare versjon av VeraCrypt er nødvendig for å montera dette volumet.</string>
     <string lang="nn" key="VOL_CREATION_WIZARD_NOT_FOUND">Feil: Volum Opprettings Vegvisar vart ikkje funnen.\n\nSjekk att fila 'VeraCrypt Format.exe' er i same mappe som 'VeraCrypt.exe' vart starta i. Viss den ikkje er der, må du ominstallera VeraCrypt eller finna 'VeraCrypt Format.exe' på hardisken din</string>
     <string lang="en" key="VOL_EXPANDER_NOT_FOUND">Error: Volume Expander not found.\n\nPlease make sure that the file 'VeraCryptExpander.exe' is in the folder from which 'VeraCrypt.exe' was launched. If it is not, please reinstall VeraCrypt, or locate 'VeraCryptExpander.exe' on your disk and run it.</string>
@@ -598,8 +612,8 @@
     <string lang="nn" key="KEYFILE_CHANGED">Nøkkelfil(er) lagt til/fjerna.</string>
     <string lang="en" key="KEYFILE_EXPORTED">Keyfile exported.</string>
     <string lang="nn" key="PKCS5_PRF_CHANGED">Hovud nøkkel derivasjons algorytme vellykka sett.</string>
-    <string lang="en" key="NONSYS_INPLACE_ENC_RESUME_PASSWORD_PAGE_HELP">Please enter the password and/or keyfile(s) for the non-system volume where you want to resume the process of in-place encryption.\n\n\nRemark: After you click Next, VeraCrypt will attempt to find all non-system volumes where the process of encryption has been interrupted and where the VeraCrypt volume header can be decrypted using the supplied password and/or keyfile(s). If more than one such volume is found, you w [...]
-    <string lang="en" key="NONSYS_INPLACE_ENC_RESUME_VOL_SELECT_HELP">Please select one of the listed volumes. The list contains every accessible non-system volume where the process of encryption has been interrupted and whose header could be decrypted using the supplied password and/or keyfile(s).</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_RESUME_PASSWORD_PAGE_HELP">Please enter the password and/or keyfile(s) for the non-system volume where you want to resume the process of in-place encryption/decryption.\n\nRemark: After you click Next, VeraCrypt will attempt to find all non-system volumes where the process of encryption/decryption has been interrupted and where the VeraCrypt volume header can be deciphered using the supplied password and/or keyfile(s). If more than one such v [...]
+    <string lang="en" key="NONSYS_INPLACE_ENC_RESUME_VOL_SELECT_HELP">Please select one of the listed volumes. The list contains each accessible non-system volume where the process of encryption/decryption has been interrupted and where the volume header was successfully deciphered using the supplied password and/or keyfile(s).</string>
     <string lang="en" key="NONSYS_INPLACE_DEC_PASSWORD_PAGE_HELP">Please enter the password and/or keyfile(s) for the non-system VeraCrypt volume that you want to decrypt.</string>
     <string lang="en" key="PASSWORD_HELP">It is very important that you choose a good password. You should avoid choosing one that contains only a single word that can be found in a dictionary (or a combination of 2, 3, or 4 such words). It should not contain any names or dates of birth. It should not be easy to guess. A good password is a random combination of upper and lower case letters, numbers, and special characters, such as @ ^ = $ * + etc. We recommend choosing a password consist [...]
     <string lang="nn" key="PASSWORD_HIDDENVOL_HELP">Vel eit passord for det skjulte volumet. </string>
@@ -613,12 +627,12 @@
     <string lang="en" key="PASSWORD_HIDDEN_OS_TITLE">Password for Hidden Operating System</string>
     <string lang="nn" key="PASSWORD_LENGTH_WARNING">ADVARSEL: Korte passord er enkle å knekka ved bruk av 'brute force' teknikkar!\n\nMe anbefaler å velja eit passord som består av minst 20 teikn.\n\nEr du sikker på att du vil bruka eit kort passord?</string>
     <string lang="nn" key="PASSWORD_TITLE">Volum Passord</string>
-    <string lang="nn" key="PASSWORD_WRONG">Feil passord eller ikkje eit VeraCrypt volum.</string>
-    <string lang="nn" key="PASSWORD_OR_KEYFILE_WRONG">Feil nøkkelfil(er) og/eller passord eller ikkje eit VeraCrypt volum.</string>
-    <string lang="en" key="PASSWORD_OR_MODE_WRONG">Wrong mount mode, incorrect password, or not a VeraCrypt volume.</string>
-    <string lang="en" key="PASSWORD_OR_KEYFILE_OR_MODE_WRONG">Wrong mount mode, incorrect keyfile(s) and/or password, or not a VeraCrypt volume.</string>
-    <string lang="nn" key="PASSWORD_WRONG_AUTOMOUNT">Feil passord eller ingen VeraCrypt volum funne.</string>
-    <string lang="nn" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Feil nøkkelfil(er)/passord eller ingen VeraCrypt volum funnet.</string>
+    <string lang="en" key="PASSWORD_WRONG">Operation failed due to one or more of the following:\n - Incorrect password.\n - Incorrect Volume PIM number.\n - Incorrect PRF (hash).\n - Not a valid volume.</string>
+    <string lang="en" key="PASSWORD_OR_KEYFILE_WRONG">Operation failed due to one or more of the following:\n - Incorrect keyfile(s).\n - Incorrect password.\n - Incorrect Volume PIM number.\n - Incorrect PRF (hash).\n - Not a valid volume.</string>
+    <string lang="en" key="PASSWORD_OR_MODE_WRONG">Operation failed due to one or more of the following:\n - Wrong mount mode.\n - Incorrect password.\n - Incorrect Volume PIM number.\n - Incorrect PRF (hash).\n - Not a valid volume.</string>
+    <string lang="en" key="PASSWORD_OR_KEYFILE_OR_MODE_WRONG">Operation failed due to one or more of the following:\n - Wrong mount mode.\n - Incorrect keyfile(s).\n - Incorrect password.\n - Incorrect Volume PIM number.\n - Incorrect PRF (hash).\n - Not a valid volume.</string>
+    <string lang="en" key="PASSWORD_WRONG_AUTOMOUNT">Auto-mount failed due to one or more of the following:\n - Incorrect password.\n - Incorrect Volume PIM number.\n - Incorrect PRF (hash).\n - No valid volume found.</string>
+    <string lang="en" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Auto-mount failed due to one or more of the following:\n - Incorrect keyfile(s).\n - Incorrect password.\n - Incorrect Volume PIM number.\n - Incorrect PRF (hash).\n - No valid volume found.</string>
     <string lang="nn" key="PASSWORD_WRONG_CAPSLOCK_ON">\n\nAdvarsel: Caps Lock er på. Dette kan føra til att du skriv inn passordet feil.</string>
     <string lang="en" key="PIM_CHANGE_WARNING">Remember Number to Mount Volume</string>
     <string lang="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
@@ -633,10 +647,10 @@
     <string lang="en" key="PIM_TITLE">Volume PIM</string>
     <string lang="en" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nWARNING: Hidden file(s) have been found in a keyfile search path. Such hidden files cannot be used as keyfiles. If you need to use them as keyfiles, remove their 'Hidden' attribute (right-click each of them, select 'Properties', uncheck 'Hidden' and click OK). Note: Hidden files are visible only if the corresponding option is enabled (Computer > Organize > 'Folder and search options' > View).</string>
     <string lang="en" key="HIDDEN_VOL_PROT_PASSWORD_US_KEYB_LAYOUT">If you are attempting to protect a hidden volume containing a hidden system, please make sure you are using the standard US keyboard layout when typing the password for the hidden volume. This is required due to the fact that the password needs to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available.</string>
-    <string lang="en" key="FOUND_NO_PARTITION_W_DEFERRED_INPLACE_ENC">VeraCrypt has not found any volume where non-system encryption has been interrupted and where the volume header can be decrypted using the supplied password and/or keyfile(s).\n\nPlease make sure the password and/or keyfile(s) are correct and that the partition/volume is not being used by the system or applications (including antivirus software).</string>
+    <string lang="en" key="FOUND_NO_PARTITION_W_DEFERRED_INPLACE_ENC">VeraCrypt has not found any volume where the process of encryption/decryption of a non-system volume has been interrupted and where the volume header can be deciphered using the supplied password and/or keyfile(s).\n\nPlease make sure the password and/or keyfile(s) are correct and that the partition/volume is not being used by the system or applications (including antivirus software).</string>
     <string lang="en" key="SELECTED_PARTITION_ALREADY_INPLACE_ENC">The selected partition/device is already fully encrypted.\nHeader Flags = 0x%.8X</string>
     <string lang="en" key="SELECTED_PARTITION_NOT_INPLACE_ENC">The selected partition/device is not using in-place encryption.\nHeader Flags = 0x%.8X</string>
-    <string lang="en" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nNote: If you are attempting to mount a partition located on an encrypted system drive without pre-boot authentication or to mount the encrypted system partition of an operating system that is not running, you can do so by selecting 'System' > 'Mount Without Pre-Boot Authentication'.</string>
+    <string lang="en" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nNote: If you are attempting to mount a partition located on an encrypted system drive without pre-boot authentication or to mount the encrypted system partition of an operating system that is not running, you can do so by selecting 'System' > 'Mount Without Pre-Boot Authentication'.</string>
     <string lang="en" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">In this mode, you cannot mount a partition located on a drive whose portion is within the key scope of active system encryption.\n\nBefore you can mount this partition in this mode, you need to either boot an operating system installed on a different drive (encrypted or unencrypted) or boot an unencrypted operating system.</string>
     <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
     <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
@@ -647,6 +661,7 @@
     <string lang="nn" key="SELECT_KEYFILE">Vel Nøkkelfil</string>
     <string lang="nn" key="SELECT_KEYFILE_PATH">Vel ei nøkkelfil søke sti. ADVARSEL: merk att det er berre stien som vert hugsa, ikkje filnamna!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="en" key="SERPENT_HELP">Designed by Ross Anderson, Eli Biham, and Lars Knudsen. Published in 1998. 256-bit key, 128-bit block. Mode of operation is XTS. Serpent was one of the AES finalists.</string>
     <string lang="en" key="SIZE_HELP">Please specify the size of the container you want to create.\n\nIf you create a dynamic (sparse-file) container, this parameter will specify its maximum possible size.\n\nNote that the minimum possible size of a FAT volume is 292 KB. The minimum possible size of an NTFS volume is 3792 KB.</string>
     <string lang="en" key="SIZE_HELP_HIDDEN_HOST_VOL">Please specify the size of the outer volume to be created (you will first create the outer volume and then a hidden volume within it). The minimum possible size of a volume within which a hidden volume is intended to be created is 340 KB.</string>
@@ -691,7 +706,7 @@
     <string lang="nn" key="WRONG_VOL_TYPE">VeraCrypt kan ikkje endra passordet for eit framand volum.</string>
     <string lang="nn" key="SELECT_FREE_DRIVE">Ver gild å vel ein ledig stasjons bokstav frå lista.</string>
     <string lang="nn" key="SELECT_A_MOUNTED_VOLUME">Ver gild å vel eit montert volum i stasjons bokstav lista.</string>
-    <string lang="en" key="AMBIGUOUS_VOL_SELECTION">Two different mounted volumes are currently selected (one in the drive letter list and the other in the input field below the list).\n\nPlease choose the volume you wanted to select:</string>
+    <string lang="en" key="AMBIGUOUS_VOL_SELECTION">Warning: Two different volumes/devices are currently selected (the first is selected in the drive letter list and the second is selected in the input field below the drive letter list).\n\nPlease confirm your choice:</string>
     <string lang="nn" key="CANT_CREATE_AUTORUN">Feil: Kunne ikkje oppretta autorun.inf</string>
     <string lang="nn" key="ERR_PROCESS_KEYFILE">Feil ved prosesering av nøkkelfil!</string>
     <string lang="nn" key="ERR_PROCESS_KEYFILE_PATH">Feil ved proseserig av nøkkelfil sti!</string>
@@ -703,18 +718,18 @@
     <string lang="en" key="ERR_VOL_FORMAT_BAD">Error: Bad volume format.</string>
     <string lang="en" key="ERR_HIDDEN_NOT_NORMAL_VOLUME">Error: You supplied a password for a hidden volume (not for a normal volume).</string>
     <string lang="en" key="ERR_HIDDEN_VOL_HOST_ENCRYPTED_INPLACE">For security reasons, a hidden volume cannot be created within a VeraCrypt volume containing a filesystem that has been encrypted in place (because the free space on the volume has not been filled with random data).</string>
-    <string lang="en" key="LEGAL_NOTICES_DLG_TITLE">VeraCrypt - Legal Notices</string>
+    <string lang="en" key="LEGAL_NOTICES_DLG_TITLE">VeraCrypt - Legal Notices</string>    
     <string lang="nn" key="ALL_FILES">Alle Filer</string>
     <string lang="nn" key="TC_VOLUMES">VeraCrypt Volum</string>
     <string lang="en" key="DLL_FILES">Library Modules</string>
     <string lang="nn" key="FORMAT_NTFS_STOP">NTFS formatering kan ikkje halde fram.</string>
     <string lang="nn" key="CANT_MOUNT_VOLUME">Kan ikkje montera volum.</string>
     <string lang="nn" key="CANT_DISMOUNT_VOLUME">Kan ikkje demontera volum.</string>
-    <string lang="nn" key="FORMAT_NTFS_FAILED">Eng: Windows failed to format the volume as NTFS.\n\nPlease select a different type of file system (if possible) and try again. Alternatively, you could leave the volume unformatted (select 'None' as the filesystem), exit this wizard, mount the volume, and then use either a system or a third-party tool to format the mounted volume (the volume will remain encrypted).</string>
+    <string lang="en" key="FORMAT_NTFS_FAILED">Windows failed to format the volume as NTFS.\n\nPlease select a different type of file system (if possible) and try again. Alternatively, you could leave the volume unformatted (select 'None' as the filesystem), exit this wizard, mount the volume, and then use either a system or a third-party tool to format the mounted volume (the volume will remain encrypted).</string>
     <string lang="en" key="FORMAT_NTFS_FAILED_ASK_FAT">Windows failed to format the volume as NTFS.\n\nDo you want to format the volume as FAT instead?</string>
     <string lang="nn" key="DEFAULT">Standard</string>
-    <string lang="en" key="PARTITION_LOWER_CASE">partition</string>
-    <string lang="nn" key="PARTITION_UPPER_CASE">Partisjon</string>
+    <string lang="en" key="PARTITION_LOWER_CASE">partisjon</string>
+    <string lang="nn" key="PARTITION_UPPER_CASE">PARTISJON</string>
     <string lang="nn" key="DEVICE">Einheit</string>
     <string lang="en" key="DEVICE_LOWER_CASE">device</string>
     <string lang="nn" key="DEVICE_UPPER_CASE">EINHEIT</string>
@@ -744,14 +759,14 @@
     <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
     <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
     <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
-    <string lang="nn" key="CANT_ACCESS_VOL">Feil: Cannot access the volume!\n\nMake sure that the selected volume exists, that it is not mounted or being used by the system or an application, that you have read/write permission for the volume, and that it is not write-protected.</string>
+    <string lang="en" key="CANT_ACCESS_VOL">Error: Cannot access the volume!\n\nMake sure that the selected volume exists, that it is not mounted or being used by the system or an application, that you have read/write permission for the volume, and that it is not write-protected.</string>
     <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Error: Cannot access the volume and/or obtain information about the volume.\n\nMake sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Error: Cannot access the volume and/or obtain information about the volume. Make sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.\n\nIf the problem persists, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">An error prevented VeraCrypt from encrypting the partition. Please try fixing any previously reported problems and then try again. If the problems persist, it might help to follow the below steps.</string>
-    <string lang="en" key="INPLACE_ENC_GENERIC_ERR_RESUME">An error prevented VeraCrypt from resuming the process of encryption of the partition.\n\nPlease try fixing any previously reported problems and then try resuming the process again. Note that the volume cannot be mounted until it has been fully encrypted.</string>
     <string lang="en" key="INPLACE_DEC_GENERIC_ERR">An error prevented VeraCrypt from decrypting the volume. Please try fixing any previously reported problems and then try again if possible.</string>
-    <string lang="nn" key="CANT_DISMOUNT_OUTER_VOL">Feil: Kan ikkje demontera det ytre volumet!\n\nVolumet kan ikkje demonterast vist det inneheld filer eller mapper som er i bruk at eit program eller systemet.\n\nVer gild å steng alle program som kan bruka filer eller mapper på volumet og trykk Prøv på nytt.</string>
+    <string lang="en" key="INPLACE_ENC_GENERIC_ERR_RESUME">An error prevented VeraCrypt from resuming the process of encryption/decryption of the partition/volume.\n\nPlease try fixing any previously reported problems and then try resuming the process again if possible. Note that the volume cannot be mounted until it has been fully encrypted or fully decrypted.</string>
+    <string lang="en" key="CANT_DISMOUNT_OUTER_VOL">Error: Cannot dismount the outer volume!\n\nVolume cannot be dismounted if it contains files or folders being used by a program or the system.\n\nPlease close any program that might be using files or directories on the volume and click Retry.</string>
     <string lang="en" key="CANT_GET_OUTER_VOL_INFO">Error: Cannot obtain information about the outer volume!\nVolume creation cannot continue.</string>
     <string lang="nn" key="CANT_ACCESS_OUTER_VOL">Feil: Kan ikkje opna det ytre volumet! Volum oppretting kan ikkje halde fram.</string>
     <string lang="nn" key="CANT_MOUNT_OUTER_VOL">Feil: Kan ikkje montera det ytre volumet! Volum oppretting kan ikkje halde fram.</string>
@@ -861,11 +876,11 @@
     <string lang="en" key="UNINSTALL_OF_FAILED">Failed to uninstall '%hs'. %hs\nDo you want to continue uninstalling?</string>
     <string lang="nn" key="INSTALL_COMPLETED">Installasjonen er fullført.</string>
     <string lang="nn" key="CANT_CREATE_FOLDER">Mappe '%hs' kunne ikkje opprettast</string>
-    <string lang="nn" key="CLOSE_TC_FIRST">Eng: The VeraCrypt device driver cannot be unloaded.\n\nPlease close all open VeraCrypt windows first. If it does not help, please restart Windows and then try again.</string>
+    <string lang="en" key="CLOSE_TC_FIRST">The VeraCrypt device driver cannot be unloaded.\n\nPlease close all open VeraCrypt windows first. If it does not help, please restart Windows and then try again.</string>
     <string lang="nn" key="DISMOUNT_ALL_FIRST">Alle VeraCrypt volum må demonterast før du installerar eller avinstallerar VeraCrypt.</string>
     <string lang="en" key="UNINSTALL_OLD_VERSION_FIRST">An obsolete version of VeraCrypt is currently installed on this system. It needs to be uninstalled before you can install this new version of VeraCrypt.\n\nAs soon as you close this message box, the uninstaller of the old version will be launched. Note that no volume will be decrypted when you uninstall VeraCrypt. After you uninstall the old version of VeraCrypt, run the installer of the new version of VeraCrypt again.</string>
     <string lang="nn" key="REG_INSTALL_FAILED">Installasjonen av register oppføringane har feila</string>
-    <string lang="nn" key="DRIVER_INSTALL_FAILED">Eng: The installation of the device driver has failed. Please restart Windows and then try installing VeraCrypt again.</string>
+    <string lang="en" key="DRIVER_INSTALL_FAILED">The installation of the device driver has failed. Please restart Windows and then try installing VeraCrypt again.</string>
     <string lang="nn" key="STARTING_DRIVER">Startar VeraCrypt einings drivarane</string>
     <string lang="en" key="DRIVER_UINSTALL_FAILED">Uninstallation of the device driver has failed. Please note that, due to a Windows issue, it may be necessary to log off or restart the system before the device driver can be uninstalled (or reinstalled).</string>
     <string lang="nn" key="INSTALLING_DRIVER">Installerer VeraCrypt einings drivarane</string>
@@ -925,11 +940,11 @@
     <string lang="en" key="KEYFILE_INVALID_BASE_NAME">The base name of the keyfile(s) is invalid</string>
     <string lang="en" key="KEYFILE_ALREADY_EXISTS">The keyfile '%s' already exists.\nDo you want to overwrite it? The generation process will be stopped if you answer No.</string>
     <string lang="en" key="HEADER_DAMAGED_AUTO_USED_HEADER_BAK">WARNING: The header of this volume is damaged! VeraCrypt automatically used the backup of the volume header embedded in the volume.\n\nYou should repair the volume header by selecting 'Tools' > 'Restore Volume Header'.</string>
-    <string lang="nn" key="VOL_HEADER_BACKED_UP">Eng: Volume header backup has been successfully created.\n\nIMPORTANT: Restoring the volume header using this backup will also restore the current volume password. Moreover, if keyfile(s) are/is necessary to mount the volume, the same keyfile(s) will be necessary to mount the volume again when the volume header is restored.\n\nWARNING: This volume header backup may be used to restore the header ONLY of this particular volume. If you use th [...]
-    <string lang="nn" key="VOL_HEADER_RESTORED">Volum header har vorte gjennoppretta.\n\nVIKTIG: Merk deg att eit gammalt passord  kan ha vorte gjennoppretta og</string>
+    <string lang="en" key="VOL_HEADER_BACKED_UP">Volume header backup has been successfully created.\n\nIMPORTANT: Restoring the volume header using this backup will also restore the current volume password. Moreover, if keyfile(s) are/is necessary to mount the volume, the same keyfile(s) will be necessary to mount the volume again when the volume header is restored.\n\nWARNING: This volume header backup may be used to restore the header ONLY of this particular volume. If you use this he [...]
+    <string lang="en" key="VOL_HEADER_RESTORED">The volume header has been successfully restored.\n\nIMPORTANT: Please note that an old password may have been restored as well. Moreover, if keyfile(s) were/was necessary to mount the volume when the backup was created, the same keyfile(s) are now necessary to mount the volume again.</string>
     <string lang="en" key="EXTERNAL_VOL_HEADER_BAK_FIRST_INFO">For security reasons, you will have to enter the correct password (and/or supply the correct keyfiles) for the volume.\n\nNote: If the volume contains a hidden volume, you will have to enter the correct password (and/or supply the correct keyfiles) for the outer volume first. Afterwards, if you choose to back up the header of the hidden volume, you will have to enter the correct password (and/or supply the correct keyfiles) f [...]
     <string lang="en" key="CONFIRM_VOL_HEADER_BAK">Are you sure you want to create volume header backup for %hs?\n\nAfter you click Yes, you will prompted for a filename for the header backup.\n\nNote: Both the standard and the hidden volume headers will be re-encrypted using a new salt and stored in the backup file. If there is no hidden volume within this volume, the area reserved for the hidden volume header in the backup file will be filled with random data (to preserve plausible den [...]
-    <string lang="nn" key="CONFIRM_VOL_HEADER_RESTORE">Er du sikker på att du vill gjennoppretta volum header av %hs ?\n\nADVARSEL: Gjennoppretting av ein volume header gjennopprettar og volum passordet som var gyldig når sikkerheits kopien vart laga.\n\nEtter att du har trykt Ja, skal du velja header sikkerheits kopi fila.</string>
+    <string lang="en" key="CONFIRM_VOL_HEADER_RESTORE">Are you sure you want to restore volume header of %hs?\n\nWARNING: Restoring a volume header also restores the volume password that was valid when the backup was created. Moreover, if keyfile(s) were/was necessary to mount the volume when the backup was created, the same keyfile(s) will be necessary to mount the volume again after the volume header is restored.\n\nAfter you click Yes, you will select the header backup file.</string>
     <string lang="en" key="DOES_VOLUME_CONTAIN_HIDDEN">Does the volume contain a hidden volume?</string>
     <string lang="en" key="VOLUME_CONTAINS_HIDDEN">The volume contains a hidden volume</string>
     <string lang="en" key="VOLUME_DOES_NOT_CONTAIN_HIDDEN">The volume does not contain a hidden volume</string>
@@ -974,15 +989,15 @@
     <string lang="en" key="DRIVE_LETTER_ITEM">Drive Letter:   </string>
     <string lang="nn" key="UNSUPPORTED_CHARS_IN_PWD">Feil: Passord kan berre innehalde ASCII teikn.\n\nikkje-ASCII teikn i passord kan føra til att det ikkje vert mogeleg å montera volumet når system konfigen din endrar seg.\n\nFølgjande teken er lov:\n\n  ! " # $ % & ' ( ) * + , - . / 0 1 2 3 4  5 6 7 8 9 : ; < = > ? @ A B C D E F  G H I J K L M N O P Q R S T U V W X  Y Z [ \\ ] ^ _ ` a b c d e f g h i j k l m  n o p q r s t u v w x y z { | } ~</string>
     <string lang="nn" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">Advarsel: Passord inneheld ikkje-ASCII teikn. Dette kan føra til att det ikkje vert mogeleg å montera volumet når system konfigen din endrar seg.\n\nDu bør byta ut alle ikkje-ASCII teken i passordet med ASCII teken. For å gjera det, trykk på 'Volum' -> 'Endre Volum passord'.\n\nFølgjande er ASCII teikn:\n\n  ! " # $ % & ' ( ) * + , - . / 0 1 2 3 4  5 6 7 8 9 : ; < = > ? @ A B C D E F  G H I J K L M N O P Q R S T U V  [...]
-    <string lang="en" key="EXE_FILE_EXTENSION_CONFIRM">WARNING: We strongly recommend that you avoid file extensions that are used for executable files (such as .exe, .sys, or .dll) and other similarly problematic file extensions. Using such file extensions causes Windows and antivirus software to interfere with the container, which adversely affects the performance of the volume and may also cause other serious problems.\n\nWe strongly recommend that you remove the file extension or cha [...]
-    <string lang="en" key="EXE_FILE_EXTENSION_MOUNT_WARNING">WARNING: This container has a file extension that is used for executable files (such as .exe, .sys, or .dll) or some other file extension that is similarly problematic. It will very likely cause Windows and antivirus software to interfere with the container, which will adversely affect the performance of the volume and may also cause other serious problems.\n\nWe strongly recommend that you remove the file extension of the cont [...]
+    <string lang="en" key="EXE_FILE_EXTENSION_CONFIRM">WARNING: We strongly recommend that you avoid file extensions that are used for executable files (such as .exe, .sys, or .dll) and other similarly problematic file extensions. Using such file extensions causes Windows and antivirus software to interfere with the container, which adversely affects the performance of the volume and may also cause other serious problems.\n\nWe strongly recommend that you remove the file extension or cha [...]
+    <string lang="en" key="EXE_FILE_EXTENSION_MOUNT_WARNING">WARNING: This container has a file extension that is used for executable files (such as .exe, .sys, or .dll) or some other file extension that is similarly problematic. It will very likely cause Windows and antivirus software to interfere with the container, which will adversely affect the performance of the volume and may also cause other serious problems.\n\nWe strongly recommend that you remove the file extension of the cont [...]
     <string lang="nn" key="HOMEPAGE">Heimeside</string>
     <string lang="nn" key="LARGE_IDE_WARNING_XP">ADVARSEL: Det ser ut til att du ikkje har installert nokon service pakke til din Windows installasjon. Du skal ikkje skriva til IDE diskar større enn 128 GB under Windows XP som ikkje har SP 1 eller høgare! Vist du gjere det kan data som er på disken (uansett om det er eit VeraCrypt Volum eller ikkje) verta korrupte.  Dette er ein begrensing i Windows, ikkje ein feil i VeraCrypt.</string>
     <string lang="nn" key="LARGE_IDE_WARNING_2K">ADVARSEL: Det ser ut til att du ikkje har installert service pack 2 eller seinare til din Windows installasjon. Du skal ikkje skriva til IDE diskar større enn 128 GB under Windows 2000 som ikkje har installert SP 3 eller høgare! Vist du gjere det kan data som er på disken (uansett om det er eit VeraCrypt Volum eller ikkje) verta korrupte.  Dette er ein begrensing i Windows, ikkje ein feil i VeraCrypt.\n\nMerk: Det kan og hende du må aktive [...]
-    <string lang="nn" key="LARGE_IDE_WARNING_2K_REGISTRY">Advarsel: 48-bit LBA ATAPI support is disabled on your system. Therefore, you should not write to IDE disks larger than 128 GB! If you do, data on the disk (no matter if it is a VeraCrypt volume or not) may get corrupted. Note that this is a limitation of Windows, not a limitation of VeraCrypt.\n\nTo enable the 48-bit LBA support, add the 'EnableBigLba' registry value in the registry key HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlS [...]
+    <string lang="en" key="LARGE_IDE_WARNING_2K_REGISTRY">WARNING: 48-bit LBA ATAPI support is disabled on your system. Therefore, you should not write to IDE disks larger than 128 GB! If you do, data on the disk (no matter if it is a VeraCrypt volume or not) may get corrupted. Note that this is a limitation of Windows, not a limitation of VeraCrypt.\n\nTo enable the 48-bit LBA support, add the 'EnableBigLba' registry value in the registry key HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSe [...]
     <string lang="en" key="VOLUME_TOO_LARGE_FOR_FAT32">Error: Files larger than 4 GB cannot be stored on a FAT32 file system. Therefore, file-hosted VeraCrypt volumes (containers) stored on a FAT32 file system cannot be larger than 4 GB.\n\nIf you need a larger volume, create it on an NTFS file system (or, if you use Windows Vista SP1 or later, on an exFAT file system) or, instead of creating a file-hosted volume, encrypt an entire partition or device.</string>
     <string lang="en" key="VOLUME_TOO_LARGE_FOR_WINXP">Warning: Windows XP does not support files larger than 2048 GB (it will report that "Not enough storage is available"). Therefore, you cannot create a file-hosted VeraCrypt volume (container) larger than 2048 GB under Windows XP.\n\nNote that it is still possible to encrypt the entire drive or create a partition-hosted VeraCrypt volume larger than 2048 GB under Windows XP.</string>
-    <string lang="nn" key="FREE_SPACE_FOR_WRITING_TO_OUTER_VOLUME">Advarsel: If you want to be able to add more data/files to the outer volume in future, you should consider choosing a smaller size for the hidden volume.\n\nAre you sure you want to continue with the size you specified?</string>
+    <string lang="en" key="FREE_SPACE_FOR_WRITING_TO_OUTER_VOLUME">WARNING: If you want to be able to add more data/files to the outer volume in future, you should consider choosing a smaller size for the hidden volume.\n\nAre you sure you want to continue with the size you specified?</string>
     <string lang="nn" key="NO_VOLUME_SELECTED">Ingen volum valgt.\n\nKlikk 'Vel Einheit' eller 'Vel Fil' for å velgja eit VeraCrypt volum.</string>
     <string lang="en" key="NO_SYSENC_PARTITION_SELECTED">No partition selected.\n\nClick 'Select Device' to select a dismounted partition that normally requires pre-boot authentication (for example, a partition located on the encrypted system drive of another operating system, which is not running, or the encrypted system partition of another operating system).\n\nNote: The selected partition will be mounted as a regular VeraCrypt volume without pre-boot authentication. This is useful e. [...]
     <string lang="en" key="CONFIRM_SAVE_DEFAULT_KEYFILES">WARNING: If default keyfiles are set and enabled, volumes that are not using these keyfiles will be impossible to mount. Therefore, after you enable default keyfiles, keep in mind to uncheck the 'Use keyfiles' checkbox (below a password input field) whenever mounting such volumes.\n\nAre you sure you want to save the selected keyfiles/paths as default?</string>
@@ -1009,21 +1024,21 @@
     <string lang="en" key="SUCCESSFULLY_DISMOUNTED">Successfully dismounted</string>
     <string lang="en" key="CONFIRM_BACKGROUND_TASK_DISABLED">WARNING: If the VeraCrypt Background Task is disabled, the following functions will be disabled:\n\n1) Hot keys\n2) Auto-dismount (e.g., upon logoff, inadvertent host device removal, time-out, etc.)\n3) Auto-mount of favorite volumes\n4) Notifications (e.g., when damage to hidden volume is prevented)\n5) Tray icon\n\nNote: You can shut down the Background Task anytime by right-clicking the VeraCrypt tray icon and selecting 'Exi [...]
     <string lang="nn" key="CONFIRM_NO_FORCED_AUTODISMOUNT">Advarsel: Vist denne mogelegheita vert aktivert, vill ikkje volum som inneheld opne  filer/mapper vera mogeleg å auto-demontera.\n\nEr du sikker på att du vill deaktivera denne mogelegheita?</string>
-    <string lang="nn" key="WARN_PREF_AUTO_DISMOUNT">ADVARSEL:VeraCrypt avsluttar no, følgjande funksjonar vill vera deaktivert når du avluttar VeraCrypt:\n\n1) Snøggtastar 2) Auto-demontering 3) Meldingar (td. når skade på skult volum er ungått)\n\nMerk: Vist du vill att VeraCrypt skall halda fram med å kjøyra i bakgrunnen etter att du lukkar dette vindauga, deaktiver bakgrunns oppgåve i Innstillingar.\n\nEr du sikker på att du vil halde fram med å avslutta VeraCrypt?</string>
+    <string lang="en" key="WARN_PREF_AUTO_DISMOUNT">WARNING: Volumes containing open files/directories will NOT be auto-dismounted.\n\nTo prevent this, enable the following option in this dialog window: 'Force auto-dismount even if volume contains open files or directories'</string>
     <string lang="en" key="WARN_PREF_AUTO_DISMOUNT_ON_POWER">WARNING: When the notebook battery power is low, Windows may omit sending the appropriate messages to running applications when the computer is entering power saving mode. Therefore, VeraCrypt may fail to auto-dismount volumes in such cases.</string>
-    <string lang="en" key="NONSYS_INPLACE_ENC_RESUME_PROMPT">You have scheduled the process of encryption of a partition/volume. The process has not been completed yet.\n\nDo you want to resume the process now?</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_RESUME_PROMPT">You have scheduled the process of encryption/decryption of a partition/volume. The process has not been completed yet.\n\nDo you want to resume the process now?</string>
     <string lang="en" key="SYSTEM_ENCRYPTION_RESUME_PROMPT">You have scheduled the process of encryption or decryption of the system partition/drive. The process has not been completed yet.\n\nDo you want to start (resume) the process now?</string>
-    <string lang="en" key="ASK_NONSYS_INPLACE_ENC_NOTIFICATION_REMOVAL">Do you want to be prompted about whether you want to resume the currently scheduled processes of encryption of non-system partitions/volumes?</string>
+    <string lang="en" key="ASK_NONSYS_INPLACE_ENC_NOTIFICATION_REMOVAL">Do you want to be prompted about whether you want to resume the currently scheduled processes of encryption/decryption of non-system partitions/volumes?</string>
     <string lang="en" key="KEEP_PROMPTING_ME">Yes, keep prompting me</string>
     <string lang="en" key="DO_NOT_PROMPT_ME">No, do not prompt me</string>
-    <string lang="en" key="NONSYS_INPLACE_ENC_NOTIFICATION_REMOVAL_NOTE">IMPORTANT: Keep in mind that you can resume the process of encryption of any non-system partition/volume by selecting 'Volumes' > 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window.</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_NOTIFICATION_REMOVAL_NOTE">IMPORTANT: Keep in mind that you can resume the process of encryption/decryption of any non-system partition/volume by selecting 'Volumes' > 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window.</string>
     <string lang="en" key="SYSTEM_ENCRYPTION_SCHEDULED_BUT_PBA_FAILED">You have scheduled the process of encryption or decryption of the system partition/drive. However, pre-boot authentication failed (or was bypassed).\n\nNote: If you decrypted the system partition/drive in the pre-boot environment, you may need to finalize the process by selecting 'System' > 'Permanently Decrypt System Partition/Drive' from the menu bar of the main VeraCrypt window.</string>
     <string lang="en" key="CONFIRM_EXIT">WARNING: If VeraCrypt exits now, the following functions will be disabled:\n\n1) Hot keys\n2) Auto-dismount (e.g., upon logoff, inadvertent host device removal, time-out, etc.)\n3) Auto-mount of favorite volumes\n4) Notifications (e.g., when damage to hidden volume is prevented)\n\nNote: If you do not wish VeraCrypt to run in the background, disable the VeraCrypt Background Task in the Preferences (and, if necessary, disable the automatic start of [...]
     <string lang="en" key="CONFIRM_EXIT_UNIVERSAL">Exit?</string>
     <string lang="en" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt does not have sufficient information to determine whether to encrypt or decrypt.</string>
     <string lang="en" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">VeraCrypt does not have sufficient information to determine whether to encrypt or decrypt.\n\nNote: If you decrypted the system partition/drive in the pre-boot environment, you may need to finalize the process by clicking Decrypt.</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_REVERSE_INFO">Note: When you are encrypting a non-system partition/volume in place and an error persistently prevents you from finishing the process, you will not be able to mount the volume (and access data stored on it) until you entirely DECRYPT the volume (i.e. reverse the process).\n\nIf you need to do so, follow these steps:\n1) Exit this wizard.\n2) In the main VeraCrypt window, select 'Volumes' > 'Resume Interrupted Process'.\n3) S [...]
-    <string lang="en" key="NONSYS_INPLACE_ENC_DEFER_CONFIRM">Do you want to interrupt and postpone the process of encryption of the partition/volume?\n\nNote: Keep in mind that the volume cannot be mounted until it has been fully encrypted. You will be able to resume the process of encryption and it will continue from the point it was stopped. You can do so, for example, by selecting 'Volumes' > 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window.</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_DEFER_CONFIRM">Do you want to interrupt and postpone the process of encryption/decryption of the partition/volume?\n\nNote: Keep in mind that the volume cannot be mounted until it has been fully encrypted or decrypted. You will be able to resume the process of encryption/decryption and it will continue from the point where it was stopped. You can do so, for example, by selecting 'Volumes' > 'Resume Interrupted Process' from the menu bar of [...]
     <string lang="en" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Do you want to interrupt and postpone the process of encryption of the system partition/drive?\n\nNote: You will be able to resume the process and it will continue from the point it was stopped. You can do so, for example, by selecting 'System' > 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window. If you want to permanently terminate or reverse the encryption process, select 'System' > 'Permanently [...]
     <string lang="en" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Do you want to interrupt and postpone the process of decryption of the system partition/drive?\n\nNote: You will be able to resume the process and it will continue from the point it was stopped. You can do so, for example, by selecting 'System' > 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window. If you want to reverse the decryption process (and start encrypting), select 'System' > 'Encrypt Syste [...]
     <string lang="en" key="FAILED_TO_INTERRUPT_SYSTEM_ENCRYPTION">Error: Failed to interrupt the process of encryption/decryption of the system partition/drive.</string>
@@ -1033,19 +1048,18 @@
     <string lang="en" key="INCONSISTENCY_RESOLVED">Inconsistency resolved.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="en" key="NOTHING_TO_RESUME">There is no process/task to resume.</string>
     <string lang="nn" key="HIDVOL_PROT_BKG_TASK_WARNING">ADVARSEL: VeraCrypt Bakgrunns oppgåve er deaktivert. Etter att du avsluttar VeraCrypt, vil du ikkje lenger få melding om skade på skjult volum er ungått.\n\nMerk: Du kan og slå av bakgrunns oppgåva kor tid som helst ved å høgre klikka på VeraCrypt systemstatus felt ikonet og vel 'Avslutt'.\n\n\nAktivera VeraCrypt bakgrunns oppgåve?</string>
     <string lang="nn" key="LANG_PACK_VERSION">Språk pakke versjon:  %s</string>
     <string lang="nn" key="CHECKING_FS">Sjekkar filsystemet på VeraCrypt volumet montert som %hs...</string>
     <string lang="nn" key="REPAIRING_FS">Forsøk på å reparere filsystemet på VeraCrypt volumet montert som har %hs...</string>
     <string lang="en" key="WARN_CBC_MODE">Warning: This volume is encrypted in CBC mode. Due to security issues, CBC mode has been deprecated since VeraCrypt 4.1.\n\nWe strongly recommend that you move data from this VeraCrypt volume to a new volume created by this version of VeraCrypt. After you do so, you should securely erase or destroy the old volume. For more information, please see the Version History in the documentation or the release notices distributed with VeraCrypt 4.1 or lat [...]
-    <string lang="nn" key="WARN_64_BIT_BLOCK_CIPHER">Advarsel: This volume is encrypted with a legacy encryption algorithm.\n\nAll 64-bit-block encryption algorithms (e.g., Blowfish, CAST-128, or Triple DES) are deprecated. It will be possible to mount this volume using future versions of VeraCrypt. However, there will be no further enhancements to the implementations of these legacy encryption algorithms. We recommend that you create a new VeraCrypt volume encrypted with a 128-bit-block [...]
-    <string lang="nn" key="SYS_AUTOMOUNT_DISABLED">Systemet ditt er ikkje konfigurert for å auto montera nye volum. Det kan vera umogeleg å montera einings verta volum. Auto montering kan aktiverast ved å utføra følgjande kommando og restarta systemet.\n\nmountvol.exe /E</string>
+    <string lang="en" key="WARN_64_BIT_BLOCK_CIPHER">Warning: This volume is encrypted with a legacy encryption algorithm.\n\nAll 64-bit-block encryption algorithms (e.g., Blowfish, CAST-128, or Triple DES) are deprecated. It will be possible to mount this volume using future versions of VeraCrypt. However, there will be no further enhancements to the implementations of these legacy encryption algorithms. We recommend that you create a new VeraCrypt volume encrypted with a 128-bit-block  [...]
+    <string lang="en" key="SYS_AUTOMOUNT_DISABLED">Your system is not configured to auto-mount new volumes. It may be impossible to mount device-hosted VeraCrypt volumes. Auto-mounting can be enabled by executing the following command and restarting the system.\n\nmountvol.exe /E</string>
     <string lang="nn" key="SYS_ASSIGN_DRIVE_LETTER">Tildel ein stasjons bokstav til pertisjonen/einheiten før du held fram ('Kontrollpanel' > 'System og Vedlikehold' > 'Administrative Vertøy' - 'Lag og formater harddiskpartisjoner').\n\nMerk att dette er eit krav frå opperativ systemet.</string>
     <string lang="nn" key="MOUNT_TC_VOLUME">Mounter VeraCrypt volum</string>
     <string lang="nn" key="DISMOUNT_ALL_TC_VOLUMES">Demonter alle VeraCrypt volum</string>
     <string lang="nn" key="UAC_INIT_ERROR">VeraCrypt kunne ikkje skaffa Administrator rettigheiter.</string>
-    <string lang="nn" key="ERR_ACCESS_DENIED">Eng: Access was denied by the operating system.\n\nPossible cause: The operating system requires that you have read/write permission (or administrator privileges) for certain folders, files, and devices, in order for you to be allowed to read and write data to/from them. Normally, a user without administrator privileges is allowed to create, read and modify files in his or her Documents folder.</string>
+    <string lang="en" key="ERR_ACCESS_DENIED">Access was denied by the operating system.\n\nPossible cause: The operating system requires that you have read/write permission (or administrator privileges) for certain folders, files, and devices, in order for you to be allowed to read and write data to/from them. Normally, a user without administrator privileges is allowed to create, read and modify files in his or her Documents folder.</string>
     <string lang="en" key="SECTOR_SIZE_UNSUPPORTED">Error: The drive uses an unsupported sector size.\n\nIt is currently not possible to create partition/device-hosted volumes on drives that use sectors larger than 4096 bytes. However, note that you can create file-hosted volumes (containers) on such drives.</string>
     <string lang="en" key="SYSENC_UNSUPPORTED_SECTOR_SIZE_BIOS">It is currently not possible to encrypt a system installed on a disk that uses a sector size other than 512 bytes.</string>
     <string lang="en" key="NO_SPACE_FOR_BOOT_LOADER">The VeraCrypt Boot Loader requires at least 32 KBytes of free space at the beginning of the system drive (the VeraCrypt Boot Loader needs to be stored in that area). Unfortunately, your drive does not meet this condition.\n\nPlease do NOT report this as a bug/problem in VeraCrypt. To solve this problem, you will need to repartition your disk and leave the first 32 KBytes of the disk free (in most cases, you will need to delete and recr [...]
@@ -1057,7 +1071,7 @@
     <string lang="en" key="WINDOWS_NOT_ON_BOOT_DRIVE_ERROR">WARNING: Windows does not appear to be installed on the drive from which it boots. This is not supported.\n\nYou should continue only if you are sure that Windows is installed on the drive from which it boots.\n\nDo you want to continue?</string>
     <string lang="en" key="GPT_BOOT_DRIVE_UNSUPPORTED">Your system drive has a GUID partition table (GPT). Currently, only drives with a MBR partition table are supported.</string>
     <string lang="en" key="TC_BOOT_LOADER_ALREADY_INSTALLED">CAUTION: The VeraCrypt Boot Loader is already installed on your system drive!\n\nIt is possible that another system on your computer is already encrypted.\n\nWARNING: PROCEEDING WITH ENCRYPTION OF THE CURRENTLY RUNNING SYSTEM MAY MAKE OTHER SYSTEM(S) IMPOSSIBLE TO START AND RELATED DATA INACCESSIBLE.\n\nAre you sure you want to continue?</string>
-    <string lang="en" key="SYS_LOADER_RESTORE_FAILED">Failed to restore the original system loader.\n\nPlease use your VeraCrypt Rescue Disk ('Repair Options' > 'Restore original system loader') or Windows installation medium to replace the VeraCrypt Boot Loader with the Windows system loader.</string>
+    <string lang="en" key="SYS_LOADER_RESTORE_FAILED">Failed to restore the original system loader.\n\nPlease use your VeraCrypt Rescue Disk ('Repair Options' > 'Restore original system loader') or Windows installation medium to replace the VeraCrypt Boot Loader with the Windows system loader.</string>
     <string lang="en" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">The original system loader will not be stored on the Rescue Disk (probable cause: missing backup file).</string>
     <string lang="en" key="ERROR_MBR_PROTECTED">Failed to write the MBR sector.\n\nYour BIOS may be configured to protect the MBR sector. Check your BIOS settings (press F2, Delete, or Esc, after powering on your computer) for MBR/antivirus protection.</string>
     <string lang="en" key="BOOT_LOADER_FINGERPRINT_CHECK_FAILED">WARNING: The verification of VeraCrypt bootloader fingerprint failed!\nYour disk may have been tampered with by an attacker ("Evil Maid" attack).\n\nThis warning can also be triggered if you restored VeraCrypt boot loader using an Rescue Disk generated using a different VeraCrypt version.\n\nYou are advised to change your password immediately which will also restore the correct VeraCrypt bootloader. It is recommended to rei [...]
@@ -1079,21 +1093,20 @@
     <string lang="en" key="DECOY_OS_REINSTALL_WARNING">WARNING: During the process of creation of the hidden operating system, you will be required to fully reinstall the currently running system (in order to create a decoy system securely).\n\nNote: The currently running operating system and the entire content of the system partition will be copied to the hidden volume (in order to create the hidden system).\n\n\nAre you sure you will be able to install Windows using a Windows Setup med [...]
     <string lang="en" key="DECOY_OS_REQUIREMENTS">For security reasons, if the currently running operating system requires activation, it must be activated before proceeding. Note that the hidden operating system will be created by copying the content of the system partition to a hidden volume (so if this operating system is not activated, the hidden operating system will not be activated either). For more information, see the section "Security Requirements and Precautions Pertaining to  [...]
     <string lang="en" key="CONFIRM_HIDDEN_OS_EXTRA_BOOT_PARTITION">Your system uses an extra boot partition. VeraCrypt does not support hibernation on hidden operating systems that use an extra boot partition (decoy systems can be hibernated without any problems).\n\nPlease note that the boot partition would be shared by both the decoy and the hidden system. Therefore, in order to prevent data leaks and problems while resuming from hibernation, VeraCrypt has to prevent the hidden system  [...]
-    <string lang="en" key="EXTRA_BOOT_PARTITION_REMOVAL_INSTRUCTIONS">\nThe extra boot partition can be removed before installing Windows. To do so, follow these steps:\n\n1) Boot your Windows installation disc.\n\n2) In the Windows installer screen, click 'Install now' > 'Custom (advanced)'.\n\n3) Click 'Drive Options'.\n\n4) Select the main system partition and delete it by clicking 'Delete' and 'OK'.\n\n5) Select the 'System Reserved' partition, click 'Extend', and increase its siz [...]
+    <string lang="en" key="EXTRA_BOOT_PARTITION_REMOVAL_INSTRUCTIONS">\nThe extra boot partition can be removed before installing Windows. To do so, follow these steps:\n\n1) Boot your Windows installation disc.\n\n2) In the Windows installer screen, click 'Install now' > 'Custom (advanced)'.\n\n3) Click 'Drive Options'.\n\n4) Select the main system partition and delete it by clicking 'Delete' and 'OK'.\n\n5) Select the 'System Reserved' partition, click 'Extend', and increase its size s [...]
     <string lang="en" key="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">Warning: There is unallocated space between the system partition and the first partition behind it. After you create the hidden operating system, you must not create any new partitions in that unallocated space. Otherwise, the hidden operating system will be impossible to boot (until you delete such newly created partitions).</string>
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">This algorithm is currently not supported for system encryption.</string>
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
     <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</string>
     <string lang="en" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Error: Cannot set the keyboard layout for VeraCrypt to the standard US keyboard layout.\n\nNote that the password needs to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout.</string>
     <string lang="en" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">As VeraCrypt temporarily changed the keyboard layout to the standard US keyboard layout, it is not possible to type characters by pressing keys while the right Alt key is held down. However, you can type most of such characters by pressing appropriate keys while the Shift key is held down.</string>
     <string lang="en" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCrypt prevented change of keyboard layout.</string>
     <string lang="en" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Note: The password will need to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout. However, it is important to note that you do NOT need a real US keyboard. VeraCrypt automatically ensures that you can safely type the password (right now and in the pre-boot environment) even if yo [...]
-    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (TRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the TRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the TRD allows you to permanently decrypt the partition/drive before Windows  [...]
+    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (VRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the VRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the VRD allows you to permanently decrypt the partition/drive before Windows  [...]
     <string lang="en" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">After you click OK, Microsoft Windows Disc Image Burner will be launched. Please use it to burn the VeraCrypt Rescue Disk ISO image to a CD or DVD.\n\nAfter you do so, return to the VeraCrypt Volume Creation Wizard and follow its instructions.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn it to a CD or DVD.\n\n%lsAfter you burn the Rescue Disk, click Next to verify that it has been correctly burned.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you should either burn the image to a CD/DVD or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
@@ -1183,11 +1196,11 @@
     <string lang="en" key="RESCUE_DISK_HELP_PORTION_1">\nIF POSSIBLE, PLEASE PRINT THIS TEXT (click 'Print' below).\n\n\nHow and When to Use VeraCrypt Rescue Disk (After Encrypting)\n-----------------------------------------------------------------------------------\n\n</string>
     <string lang="en" key="RESCUE_DISK_HELP_PORTION_2">I. How to Boot VeraCrypt Rescue Disk\n\nTo boot a VeraCrypt Rescue Disk, insert it into your CD/DVD drive and restart your computer. If the VeraCrypt Rescue Disk screen does not appear (or if you do not see the 'Repair Options' item in the 'Keyboard Controls' section of the screen), it is possible that your BIOS is configured to attempt to boot from hard drives before CD/DVD drives. If that is the case, restart your computer, press F [...]
     <string lang="en" key="RESCUE_DISK_HELP_PORTION_3">II. When and How to Use VeraCrypt Rescue Disk (After Encrypting)\n\n</string>
-    <string lang="en" key="RESCUE_DISK_HELP_PORTION_4">1) If the VeraCrypt Boot Loader screen does not appear after you start your computer (or if Windows does not boot), the VeraCrypt Boot Loader may be damaged. The VeraCrypt Rescue Disk allows you to restore it and thus to regain access to your encrypted system and data (however, note that you will still have to enter the correct password then). In the Rescue Disk screen, select 'Repair Options' > 'Restore VeraCrypt Boot Loader'. Th [...]
-    <string lang="en" key="RESCUE_DISK_HELP_PORTION_5">2) If you repeatedly enter the correct password but VeraCrypt says that the password is incorrect, the master key or other critical data may be damaged. The VeraCrypt Rescue Disk allows you to restore them and thus to regain access to your encrypted system and data (however, note that you will still have to enter the correct password then). In the Rescue Disk screen, select 'Repair Options' > 'Restore key data'. Then enter your pa [...]
+    <string lang="en" key="RESCUE_DISK_HELP_PORTION_4">1) If the VeraCrypt Boot Loader screen does not appear after you start your computer (or if Windows does not boot), the VeraCrypt Boot Loader may be damaged. The VeraCrypt Rescue Disk allows you to restore it and thus to regain access to your encrypted system and data (however, note that you will still have to enter the correct password then). In the Rescue Disk screen, select 'Repair Options' > 'Restore VeraCrypt Boot Loader'. Then  [...]
+    <string lang="en" key="RESCUE_DISK_HELP_PORTION_5">2) If you repeatedly enter the correct password but VeraCrypt says that the password is incorrect, the master key or other critical data may be damaged. The VeraCrypt Rescue Disk allows you to restore them and thus to regain access to your encrypted system and data (however, note that you will still have to enter the correct password then). In the Rescue Disk screen, select 'Repair Options' > 'Restore key data'. Then enter your passw [...]
     <string lang="en" key="RESCUE_DISK_HELP_PORTION_6">3) If the VeraCrypt Boot Loader is damaged, you can avoid running it by booting directly from the VeraCrypt Rescue Disk. Insert your Rescue Disk into your CD/DVD drive and then enter your password in the Rescue Disk screen.\n\n</string>
-    <string lang="en" key="RESCUE_DISK_HELP_PORTION_7">4) If Windows is damaged and cannot start, the VeraCrypt Rescue Disk allows you to permanently decrypt the partition/drive before Windows starts. In the Rescue Disk screen, select 'Repair Options' > 'Permanently decrypt system partition/drive'. Enter the correct password and wait until decryption is complete. Then you can e.g. boot your MS Windows setup CD/DVD to repair your Windows installation.\n\n</string>
-    <string lang="en" key="RESCUE_DISK_HELP_PORTION_8">Note: Alternatively, if Windows is damaged (cannot start) and you need to repair it (or access files on it), you can avoid decrypting the system partition/drive by following these steps: If you have multiple operating systems installed on your computer, boot the one that does not require pre-boot authentication. If you do not have multiple operating systems installed on your computer, you can boot a WinPE or BartPE CD/DVD or you can  [...]
+    <string lang="en" key="RESCUE_DISK_HELP_PORTION_7">4) If Windows is damaged and cannot start, the VeraCrypt Rescue Disk allows you to permanently decrypt the partition/drive before Windows starts. In the Rescue Disk screen, select 'Repair Options' > 'Permanently decrypt system partition/drive'. Enter the correct password and wait until decryption is complete. Then you can e.g. boot your MS Windows setup CD/DVD to repair your Windows installation.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_HELP_PORTION_8">Note: Alternatively, if Windows is damaged (cannot start) and you need to repair it (or access files on it), you can avoid decrypting the system partition/drive by following these steps: If you have multiple operating systems installed on your computer, boot the one that does not require pre-boot authentication. If you do not have multiple operating systems installed on your computer, you can boot a WinPE or BartPE CD/DVD or you can  [...]
     <string lang="en" key="RESCUE_DISK_HELP_PORTION_9">Note that even if you lose your VeraCrypt Rescue Disk and an attacker finds it, he or she will NOT be able to decrypt the system partition or drive without the correct password.</string>
     <string lang="en" key="DECOY_OS_INSTRUCTIONS_PORTION_1">\n\nI M P O R T A N T -- PLEASE PRINT THIS TEXT IF POSSIBLE (click 'Print' below).\n\n\nNote: This text will be automatically displayed each time you start the hidden system until you start creating the decoy system.\n\n\n</string>
     <string lang="en" key="DECOY_OS_INSTRUCTIONS_PORTION_2">How to Create Decoy System Safely and Securely\n----------------------------------------------------------------------------\n\nIn order to achieve plausible deniability, you need to create the decoy operating system now. To do so, follow these steps:\n\n</string>
@@ -1219,7 +1232,7 @@
     <string lang="en" key="SYSTEM_ENCRYPTION_IN_PROGRESS_ELSEWHERE">An instance of the VeraCrypt Volume Creation Wizard is currently running on this system and performing or preparing encryption/decryption of the system partition/drive. Before you proceed, please wait for it to finish or close it. If you cannot close it, please restart your computer before proceeding.</string>
     <string lang="en" key="SYSTEM_ENCRYPTION_NOT_COMPLETED">The process of encryption or decryption of the system partition/drive has not been completed. Please wait until it is complete before proceeding.</string>
     <string lang="en" key="ERR_ENCRYPTION_NOT_COMPLETED">Error: The process of encryption of the partition/drive has not been completed. It must be completed first.</string>
-    <string lang="en" key="ERR_NONSYS_INPLACE_ENC_INCOMPLETE">Error: The process of encryption of the partition/volume has not been completed. It must be completed first.\n\nNote: To resume the process, select 'Volumes' > 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window.</string>
+    <string lang="en" key="ERR_NONSYS_INPLACE_ENC_INCOMPLETE">Error: The process of encryption or decryption of the partition/volume has not been completed. It must be completed first.\n\nNote: To resume the process, select 'Volumes' > 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window.</string>
     <string lang="en" key="ERR_SYS_HIDVOL_HEAD_REENC_MODE_WRONG">The password is correct, VeraCrypt has successfully decrypted the volume header and detected that this volume is a hidden system volume. However, you cannot modify the header of a hidden system volume this way.\n\nTo change the password for a hidden system volume, boot the operating system residing in the hidden volume, and then select 'System' > 'Change Password' from the menu bar of the main VeraCrypt window.\n\nTo set [...]
     <string lang="en" key="CANNOT_DECRYPT_HIDDEN_OS">VeraCrypt does not support in-place decryption of a hidden system partition.\n\nNote: If you want to decrypt the decoy system partition, boot the decoy system, and then select 'System' > 'Permanently Decrypt System Partition/Drive' from the menu bar of the main VeraCrypt window.</string>
     <string lang="en" key="ERR_PARAMETER_INCORRECT">Error: Incorrect/invalid parameter.</string>
@@ -1234,9 +1247,9 @@
     <string lang="en" key="NOTE_CASCADE_FOR_SYS_ENCRYPTION">If you encounter any of the previously described problems, decrypt the partition/drive (if it is encrypted) and then try encrypting it again using a non-cascade encryption algorithm (e.g. AES).</string>
     <string lang="en" key="UPDATE_TC_IN_DECOY_OS_FIRST">WARNING: For safety and security reasons, you should update VeraCrypt on the decoy operating system before you update it on the hidden operating system.\n\nTo do so, boot the decoy system and run the VeraCrypt installer from within it. Then boot the hidden system and run the installer from within it as well.\n\nNote: The decoy system and the hidden system share a single boot loader. If you upgraded VeraCrypt only on the hidden syste [...]
     <string lang="en" key="UPDATE_TC_IN_HIDDEN_OS_TOO">The version number of the VeraCrypt Boot Loader that booted this operating system is different from the version number of the VeraCrypt driver (and of the VeraCrypt applications) installed on this system.\n\nYou should run the VeraCrypt installer (whose version number is the same as the one of the VeraCrypt Boot Loader) to update VeraCrypt on this operating system.</string>
-    <string lang="en" key="BOOT_LOADER_VERSION_DIFFERENT_FROM_DRIVER_VERSION">The version number of the VeraCrypt Boot Loader that booted this operating system is different from the version number of the VeraCrypt driver (and of the VeraCrypt applications) installed on this system. Note that older versions may contain bugs fixed in later versions.\n\nIf you did not boot from the VeraCrypt Rescue Disk, you should reinstall VeraCrypt or upgrade it to the latest stable version (the boot loa [...]
-    <string lang="en" key="BOOT_LOADER_UPGRADE_OK">The VeraCrypt Boot Loader has been upgraded.\n\nIt is strongly recommended that you create a new VeraCrypt Rescue Disk (which will contain the new version of the VeraCrypt Boot Loader) by selecting 'System' > 'Create Rescue Disk' after you restart your computer.</string>
-    <string lang="en" key="BOOT_LOADER_UPGRADE_OK_HIDDEN_OS">The VeraCrypt Boot Loader has been upgraded.\n\nIt is strongly recommended that you boot the decoy operating system and then create a new VeraCrypt Rescue Disk (which will contain the new version of the VeraCrypt Boot Loader) by selecting 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="BOOT_LOADER_VERSION_DIFFERENT_FROM_DRIVER_VERSION">The version number of the VeraCrypt Boot Loader that booted this operating system is different from the version number of the VeraCrypt driver (and of the VeraCrypt applications) installed on this system. Note that older versions may contain bugs fixed in later versions.\n\nIf you did not boot from the VeraCrypt Rescue Disk, you should reinstall VeraCrypt or upgrade it to the latest stable version (the boot loa [...]
+    <string lang="en" key="BOOT_LOADER_UPGRADE_OK">The VeraCrypt Boot Loader has been upgraded.\n\nIt is strongly recommended that you create a new VeraCrypt Rescue Disk (which will contain the new version of the VeraCrypt Boot Loader) by selecting 'System' > 'Create Rescue Disk' after you restart your computer.</string>
+    <string lang="en" key="BOOT_LOADER_UPGRADE_OK_HIDDEN_OS">The VeraCrypt Boot Loader has been upgraded.\n\nIt is strongly recommended that you boot the decoy operating system and then create a new VeraCrypt Rescue Disk (which will contain the new version of the VeraCrypt Boot Loader) by selecting 'System' > 'Create Rescue Disk'.</string>
     <string lang="en" key="BOOT_LOADER_UPGRADE_FAILED">Failed to upgrade the VeraCrypt Boot Loader.</string>
     <string lang="en" key="SYS_DRIVE_SIZE_PROBE_TIMEOUT">VeraCrypt failed to detect the real size of the system drive and, therefore, the size reported by the operating system (which may be smaller than the real size) will be used. Also note that this is not a bug in VeraCrypt.</string>
     <string lang="en" key="HIDDEN_SECTOR_DETECTION_FAILED_PREVIOUSLY">WARNING: It appears that VeraCrypt has already tried to detect hidden sectors on this system drive. If you encountered any problems during the previous detection process, you can avoid the problems by skipping the detection of hidden sectors now. Note that if you do so, VeraCrypt will use the size reported by the operating system (which may be smaller than the real size of the drive).\n\nNote that this issue is not cau [...]
@@ -1249,8 +1262,8 @@
     <string lang="en" key="ENTER_TOKEN_PASSWORD">Enter password/PIN for token '%s':</string>
     <string lang="en" key="PKCS11_LIB_LOCATION_HELP">In order to allow VeraCrypt to access a security token or smart card, you need to install a PKCS #11 software library for the token or smart card first. Such a library may be supplied with the device or it may be available for download from the website of the vendor or other third parties.\n\nAfter you install the library, you can either select it manually by clicking 'Select Library' or you can let VeraCrypt find and select it automat [...]
     <string lang="en" key="SELECT_PKCS11_MODULE_HELP">Note: For the filename and location of the PKCS #11 library installed for your security token or smart card, please refer to the documentation supplied with the token, card, or third-party software.\n\nClick 'OK' to select the path and filename.</string>
-    <string lang="en" key="NO_PKCS11_MODULE_SPECIFIED">In order to allow VeraCrypt to access a security token or smart card, you need to select a PKCS #11 software library for the token/card first. To do so, select 'Settings' > 'Security Tokens'.</string>
-    <string lang="en" key="PKCS11_MODULE_INIT_FAILED">Failed to initialize PKCS #11 security token library.\n\nPlease make sure the specified path and filename refer to a valid PKCS #11 library. To specify a PKCS #11 library path and filename, select 'Settings' > 'Security Tokens'.</string>
+    <string lang="en" key="NO_PKCS11_MODULE_SPECIFIED">In order to allow VeraCrypt to access a security token or smart card, you need to select a PKCS #11 software library for the token/card first. To do so, select 'Settings' > 'Security Tokens'.</string>
+    <string lang="en" key="PKCS11_MODULE_INIT_FAILED">Failed to initialize PKCS #11 security token library.\n\nPlease make sure the specified path and filename refer to a valid PKCS #11 library. To specify a PKCS #11 library path and filename, select 'Settings' > 'Security Tokens'.</string>
     <string lang="en" key="PKCS11_MODULE_AUTO_DETECTION_FAILED">No PKCS #11 library has been found in the Windows system directory.\n\nPlease make sure that a PKCS #11 library for your security token (or for your smart card) is installed (such a library may be supplied with the token/card or it may be available for download from the website of the vendor or other third parties). If it is installed in a directory other than the Windows system directory, click 'Select Library' to locate th [...]
     <string lang="en" key="NO_TOKENS_FOUND">No security token found.\n\nPlease make sure your security token is connected to your computer and the correct device driver for your token is installed.</string>
     <string lang="en" key="TOKEN_KEYFILE_NOT_FOUND">Security token keyfile not found.</string>
@@ -1259,13 +1272,13 @@
     <string lang="en" key="INVALID_TOKEN_KEYFILE_PATH">Security token keyfile path is invalid.</string>
     <string lang="en" key="SECURITY_TOKEN_ERROR">Security token error</string>
     <string lang="en" key="CKR_PIN_INCORRECT">Password for security token is incorrect.</string>
-    <string lang="en" key="CKR_DEVICE_MEMORY">The security token does not have enough memory/space to perform the requested operation.\n\nIf you are attempting to import a keyfile, you should select a smaller file or use a keyfile generated by VeraCrypt (select 'Tools' > 'Keyfile Generator').</string>
+    <string lang="en" key="CKR_DEVICE_MEMORY">The security token does not have enough memory/space to perform the requested operation.\n\nIf you are attempting to import a keyfile, you should select a smaller file or use a keyfile generated by VeraCrypt (select 'Tools' > 'Keyfile Generator').</string>
     <string lang="en" key="ALL_TOKEN_SESSIONS_CLOSED">All open security token sessions have been closed.</string>
     <string lang="en" key="SELECT_TOKEN_KEYFILES">Select Security Token Keyfiles</string>
     <string lang="en" key="TOKEN_SLOT_ID">Slot</string>
     <string lang="en" key="TOKEN_NAME">Token name</string>
     <string lang="en" key="TOKEN_DATA_OBJECT_LABEL">File name</string>
-    <string lang="en" key="BOOT_PASSWORD_CACHE_KEYBOARD_WARNING">IMPORTANT: Please note that pre-boot authentication passwords are always typed using the standard US keyboard layout. Therefore, a volume that uses a password typed using any other keyboard layout may be impossible to mount using a pre-boot authentication password (note that this is not a bug in VeraCrypt). To allow such a volume to be mounted using a pre-boot authentication password, follow these steps:\n\n1) Click 'Select [...]
+    <string lang="en" key="BOOT_PASSWORD_CACHE_KEYBOARD_WARNING">IMPORTANT: Please note that pre-boot authentication passwords are always typed using the standard US keyboard layout. Therefore, a volume that uses a password typed using any other keyboard layout may be impossible to mount using a pre-boot authentication password (note that this is not a bug in VeraCrypt). To allow such a volume to be mounted using a pre-boot authentication password, follow these steps:\n\n1) Click 'Select [...]
     <string lang="en" key="SYS_FAVORITES_KEYBOARD_WARNING">System favorite volumes will be mounted using the pre-boot authentication password. If any system favorite volume uses a different password, it will not be mounted.</string>
     <string lang="en" key="SYS_FAVORITES_ADMIN_ONLY_INFO">Please note that if you need to prevent normal VeraCrypt volume actions (such as 'Dismount All', auto-dismount, etc.) from affecting system favorite volumes, you should enable the option 'Allow only administrators to view and dismount system favorite volumes in VeraCrypt'. In addition, when VeraCrypt is run without administrator privileges (the default on Windows Vista and later), system favorite volumes will not be displayed in t [...]
     <string lang="en" key="SYS_FAVORITES_ADMIN_ONLY_WARNING">IMPORTANT: Please keep in mind that if this option is enabled and VeraCrypt does not have administrator privileges, mounted system favorite volumes are NOT displayed in the VeraCrypt application window and they cannot be dismounted. Therefore, if you need e.g. to dismount a system favorite volume, please right-click the VeraCrypt icon (in the Start menu) and select 'Run as administrator' first. The same limitation applies to th [...]
@@ -1279,17 +1292,18 @@
     <string lang="en" key="MOUNTED_VOLUME_DIRTY">Warning: The filesystem on the volume mounted as '%s' was not cleanly dismounted and thus may contain errors. Using a corrupted filesystem can cause data loss or data corruption.\n\nNote: Before you physically remove or switch off a device (such as a USB flash drive or an external hard drive) where a mounted VeraCrypt volume resides, you should always dismount the VeraCrypt volume in VeraCrypt first.\n\n\nDo you want Windows to attempt to  [...]
     <string lang="en" key="SYS_FAVORITE_VOLUME_DIRTY">Warning: One or more system favorite volumes were not cleanly dismounted and thus may contain filesystem errors. Please see the system event log for further details.\n\nUsing a corrupted filesystem can cause data loss or data corruption. You should check the affected system favorite volume(s) for errors (right-click each of them in VeraCrypt and select 'Repair Filesystem').</string>
     <string lang="en" key="FILESYS_REPAIR_CONFIRM_BACKUP">Warning: Repairing a damaged filesystem using the Microsoft 'chkdsk' tool might cause loss of files in damaged areas. Therefore, it is recommended that you first back up the files stored on the VeraCrypt volume to another, healthy, VeraCrypt volume.\n\nDo you want to repair the filesystem now?</string>
-    <string lang="en" key="MOUNTED_CONTAINER_FORCED_READ_ONLY">Volume '%s' has been mounted as read-only because write access was denied.\n\nPlease make sure the security permissions of the file container allow you to write to it (right-click the container and select Properties > Security).\n\nNote that, due to a Windows issue, you may see this warning even after setting the appropriate security permissions. This is not caused by a bug in VeraCrypt. A possible solution is to move your [...]
+    <string lang="en" key="MOUNTED_CONTAINER_FORCED_READ_ONLY">Volume '%s' has been mounted as read-only because write access was denied.\n\nPlease make sure the security permissions of the file container allow you to write to it (right-click the container and select Properties > Security).\n\nNote that, due to a Windows issue, you may see this warning even after setting the appropriate security permissions. This is not caused by a bug in VeraCrypt. A possible solution is to move your co [...]
     <string lang="en" key="MOUNTED_DEVICE_FORCED_READ_ONLY">Volume '%s' had to be mounted as read-only because write access was denied.\n\nPlease make sure no other application (e.g. antivirus software) is accessing the partition/device on which the volume is hosted.</string>
     <string lang="en" key="MOUNTED_DEVICE_FORCED_READ_ONLY_WRITE_PROTECTION">Volume '%s' has been mounted as read-only because the operating system reported the host device to be write-protected.\n\nPlease note that some custom chipset drivers have been reported to cause writable media to falsely appear write-protected. This problem is not caused by VeraCrypt. It may be solved by updating or uninstalling any custom (non-Microsoft) chipset drivers that are currently installed on this syst [...]
     <string lang="en" key="LIMIT_ENC_THREAD_POOL_NOTE">Note that the Hyper-Threading technology provides multiple logical cores per a single physical core. When Hyper Threading is enabled, the number selected above represents the number of logical processors/cores.</string>
     <string lang="en" key="NUMBER_OF_THREADS">%d threads</string>
-    <string lang="en" key="DISABLED_HW_AES_AFFECTS_PERFORMANCE">Note that hardware-accelerated AES is disabled, which will affect benchmark results (worse performance).\n\nTo enable hardware acceleration, select 'Settings' > 'Performance' and enable the corresponding option.</string>
-    <string lang="en" key="LIMITED_THREAD_COUNT_AFFECTS_PERFORMANCE">Note that the number of threads is currently limited, which will affect benchmark results (worse performance).\n\nTo utilize the full potential of the processor(s), select 'Settings' > 'Performance' and disable the corresponding option.</string>
+    <string lang="en" key="DISABLED_HW_AES_AFFECTS_PERFORMANCE">Note that hardware-accelerated AES is disabled, which will affect benchmark results (worse performance).\n\nTo enable hardware acceleration, select 'Settings' > 'Performance' and enable the corresponding option.</string>
+    <string lang="en" key="LIMITED_THREAD_COUNT_AFFECTS_PERFORMANCE">Note that the number of threads is currently limited, which will affect benchmark results (worse performance).\n\nTo utilize the full potential of the processor(s), select 'Settings' > 'Performance' and disable the corresponding option.</string>
     <string lang="en" key="ASK_REMOVE_DEVICE_WRITE_PROTECTION">Do you want VeraCrypt to attempt to disable write protection of the partition/drive?</string>
     <string lang="en" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">WARNING: This setting may degrade performance.\n\nAre you sure you want to use this setting?</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="en" key="TEST">Test</string>
     <string lang="nn" key="KEYFILE">Nøkkelfil</string>
     <string lang="nn" key="VKEY_08">Backspace</string>
@@ -1412,4 +1426,4 @@
       </xs:complexType>
     </xs:element>
   </xs:schema>
-</VeraCrypt>
\ No newline at end of file
+</VeraCrypt>
diff --git a/Translations/Language.pl.xml b/Translations/Language.pl.xml
index beb2e52..177cb69 100644
--- a/Translations/Language.pl.xml
+++ b/Translations/Language.pl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="pl" name="Polski" en-name="Polish" version="1.0.0" translators="Mirek Druchowicz, Janusz Zamecki, Sobiesław Antolak, Begina Felicysym" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="pl" key="IDC_QUICKFORMAT">Szybkie formatowanie</control>
     <control lang="pl" key="IDC_SHOW_PASSWORD">&Wyświetl hasło</control>
     <control lang="pl" key="IDC_SHOW_PASSWORD_SINGLE">&Wyświetl hasło</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="pl" key="IDC_SINGLE_BOOT">Jeden system</control>
     <control lang="pl" key="IDC_STD_VOL">Standardowy wolumen VeraCrypt</control>
     <control lang="pl" key="IDC_SYSENC_HIDDEN">Uk&ryty</control>
@@ -98,6 +99,7 @@
     <control lang="pl" key="IDT_SYSENC_KEYS_GEN_INFO">Klucze, ciągi zaburzające (salt) i inne dane zostały pomyślnie wygenerowane. Jeśli chcesz generować nowe klucze, kliknij przycisk Wstecz a następnie Dalej. W przeciwnym wypadku kliknij przycisk Dalej, aby kontynuować.</control>
     <control lang="pl" key="IDT_SYS_DEVICE">Zaszyfruj partycję lub dysk, na którym zainstalowany jest Windows. Każdy kto będzie chciał uzyskać dostęp do systemu, czytać i zapisywać pliki, itd., będą musieli wpisać poprawne hasło za każdym razem, gdy będzie uruchamiany Windows.</control>
     <control lang="pl" key="IDT_SYS_PARTITION">Wybierz tą opcję, aby zaszyfrować partycję, gdzie obecnie jest zainstalowany i uruchomiony Windows.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="pl" key="IDT_WIPE_MODE">Wymaż</control>
     <control lang="pl" key="IDCLOSE">Zamknij</control>
     <control lang="pl" key="IDC_ALLOW_ESC_PBA_BYPASS">Pozwól ominąć &autoryzację podczas startowania przez naciśnięcie klawisza Esc (boot manager)</control>
@@ -111,6 +113,7 @@
     <control lang="pl" key="IDC_CACHE">Przechowuj w pamięci hasła i pliki-&klucze</control>
     <control lang="pl" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Wyjdź, jeśli nie ma podłączonych wolumenów</control>
     <control lang="pl" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Zamknij token sesji (wylogowanie), gdy wolumen zostanie pomyślnie podłączony</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="pl" key="IDC_COPY_WIZARD">Włącz kreatora wolumenów VeraCrypt</control>
     <control lang="pl" key="IDC_CREATE">Utwórz</control>
     <control lang="pl" key="IDC_CREATE_VOLUME">&Utwórz wolumen</control>
@@ -271,6 +274,8 @@
     <control lang="pl" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Wyświetlenie twojej wiadomości podczas autoryzowania i startowania (maksimum 24 znaki):</control>
     <control lang="pl" key="IDT_DEFAULT_MOUNT_OPTIONS">Domyślne opcje podłączania</control>
     <control lang="pl" key="IDT_DISMOUNT_ACTION">Opcje klawiatury</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="pl" key="IDT_FAVORITE_LABEL">Etykieta wybranego ulubionego wolumenu:</control>
     <control lang="pl" key="IDT_FILE_SETTINGS">Ustawienia pliku</control>
     <control lang="pl" key="IDT_HOTKEY_KEY">Klawisz do przypisania:</control>
@@ -537,6 +542,15 @@
     <string lang="pl" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Uwaga: Jeżeli potrzebujesz szyfrowanej transmisji plików pomiedzy pierwszym systemem a ukrytym systemem, postępuj wg kroków: 1) Uruchom pierwszy system (decoy system). 2) Zapisz pliki na niezaszyfrowanym wolumenie lub na zewnętrznym/normalnym wolumenie VeraCrypt. 3) Uruchom ukryty sytsem operacyjny. 4) Jeżeli zapisałeś pliki na wolumenie VeraCrypt, podłącz go (zostanie on automatycznie podłączony jako tylko do odczytu). 5 [...]
     <string lang="pl" key="CONFIRM_RESTART">Komputer musi być ponownie uruchomiony.\n\nCzy wykonać to teraz?</string>
     <string lang="pl" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Wystąpił błąd podczas pobierania statusu szyfrowania systemu. </string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="pl" key="INIT_SYS_ENC">Nie można zainicjować komponentów aplikacji dla szyfrowania systemu.</string>
     <string lang="pl" key="INIT_RAND">Błąd inicjowania generatora liczb losowych!</string>
     <string lang="pl" key="CAPI_RAND">Błąd API Windows Crypto!\n\n\n(Jeżeli zgłosisz powiązany z tym błąd, proszę dołączyć następujące informacje techniczne w raporcie błędu:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="pl" key="SELECT_KEYFILE">Wybierz plik-klucz</string>
     <string lang="pl" key="SELECT_KEYFILE_PATH">Wskaż ścieżkę wyszukiwania pliku-klucza. UWAGA: Zapisana będzie tylko ścieżka a nie nazwy plików!</string>
     <string lang="pl" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Wybierz katalog do przechowywania plików-kluczy.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="pl" key="SERPENT_HELP">Zaprojektowany przez Rossa Andersona, Eli Bihama i Larsa Knudsena. Opublikowany w 1998. 256-bitowy klucz, 128-bitowy blok. Tryb szyfrowania: XTS. Algorytm Serpent był jednym z finalistów konkursu na algorytm AES.</string>
     <string lang="pl" key="SIZE_HELP">Wskaż rozmiar kontenera do utworzenia.\n\nJeśli tworzysz dynamiczny (sparse-file) kontener, ten parametr wskazuje maksymalny możliwy rozmiar.\n\nZauważ, że minimalny możliwy rozmiar woluminu FAT wynosi 292 KB. Minimalny możliwy rozmiar wolumenu NTFS to 3792 KB.</string>
     <string lang="pl" key="SIZE_HELP_HIDDEN_HOST_VOL">Wskaż rozmiar zewnętrznego wolumenu do utworzenia (na początku zostanie utworzony wolumen zewnętrzny a następnie wolumen ukryty wewnątrz niego). Minimalny możliwy rozmiar wolumenu, wewnątrz którego tworzony jest wolumen ukryty wynosi 340 KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="pl" key="INCONSISTENCY_RESOLVED">Wykryto i usunięto niespójność.\n\n\n(Jeśli będziesz zgłaszać związany z tym błąd, umieść w raporcie błędu następujące informacje techniczne: %hs)</string>
     <string lang="pl" key="UNEXPECTED_STATE">BŁĄD: Stan nieoznaczony.\n\n\n(Jeżeli będziesz wykonywał raport z błędem, proszę dołącz te techniczne informacje: %hs)</string>
     <string lang="pl" key="NO_SYS_ENC_PROCESS_TO_RESUME">Nie ma przerwanego procesu szyfrowania lub deszyfrowania partycji systemowej lub napędu do wznowienia.\n\nZawuaż: Jeżeli chcesz wznowić przerwany proces szyfrowania lub deszyfrowania partycji lub wolumenu niesystemowego, wybierz 'Wolumeny' > 'Kontynuuj przerwany proces'.</string>
-    <string lang="pl" key="NOTHING_TO_RESUME">Nie ma procesu ani zadania do wznowienia.</string>
     <string lang="pl" key="HIDVOL_PROT_BKG_TASK_WARNING">OSTRZEŻENIE: Proces VeraCrypt uruchamiany w tle jest wyłączony. Po zakończeniu pracy programu VeraCrypt nie będą generowane ostrzeżenia o podjęciu działań zabezpieczających przed uszkodzeniem wolumenów ukrytych.\n\nProces uruchamiany w tle można zamknąć w dowolnym momencie, klikając prawym przyciskiem myszy ikonę VeraCrypt w zasobniku i wybierając opcję 'Wyjście'.\n\nUruchomić proces programu VeraCrypt w tle?</string>
     <string lang="pl" key="LANG_PACK_VERSION">Wersja pakietu językowego: %s</string>
     <string lang="pl" key="CHECKING_FS">Sprawdzanie systemu plików w wolumenie VeraCrypt podłączonym jako %hs...</string>
@@ -1085,8 +1099,7 @@
     <string lang="pl" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">Ten algorytm nie jest obsługiwany w trybie TrueCrypt.</string>
     <string lang="pl" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">MOI (Mnożnik Osobistych Iteracji) nie obsługuje trybu TrueCrypt.</string>
     <string lang="pl" key="PIM_REQUIRE_LONG_PASSWORD">Hasło musi zawierać przynajmniej 20 albo więcej znaków, aby móc używać określonego MOI.\nKrótsze hasła mogą być używane tylko wtedy, gdy MOI wynosi 485 albo więcej.</string>
-    <string lang="pl" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Hasło uwierzytelniania przed uruchomieniem musi zawierać 20 albo więcej znaków, aby móc używać określonego MOI.\nKrótsze hasła mogą być używane tylko wtedy, gdy MOI wynosi 98 albo więcej.</string>
-    <string lang="pl" key="UNSUPPORTED_TRUECRYPT_FORMAT">Ten wolumen został stworzony w TrueCrypt %x.%x, ale VeraCrypt obsługuje jedynie wolumeny TrueCrypt stworzone w serii TrueCrypt 6.x/7.x</string>
+    <string lang="pl" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Hasło uwierzytelniania przed uruchomieniem musi zawierać 20 albo więcej znaków, aby móc używać określonego MOI.\nKrótsze hasła mogą być używane tylko wtedy, gdy MOI wynosi 98 albo więcej.</string>    
     <string lang="pl" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Pliki-klucze nie są obecnie obsługiwane/wspierane do szyfrowania systemu.</string>
     <string lang="pl" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Ostrzeżenie: Program VeraCrypt nie mógł odtworzyć oryginalnych ustawień klawiatury. To może spowodować błędne wprowadzenie hasła.</string>
     <string lang="pl" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Błąd: Nie można ustawić trybu klawiatury dla VeraCrypt na układ USA.\n\nHasło będzie wprowadzane w środowisku PRZED uruchomieniem systemu Windows, gdzie inne niż standardowy układy klawiatury nie są dostępne. Dlatego, hasło MUSI być zawsze wprowadzane przy użyciu standardowego układu klawiatury USA.</string>
@@ -1291,6 +1304,7 @@ płyty ratunkowej VeraCrypt, włóż ją do napędu CD/DVD i uruchom ponownie ko
     <string lang="pl" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">UWAGA: Takie ustawienie może zmniejszyć wydajność.\n\nNa pewno wprowadzić to ustawienie?</string>
     <string lang="pl" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Ostrzeżenie: Wolumen VeraCrypt automatycznie odłączony</string>
     <string lang="pl" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Zanim fizycznie usuniesz lub wyłączysz nośnik zawierający podłączony wolumen, musisz najpierw zawsze odłączyć wolumen VeraCrypt.\n\nNieoczekiwane spontaniczne odłączenie jest często spowodowane sporadycznie rozłączający się przewód, napęd (obudowa), itp.</string>
+    <string lang="pl" key="UNSUPPORTED_TRUECRYPT_FORMAT">Ten wolumen został stworzony w TrueCrypt %x.%x, ale VeraCrypt obsługuje jedynie wolumeny TrueCrypt stworzone w serii TrueCrypt 6.x/7.x</string>
     <string lang="pl" key="TEST">Test</string>
     <string lang="pl" key="KEYFILE">Plik-klucz</string>
     <string lang="pl" key="VKEY_08">Backspace</string>
diff --git a/Translations/Language.pt-br.xml b/Translations/Language.pt-br.xml
index 9e15cc8..71718b9 100644
--- a/Translations/Language.pt-br.xml
+++ b/Translations/Language.pt-br.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="pt-br" name="Português-Brasil" en-name="Portuguese (Brazil)" version="0.1.0" translators="Thiago C. L. Mendes, Lecidio S. Alencar , Lucas C. Ferreira" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="pt-br" key="IDC_QUICKFORMAT">Formatação rápida</control>
     <control lang="pt-br" key="IDC_SHOW_PASSWORD">&Mostrar senha</control>
     <control lang="pt-br" key="IDC_SHOW_PASSWORD_SINGLE">&Mostrar senha</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="pt-br" key="IDC_SINGLE_BOOT">Boot Único</control>
     <control lang="pt-br" key="IDC_STD_VOL">Volume VeraCrypt padrão</control>
     <control lang="pt-br" key="IDC_SYSENC_HIDDEN">O&culto</control>
@@ -98,6 +99,7 @@
     <control lang="pt-br" key="IDT_SYSENC_KEYS_GEN_INFO">As chaves, salt e outros dados foram gerados com sucesso. Se você deseja gerar novas chaves, clique em Voltar e depois em Avançar. Caso contrário, clique em Avançar para continuar.</control>
     <control lang="pt-br" key="IDT_SYS_DEVICE">Criptografa a partição/unidade onde o Windows está instalado. Quem quiser ter acesso e utilizar o sistema, ler e escrever arquivos, etc, precisará digitar a senha correta toda vez antes de inicializar o Windows. Opcionalmente, cria um sistema oculto.</control>
     <control lang="en" key="IDT_SYS_PARTITION">Select this option to encrypt the partition where the currently running Windows operating system is installed.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="pt-br" key="IDT_WIPE_MODE">Modo de limpeza:</control>
     <control lang="pt-br" key="IDCLOSE">Fechar</control>
     <control lang="pt-br" key="IDC_ALLOW_ESC_PBA_BYPASS">Permitir que a autenticação pré-boot seja contornada pressionando a tecla Esc (permite gerenciador de inicialização)</control>
@@ -111,6 +113,7 @@
     <control lang="pt-br" key="IDC_CACHE">Mant&er senhas e arquivos-chave na memória</control>
     <control lang="pt-br" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Sair quando não existirem volumes montados</control>
     <control lang="pt-br" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">Fe&char a sessão do token (deslogar) após um volume ser montado com sucesso</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="pt-br" key="IDC_COPY_WIZARD">Incluir assistente de criação de volume VeraCrypt</control>
     <control lang="pt-br" key="IDC_CREATE">Criar</control>
     <control lang="pt-br" key="IDC_CREATE_VOLUME">&Criar Volume</control>
@@ -271,6 +274,8 @@
     <control lang="pt-br" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Mostrar esta mensagem personalizada na tela de autenticação pré-boot (24 caracteres no máximo):</control>
     <control lang="pt-br" key="IDT_DEFAULT_MOUNT_OPTIONS">Opções Padrão de Montagem</control>
     <control lang="pt-br" key="IDT_DISMOUNT_ACTION">Opções de Atalhos</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="en" key="IDT_FAVORITE_LABEL">Label of selected favorite volume:</control>
     <control lang="pt-br" key="IDT_FILE_SETTINGS">Configurações de Arquivo</control>
     <control lang="pt-br" key="IDT_HOTKEY_KEY">Chave a atribuir:</control>
@@ -537,6 +542,15 @@
     <string lang="pt-br" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Nota: Caso necessite transferir arquivos com segurança do sistema isca para o  sistema oculto, siga estas etapas: 1) Inicie o sistema isca. 2) Salve os arquivos para um volume não-criptografado ou para um volume VeraCrypt externo/normal. 3) Inicie o sistema oculto. 4) Se você salvou os arquivos em um volume VeraCrypt, monte-o (ele será automaticamente montado como somente leitura). 5) Copie os arquivos para a partição  [...]
     <string lang="pt-br" key="CONFIRM_RESTART">Seu computador precisa ser reiniciado.\n\nVocê deseja reiniciá-lo agora?</string>
     <string lang="pt-br" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Ocorreu um erro ao obter o estado de criptografia do sistema.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="pt-br" key="INIT_SYS_ENC">Não foi possível iniciar componentes do programa de criptografia do sistema.</string>
     <string lang="pt-br" key="INIT_RAND">Falha ao iniciar o gerador de números aleatórios!</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="pt-br" key="SELECT_KEYFILE">Selecione o Arquivo-chave</string>
     <string lang="pt-br" key="SELECT_KEYFILE_PATH">Selecione o caminho do arquivo-chave. AVISO: Lembre que apenas o caminho sera lembrado, não os nomes dos arquivos!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="pt-br" key="SERPENT_HELP">Criada por Ross Anderson, Eli Biham e Lars Knudsen. Publicada em 1998. chave de 256 bits, bloco de 128 bits. O modo de operação é o XTS. Serpent foi um dos finalistas no AES.</string>
     <string lang="en" key="SIZE_HELP">Please specify the size of the container you want to create.\n\nIf you create a dynamic (sparse-file) container, this parameter will specify its maximum possible size.\n\nNote that the minimum possible size of a FAT volume is 292 KB. The minimum possible size of an NTFS volume is 3792 KB.</string>
     <string lang="en" key="SIZE_HELP_HIDDEN_HOST_VOL">Please specify the size of the outer volume to be created (you will first create the outer volume and then a hidden volume within it). The minimum possible size of a volume within which a hidden volume is intended to be created is 340 KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="pt-br" key="INCONSISTENCY_RESOLVED">Inconsistência resolvida.\n\n\n(Se você relatar um bug devido a isso, favor incluir a seguinte informação técnica no relatório: %hs)</string>
     <string lang="pt-br" key="UNEXPECTED_STATE">Erro: Estado inesperado.\n\n\n(Se você relatar um bug relacionado a isto, por favor inclua as seguintes informações técnicas no relatório de erros: %hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="pt-br" key="NOTHING_TO_RESUME">Não há nenhum processo/tarefa a continuar.</string>
     <string lang="pt-br" key="HIDVOL_PROT_BKG_TASK_WARNING">AVISO: A tarefa em Background do VeraCrypt está desabilitada. Depois de sair do VeraCrypt, voce não será notificado se algum dano a um arquivo escondido for evitado.\n\nObs: Voce pode parar a tarefa em Background a qualquer momento clicando com o botão direito no ícone do VeraCrypt na bandeja do sistema e selecionando 'Sair'.\n\nHabilitar a execução do VeraCrypt em Segundo Plano?</string>
     <string lang="pt-br" key="LANG_PACK_VERSION">Versão da Tradução: %s</string>
     <string lang="pt-br" key="CHECKING_FS">Verificando o sistema de arquivos do volume VeraCrypt montado como %hs...</string>
@@ -1085,15 +1099,14 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="pt-br" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Arquivos-chave atualmente não são suportados para criptografia do sistema.</string>
     <string lang="pt-br" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Aviso: O VeraCrypt não conseguiu restaurar o layout original do teclado. Isto poderá fazê-lo digitar a senha incorretamente.</string>
     <string lang="pt-br" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Erro: Não foi possível configurar o layout do teclado para o VeraCrypt como layout Estados Unidos (Internacional).\n\nLembre que a senha precisa ser digitada em ambiente pré-boot (antes de o Windows iniciar) onde layouts não-Windows Estados Unidos (Internacional) não estão disponíveis. Por isso, a senha deve ser digitada sempre usando o layout Estados Unidos (Internacional).</string>
     <string lang="pt-br" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">Como o VeraCrypt mudou temporariamente o layout do seu teclado para o layout Estados Unidos (Internacional), não será possível digitar caracteres pressionando teclas enquanto a tecla Alt Gr estiver pressionada. Mas você ainda pode digitar a maioria desses caracteres usando a tecla apropriada enquanto mantem pressionada a tecla Shift.</string>
     <string lang="pt-br" key="KEYB_LAYOUT_CHANGE_PREVENTED">O VeraCrypt impediu uma alteração no layout do teclado.</string>
     <string lang="pt-br" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Lembre: A senha precisará ser digitada no ambiente pré-inicialização (antes de iniciar o Windows) onde layouts não-Estados Unidos (Internacional) não estão disponíveis. Por isso, a senha precisa ser digitada sempre usando o layout Estados Unidos (Internacional). Mesmo assim, é importante lembrar que você NÃO precisa de um teclado Estados Unidos (Internacional) real. O VeraCrypt certifica-se automaticamente de que você pode di [...]
-    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (TRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the TRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the TRD allows you to permanently decrypt the partition/drive before Windows  [...]
+    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (VRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the VRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the VRD allows you to permanently decrypt the partition/drive before Windows  [...]
     <string lang="en" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">After you click OK, Microsoft Windows Disc Image Burner will be launched. Please use it to burn the VeraCrypt Rescue Disk ISO image to a CD or DVD.\n\nAfter you do so, return to the VeraCrypt Volume Creation Wizard and follow its instructions.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn it to a CD or DVD.\n\n%lsAfter you burn the Rescue Disk, click Next to verify that it has been correctly burned.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you should either burn the image to a CD/DVD or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
@@ -1290,6 +1303,7 @@
     <string lang="en" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">WARNING: This setting may degrade performance.\n\nAre you sure you want to use this setting?</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="pt-br" key="TEST">Testar</string>
     <string lang="pt-br" key="KEYFILE">Arquivo-Chave</string>
     <string lang="pt-br" key="VKEY_08">Backspace</string>
diff --git a/Translations/Language.ru.xml b/Translations/Language.ru.xml
index 42bc1de..5df9217 100644
--- a/Translations/Language.ru.xml
+++ b/Translations/Language.ru.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="ru" name="Русский" en-name="Russian" version="1.0.0" translators="Dmitry Yerokhin" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="ru" key="IDC_QUICKFORMAT">Быстрое форматир.</control>
     <control lang="ru" key="IDC_SHOW_PASSWORD">&Показ пароля</control>
     <control lang="ru" key="IDC_SHOW_PASSWORD_SINGLE">&Показ пароля</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="ru" key="IDC_SINGLE_BOOT">Одиночная загрузка</control>
     <control lang="ru" key="IDC_STD_VOL">Обычный том VeraCrypt</control>
     <control lang="ru" key="IDC_SYSENC_HIDDEN">Скр&ытый</control>
@@ -98,6 +99,7 @@
     <control lang="ru" key="IDT_SYSENC_KEYS_GEN_INFO">Ключи, 'соль' и другие данные успешно созданы. Если вы хотите сгенерировать новые ключи, нажмите 'Назад', а затем 'Далее'. Если же нет, то нажмите 'Далее' для продолжения.</control>
     <control lang="ru" key="IDT_SYS_DEVICE">Зашифровать раздел/диск, где установлена Windows. Перед каждой загрузкой Windows нужно будет вводить пароль для доступа к ОС, считывания и записи файлов и т.д. Дополнительно - создать скрытую ОС.</control>
     <control lang="ru" key="IDT_SYS_PARTITION">Выберите эту опцию, чтобы зашифровать раздел, где установлена ныне работающая Windows.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="ru" key="IDT_WIPE_MODE">Режим очистки:</control>
     <control lang="ru" key="IDCLOSE">Закрыть</control>
     <control lang="ru" key="IDC_ALLOW_ESC_PBA_BYPASS">Об&ход дозагрузочной аутентификации по Esc (разрешает диспетчер загрузки)</control>
@@ -111,6 +113,7 @@
     <control lang="ru" key="IDC_CACHE">К&эшировать пароли и ключевые файлы</control>
     <control lang="ru" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Выход, если нет смонтированных томов</control>
     <control lang="ru" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">Закр&ыть токен-сессию (выйти) после успешного монтирования тома</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="ru" key="IDC_COPY_WIZARD">С мастером создания томов VeraCrypt</control>
     <control lang="ru" key="IDC_CREATE">Создать</control>
     <control lang="ru" key="IDC_CREATE_VOLUME">С&оздать том</control>
@@ -271,6 +274,8 @@
     <control lang="ru" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Показывать этот текст на экране дозагрузочной аутентификации (до 24 символов):</control>
     <control lang="ru" key="IDT_DEFAULT_MOUNT_OPTIONS">Параметры монтирования томов по умолчанию</control>
     <control lang="ru" key="IDT_DISMOUNT_ACTION">Дополнительные параметры</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="ru" key="IDT_FAVORITE_LABEL">Метка выбранного избранного тома:</control>
     <control lang="ru" key="IDT_FILE_SETTINGS">Файловые параметры</control>
     <control lang="ru" key="IDT_HOTKEY_KEY">Клавиша:</control>
@@ -537,6 +542,15 @@
     <string lang="ru" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Примечание: если нужно безопасно перенести файлы из обманной системы в скрытую, выполните следующее: 1) Загрузите обманную систему. 2) Сохраните нужные вам файлы на незашифрованном томе или на внешнем/обычном томе VeraCrypt. 3) Загрузите скрытую систему. 4) Если вы сохранили файлы на томе VeraCrypt, смонтируйте его (он будет автоматически смонтирован как 'только для чтения'). 5) Скопируйте файлы в скрытый системный раздел [...]
     <string lang="ru" key="CONFIRM_RESTART">Требуется перезагрузка компьютера.\n\nВыполнить перезагрузку сейчас?</string>
     <string lang="ru" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Ошибка получения состояния системного шифрования.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="ru" key="INIT_SYS_ENC">Невозможно инициализировать компоненты приложения для системного шифрования.</string>
     <string lang="ru" key="INIT_RAND">Ошибка инициализации генератора случайных чисел.</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="ru" key="SELECT_KEYFILE">Выберите ключевой файл</string>
     <string lang="ru" key="SELECT_KEYFILE_PATH">Выберите путь поиска ключевых файлов. ВНИМАНИЕ: Запоминается только путь, но не имена файлов.</string>
     <string lang="ru" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Выбрать директорию хранения ключевых файлов.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="ru" key="SERPENT_HELP">Авторы: Ross Anderson, Eli Biham и Lars Knudsen. Опубликован в 1998 г. 256-бит ключ, 128-бит блок. Режим работы: XTS. Алгоритм Serpent - один из финалистов AES.</string>
     <string lang="ru" key="SIZE_HELP">Укажите размер создаваемого контейнера.\n\nПри создании динамического ('растягивающегося' по мере заполнения) контейнера, этот параметр определяет его максимальный размер.\n\nМинимальный объём для тома FAT: 292 КБ, для тома NTFS: 3792 КБ.</string>
     <string lang="ru" key="SIZE_HELP_HIDDEN_HOST_VOL">Укажите размер нового внешнего тома (сначала создаётся внешний том, а затем внутри него - скрытый). Минимально возможный размер тома, предназначенного для создания скрытого тома, составляет 340 КБ.</string>
@@ -1033,7 +1048,6 @@
     <string lang="ru" key="INCONSISTENCY_RESOLVED">Несоответствие устранено.\n\n\n(Если вы сообщаете нам о связанной с этим ошибке, включите в свой отчёт следующую техническую информацию: %hs)</string>
     <string lang="ru" key="UNEXPECTED_STATE">Ошибка! Неизвестное состояние.\n\n\n(Если вы сообщаете нам о связанной с этим ошибке, включите в свой отчёт следующую техническую информацию: %hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="ru" key="NOTHING_TO_RESUME">Нет процесса/задания для возобновления.</string>
     <string lang="ru" key="HIDVOL_PROT_BKG_TASK_WARNING">ВНИМАНИЕ: Фоновый процесс VeraCrypt отключён. При выходе из VeraCrypt вы не будете извещены о предотвращении повреждения скрытого тома.\n\nПримечание: фоновый процесс можно закрыть в любой момент, щёлкнув правой кнопкой мыши на значке VeraCrypt в системном лотке и выбрав 'Выход'.\n\nВключить фоновый процесс VeraCrypt?</string>
     <string lang="ru" key="LANG_PACK_VERSION">Версия языкового модуля: %s</string>
     <string lang="ru" key="CHECKING_FS">Проверка файловой системы тома VeraCrypt, смонтированного как %hs...</string>
@@ -1085,15 +1099,14 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="ru" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">В настоящий момент ключевые файлы для шифрования системы не поддерживаются.</string>
     <string lang="ru" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Внимание! VeraCrypt не может восстановить первоначальную раскладку клавиатуры. Это может привести к неправильному вводу пароля.</string>
     <string lang="ru" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Ошибка! Невозможно установить раскладку клавиатуры для VeraCrypt в стандартную американскую (US).\n\nОбратите внимание, что пароль вводится ДО загрузки Windows, когда любые раскладки клавиатуры, отличающиеся от американской, ещё недоступны. Поэтому пароль всегда должен вводиться при стандартной американской раскладке.</string>
     <string lang="ru" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">Поскольку VeraCrypt временно изменил раскладку клавиатуры на стандартную американскую, ввод символов при нажатой правой клавише Alt невозможен. Тем не менее, большинство таких символов можно ввести соответствующими клавишами при нажатой клавише Shift.</string>
     <string lang="ru" key="KEYB_LAYOUT_CHANGE_PREVENTED">Изменение раскладки клавиатуры заблокировано VeraCrypt.</string>
     <string lang="ru" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Примечание: пароль вводится ДО загрузки Windows, когда любые раскладки клавиатуры, отличающиеся от американской, ещё недоступны. Поэтому пароль всегда должен вводиться при стандартной американской раскладке. Важно, однако, иметь в виду, что вам НЕ нужно иметь настоящую американскую клавиатуру. VeraCrypt автоматически обеспечивает вам безопасный ввод пароля (прямо сейчас и на стадии перед загрузкой ОС), даже если у вас НЕ настоящ [...]
-    <string lang="ru" key="RESCUE_DISK_INFO">Прежде чем приступить к шифрованию раздела/диска, нужно создать диск восстановления VeraCrypt Rescue Disk (TRD), обеспечивающий следующее:\n\n- В случае повреждения загрузчика VeraCrypt, мастер-ключа или других критических данных, TRD позволяет их восстановить (при этом всё равно надо будет ввести правильный пароль).\n- При повреждении и невозможности загрузки Windows, TRD позволяет перманентно расшифровать раздел/диск перед стартом Windows.\n [...]
+    <string lang="ru" key="RESCUE_DISK_INFO">Прежде чем приступить к шифрованию раздела/диска, нужно создать диск восстановления VeraCrypt Rescue Disk (VRD), обеспечивающий следующее:\n\n- В случае повреждения загрузчика VeraCrypt, мастер-ключа или других критических данных, VRD позволяет их восстановить (при этом всё равно надо будет ввести правильный пароль).\n- При повреждении и невозможности загрузки Windows, VRD позволяет перманентно расшифровать раздел/диск перед стартом Windows.\n [...]
     <string lang="ru" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">После нажатия OK будет запущено средство записи образов дисков Windows. Запишите с её помощью ISO-образ диска восстановления VeraCrypt на CD или DVD.\n\nЗатем вернитесь в окно мастера создания томов VeraCrypt и следуйте инструкциям.</string>
     <string lang="ru" key="RESCUE_DISK_BURN_INFO">Образ диска восстановления создан и сохранён в файле: %hs\n\nСейчас вам нужно записать этот образ на CD или DVD.\n\n%lsПосле записи диска восстановления нажмите 'Далее', чтобы проверить, корректно ли он был записан.</string>
     <string lang="ru" key="RESCUE_DISK_BURN_INFO_NO_CHECK">Образ диска восстановления создан и сохранён в этом файле: %hs\n\nСейчас вам следует либо записать (прожечь) диск восстановления на CD/DVD, либо переместить его ISO-образ в безопасное место для использования в дальнейшем.\n\n%lsНажмите 'Далее' для продолжения.</string>
@@ -1290,6 +1303,7 @@
     <string lang="ru" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">ВНИМАНИЕ: Этот параметр может ухудшить производительность.\n\nВы действительно хотите включить этот параметр?</string>
     <string lang="ru" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">ВНИМАНИЕ: Том VeraCrypt автоматически размонтирован</string>
     <string lang="ru" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Прежде чем физически удалить или отключить устройство, содержащее смонтированный том, сначала следует всегда размонтировать этот том в VeraCrypt.\n\nНеожиданное самопроизвольное размонтирование бывает обычно вызвано периодическими сбоями в кабеле, диске (корпусе), и т.д.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="ru" key="TEST">Тест</string>
     <string lang="ru" key="KEYFILE">Ключевой файл</string>
     <string lang="ru" key="VKEY_08">Backspace</string>
diff --git a/Translations/Language.sk.xml b/Translations/Language.sk.xml
index 928fe3a..1a910e5 100644
--- a/Translations/Language.sk.xml
+++ b/Translations/Language.sk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="sk" name="Slovenčina" en-name="Slovak" version="0.1.0" translators="Kamil David" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="sk" key="IDC_QUICKFORMAT">Rýchlo sformátovať</control>
     <control lang="sk" key="IDC_SHOW_PASSWORD">&Ukázať heslo</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&Display password</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="en" key="IDC_SINGLE_BOOT">Single-boot</control>
     <control lang="en" key="IDC_STD_VOL">Standard VeraCrypt volume</control>
     <control lang="en" key="IDC_SYSENC_HIDDEN">Hi&dden</control>
@@ -98,6 +99,7 @@
     <control lang="en" key="IDT_SYSENC_KEYS_GEN_INFO">The keys, salt, and other data have been successfully generated. If you want to generate new keys, click Back and then Next. Otherwise, click Next to continue.</control>
     <control lang="en" key="IDT_SYS_DEVICE">Encrypts the partition/drive where Windows is installed. Anyone who wants to gain access and use the system, read and write files, etc., will need to enter the correct password each time before Windows boots. Optionally, creates a hidden system.</control>
     <control lang="en" key="IDT_SYS_PARTITION">Select this option to encrypt the partition where the currently running Windows operating system is installed.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="en" key="IDT_WIPE_MODE">Wipe mode:</control>
     <control lang="sk" key="IDCLOSE">Zatvoriť</control>
     <control lang="en" key="IDC_ALLOW_ESC_PBA_BYPASS">Allow pre-boot &authentication to be bypassed by pressing the Esc key (enables boot manager)</control>
@@ -111,6 +113,7 @@
     <control lang="sk" key="IDC_CACHE">Ukladať &hesla a súborové kľúče do medzipamäte</control>
     <control lang="sk" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Skončiť pokiaľ neexistuje žiaden pripojený zväzok</control>
     <control lang="en" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Close token session (log out) after a volume is successfully mounted</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="sk" key="IDC_COPY_WIZARD">Zahrnúť Sprievodca vytvorením zväzku VeraCrypt</control>
     <control lang="sk" key="IDC_CREATE">Vytvoriť</control>
     <control lang="sk" key="IDC_CREATE_VOLUME">V&ytvoriť zväzok</control>
@@ -271,6 +274,8 @@
     <control lang="en" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Display this custom message in the pre-boot authentication screen (24 characters maximum):</control>
     <control lang="sk" key="IDT_DEFAULT_MOUNT_OPTIONS">Pôvodné (default) predvoľby pripojenia</control>
     <control lang="sk" key="IDT_DISMOUNT_ACTION">Predvoľby klávesových skratiek</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="en" key="IDT_FAVORITE_LABEL">Label of selected favorite volume:</control>
     <control lang="sk" key="IDT_FILE_SETTINGS">Nastavanie súboru</control>
     <control lang="sk" key="IDT_HOTKEY_KEY">Kláves k priradeniu:</control>
@@ -537,6 +542,15 @@
     <string lang="en" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Note: If you need to securely transfer files from the decoy system to the hidden system, follow these steps:\n1) Start the decoy system.\n2) Save the files to an unencrypted volume or to an outer/normal VeraCrypt volume.\n3) Start the hidden system.\n4) If you saved the files to a VeraCrypt volume, mount it (it will be automatically mounted as read-only).\n5) Copy the files to the hidden system partition or to another hid [...]
     <string lang="en" key="CONFIRM_RESTART">Your computer must be restarted.\n\nDo you want to restart it now?</string>
     <string lang="en" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">An error occurred when obtaining the system encryption status.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="en" key="INIT_SYS_ENC">Cannot initialize application components for system encryption.</string>
     <string lang="sk" key="INIT_RAND">Zlyhala inicializácia generátora náhodných čísel!</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="sk" key="SELECT_KEYFILE">Vyberte súborový kľúč</string>
     <string lang="sk" key="SELECT_KEYFILE_PATH">Zvoľte cestu pre hľadanie súborového kľúča. UPOZORNENIE: Zapamätaná bude len cesta, nie názov súboru!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="en" key="SERPENT_HELP">Designed by Ross Anderson, Eli Biham, and Lars Knudsen. Published in 1998. 256-bit key, 128-bit block. Mode of operation is XTS. Serpent was one of the AES finalists.</string>
     <string lang="en" key="SIZE_HELP">Please specify the size of the container you want to create.\n\nIf you create a dynamic (sparse-file) container, this parameter will specify its maximum possible size.\n\nNote that the minimum possible size of a FAT volume is 292 KB. The minimum possible size of an NTFS volume is 3792 KB.</string>
     <string lang="en" key="SIZE_HELP_HIDDEN_HOST_VOL">Please specify the size of the outer volume to be created (you will first create the outer volume and then a hidden volume within it). The minimum possible size of a volume within which a hidden volume is intended to be created is 340 KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="en" key="INCONSISTENCY_RESOLVED">Inconsistency resolved.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="en" key="NOTHING_TO_RESUME">There is no process/task to resume.</string>
     <string lang="sk" key="HIDVOL_PROT_BKG_TASK_WARNING">UPOZORNENIE: VeraCrypt možnosť úloha na pozadí je vypnutá. Po skončení programu VeraCrypt, či je zabránené poškodenie skrytého zväzku.\n\nPozn.: úlohu na pozadí môžete kedykoľvek zatvoriť kliknutím pravého tlačidla myši na ikonu programu VeraCrypt v pravom dolnom rohu a vyberte 'Koniec'.\n\nPovoliť VeraCrypt úlohu na pozadí?</string>
     <string lang="sk" key="LANG_PACK_VERSION">Verzia jazykového balíčka:  %s</string>
     <string lang="sk" key="CHECKING_FS">Kontrolujem systém súborov na zväzku VeraCrypt pripojeného ako %hs...</string>
@@ -1085,15 +1099,14 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</string>
     <string lang="en" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Error: Cannot set the keyboard layout for VeraCrypt to the standard US keyboard layout.\n\nNote that the password needs to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout.</string>
     <string lang="en" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">As VeraCrypt temporarily changed the keyboard layout to the standard US keyboard layout, it is not possible to type characters by pressing keys while the right Alt key is held down. However, you can type most of such characters by pressing appropriate keys while the Shift key is held down.</string>
     <string lang="en" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCrypt prevented change of keyboard layout.</string>
     <string lang="en" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Note: The password will need to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout. However, it is important to note that you do NOT need a real US keyboard. VeraCrypt automatically ensures that you can safely type the password (right now and in the pre-boot environment) even if yo [...]
-    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (TRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the TRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the TRD allows you to permanently decrypt the partition/drive before Windows  [...]
+    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (VRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the VRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the VRD allows you to permanently decrypt the partition/drive before Windows  [...]
     <string lang="en" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">After you click OK, Microsoft Windows Disc Image Burner will be launched. Please use it to burn the VeraCrypt Rescue Disk ISO image to a CD or DVD.\n\nAfter you do so, return to the VeraCrypt Volume Creation Wizard and follow its instructions.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn it to a CD or DVD.\n\n%lsAfter you burn the Rescue Disk, click Next to verify that it has been correctly burned.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you should either burn the image to a CD/DVD or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
@@ -1290,6 +1303,7 @@
     <string lang="en" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">WARNING: This setting may degrade performance.\n\nAre you sure you want to use this setting?</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="en" key="TEST">Test</string>
     <string lang="sk" key="KEYFILE">Súborový kľúč</string>
     <string lang="sk" key="VKEY_08">Backspace</string>
diff --git a/Translations/Language.sl.xml b/Translations/Language.sl.xml
index ca04828..925487f 100644
--- a/Translations/Language.sl.xml
+++ b/Translations/Language.sl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="sl" name="Slovenščina" en-name="Slovenian" version="0.1.0" translators="Erik David Salam" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="sl" key="IDC_QUICKFORMAT">Hitro format.</control>
     <control lang="sl" key="IDC_SHOW_PASSWORD">&Prikaži geslo</control>
     <control lang="sl" key="IDC_SHOW_PASSWORD_SINGLE">&Prikaži geslo</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="sl" key="IDC_SINGLE_BOOT">Enojni zagon</control>
     <control lang="sl" key="IDC_STD_VOL">Običajen VeraCrypt-ov zbirnik</control>
     <control lang="sl" key="IDC_SYSENC_HIDDEN">&Skrito</control>
@@ -98,6 +99,7 @@
     <control lang="sl" key="IDT_SYSENC_KEYS_GEN_INFO">Ključi, naključne vrednosti in drugi podatki so bili uspešno proizvedeni. Če želite proizvesti nove ključe, kliknite Nazaj in nato Naprej. V nasprotnem primeru kliknite Naprej za nadaljevanje.</control>
     <control lang="sl" key="IDT_SYS_DEVICE">Šifrira razdelek/pogon kjer so naložena Okna. Kdorkoli želi pridobiti dostop ali uporabiti sistem, torej branje in pisanje datotek ipd., bo moral vsakič vnesti pravilno geslo preden se bodo Okna zagnala. Izbirno ustvari še skriti sistem.</control>
     <control lang="en" key="IDT_SYS_PARTITION">Select this option to encrypt the partition where the currently running Windows operating system is installed.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="en" key="IDT_WIPE_MODE">Wipe mode:</control>
     <control lang="sl" key="IDCLOSE">Zapri</control>
     <control lang="en" key="IDC_ALLOW_ESC_PBA_BYPASS">Allow pre-boot &authentication to be bypassed by pressing the Esc key (enables boot manager)</control>
@@ -111,6 +113,7 @@
     <control lang="sl" key="IDC_CACHE">&Shrani gesla in ključne dat. v predpom.</control>
     <control lang="sl" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Pojdi ven iz programa, ko ni priklopljenih zbirnikov</control>
     <control lang="sl" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Zapri žetonsko sejo (odlogiranje) potem, ko je zbirnik uspešno priklopljen</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="sl" key="IDC_COPY_WIZARD">Vključi VeraCrypt-ov čarovnik za ustvarjanje zbirnikov</control>
     <control lang="sl" key="IDC_CREATE">Ustvari</control>
     <control lang="sl" key="IDC_CREATE_VOLUME">&Ustvari zbirnik</control>
@@ -271,6 +274,8 @@
     <control lang="en" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Display this custom message in the pre-boot authentication screen (24 characters maximum):</control>
     <control lang="sl" key="IDT_DEFAULT_MOUNT_OPTIONS">Privzete možnosti priklopa</control>
     <control lang="sl" key="IDT_DISMOUNT_ACTION">Možnosti vročih tipk</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="en" key="IDT_FAVORITE_LABEL">Label of selected favorite volume:</control>
     <control lang="sl" key="IDT_FILE_SETTINGS">Datotečne nastavitve</control>
     <control lang="sl" key="IDT_HOTKEY_KEY">Zadolži tipko:</control>
@@ -537,6 +542,15 @@
     <string lang="en" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Note: If you need to securely transfer files from the decoy system to the hidden system, follow these steps:\n1) Start the decoy system.\n2) Save the files to an unencrypted volume or to an outer/normal VeraCrypt volume.\n3) Start the hidden system.\n4) If you saved the files to a VeraCrypt volume, mount it (it will be automatically mounted as read-only).\n5) Copy the files to the hidden system partition or to another hid [...]
     <string lang="en" key="CONFIRM_RESTART">Your computer must be restarted.\n\nDo you want to restart it now?</string>
     <string lang="en" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">An error occurred when obtaining the system encryption status.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="en" key="INIT_SYS_ENC">Cannot initialize application components for system encryption.</string>
     <string lang="en" key="INIT_RAND">Failed to initialize the random number generator!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="en" key="SELECT_KEYFILE">Select Keyfile</string>
     <string lang="en" key="SELECT_KEYFILE_PATH">Select a keyfile search path. WARNING: Note that only the path will be remembered, not the filenames!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="sl" key="SERPENT_HELP">Zasnoval ga je Ross Anderson, Eli Biham in Lars Knudsen. Objavljen je bil leta 1998. Uporablja 256-bitni ključ in 128-bitni blok. Način delovanja je XTS. Serpent je bil eden izmed AES-ovih finalistov.</string>
     <string lang="en" key="SIZE_HELP">Please specify the size of the container you want to create.\n\nIf you create a dynamic (sparse-file) container, this parameter will specify its maximum possible size.\n\nNote that the minimum possible size of a FAT volume is 292 KB. The minimum possible size of an NTFS volume is 3792 KB.</string>
     <string lang="en" key="SIZE_HELP_HIDDEN_HOST_VOL">Please specify the size of the outer volume to be created (you will first create the outer volume and then a hidden volume within it). The minimum possible size of a volume within which a hidden volume is intended to be created is 340 KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="en" key="INCONSISTENCY_RESOLVED">Inconsistency resolved.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="sl" key="NOTHING_TO_RESUME">Ni nobenega procesa/opravila, ki bi (lahko) nadaljeval/i.</string>
     <string lang="en" key="HIDVOL_PROT_BKG_TASK_WARNING">WARNING: VeraCrypt Background Task is disabled. After you exit VeraCrypt, you will not be notified if damage to hidden volume is prevented.\n\nNote: You may shut down the Background Task anytime by right-clicking the VeraCrypt tray icon and selecting 'Exit'.\n\nEnable VeraCrypt Background Task?</string>
     <string lang="sl" key="LANG_PACK_VERSION">Različica jezikovnega paketa:  %s</string>
     <string lang="en" key="CHECKING_FS">Checking the file system on the VeraCrypt volume mounted as %hs...</string>
@@ -1085,15 +1099,14 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</string>
     <string lang="en" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Error: Cannot set the keyboard layout for VeraCrypt to the standard US keyboard layout.\n\nNote that the password needs to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout.</string>
     <string lang="en" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">As VeraCrypt temporarily changed the keyboard layout to the standard US keyboard layout, it is not possible to type characters by pressing keys while the right Alt key is held down. However, you can type most of such characters by pressing appropriate keys while the Shift key is held down.</string>
     <string lang="sl" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCrypt je preprečil spremembo postavitve tipkovnice.</string>
     <string lang="sl" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Opomba: Geslo se bo moralo vtipkati v predzagonskem okolju (preden se Okna zaženejo), kjer ni možna postavitev neameriških Okenskih tipkovnic. Tako torej se mora geslo vedno vtipkati z uporabo standardne postavitve ameriške tipkovnice. Čeprav je pa pomembno, da si zabeležite, da dejansko NE potrebujete ameriške tipkovnice. VeraCrypt samodejno zagotavlja, da lahko varno vtipkate geslo (takoj in v predzagonskem okolju) četudi NIMA [...]
-    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (TRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the TRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the TRD allows you to permanently decrypt the partition/drive before Windows  [...]
+    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (VRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the VRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the VRD allows you to permanently decrypt the partition/drive before Windows  [...]
     <string lang="en" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">After you click OK, Microsoft Windows Disc Image Burner will be launched. Please use it to burn the VeraCrypt Rescue Disk ISO image to a CD or DVD.\n\nAfter you do so, return to the VeraCrypt Volume Creation Wizard and follow its instructions.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn it to a CD or DVD.\n\n%lsAfter you burn the Rescue Disk, click Next to verify that it has been correctly burned.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you should either burn the image to a CD/DVD or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
@@ -1290,6 +1303,7 @@
     <string lang="en" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">WARNING: This setting may degrade performance.\n\nAre you sure you want to use this setting?</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="en" key="TEST">Test</string>
     <string lang="sl" key="KEYFILE">Ključna datoteka</string>
     <string lang="en" key="VKEY_08">Backspace</string>
diff --git a/Translations/Language.sv.xml b/Translations/Language.sv.xml
index e30b07d..b804cf6 100644
--- a/Translations/Language.sv.xml
+++ b/Translations/Language.sv.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="sv" name="Svenska" en-name="Swedish" version="1.0.0" translators="Peter Runesson" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="sv" key="IDC_QUICKFORMAT">Snabb- formatering</control>
     <control lang="sv" key="IDC_SHOW_PASSWORD">&Visa lösenord</control>
     <control lang="sv" key="IDC_SHOW_PASSWORD_SINGLE">&Visa lösenord</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="sv" key="IDC_SINGLE_BOOT">&Envalsstart</control>
     <control lang="sv" key="IDC_STD_VOL">&Synlig VeraCrypt-volym</control>
     <control lang="sv" key="IDC_SYSENC_HIDDEN">&Dold</control>
@@ -98,6 +99,7 @@
     <control lang="sv" key="IDT_SYSENC_KEYS_GEN_INFO">Nycklarna, saltet och andra data har genererats utan fel. Klicka på Föregående och sedan Nästa för att generera nya nycklar eller klicka på Nästa för att fortsätta.</control>
     <control lang="sv" key="IDT_SYS_DEVICE">Krypterar hela partitionen eller enheten där Windows är installerat. Alla som vill använda systemet, t.ex. läsa och skriva filer, kommer att behöva ange ett lösenord varje gång Windows startas. Systemet kan göras synligt eller dolt.</control>
     <control lang="sv" key="IDT_SYS_PARTITION">Välj detta alternativ för att kryptera den partition där aktuellt operativsystem (Windows) är installerat.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="sv" key="IDT_WIPE_MODE">Överskrivning:</control>
     <control lang="sv" key="IDCLOSE">Stäng</control>
     <control lang="sv" key="IDC_ALLOW_ESC_PBA_BYPASS">Tillåt att förstarts&autentiseringen förbigås genom att trycka på Esc (aktiverar starthanteraren)</control>
@@ -111,6 +113,7 @@
     <control lang="sv" key="IDC_CACHE">Lagra lösenord och nyckelfiler i &cacheminnet</control>
     <control lang="sv" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">A&vsluta när inga volymer är monterade</control>
     <control lang="sv" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Stäng tokensession (logga ut) efter att en volym monterats utan fel</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="sv" key="IDC_COPY_WIZARD">Inkludera &guiden Skapa VeraCrypt-volym</control>
     <control lang="sv" key="IDC_CREATE">Skapa</control>
     <control lang="sv" key="IDC_CREATE_VOLUME">S&kapa volym</control>
@@ -271,6 +274,8 @@
     <control lang="sv" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Visa detta anpassade meddelande vid förstartsautentiseringen (maximalt antal tecken är 24):</control>
     <control lang="sv" key="IDT_DEFAULT_MOUNT_OPTIONS">Standardmonteringsalternativ</control>
     <control lang="sv" key="IDT_DISMOUNT_ACTION">Snabbtangentsalternativ</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="sv" key="IDT_FAVORITE_LABEL">Eget namn på volymfavoriten:</control>
     <control lang="sv" key="IDT_FILE_SETTINGS">Filinställningar</control>
     <control lang="sv" key="IDT_HOTKEY_KEY">Tangent:</control>
@@ -537,6 +542,15 @@
     <string lang="sv" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Observera: Följ dessa steg om du vill överföra filer från skenoperativsystemet till det dolda operativsystemet på ett säkert sätt:\n1) Starta skenoperativsystemet.\n2) Spara filerna på en okrypterad volym eller på en yttre eller normal VeraCrypt-volym.\n3) Starta det dolda operativsystemet.\n4) Montera VeraCrypt-volymen, om du sparade filerna på en sådan. (Den kommer automatiskt att monteras som skrivskyddad.)\n5) Kopiera [...]
     <string lang="sv" key="CONFIRM_RESTART">Din dator måste startas om.\n\nVill du starta om den nu?</string>
     <string lang="sv" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Ett fel inträffade när systemets krypteringsstatus skulle inhämtas.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="sv" key="INIT_SYS_ENC">Det går inte att initiera applikationskomponenter för systemkryptering.</string>
     <string lang="sv" key="INIT_RAND">Initieringen av slumptalsgeneratorn misslyckades!</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="sv" key="SELECT_KEYFILE">Välj nyckelfil</string>
     <string lang="sv" key="SELECT_KEYFILE_PATH">Välj en nyckelfilssökväg. VARNING: Observera att endast sökvägen lagras, inte filnamnen!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="sv" key="SERPENT_HELP">Utvecklad av Ross Anderson, Eli Biham och Lars Knudsen. Publicerad 1998. 256-bitars nyckel, 128-bitars block. Arbetsläget är XTS. Serpent var en av AES-finalisterna.</string>
     <string lang="sv" key="SIZE_HELP">Ange storleken på den volymbehållare du vill skapa.\n\nOm du skapar en dynamisk volymbehållare (sparse-fil), kommer volymbehållarens maximala storlek att vara värdet du anger.\n\nObservera att den minsta möjliga storleken på en FAT-volym är 292 kB. Den minsta möjliga storleken på en NTFS-volym är 3 792 kB.</string>
     <string lang="sv" key="SIZE_HELP_HIDDEN_HOST_VOL">Ange storleken på den yttre volym som ska skapas. (Du kommer först att skapa den yttre volymen och sedan en dold volym inuti den.) Den minsta möjliga storleken på en volym inuti vilken en dold volym ska skapas är 340 kB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="sv" key="INCONSISTENCY_RESOLVED">En inkonsekvens har lösts.\n\n\n(Om du i samband med detta rapporterar ett fel, se till att felrapporten innehåller följande tekniska information:\n%hs)</string>
     <string lang="sv" key="UNEXPECTED_STATE">Fel: Oväntat tillstånd.\n\n\n(Om du i samband med detta skickar en felrapport, inkludera då följande tekniska information i rapporten:\n%hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="sv" key="NOTHING_TO_RESUME">Det finns ingen process eller uppgift att återuppta.</string>
     <string lang="sv" key="HIDVOL_PROT_BKG_TASK_WARNING">VARNING: VeraCrypts bakgrundsaktivitet är inaktiverad. Efter att du avslutat VeraCrypt kommer du inte att bli meddelad om en skada av en dold volym förhindrats.\n\nObservera: Du kan stänga av bakgrundsaktiviteten när som helst genom att högerklicka på VeraCrypts meddelandefältsikon och välja ”Avsluta”.\n\nVill du aktivera VeraCrypts bakgrundsaktivitet?</string>
     <string lang="sv" key="LANG_PACK_VERSION">Språkpaketsversion: %s</string>
     <string lang="sv" key="CHECKING_FS">Kontrollerar filsystemet på VeraCrypt-volymen monterad som %hs …</string>
@@ -1085,8 +1099,7 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="sv" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Nyckelfiler stöds för närvarande inte vid systemkryptering.</string>
     <string lang="sv" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Varning: VeraCrypt kunde inte återställa den ursprungliga tangentbordslayouten. Detta kan orsaka att du anger ett felaktigt lösenord.</string>
     <string lang="sv" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Fel: Det går inte att ange amerikansk tangentbordslayout som tangentbordslayout för VeraCrypt.\n\nObservera att lösenordet måste anges i förstartsmiljön (innan Windows startas), där inga andra tangentbordslayouter än den amerikanska finns tillgängliga. Därför måste amerikansk tangentbordslayout alltid användas när du anger lösenordet.</string>
@@ -1290,6 +1303,7 @@
     <string lang="sv" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">VARNING: Denna inställning kan ge försämrade prestanda.\n\nÄr du säker på att du vill använda denna inställning?</string>
     <string lang="sv" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Varning: VeraCrypt-volym automatiskt demonterad</string>
     <string lang="sv" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Innan du fysiskt tar bort eller stänger av en enhet som innehåller en VeraCrypt-volym, bör du alltid demontera den i VeraCrypt.\n\nOväntade demonteringar orsakas oftast av en trasig kabel eller enhet (diskkabinett) etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="sv" key="TEST">Testa</string>
     <string lang="sv" key="KEYFILE">Nyckelfil</string>
     <string lang="sv" key="VKEY_08">Backsteg</string>
diff --git a/Translations/Language.tr.xml b/Translations/Language.tr.xml
index 1c831ad..a22e461 100644
--- a/Translations/Language.tr.xml
+++ b/Translations/Language.tr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="tr" name="Türkçe" en-name="Turkish" version="0.1.0" translators="Ali İskender Turan, Zeynel Abidin Öztürk" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="tr" key="IDC_QUICKFORMAT">Hızlı Biçimlendirme</control>
     <control lang="tr" key="IDC_SHOW_PASSWORD">&Parolayı göster</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&Display password</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="en" key="IDC_SINGLE_BOOT">Single-boot</control>
     <control lang="en" key="IDC_STD_VOL">Standard VeraCrypt volume</control>
     <control lang="en" key="IDC_SYSENC_HIDDEN">Hi&dden</control>
@@ -98,6 +99,7 @@
     <control lang="en" key="IDT_SYSENC_KEYS_GEN_INFO">The keys, salt, and other data have been successfully generated. If you want to generate new keys, click Back and then Next. Otherwise, click Next to continue.</control>
     <control lang="en" key="IDT_SYS_DEVICE">Encrypts the partition/drive where Windows is installed. Anyone who wants to gain access and use the system, read and write files, etc., will need to enter the correct password each time before Windows boots. Optionally, creates a hidden system.</control>
     <control lang="en" key="IDT_SYS_PARTITION">Select this option to encrypt the partition where the currently running Windows operating system is installed.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="en" key="IDT_WIPE_MODE">Wipe mode:</control>
     <control lang="tr" key="IDCLOSE">Kapat</control>
     <control lang="en" key="IDC_ALLOW_ESC_PBA_BYPASS">Allow pre-boot &authentication to be bypassed by pressing the Esc key (enables boot manager)</control>
@@ -111,6 +113,7 @@
     <control lang="tr" key="IDC_CACHE">Parolaları ve anahtar dos&yaları önbelleğe al</control>
     <control lang="tr" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Bağlı birim olmadığında çık</control>
     <control lang="en" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Close token session (log out) after a volume is successfully mounted</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="tr" key="IDC_COPY_WIZARD">VeraCrypt Birim Oluşturma Sihirbazını dahil et</control>
     <control lang="tr" key="IDC_CREATE">Oluştur</control>
     <control lang="tr" key="IDC_CREATE_VOLUME">Birim Oluş&tur</control>
@@ -271,6 +274,8 @@
     <control lang="en" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Display this custom message in the pre-boot authentication screen (24 characters maximum):</control>
     <control lang="tr" key="IDT_DEFAULT_MOUNT_OPTIONS">Ön tanımlı Bağlama Özellikleri</control>
     <control lang="tr" key="IDT_DISMOUNT_ACTION">Kısayol Özellikleri</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="en" key="IDT_FAVORITE_LABEL">Label of selected favorite volume:</control>
     <control lang="tr" key="IDT_FILE_SETTINGS">Dosya Ayarları</control>
     <control lang="tr" key="IDT_HOTKEY_KEY">Atanacak tuş:</control>
@@ -537,6 +542,15 @@
     <string lang="en" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Note: If you need to securely transfer files from the decoy system to the hidden system, follow these steps:\n1) Start the decoy system.\n2) Save the files to an unencrypted volume or to an outer/normal VeraCrypt volume.\n3) Start the hidden system.\n4) If you saved the files to a VeraCrypt volume, mount it (it will be automatically mounted as read-only).\n5) Copy the files to the hidden system partition or to another hid [...]
     <string lang="en" key="CONFIRM_RESTART">Your computer must be restarted.\n\nDo you want to restart it now?</string>
     <string lang="en" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">An error occurred when obtaining the system encryption status.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="en" key="INIT_SYS_ENC">Cannot initialize application components for system encryption.</string>
     <string lang="tr" key="INIT_RAND">Rasgele sayı oluşturucusunu başlatma başarısız!</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="tr" key="SELECT_KEYFILE">Anahtar Dosyayı Seçin</string>
     <string lang="tr" key="SELECT_KEYFILE_PATH">Anahtar dosyası arama konumunu seçin. UYARI: Sadece konum hatırlanacaktır, dosya adları hatırlanmayacaktır!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="en" key="SERPENT_HELP">Designed by Ross Anderson, Eli Biham, and Lars Knudsen. Published in 1998. 256-bit key, 128-bit block. Mode of operation is XTS. Serpent was one of the AES finalists.</string>
     <string lang="en" key="SIZE_HELP">Please specify the size of the container you want to create.\n\nIf you create a dynamic (sparse-file) container, this parameter will specify its maximum possible size.\n\nNote that the minimum possible size of a FAT volume is 292 KB. The minimum possible size of an NTFS volume is 3792 KB.</string>
     <string lang="en" key="SIZE_HELP_HIDDEN_HOST_VOL">Please specify the size of the outer volume to be created (you will first create the outer volume and then a hidden volume within it). The minimum possible size of a volume within which a hidden volume is intended to be created is 340 KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="en" key="INCONSISTENCY_RESOLVED">Inconsistency resolved.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="en" key="NOTHING_TO_RESUME">There is no process/task to resume.</string>
     <string lang="tr" key="HIDVOL_PROT_BKG_TASK_WARNING">UYARI: VeraCrypt Arkaplan Görevi devre dışı. VeraCrypt'ten çıktıktan sonra, gizli birimin hasardan korunduğuna dair uyarılmayacaksınız.\n\nUyarı: Arkaplan Görevini istediğiniz zaman sistem uyarı alanındaki VeraCrypt simgesine sağ tıklayıp, 'Çıkış'ı seçerek kapatabilirsiniz.\n\nVeraCrypt Arkaplan Görevi etkinleştirilsin mi?</string>
     <string lang="tr" key="LANG_PACK_VERSION">Dil paketi versiyonu:  %s</string>
     <string lang="tr" key="CHECKING_FS">%hs olarak bağlanan VeraCrypt biriminin dosya sistemi kontrol ediliyor...</string>
@@ -1085,15 +1099,14 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</string>
     <string lang="en" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Error: Cannot set the keyboard layout for VeraCrypt to the standard US keyboard layout.\n\nNote that the password needs to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout.</string>
     <string lang="en" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">As VeraCrypt temporarily changed the keyboard layout to the standard US keyboard layout, it is not possible to type characters by pressing keys while the right Alt key is held down. However, you can type most of such characters by pressing appropriate keys while the Shift key is held down.</string>
     <string lang="en" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCrypt prevented change of keyboard layout.</string>
     <string lang="en" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Note: The password will need to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout. However, it is important to note that you do NOT need a real US keyboard. VeraCrypt automatically ensures that you can safely type the password (right now and in the pre-boot environment) even if yo [...]
-    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (TRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the TRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the TRD allows you to permanently decrypt the partition/drive before Windows  [...]
+    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (VRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the VRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the VRD allows you to permanently decrypt the partition/drive before Windows  [...]
     <string lang="en" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">After you click OK, Microsoft Windows Disc Image Burner will be launched. Please use it to burn the VeraCrypt Rescue Disk ISO image to a CD or DVD.\n\nAfter you do so, return to the VeraCrypt Volume Creation Wizard and follow its instructions.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn it to a CD or DVD.\n\n%lsAfter you burn the Rescue Disk, click Next to verify that it has been correctly burned.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you should either burn the image to a CD/DVD or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
@@ -1290,6 +1303,7 @@
     <string lang="en" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">WARNING: This setting may degrade performance.\n\nAre you sure you want to use this setting?</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="en" key="TEST">Test</string>
     <string lang="tr" key="KEYFILE">Anahtar Dosya</string>
     <string lang="tr" key="VKEY_08">Geri Al Tuşu</string>
diff --git a/Translations/Language.uk.xml b/Translations/Language.uk.xml
index e786c0d..26f58ca 100644
--- a/Translations/Language.uk.xml
+++ b/Translations/Language.uk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="uk" name="Українська" en-name="Ukrainian" version="1.0.0" translators="Kravchuk Olexandr, Babchuk Volodymyr" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="uk" key="IDC_QUICKFORMAT">Швидке форматування.</control>
     <control lang="uk" key="IDC_SHOW_PASSWORD">&Показ пароля</control>
     <control lang="uk" key="IDC_SHOW_PASSWORD_SINGLE">&Показ пароля</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="uk" key="IDC_SINGLE_BOOT">Одиночна загрузка</control>
     <control lang="uk" key="IDC_STD_VOL">Звичайний том VeraCrypt</control>
     <control lang="uk" key="IDC_SYSENC_HIDDEN">Пр&ихований</control>
@@ -98,6 +99,7 @@
     <control lang="uk" key="IDT_SYSENC_KEYS_GEN_INFO">Ключі, 'соль' і інші дані успішно згенеровані. Якщо ви хчете згенерувати новіе ключі, натисніть 'Назад', а потім 'Далі'. Якщо ж ні, то натисніть 'Далі' для продовження.</control>
     <control lang="uk" key="IDT_SYS_DEVICE">Зашифрувати розділ/диск, де встановлена Windows. Перед кожним завантаженням Windows потрібно буде вводити пароль для доступа до ОС, зчтитування і записи файлів і т.д. Додатково - створення прихоапної ОС.</control>
     <control lang="uk" key="IDT_SYS_PARTITION">Виберіть цю опцію, щоб зашифрувати розділ, де встановлена Windows і з якого вона завантажується.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="uk" key="IDT_WIPE_MODE">Режим очищення:</control>
     <control lang="uk" key="IDCLOSE">Закрити</control>
     <control lang="uk" key="IDC_ALLOW_ESC_PBA_BYPASS">Доз&волити відміну предзагрузочної аутентифікації по Esc (включити диспетчер завантаженння)</control>
@@ -111,6 +113,7 @@
     <control lang="uk" key="IDC_CACHE">К&ешувати паролі і ключеві файли</control>
     <control lang="uk" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Вхід, якщо нема змонтованих томів</control>
     <control lang="uk" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">Закр&ити токен-сесію (вийти) після успішного монтування тома</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="uk" key="IDC_COPY_WIZARD">З майстром створення томів VeraCrypt</control>
     <control lang="uk" key="IDC_CREATE">Створити</control>
     <control lang="uk" key="IDC_CREATE_VOLUME">&Створити том</control>
@@ -271,6 +274,8 @@
     <control lang="uk" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Показувати цей текст на екрані предзавантажувальної аутентифікації (не більше 24 символів):</control>
     <control lang="uk" key="IDT_DEFAULT_MOUNT_OPTIONS">Опції типове монтування томів</control>
     <control lang="uk" key="IDT_DISMOUNT_ACTION">Додаткові параметри</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="uk" key="IDT_FAVORITE_LABEL">Мітка обраного тому:</control>
     <control lang="uk" key="IDT_FILE_SETTINGS">Файлові параметри</control>
     <control lang="uk" key="IDT_HOTKEY_KEY">Клавіша:</control>
@@ -537,6 +542,15 @@
     <string lang="uk" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Примітка: якщо потрібно безпечно перенести файли із підставної системи в приховану, виконайте наступне: 1) Загрузіть підставну систему. 2) Збережіть потрібні вам файли на незашифрованому томі або на зовнішньому/звичайному томі VeraCrypt. 3) Завантажте приховану систему. 4) Якщо ви зберегли файли на томі VeraCrypt, змонтуйте його (вон буде автоматично змонтована як 'тільки для читання'). 5) Скопіюйте файли в прихований сис [...]
     <string lang="uk" key="CONFIRM_RESTART">Комп'ютер потрібно перезавантажити.\n\nПерезавантажити зараз?</string>
     <string lang="uk" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">При отриманні статусу системного шифрування виникла помилка.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="uk" key="INIT_SYS_ENC">Неможливо ініціалізувати компонент застосунку для системного шифрування.</string>
     <string lang="uk" key="INIT_RAND">Невдала ініціалізація генератора випадкових чисел!</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="uk" key="SELECT_KEYFILE">Оберіть файл-ключ</string>
     <string lang="uk" key="SELECT_KEYFILE_PATH">Оберіть шлях пошуку файл-ключів. УВАГА: запам'ятовується лише шлях, але не імена файлів!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="uk" key="SERPENT_HELP">Автори: Ross Anderson, Eli Biham та Lars Knudsen. Опублікований у 1998 р. 256-біт ключ, 128-біт блок. Режим роботи - XTS. Алгоритм Serpent - один з фіналістів AES.</string>
     <string lang="uk" key="SIZE_HELP">Вкажіть розмір контейнера.\n\nПри створені динамічного ('розтягуючого' по мірі заповнення) контейнера, цей приклад визначає його максимальний розмір.\n\nМнімальний обєм для тома FAT рівний 275 Кб, для тому NTFS -- 2829 Кб.</string>
     <string lang="uk" key="SIZE_HELP_HIDDEN_HOST_VOL">Вкажіть розмір нового зовнішнього тому (спочатку створюється зовнішній том, а потім всередині нього -- прихований). Мінімально можливий розмір тому, призначеного для створення прихованого тому, складає 305 Кб.</string>
@@ -1033,7 +1048,6 @@
     <string lang="uk" key="INCONSISTENCY_RESOLVED">Несумісність рішення.\n\n\n(якщо ви повідомляєте про помилку, будь ласка, додайте наступну технічну інформацію до повідомлення про помилку: %hs)</string>
     <string lang="uk" key="UNEXPECTED_STATE">Помилка! Невідомий стан.\n\n\n(Якщо ви повідомите про помилку, будь ласка, додайте наступну технічну інформацію до повідомлення про помилку: %hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="uk" key="NOTHING_TO_RESUME">Немає призупинених процесів/завдань.</string>
     <string lang="uk" key="HIDVOL_PROT_BKG_TASK_WARNING">УВАГА: фоновий процес VeraCrypt вимкнений. При виході з VeraCrypt ви не будете попереджені про запобігання пошкодження прихованого тому.\n\nПам'ятайте: фоновий процес можна завершити у будь-який момент, натиснувши правою кнопкою миші на значок VeraCrypt у системному треї й обравши пункт 'Вихід'.\n\nВвімкнути фоновий процес VeraCrypt?</string>
     <string lang="uk" key="LANG_PACK_VERSION">Версія мовного модулю: %s</string>
     <string lang="uk" key="CHECKING_FS">Перевірка файлової системи тому VeraCrypt, змонтованого як %hs...</string>
@@ -1085,15 +1099,14 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="uk" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">В даний момент ключові файли для шифрування системи не підтримуються.</string>
     <string lang="uk" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Увага! VeraCrypt не може відновити первісну розкладку клавіатури. Це може призвести до неправильного введення пароля.</string>
     <string lang="uk" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Помилка! Неможливо встановити розкладку клавіатури для VeraCrypt в стандартну американську (US).\n\nЗверніть увагу, що пароль вводиться ДО завантаження Windows, коли будь-які розкладки клавіатури, що відрізняються від американської, ще недоступні. Тому пароль завжди повинен вводиться при стандартній американської розкладці.</string>
     <string lang="uk" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">Оскільки VeraCrypt тимчасово змінив розкладку клавіатури на стандартну американську, введення символів при натиснутій правій клавіші Alt неможливий. Тим не менше, більшість таких символів можна ввести відповідними клавішами при натиснутій клавіші Shift.</string>
     <string lang="uk" key="KEYB_LAYOUT_CHANGE_PREVENTED">Зміна розкладки клавіатури заблоковано VeraCrypt.</string>
     <string lang="uk" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Примітка: пароль вводиться ДО завантаження Windows, коли будь-які розкладки клавіатури, що відрізняються від американської, ще недоступні. Тому пароль завжди повинен вводиться при стандартній американської розкладці. Важливо, однак, мати на увазі, що вам не потрібно мати справжню американську клавіатуру. VeraCrypt автоматично забезпечує вам безпечний введення пароля (прямо зараз і на стадії перед завантаженням ОС), навіть якщо у [...]
-    <string lang="uk" key="RESCUE_DISK_INFO">Перш ніж приступити до шифруванню розділу / диска, ви повинні створити диск відновлення VeraCrypt Rescue Disk (TRD), що забезпечує наступне:\n\n-У випадку пошкодження завантажувача VeraCrypt, майстер-ключа або інших критичних даних, TRD дозволяє їх відновити (майте на увазі, що вам все одно буде потрібно ввести правильний пароль).\n\n-Если завантажувач VeraCrypt виявиться пошкодженим або інфікованим вірусом, ви зможете уникнути його запуску, з [...]
+    <string lang="uk" key="RESCUE_DISK_INFO">Перш ніж приступити до шифруванню розділу / диска, ви повинні створити диск відновлення VeraCrypt Rescue Disk (VRD), що забезпечує наступне:\n\n-У випадку пошкодження завантажувача VeraCrypt, майстер-ключа або інших критичних даних, VRD дозволяє їх відновити (майте на увазі, що вам все одно буде потрібно ввести правильний пароль).\n\n-Если завантажувач VeraCrypt виявиться пошкодженим або інфікованим вірусом, ви зможете уникнути його запуску, з [...]
     <string lang="uk" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">Після натискання ГАРАЗД буде запущено засіб запису образів дисків Windows. Запишіть з його допомогою ISO-образ диска відновлення VeraCrypt на CD або DVD.\n\nПотім поверніться у вікно майстра створення томів VeraCrypt і дотримуйтесь інструкцій.</string>
     <string lang="uk" key="RESCUE_DISK_BURN_INFO">Образ диска відновлення створений та збережений у файлі:%hs\n\nЗараз вам потрібно записати цей образ на CD або DVD.\n\nВАЖНО: Файл-образ має бути записаний на CD/DVD як ISO-образ диска (а не як окремий файл). Про те, як це зробити, див документацію на ваше ПЗ для запису CD/DVD. Якщо у вас немає програми, здатної записати ISO-образ на CD/DVD, клацніть за посиланням нижче, щоб отримати таке безкоштовне ПЗ.\n\nПісля запису диска відновлення  [...]
     <string lang="uk" key="RESCUE_DISK_BURN_INFO_NO_CHECK">Диск відновлення створено та збережено в цьому файлі:%hs\n\nЗараз вам слід або записати (пропалити) диск відновлення на CD/DVD, або перемістити його ISO-образ в безпечне місце для використання в подальшому.\n\nЯкщо у вас немає програми, здатної записати ISO-образ на CD/DVD, клацніть на посилання нижче, щоб отримати таке безкоштовне ПЗ.\n\nНатисніть кнопку 'Далі' для продовження.</string>
@@ -1290,6 +1303,7 @@
     <string lang="uk" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">УВАГА: Цей параметр може знизити продуктивність.\n\nвикористовувати цей параметр?</string>
     <string lang="uk" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Увага: VeraCrypt авто-розмонтував пристрої</string>
     <string lang="uk" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Перед тим, як фізично видалити або відключити пристрій, що містить встановлений обсяг, ви повинні демонтувати спершу том VeraCrypt.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="uk" key="TEST">Тест</string>
     <string lang="uk" key="KEYFILE">Файл-ключ</string>
     <string lang="uk" key="VKEY_08">Backspace</string>
diff --git a/Translations/Language.uz.xml b/Translations/Language.uz.xml
index cacd5e5..a7cdca3 100644
--- a/Translations/Language.uz.xml
+++ b/Translations/Language.uz.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="uz" name="Ўзбекча" en-name="Uzbek (Cyrillic)" version="0.1.0" translators="Abdurauf Azizov, Dmitry Yerokhin" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="uz" key="IDC_QUICKFORMAT">Тезда форматлаш.</control>
     <control lang="uz" key="IDC_SHOW_PASSWORD">&Паролни кўрсатишлик</control>
     <control lang="uz" key="IDC_SHOW_PASSWORD_SINGLE">&Паролни кўрсатишлик</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="uz" key="IDC_SINGLE_BOOT">Биттадан юклаш</control>
     <control lang="uz" key="IDC_STD_VOL">VeraCrypt оддий томи</control>
     <control lang="uz" key="IDC_SYSENC_HIDDEN">Яши&рин</control>
@@ -98,6 +99,7 @@
     <control lang="uz" key="IDT_SYSENC_KEYS_GEN_INFO">Калитлар ва бошқа берилган маълумотлар генерация қилинди. Агарда сиз янги калитларни генерация қилмоқчи бўлсангиз 'Орқага' тугмасини босиб кейин 'Давоми' тугмасини босасиз. Бўлмасам 'Давоми' тугмасини бўсинг.</control>
     <control lang="uz" key="IDT_SYS_DEVICE">Зашифровать раздел/диск, где установлена Windows. Перед каждой загрузкой Windows нужно будет вводить пароль для доступа к ОС, считывания и записи файлов и т.д. Дополнительно - создание скрытой ОС.</control>
     <control lang="en" key="IDT_SYS_PARTITION">Select this option to encrypt the partition where the currently running Windows operating system is installed.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="uz" key="IDT_WIPE_MODE">Режим очистки:</control>
     <control lang="uz" key="IDCLOSE">Закрыть</control>
     <control lang="uz" key="IDC_ALLOW_ESC_PBA_BYPASS">Разре&шить отмену предзагрузочной авторизации по Esc (включить диспетчер загрузки)</control>
@@ -111,6 +113,7 @@
     <control lang="uz" key="IDC_CACHE">К&эшировать пароли и ключевые файлы</control>
     <control lang="uz" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Выход, если нет смонтированных томов</control>
     <control lang="uz" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">Закр&ыть токен-сессию (выйти) после успешного монтирования тома</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="uz" key="IDC_COPY_WIZARD">С мастером создания томов VeraCrypt</control>
     <control lang="uz" key="IDC_CREATE">Создать</control>
     <control lang="uz" key="IDC_CREATE_VOLUME">&Том(файл) яратиш</control>
@@ -271,6 +274,8 @@
     <control lang="uz" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Показывать этот текст на экране предзагрузочной авторизации (не более 24 символов):</control>
     <control lang="uz" key="IDT_DEFAULT_MOUNT_OPTIONS">Параметры монтирования томов по умолчанию</control>
     <control lang="uz" key="IDT_DISMOUNT_ACTION">Дополнительные параметры</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="en" key="IDT_FAVORITE_LABEL">Label of selected favorite volume:</control>
     <control lang="uz" key="IDT_FILE_SETTINGS">Файловые параметры</control>
     <control lang="uz" key="IDT_HOTKEY_KEY">Клавиша:</control>
@@ -537,6 +542,15 @@
     <string lang="uz" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Примечание: если нужно безопасно перенести файлы из обманной системы в скрытую, выполните следующее: 1) Загрузите обманную систему. 2) Сохраните нужные вам файлы на незашифрованном томе или на внешнем/обычном томе VeraCrypt. 3) Загрузите скрытую систему. 4) Если вы сохранили файлы на томе VeraCrypt, смонтируйте его (он будет автоматически смонтирован как 'только для чтения'). 5) Скопируйте файлы в скрытый системный раздел [...]
     <string lang="uz" key="CONFIRM_RESTART">Требуется перезагрузить компьютер.\n\nХотите перезагрузить его сейчас?</string>
     <string lang="uz" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Ошибка получения состояния системного шифрования.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="uz" key="INIT_SYS_ENC">Невозможно инициализировать компоненты приложения для системного шифрования.</string>
     <string lang="uz" key="INIT_RAND">Ошибка инициализации генератора случайных чисел.</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="uz" key="SELECT_KEYFILE">Выберите ключевой файл</string>
     <string lang="uz" key="SELECT_KEYFILE_PATH">Выберите путь поиска ключевых файлов. ВНИМАНИЕ: Запоминается только путь, но не имена файлов.</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="uz" key="SERPENT_HELP">Авторы: Ross Anderson, Eli Biham и Lars Knudsen. Опубликован в 1998 г. 256-бит ключ, 128-бит блок. Режим работы -- XTS. Алгоритм Serpent -- один из финалистов AES.</string>
     <string lang="en" key="SIZE_HELP">Please specify the size of the container you want to create.\n\nIf you create a dynamic (sparse-file) container, this parameter will specify its maximum possible size.\n\nNote that the minimum possible size of a FAT volume is 292 KB. The minimum possible size of an NTFS volume is 3792 KB.</string>
     <string lang="en" key="SIZE_HELP_HIDDEN_HOST_VOL">Please specify the size of the outer volume to be created (you will first create the outer volume and then a hidden volume within it). The minimum possible size of a volume within which a hidden volume is intended to be created is 340 KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="uz" key="INCONSISTENCY_RESOLVED">Несоответствие устранено.\n\n\n(Если вы сообщаете нам о связанной с этим ошибке, включите в свой отчёт следующую техническую информацию: %hs)</string>
     <string lang="uz" key="UNEXPECTED_STATE">Ошибка! Неизвестное состояние.\n\n\n(Если вы сообщаете нам о связанной с этим ошибке, включите в свой отчёт следующую техническую информацию: %hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="uz" key="NOTHING_TO_RESUME">Нет процесса/задания для возобновления.</string>
     <string lang="uz" key="HIDVOL_PROT_BKG_TASK_WARNING">ВНИМАНИЕ: Фоновый процесс VeraCrypt отключён. При выходе из VeraCrypt вы не будете извещены о предотвращении повреждения скрытого тома.\n\nПримечание: фоновый процесс можно закрыть в любой момент, щёлкнув правой кнопкой мыши на значке VeraCrypt в системном лотке и выбрав 'Выход'.\n\nВключить фоновый процесс VeraCrypt?</string>
     <string lang="uz" key="LANG_PACK_VERSION">Версия языкового модуля: %s</string>
     <string lang="uz" key="CHECKING_FS">Проверка файловой системы тома VeraCrypt, смонтированного как %hs...</string>
@@ -1085,15 +1099,14 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="uz" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">В настоящий момент ключевые файлы для шифрования системы не поддерживаются.</string>
     <string lang="uz" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Внимание! VeraCrypt не может восстановить первоначальную раскладку клавиатуры. Это может привести к неправильному вводу пароля.</string>
     <string lang="uz" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Ошибка! Невозможно установить раскладку клавиатуры для VeraCrypt в стандартную американскую (US).\n\nОбратите внимание, что пароль вводится ДО загрузки Windows, когда любые раскладки клавиатуры, отличающиеся от американской, ещё недоступны. Поэтому пароль всегда должен вводиться при стандартной американской раскладке.</string>
     <string lang="uz" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">Поскольку VeraCrypt временно изменил раскладку клавиатуры на стандартную американскую, ввод символов при нажатой правой клавише Alt невозможен. Тем не менее, большинство таких символов можно ввести соответствующими клавишами при нажатой клавише Shift.</string>
     <string lang="uz" key="KEYB_LAYOUT_CHANGE_PREVENTED">Изменение раскладки клавиатуры заблокировано VeraCrypt.</string>
     <string lang="uz" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Примечание: пароль вводится ДО загрузки Windows, когда любые раскладки клавиатуры, отличающиеся от американской, ещё недоступны. Поэтому пароль всегда должен вводиться при стандартной американской раскладке. Важно, однако, иметь в виду, что вам НЕ нужно иметь настоящую американскую клавиатуру. VeraCrypt автоматически обеспечивает вам безопасный ввод пароля (прямо сейчас и на стадии перед загрузкой ОС), даже если у вас НЕ настоящ [...]
-    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (TRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the TRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the TRD allows you to permanently decrypt the partition/drive before Windows  [...]
+    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (VRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the VRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the VRD allows you to permanently decrypt the partition/drive before Windows  [...]
     <string lang="en" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">After you click OK, Microsoft Windows Disc Image Burner will be launched. Please use it to burn the VeraCrypt Rescue Disk ISO image to a CD or DVD.\n\nAfter you do so, return to the VeraCrypt Volume Creation Wizard and follow its instructions.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn it to a CD or DVD.\n\n%lsAfter you burn the Rescue Disk, click Next to verify that it has been correctly burned.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you should either burn the image to a CD/DVD or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
@@ -1290,6 +1303,7 @@
     <string lang="en" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">WARNING: This setting may degrade performance.\n\nAre you sure you want to use this setting?</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="uz" key="TEST">Тест</string>
     <string lang="uz" key="KEYFILE">Ключевой файл</string>
     <string lang="uz" key="VKEY_08">Backspace</string>
diff --git a/Translations/Language.vi.xml b/Translations/Language.vi.xml
index 1c538a3..33b93cb 100644
--- a/Translations/Language.vi.xml
+++ b/Translations/Language.vi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="vi" name="Tiếng Việt" en-name="Vietnamese" version="0.1.0" translators="Nguyễn Kim Huy" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="vi" key="IDC_QUICKFORMAT">Định dạng nhanh</control>
     <control lang="vi" key="IDC_SHOW_PASSWORD">&Hiển thị mật mã</control>
     <control lang="vi" key="IDC_SHOW_PASSWORD_SINGLE">&Hiển thị mật mã</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="vi" key="IDC_SINGLE_BOOT">Khởi động đơn hệ</control>
     <control lang="vi" key="IDC_STD_VOL">Tập đĩa VeraCrypt chuẩn</control>
     <control lang="vi" key="IDC_SYSENC_HIDDEN">Ẩ&n</control>
@@ -98,6 +99,7 @@
     <control lang="vi" key="IDT_SYSENC_KEYS_GEN_INFO">Các khóa, muối, và những dữ liệu khác đã được tạo ra. Nếu bạn muốn tạo ra khóa mới thì nhấn Ngược lại và sau đó nhấn Kế tiếp. Không thôi thì nhấn Kế tiếp để tiếp tục.</control>
     <control lang="vi" key="IDT_SYS_DEVICE">Mã hóa phân vùng/ổ đĩa nơi mà Windows được cài đặt. Bất cứ ai muốn đưọc truy cập và sử dụng hệ thống, đọc và viết tập tin, v.v. sẽ cần nhập đúng mật mã mỗi lần trước khi Windows khởi động. Cũng có thể cấu tạo một hệ thống dấu được.</control>
     <control lang="vi" key="IDT_SYS_PARTITION">Chọn tùy chọn này để mã hóa phân vùng nơi mà hệ điều hành Windows đang chạy hiện tại được cài đặt.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="vi" key="IDT_WIPE_MODE">Phương thức tẩy:</control>
     <control lang="vi" key="IDCLOSE">Đóng</control>
     <control lang="vi" key="IDC_ALLOW_ESC_PBA_BYPASS">Cho phép bỏ qua &chứng thực tiền khởi động bằng cách bấm phím Esc (bật quản lý khởi động lên)</control>
@@ -111,6 +113,7 @@
     <control lang="vi" key="IDC_CACHE">Tạm trữ các mật mã và tập &tin khóa trong bộ nhớ</control>
     <control lang="vi" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Thoát ra khi không có tập đĩa nào được nạp lên</control>
     <control lang="vi" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Đóng phiên chạy của hiệu bài (đăng xuất) sau khi một tập đĩa được nạp lên thành công</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="vi" key="IDC_COPY_WIZARD">Thêm Trợ lý Cấu tạo Tập đĩa VeraCrypt vào</control>
     <control lang="vi" key="IDC_CREATE">Cấu tạo</control>
     <control lang="vi" key="IDC_CREATE_VOLUME">Cấu tạo Tập đĩa</control>
@@ -271,6 +274,8 @@
     <control lang="vi" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Hiển thị thông điệp riêng này trong màn hình chứng thực tiền khởi động (tối đa 24 ký tự):</control>
     <control lang="vi" key="IDT_DEFAULT_MOUNT_OPTIONS">Tùy chọn của Nạp mặc định</control>
     <control lang="vi" key="IDT_DISMOUNT_ACTION">Tùy chọn phím nóng</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="en" key="IDT_FAVORITE_LABEL">Label of selected favorite volume:</control>
     <control lang="vi" key="IDT_FILE_SETTINGS">Thiếp lập tập tin</control>
     <control lang="vi" key="IDT_HOTKEY_KEY">Khóa để giao cho:</control>
@@ -537,6 +542,15 @@
     <string lang="vi" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Lưu ý: Nếu bạn cần chuyển các tập tin một cách an toàn từ hệ thống nghi trang sang hệ thống ẩn, theo những bước sau đây:\n1) Bắt đầu hệ thống nghi trang.\n2) Lưu những tập tin vào một tập đĩa được giải mã hoặc vào một tập đĩa VeraCrypt bên ngoài/thông thường.\n3) Bắt đầu hệ ẩn.\n4) Nếu bạn đã lưu những tập tin vào một tập đĩa VeraCrypt, nạp nó lên (nó sẽ được tự động nạp lên kiểu chỉ-đọc).\n5) Chép những tập tin vào phân  [...]
     <string lang="vi" key="CONFIRM_RESTART">Máy của bạn phải được bắt đầu lại.\n\nBạn có muốn bắt đầu nó lại bây giờ không?</string>
     <string lang="vi" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Có lỗi xảy ra khi đang lấy tình trạng mã hóa hệ thống.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="vi" key="INIT_SYS_ENC">Không thể sơ khởi các bộ phận của ứng dụng cho việc mã hóa hệ thống.</string>
     <string lang="vi" key="INIT_RAND">Không sơ khởi hàm tạo ra các số ngẫu nhiên được!</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="vi" key="SELECT_KEYFILE">Chọn Tập tin khóa</string>
     <string lang="vi" key="SELECT_KEYFILE_PATH">Chọn một đường dẫn kiếm của tập tin. CẢNH BÁO: Lưu ý là chỉ có đường dẫn sẽ được nhớ chứ tên tập tin thì không!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="vi" key="SERPENT_HELP">Thiết kế bởi Ross Anderson, Eli Biham, và Lars Knudsen. Phát hành năm 1998. 256-bit key, 128-bit block. Phương thức của thao tác là XTS. Serpent đã vào các vòng kết của AES.</string>
     <string lang="en" key="SIZE_HELP">Please specify the size of the container you want to create.\n\nIf you create a dynamic (sparse-file) container, this parameter will specify its maximum possible size.\n\nNote that the minimum possible size of a FAT volume is 292 KB. The minimum possible size of an NTFS volume is 3792 KB.</string>
     <string lang="en" key="SIZE_HELP_HIDDEN_HOST_VOL">Please specify the size of the outer volume to be created (you will first create the outer volume and then a hidden volume within it). The minimum possible size of a volume within which a hidden volume is intended to be created is 340 KB.</string>
@@ -1033,7 +1048,6 @@
     <string lang="vi" key="INCONSISTENCY_RESOLVED">Mâu thuẫn đã được giải quyết.\n\n\n(Nếu bạn báo một lỗi liên quan đến chuyện này, xin bao gồm tin tức kỹ thuật sau đây trong phần báo lỗi:\n%hs)</string>
     <string lang="vi" key="UNEXPECTED_STATE">Lỗi: Trạng thái bất thường.\n\n\n(Nếu bạn báo một lỗi liên quan đến chuyện này, xin bao gồm tin tức kỹ thuật sau đây trong phần báo lỗi:\n%hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="vi" key="NOTHING_TO_RESUME">Không có quá trình/tác vụ nào để tiếp tục lại.</string>
     <string lang="vi" key="HIDVOL_PROT_BKG_TASK_WARNING">CẢNH BÁO: Tác vụ Phụ của VeraCrypt bị tắt. Sau khi bạn ra khỏi VeraCrypt, bạn sẽ không được thông báo nếu tổn hại cho tập đĩa ẩn được ngăn cản.\n\nLưu ý: Bạn có thể tắt Tác vụ Phụ bất cứ lúc nào bằng cách nhấn phải biểu tượng khay và chọn 'Thoát ra'.\n\nBật Tác vụ Phụ của VeraCrypt lên không?</string>
     <string lang="vi" key="LANG_PACK_VERSION">Phiên bản của bộ ngôn ngữ:  %s</string>
     <string lang="vi" key="CHECKING_FS">Đang kiểm soát hệ thống tập tin trong tập đĩa VeraCrypt được nạp như %hs...</string>
@@ -1085,15 +1099,14 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="vi" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Các tập tin khóa hiện không được hỗ trợ cho việc mã hóa hệ thống.</string>
     <string lang="vi" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Cảnh báo: VeraCrypt không thể hồi phục bố trí bàn phím gốc được. Chuyện này có thể làm cho bạn đánh mật mã không đúng vào.</string>
     <string lang="vi" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Lỗi: Không thể thiết đặt bố trí bàn phím cho VeraCrypt thành bố trí bàn phím căn bản của Mỹ được.\n\nLưu ý là mật mã cần được đánh vào trong môi trường tiền khởi động (trước khi Windows bắt đầu) lúc mà bố trí bàn phím Windows không phải của Mỹ không có sẵn. Vì vậy, mật mã phải luôn luôn được đánh vào dùng bố trí bàn phím căn bản của Mỹ.</string>
     <string lang="vi" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">Vì VeraCrypt đã tạm thời thay đổi bố trí bàn phím thành bố trí bàn phím căn bản của Mỹ, nên không thể đánh các ký tự bằng cách nhấn bấm các phím trong lúc phím Alt bên phải đang được giữ xuống. Tuy nhiên, bạn có thể đánh đa số những ký tự như thế bằng cách bấm các phím thích hợp trong lúc phím Shift đang được giữ xuống.</string>
     <string lang="vi" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCrypt ngăn cản sự thay đổi của bố trí bàn phím .</string>
     <string lang="vi" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Lưu ý: Mật mã sẽ cần được đánh vào trong môi trường tiền khởi động (trước khi Windows bắt đầu) lúc mà bố trí bàn phím Windows không phải của Mỹ không có sẵn. Vì vậy, mật mã phải luôn luôn được đánh vào dùng bố trí bàn phím căn bản của Mỹ. Tuy nhiên, chuyện quan trọng cần lưu ý là bạn KHÔNG cần một bàn phím thật của Mỹ. VeraCrypt tự động đảm bảo là bạn có thể đánh mật mã một cách an toàn (ngay bây giờ và trong môi trường tiền khở [...]
-    <string lang="vi" key="RESCUE_DISK_INFO">Trước khi bạn có thể mã hóa phân vùng/ổ đĩa, bạn phải cấu tạo một Đĩa Cứu hộ VeraCrypt (TRD) để dùng cho những mục đích sau đây:\n\n- Nếu Bộ tải Khởi nạp của VeraCrypt, khóa chính, hoặc những dữ liệu trọng yếu bị tổn hại thì TRD để cho bạn hồi phục nó (tuy nhiên lưu ý là bạn sẽ vẫn phải nhập mật mã đúng vào).\n\n- Nếu Windows bị tổn hại và không thể bắt đầu, TRD để cho bạn giải mã phân vùng/ổ đĩa vĩnh viễn trước khi Windows bắt đầu.\n\n- TRD s [...]
+    <string lang="vi" key="RESCUE_DISK_INFO">Trước khi bạn có thể mã hóa phân vùng/ổ đĩa, bạn phải cấu tạo một Đĩa Cứu hộ VeraCrypt (VRD) để dùng cho những mục đích sau đây:\n\n- Nếu Bộ tải Khởi nạp của VeraCrypt, khóa chính, hoặc những dữ liệu trọng yếu bị tổn hại thì VRD để cho bạn hồi phục nó (tuy nhiên lưu ý là bạn sẽ vẫn phải nhập mật mã đúng vào).\n\n- Nếu Windows bị tổn hại và không thể bắt đầu, VRD để cho bạn giải mã phân vùng/ổ đĩa vĩnh viễn trước khi Windows bắt đầu.\n\n- VRD s [...]
     <string lang="vi" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">Sau khi bạn nhấn OK, Microsoft Windows Disc Image Burner sẽ được khởi chạy. Xin sử dụng nó để sang bản ảnh ISO của Đĩa Cứu hộ VeraCrypt qua một CD hay DVD.\n\nSau khi bạn làm thế, trở lại Trợ lý Cấu tạo Tập đĩa VeraCrypt và theo những hướng dẫn của nó.</string>
     <string lang="vi" key="RESCUE_DISK_BURN_INFO">Bản ảnh của Đĩa Cứu hộ đã được cấu tạo và lưu trữ trong tập tin này:\n%hs\n\nBây giờ bạn cần sang nó qua một CD hay DVD.\n\n%lsSau khi bạn sang Đĩa Cứu hộ rồi, nhấn Kế tiếp để xác nhận là nó đã đuợc sang đúng cách.</string>
     <string lang="vi" key="RESCUE_DISK_BURN_INFO_NO_CHECK">Bản ảnh của Đĩa Cứu hộ đã được cấu tạo và lưu trữ trong tập tin này:\n%hs\n\nBây giờ bạn nên sang bản ảnh qua một CD/DVD hoặc or di chuyển nó qua một vị trí an toàn để sử dụng sau này.\n\n%lsNhấn Kế tiếp để tiếp tục.</string>
@@ -1290,6 +1303,7 @@
     <string lang="en" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">WARNING: This setting may degrade performance.\n\nAre you sure you want to use this setting?</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="vi" key="TEST">Thử nghiệm</string>
     <string lang="vi" key="KEYFILE">Tập tin Khóa</string>
     <string lang="vi" key="VKEY_08">Backspace</string>
diff --git a/Translations/Language.zh-cn.xml b/Translations/Language.zh-cn.xml
index 86b20c9..0141feb 100644
--- a/Translations/Language.zh-cn.xml
+++ b/Translations/Language.zh-cn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="zh-cn" name="简体中文" en-name="Chinese (Simplified)" version="1.0.0" translators="Barney Li" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="zh-cn" key="IDC_QUICKFORMAT">快速格式化</control>
     <control lang="zh-cn" key="IDC_SHOW_PASSWORD">显示密码(&D)</control>
     <control lang="zh-cn" key="IDC_SHOW_PASSWORD_SINGLE">显示密码(&D)</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="zh-cn" key="IDC_SINGLE_BOOT">单系统</control>
     <control lang="zh-cn" key="IDC_STD_VOL">标准 VeraCrypt 加密卷</control>
     <control lang="zh-cn" key="IDC_SYSENC_HIDDEN">隐藏(&D)</control>
@@ -98,6 +99,7 @@
     <control lang="zh-cn" key="IDT_SYSENC_KEYS_GEN_INFO">已成功生成密钥、要素、以及其它数据。如果您希望生成新的密钥,请点击〖后退〗然后点击〖下一步〗按钮。否则点击〖下一步〗按钮继续。</control>
     <control lang="zh-cn" key="IDT_SYS_DEVICE">加密 Windows 系统所在的 分区/驱动器。加密后,任何人想要访问和使用此加密系统、读写此系统盘下的文件等,都需每次在 Windows 启动前输入正确的密码。也可以选择创建一个隐形的操作系统。</control>
     <control lang="zh-cn" key="IDT_SYS_PARTITION">选择此选项,以加密您当前 Windows 操作系统所安装的分区。</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="zh-cn" key="IDT_WIPE_MODE">擦除模式:</control>
     <control lang="zh-cn" key="IDCLOSE">关闭</control>
     <control lang="zh-cn" key="IDC_ALLOW_ESC_PBA_BYPASS">允许按下 Esc 按键跳过启动验证(启用启动管理器)(&A)</control>
@@ -111,6 +113,7 @@
     <control lang="zh-cn" key="IDC_CACHE">在内存中缓存密码和密钥文件(&A)</control>
     <control lang="zh-cn" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">没有加密卷被加载时退出</control>
     <control lang="zh-cn" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">在有加密卷成功加载后关闭口令牌会话(登出)(&C)</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="zh-cn" key="IDC_COPY_WIZARD">包含 VeraCrypt 加密卷创建向导</control>
     <control lang="zh-cn" key="IDC_CREATE">创建</control>
     <control lang="zh-cn" key="IDC_CREATE_VOLUME">创建加密卷(&C)</control>
@@ -271,6 +274,8 @@
     <control lang="zh-cn" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">在启动验证屏幕显示下面自定义信息(最多 24 个字符):</control>
     <control lang="zh-cn" key="IDT_DEFAULT_MOUNT_OPTIONS">默认加载选项</control>
     <control lang="zh-cn" key="IDT_DISMOUNT_ACTION">热键设置</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="zh-cn" key="IDT_FAVORITE_LABEL">所选收藏加密卷的卷标:</control>
     <control lang="zh-cn" key="IDT_FILE_SETTINGS">文件选项</control>
     <control lang="zh-cn" key="IDT_HOTKEY_KEY">要分配的热键:</control>
@@ -537,6 +542,15 @@
     <string lang="zh-cn" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">注意:如果您要安全的从迷惑操作系统向隐形操作系统中传送文件,请遵循以下步骤: 1)启动迷惑操作系统。 2)保存这些文件到未加密的卷或者是 VeraCrypt 外层/常规加密卷。 3)启动隐形操作系统。 4)如果是把文件保存到 VeraCrypt 加密卷,则加载这个加密卷(该加密卷会自动以只读模式加载)。 5)复制这些文件到隐形操作系统的分区或者是其它隐藏加密卷。</string>
     <string lang="zh-cn" key="CONFIRM_RESTART">您的计算机必须重启。\n\n您希望现在重启计算机吗?</string>
     <string lang="zh-cn" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">获取系统加密状态时出错。</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="zh-cn" key="INIT_SYS_ENC">不能初始化用于系统加密的程序组件。</string>
     <string lang="zh-cn" key="INIT_RAND">初始化随机数据生成器失败!</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="zh-cn" key="SELECT_KEYFILE">选择密钥文件</string>
     <string lang="zh-cn" key="SELECT_KEYFILE_PATH">选择密钥文件的搜索路径。警告:注意,记忆的只是路径,而不会记忆文件名!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="zh-cn" key="SERPENT_HELP">Serpent 为与 AES 竞争算法中的一种。设计者为 Ross Anderson、Eli Biham、和 Lars Knudsen。发表于 1998 年。256 位密钥,128 位数据块,操作模式为 XTS。</string>
     <string lang="zh-cn" key="SIZE_HELP">请指定要创建的加密卷的大小。\n\n如果您打算创建一个动态的(稀疏文件)容器,该参数对应于该容器的最大尺寸。\n\n注意:最小的 FAT 加密卷大小为 292 KB。最小的 NTFS 加密卷大小为 3792 KB。</string>
     <string lang="zh-cn" key="SIZE_HELP_HIDDEN_HOST_VOL">请指定要创建的外层加密卷的大小(随后将在其内创建隐藏加密卷)。包含隐藏卷的外层加密卷最小可能大小为 340 KB。</string>
@@ -1033,7 +1048,6 @@
     <string lang="zh-cn" key="INCONSISTENCY_RESOLVED">发现不一致性。\n\n\n(如果您使用此链接报告这个错误,请在报告中包含下面信息: %hs)</string>
     <string lang="zh-cn" key="UNEXPECTED_STATE">错误:未知状态。\n\n\n(如果您报告与之相关的 BUG,请在错误报告里面包含下面的技术信息: %hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="zh-cn" key="NOTHING_TO_RESUME">没有可以继续的进程/任务。</string>
     <string lang="zh-cn" key="HIDVOL_PROT_BKG_TASK_WARNING">警告: VeraCrypt 后台任务已禁用。在您退出 VeraCrypt 后,如果设置了阻止损坏隐藏加密卷,您也将无法得到提示。\n\n注意:您可以随时在通过右键单击 VeraCrypt 通知栏图标并 选择〖退出〗来停止后台任务。\n\n\n您要启用 VeraCrypt 后台任务吗?</string>
     <string lang="zh-cn" key="LANG_PACK_VERSION">语言包版本: %s</string>
     <string lang="zh-cn" key="CHECKING_FS">正在检测加载为 %hs 的 VeraCrypt 加密卷的文件系统...</string>
@@ -1085,8 +1099,7 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="zh-cn" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">密钥文件当前不支持用在系统加密中。</string>
     <string lang="zh-cn" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">警告:VeraCrypt 不能存储原始键盘布局。这可能导致您无法正确输入密码。</string>
     <string lang="zh-cn" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">错误:不能设置 VeraCrypt 键盘布局为标准的美国键盘布局。\n\n说明:在 Windows 启动前的启动验证里需要输入密码,此时非美国标准键盘布局不可用。因此,密码必须使用标准的美国键盘布局输入。</string>
@@ -1290,6 +1303,7 @@
     <string lang="zh-cn" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">警告:此设置可能会降低性能。\n\n您确认要使用该设置吗?</string>
     <string lang="zh-cn" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">警告:VeraCrypt 加密卷已自动卸载</string>
     <string lang="zh-cn" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">在您物理卸载或关闭连接到已加载的加密卷前,您应当总是先在 VeraCrypt 中卸载它。\n\n意外发生的卸载通常是由于线缆、驱动器(附件)等导致的。</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="zh-cn" key="TEST">测试</string>
     <string lang="zh-cn" key="KEYFILE">密钥文件</string>
     <string lang="zh-cn" key="VKEY_08">Backspace</string>
diff --git a/Translations/Language.zh-hk.xml b/Translations/Language.zh-hk.xml
index 3de528d..0321f19 100644
--- a/Translations/Language.zh-hk.xml
+++ b/Translations/Language.zh-hk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="zh-hk" name="繁體中文" en-name="Chinese (Hong Kong)" version="0.1.0" translators="PUN Chi Ho" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="zh-hk" key="IDC_QUICKFORMAT">快速格式化</control>
     <control lang="zh-hk" key="IDC_SHOW_PASSWORD">顯示密碼(&D)</control>
     <control lang="zh-hk" key="IDC_SHOW_PASSWORD_SINGLE">顯示密碼(&D)</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="zh-hk" key="IDC_SINGLE_BOOT">單系統</control>
     <control lang="zh-hk" key="IDC_STD_VOL">標準 VeraCrypt 加密卷</control>
     <control lang="zh-hk" key="IDC_SYSENC_HIDDEN">隱藏(&D)</control>
@@ -98,6 +99,7 @@
     <control lang="zh-hk" key="IDT_SYSENC_KEYS_GEN_INFO">密鑰、要素、以及其他資料已被成功生成。如果您希望生成新的密鑰,請點擊 '後退' 然後點擊 '下一步' 按鈕。否則點擊 '下一步' 按鈕繼續。</control>
     <control lang="zh-hk" key="IDT_SYS_DEVICE">加密 Windows 系統所在的 分區/驅動器。加密後,任何人想要訪問和使用這個系統、讀寫檔等,都需每次在 Windows 啟動前輸入正確的密碼。也可以選擇創建一個隱形的作業系統。</control>
     <control lang="zh-hk" key="IDT_SYS_PARTITION">選擇此選項,以加密您當前 Windows 作業系統所安裝的分區。</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="zh-hk" key="IDT_WIPE_MODE">擦除模式:</control>
     <control lang="zh-hk" key="IDCLOSE">關閉</control>
     <control lang="zh-hk" key="IDC_ALLOW_ESC_PBA_BYPASS">允許按下 Esc 按鍵跳過啟動驗證(啟用啟動管理器)(&A)</control>
@@ -111,6 +113,7 @@
     <control lang="zh-hk" key="IDC_CACHE">在記憶體中緩存密碼和密鑰檔(&A)</control>
     <control lang="zh-hk" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">沒有加密卷被載入時退出</control>
     <control lang="zh-hk" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">在有加密卷成功載入後關閉口權杖會話(登出)(&C)</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="zh-hk" key="IDC_COPY_WIZARD">包含 VeraCrypt 加密卷創建嚮導</control>
     <control lang="zh-hk" key="IDC_CREATE">創建</control>
     <control lang="zh-hk" key="IDC_CREATE_VOLUME">創建加密卷(&C)</control>
@@ -271,6 +274,8 @@
     <control lang="zh-hk" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">在啟動驗證螢幕顯示下面自定義資訊(最多 24 個字元):</control>
     <control lang="zh-hk" key="IDT_DEFAULT_MOUNT_OPTIONS">默認載入選項</control>
     <control lang="zh-hk" key="IDT_DISMOUNT_ACTION">熱鍵設置</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="zh-hk" key="IDT_FAVORITE_LABEL">所選收藏加密卷的標籤:</control>
     <control lang="zh-hk" key="IDT_FILE_SETTINGS">檔選項</control>
     <control lang="zh-hk" key="IDT_HOTKEY_KEY">要分配的熱鍵:</control>
@@ -537,6 +542,15 @@
     <string lang="zh-hk" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">注意:如果您要安全的從迷惑作業系統向隱形作業系統中傳送檔,請遵循以下步驟: 1)啟動迷惑作業系統。 2)保存這些檔到未加密的卷或者是 VeraCrypt 外層/常規加密卷。 3)啟動隱形作業系統。 4)如果是把檔保存到 VeraCrypt 加密卷,則載入這個加密卷(該加密卷會自動以唯讀模式載入)。 5)複製這些檔到隱行作業系統的分區或者是其他隱藏加密卷。</string>
     <string lang="zh-hk" key="CONFIRM_RESTART">您的電腦必須重啟。\n\n您希望現在重啟電腦嗎?</string>
     <string lang="zh-hk" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">獲取系統加密狀態時出錯。</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="zh-hk" key="INIT_SYS_ENC">不能初始化用於系統加密的程式元件。</string>
     <string lang="zh-hk" key="INIT_RAND">初始化亂數據生成器失敗!</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -647,6 +661,7 @@
     <string lang="zh-hk" key="SELECT_KEYFILE">選擇密鑰檔</string>
     <string lang="zh-hk" key="SELECT_KEYFILE_PATH">選擇密鑰檔的搜索路徑。警告:注意,記憶的只是路徑,而不會記憶檔案名!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="zh-hk" key="SERPENT_HELP">Serpent 為與 AES 競爭演算法中的一種。設計者為 Ross Anderson、Eli Biham、和 Lars Knudsen。發表於 1998 年。256 位密鑰,128 位元資料塊,操作模式為 XTS。</string>
     <string lang="zh-hk" key="SIZE_HELP">請指定要創建的加密卷的大小。\n\n如果您打算創建一個動態的(稀疏檔)容器,該參數對應於該容器的最大容量。\n\n注意:最小的 FAT 加密卷大小為 292 KB。最小的 NTFS 加密卷大小為 3792 KB。</string>
     <string lang="zh-hk" key="SIZE_HELP_HIDDEN_HOST_VOL">請指定要創建的外層加密卷的大小(隨後將在其內創建隱藏加密卷)。包含隱藏卷的外層加密卷最小可能容量為 340 KB。</string>
@@ -1033,7 +1048,6 @@
     <string lang="zh-hk" key="INCONSISTENCY_RESOLVED">發現不一致性。\n\n\n(如果您使用此鏈結報告這個錯誤,請在報告中包含下面資訊: %hs)</string>
     <string lang="zh-hk" key="UNEXPECTED_STATE">錯誤:未知狀態。\n\n\n(如果您報告與之相關的 BUG,請在錯誤報告裏面包含下面的技術資訊: %hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="zh-hk" key="NOTHING_TO_RESUME">沒有可以繼續的進程/任務。</string>
     <string lang="zh-hk" key="HIDVOL_PROT_BKG_TASK_WARNING">警告: VeraCrypt 後臺任務已禁用。在您退出 VeraCrypt 後,如果對隱藏加密卷的損壞企圖已被保護,您也將無法得到提示。\n\n注意:您可以隨時在通過右鍵單擊 VeraCrypt 的通知欄圖示並 選擇“退出”來停止後臺任務。\n\n\n您要啟用 VeraCrypt 後臺任務嗎?</string>
     <string lang="zh-hk" key="LANG_PACK_VERSION">語言包版本: %s</string>
     <string lang="zh-hk" key="CHECKING_FS">正在檢測載入為 %hs 的 VeraCrypt 加密卷的檔系統...</string>
@@ -1085,8 +1099,7 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="zh-hk" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">密鑰檔當前不支援用在系統加密中。</string>
     <string lang="zh-hk" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">警告:VeraCrypt 不能存儲原始鍵盤佈局。這可能導致您無法正確輸入密碼。</string>
     <string lang="zh-hk" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">錯誤:不能設置 VeraCrypt 鍵盤佈局為標準的美國鍵盤佈局。\n\n說明:在 Windows 啟動前的啟動驗證裏需要輸入密碼,此時非美國標準鍵盤佈局不可用。因此,密碼必須使用標準的美國鍵盤佈局輸入。</string>
@@ -1290,6 +1303,7 @@
     <string lang="zh-hk" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">警告:此設置可能會降低性能。\n\n您確認要使用該設置嗎?</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="zh-hk" key="TEST">測試</string>
     <string lang="zh-hk" key="KEYFILE">密鑰文件</string>
     <string lang="zh-hk" key="VKEY_08">Backspace</string>
diff --git a/Translations/Language.zh-tw.xml b/Translations/Language.zh-tw.xml
index f22a932..e1db110 100644
--- a/Translations/Language.zh-tw.xml
+++ b/Translations/Language.zh-tw.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.12">
+  <localization prog-version="1.14">
     <!-- Languages -->
     <language langid="zh-tw" name="繁體中文" en-name="Chinese (Taiwan)" version="0.1.0" translators="Barney Li, Simon Ma, ChangMing Hsu" />
     <!-- Fonts -->
@@ -62,6 +62,7 @@
     <control lang="zh-tw" key="IDC_QUICKFORMAT">快速格式化</control>
     <control lang="zh-tw" key="IDC_SHOW_PASSWORD">顯示密碼(&D)</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&Display password</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="zh-tw" key="IDC_SINGLE_BOOT">單一系統開機</control>
     <control lang="zh-tw" key="IDC_STD_VOL">標準 VeraCrypt 加密區</control>
     <control lang="en" key="IDC_SYSENC_HIDDEN">Hi&dden</control>
@@ -96,6 +97,7 @@
     <control lang="zh-tw" key="IDT_SYSENC_KEYS_GEN_INFO">金鑰、salt 值、以及其他資料已經成功產生。如果您希望產生新的金鑰,請點 '上一步' 然後點 '下一步' 。否則點 '下一步' 繼續。</control>
     <control lang="en" key="IDT_SYS_DEVICE">Encrypts the partition/drive where Windows is installed. Anyone who wants to gain access and use the system, read and write files, etc., will need to enter the correct password each time before Windows boots. Optionally, creates a hidden system.</control>
     <control lang="en" key="IDT_SYS_PARTITION">Select this option to encrypt the partition where the currently running Windows operating system is installed.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="zh-tw" key="IDT_WIPE_MODE">清除模式:</control>
     <control lang="zh-tw" key="IDCLOSE">關閉</control>
     <control lang="en" key="IDC_ALLOW_ESC_PBA_BYPASS">Allow pre-boot &authentication to be bypassed by pressing the Esc key (enables boot manager)</control>
@@ -109,6 +111,7 @@
     <control lang="zh-tw" key="IDC_CACHE">在記憶體中快取密碼和金鑰檔(&A)</control>
     <control lang="zh-tw" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">無掛載的加密區時結束</control>
     <control lang="en" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Close token session (log out) after a volume is successfully mounted</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="zh-tw" key="IDC_COPY_WIZARD">包含 VeraCrypt 加密區建立精靈</control>
     <control lang="zh-tw" key="IDC_CREATE">建立</control>
     <control lang="zh-tw" key="IDC_CREATE_VOLUME">建立加密區(&C)</control>
@@ -269,6 +272,8 @@
     <control lang="en" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Display this custom message in the pre-boot authentication screen (24 characters maximum):</control>
     <control lang="zh-tw" key="IDT_DEFAULT_MOUNT_OPTIONS">預設掛載選項</control>
     <control lang="zh-tw" key="IDT_DISMOUNT_ACTION">快速鍵設定</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="en" key="IDT_FAVORITE_LABEL">Label of selected favorite volume:</control>
     <control lang="zh-tw" key="IDT_FILE_SETTINGS">檔案設定</control>
     <control lang="zh-tw" key="IDT_HOTKEY_KEY">要指定的快速鍵:</control>
@@ -535,6 +540,15 @@
     <string lang="en" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Note: If you need to securely transfer files from the decoy system to the hidden system, follow these steps:\n1) Start the decoy system.\n2) Save the files to an unencrypted volume or to an outer/normal VeraCrypt volume.\n3) Start the hidden system.\n4) If you saved the files to a VeraCrypt volume, mount it (it will be automatically mounted as read-only).\n5) Copy the files to the hidden system partition or to another hid [...]
     <string lang="zh-tw" key="CONFIRM_RESTART">您的電腦必須重新啟動。\n\n您希望現在重新啟動電腦嗎?</string>
     <string lang="zh-tw" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">取得系統加密狀態時出錯。</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
     <string lang="zh-tw" key="INIT_SYS_ENC">不能初始化用於系統加密的應用程式元件。</string>
     <string lang="zh-tw" key="INIT_RAND">初始化亂數資料產生器失敗!</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
@@ -645,6 +659,7 @@
     <string lang="zh-tw" key="SELECT_KEYFILE">選擇金鑰檔</string>
     <string lang="zh-tw" key="SELECT_KEYFILE_PATH">選擇金鑰檔的搜索路徑。警告:要注意記憶的只是路徑,而不會記憶檔案名!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="zh-tw" key="SERPENT_HELP">設計者為 Ross Anderson、Eli Biham、和 Lars Knudsen。發表於 1998 年。256 位金鑰,128 位元資料塊。操作模式為 XTS。Serpent 為與 AES 候選演算法中的一種。</string>
     <string lang="en" key="SIZE_HELP">Please specify the size of the container you want to create.\n\nIf you create a dynamic (sparse-file) container, this parameter will specify its maximum possible size.\n\nNote that the minimum possible size of a FAT volume is 292 KB. The minimum possible size of an NTFS volume is 3792 KB.</string>
     <string lang="en" key="SIZE_HELP_HIDDEN_HOST_VOL">Please specify the size of the outer volume to be created (you will first create the outer volume and then a hidden volume within it). The minimum possible size of a volume within which a hidden volume is intended to be created is 340 KB.</string>
@@ -1031,7 +1046,6 @@
     <string lang="zh-tw" key="INCONSISTENCY_RESOLVED">解決不一致性。\n\n\n(如果您報告錯誤與這個有關,請在報告中包含下面技術訊息: %hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' > 'Resume Interrupted Process'.</string>
-    <string lang="zh-tw" key="NOTHING_TO_RESUME">沒有可以恢復的操作/工作。</string>
     <string lang="zh-tw" key="HIDVOL_PROT_BKG_TASK_WARNING">警告:VeraCrypt 背景工作已停用。在您結束 VeraCrypt 後,如果對隱藏加密區的損壞被阻止時,您也將無法得到提示。\n\n注意:您可以隨時在 VeraCrypt 的圖示按右鍵並選擇 "結束" 來停止背景工作。\n\n\n您要啟用 VeraCrypt 背景工作嗎?</string>
     <string lang="zh-tw" key="LANG_PACK_VERSION">語言檔案版本: %s</string>
     <string lang="zh-tw" key="CHECKING_FS">正在檢測掛載為 %hs 的 VeraCrypt 加密區的檔案系統...</string>
@@ -1083,15 +1097,14 @@
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
     <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
     <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
-    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
-    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>    
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="zh-tw" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">>警告:VeraCrypt 不能回復原始鍵盤配置。這可能導致您輸入不正確的密碼。</string>
     <string lang="zh-tw" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">錯誤:不能設定 VeraCrypt 鍵盤配置為標準美式鍵盤配置。\n\n要注意在啟動前置環境(Windows 啟動前)需要輸入密碼,這時非標準美式鍵盤配置是無法使用的。因此,密碼必須總是使用標準美式鍵盤配置輸入。</string>
     <string lang="zh-tw" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">由於 VeraCrypt 暫時改變鍵盤配置為標準美式鍵盤配置,目前在按下右 ALT 鍵的情況下是不可能經由按鍵盤輸入字元。然而,您可以在按下 Shift 鍵的時候經由按適當鍵輸入大多數的字元。</string>
     <string lang="zh-tw" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCrypt 阻止了對鍵盤配置的修改</string>
     <string lang="zh-tw" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">注意:在啟動前置環境(Windows 啟動前)需要輸入密碼,這時非標準美式鍵盤配置是無法使用的。因此,密碼必須總是使用標準美式鍵盤配置輸入。然而,重要的是要注意您不需要真的使用美式鍵盤。VeraCrypt 在您沒有真的美式鍵盤的情況下也能夠自動的保證您能夠安全的輸入密碼(現在和在啟動前置環境)。</string>
-    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (TRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the TRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the TRD allows you to permanently decrypt the partition/drive before Windows  [...]
+    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (VRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the VRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the VRD allows you to permanently decrypt the partition/drive before Windows  [...]
     <string lang="en" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">After you click OK, Microsoft Windows Disc Image Burner will be launched. Please use it to burn the VeraCrypt Rescue Disk ISO image to a CD or DVD.\n\nAfter you do so, return to the VeraCrypt Volume Creation Wizard and follow its instructions.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn it to a CD or DVD.\n\n%lsAfter you burn the Rescue Disk, click Next to verify that it has been correctly burned.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you should either burn the image to a CD/DVD or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
@@ -1288,6 +1301,7 @@
     <string lang="en" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">WARNING: This setting may degrade performance.\n\nAre you sure you want to use this setting?</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</string>
     <string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="zh-tw" key="TEST">測試</string>
     <string lang="zh-tw" key="KEYFILE">金鑰檔案</string>
     <string lang="zh-tw" key="VKEY_08">Backspace</string>
diff --git a/src/Boot/Windows/BootCommon.h b/src/Boot/Windows/BootCommon.h
index 1b4ceaa..cb81145 100644
--- a/src/Boot/Windows/BootCommon.h
+++ b/src/Boot/Windows/BootCommon.h
@@ -17,7 +17,7 @@
 #include "BootDefs.h"
 
 // The user will be advised to upgrade the rescue disk if upgrading from the following or any previous version
-#define TC_RESCUE_DISK_UPGRADE_NOTICE_MAX_VERSION 0x0111
+#define TC_RESCUE_DISK_UPGRADE_NOTICE_MAX_VERSION 0x0113
 
 #define TC_BOOT_LOADER_AREA_SIZE (TC_BOOT_LOADER_AREA_SECTOR_COUNT * TC_SECTOR_SIZE_BIOS)
 
diff --git a/src/Boot/Windows/BootDefs.h b/src/Boot/Windows/BootDefs.h
index 8511d4c..dfcee6c 100644
--- a/src/Boot/Windows/BootDefs.h
+++ b/src/Boot/Windows/BootDefs.h
@@ -14,7 +14,11 @@
 #define TC_HEADER_Boot_BootDefs
 
 // Total memory required (CODE + DATA + BSS + STACK + 0x100) in KBytes - determined from linker map.
-#define TC__BOOT_MEMORY_REQUIRED	42
+#ifdef TC_WINDOWS_BOOT_RESCUE_DISK_MODE
+	#define TC__BOOT_MEMORY_REQUIRED	44
+#else
+	#define TC__BOOT_MEMORY_REQUIRED	42
+#endif
 
 #ifdef TC_WINDOWS_BOOT_SINGLE_CIPHER_MODE
 #	undef TC__BOOT_MEMORY_REQUIRED
diff --git a/src/Boot/Windows/BootMain.cpp b/src/Boot/Windows/BootMain.cpp
index 264d443..173bdb8 100644
--- a/src/Boot/Windows/BootMain.cpp
+++ b/src/Boot/Windows/BootMain.cpp
@@ -64,7 +64,7 @@ static void PrintMainMenu ()
 		return;
 
 	Print ("    Keyboard Controls:\r\n");
-	Print ("    [F5]   Hide/Show Password\r\n");
+	Print ("    [F5]   Hide/Show Password and PIM\r\n");
 	Print ("    [Esc]  ");
 
 #ifndef TC_WINDOWS_BOOT_RESCUE_DISK_MODE
@@ -246,6 +246,10 @@ static byte AskPassword (Password &password, int& pim)
 			}
 			continue;
 
+		case TC_BIOS_KEY_F5:
+			hidePassword ^= 0x01;
+			continue;
+
 		default:
 			if (scanCode == TC_BIOS_KEY_ESC || IsMenuKey (scanCode))
 			{
@@ -265,7 +269,8 @@ static byte AskPassword (Password &password, int& pim)
 
 		pim = 10*pim + (asciiCode - '0');
 		pos++;
-
+		
+		if (hidePassword) asciiCode = '*';
 		if (pos < MAX_PIM)
 			PrintChar (asciiCode);
 		else
diff --git a/src/Boot/Windows/BootSector.asm b/src/Boot/Windows/BootSector.asm
index eb4418f..1e0df32 100644
--- a/src/Boot/Windows/BootSector.asm
+++ b/src/Boot/Windows/BootSector.asm
@@ -106,7 +106,7 @@ non_backup:
 	call checksum
 	
 	; Verify checksum
-	cmp ebx, dword ptr [start + TC_BOOT_SECTOR_LOADER_CHECKSUM_OFFSET]
+	cmp ebx, dword ptr [start + TC_BOOT_SECTOR_LOADER_CHECKSUM_OFFSET]	
 	je checksum_ok
 
 	; Checksum incorrect - try using backup if available
@@ -139,6 +139,7 @@ checksum_ok:
 	
 	; Decompress boot loader
 	mov cx, word ptr [start + TC_BOOT_SECTOR_LOADER_LENGTH_OFFSET]
+	sub cx, TC_GZIP_HEADER_SIZE
 	push cx																		; Compressed data size
 	push TC_BOOT_LOADER_COMPRESSED_BUFFER_OFFSET + TC_GZIP_HEADER_SIZE			; Compressed data
 	push TC_MAX_BOOT_LOADER_DECOMPRESSED_SIZE									; Output buffer size
@@ -234,7 +235,7 @@ checksum:
 backup_loader_used		db 0
 	
 disk_error_msg			db 'Disk error', 13, 10, 7, 0
-loader_damaged_msg		db 7, 'Loader damaged! Use Rescue Disk: Repair Options > Restore', 0
+loader_damaged_msg		db 7, 'Loader damaged! Repair with Rescue Disk', 0
 
 ORG 7C00h + 510
 	dw 0AA55h			; Boot sector signature
diff --git a/src/Boot/Windows/Makefile b/src/Boot/Windows/Makefile
index 43b0989..ff2610a 100644
--- a/src/Boot/Windows/Makefile
+++ b/src/Boot/Windows/Makefile
@@ -193,6 +193,10 @@ $(LIBS)
 	$(LD) $(LFLAGS) @$(PROJ).crf
 	del $(PROJ).crf $(PROJ).crf2
 
+# Compress the Rescue Disk botloader for Cascades and SHA2 since it is too big (size > 31232 bytes)
+!if DEFINED(RESCUE_DISK) && !DEFINED (SINGLE_CIPHER) && "$(SINGLE_PRF)" == "SHA2"
+	upx $(PROJ).$(TARGETEXT)
+!endif
 	gzip.exe -c -n --best $(PROJ).$(TARGETEXT) >$(PROJ).$(TARGETEXT).gz
 	-dd.exe conv=notrunc,sync bs=512 seek=5 if=$(PROJ).$(TARGETEXT).gz of=$(PROJ).flp 2>NUL:
 	cd ..
diff --git a/src/Build/Resources/MacOSX/Info.plist.xml b/src/Build/Resources/MacOSX/Info.plist.xml
index b56f07d..a495e8f 100644
--- a/src/Build/Resources/MacOSX/Info.plist.xml
+++ b/src/Build/Resources/MacOSX/Info.plist.xml
@@ -27,7 +27,7 @@
 	<string>TRUE</string>
 
 	<key>CFBundleVersion</key>
-	<string>1.12.22</string>
+	<string>1.14.15</string>
 
 	<key>CFBundleShortVersionString</key>
 	<string>_VERSION_</string>
diff --git a/src/Common/Apidrvr.h b/src/Common/Apidrvr.h
index 5419057..1fa2e39 100644
--- a/src/Common/Apidrvr.h
+++ b/src/Common/Apidrvr.h
@@ -109,6 +109,9 @@ typedef struct
 	uint32 BytesPerPhysicalSector;
 	int VolumePim;
 	int ProtectedHidVolPim;
+	wchar_t wszLabel[33]; // maximum label length is 32 for NTFS and 11 for FAT32
+	BOOL bIsNTFS; // output only
+	BOOL bDriverSetLabel;
 } MOUNT_STRUCT;
 
 typedef struct
@@ -123,6 +126,7 @@ typedef struct
 {
 	unsigned __int32 ulMountedDrives;	/* Bitfield of all mounted drive letters */
 	wchar_t wszVolume[26][TC_MAX_PATH];	/* Volume names of mounted volumes */
+	wchar_t wszLabel[26][33];	/* Labels of mounted volumes */
 	unsigned __int64 diskLength[26];
 	int ea[26];
 	int volumeType[26];	/* Volume type (e.g. PROP_VOL_TYPE_OUTER, PROP_VOL_TYPE_OUTER_VOL_WRITE_PREVENTED, etc.) */
@@ -149,6 +153,8 @@ typedef struct
 	int hiddenVolProtection;	/* Hidden volume protection status (e.g. HIDVOL_PROT_STATUS_NONE, HIDVOL_PROT_STATUS_ACTIVE, etc.) */
 	int volFormatVersion;
 	int volumePim;
+	wchar_t wszLabel[33];
+	BOOL bDriverSetLabel;
 } VOLUME_PROPERTIES_STRUCT;
 
 typedef struct
@@ -328,5 +334,6 @@ typedef struct
 #define TC_DRIVER_CONFIG_CACHE_BOOT_PASSWORD_FOR_SYS_FAVORITES		0x2
 #define TC_DRIVER_CONFIG_DISABLE_NONADMIN_SYS_FAVORITES_ACCESS		0x4
 #define TC_DRIVER_CONFIG_DISABLE_HARDWARE_ENCRYPTION				0x8
+#define TC_DRIVER_CONFIG_ENABLE_EXTENDED_IOCTL						0x10
 
 #endif		/* _WIN32 */
diff --git a/src/Common/BootEncryption.cpp b/src/Common/BootEncryption.cpp
index 40a36a9..cb13bd2 100644
--- a/src/Common/BootEncryption.cpp
+++ b/src/Common/BootEncryption.cpp
@@ -1742,18 +1742,20 @@ namespace VeraCrypt
 #endif
 
 
-	bool BootEncryption::IsCDDrivePresent ()
+	bool BootEncryption::IsCDRecorderPresent ()
 	{
-		for (char drive = 'Z'; drive >= 'C'; --drive)
-		{
-			string path = "X:\\";
-			path[0] = drive;
+		ICDBurn* pICDBurn;
+		BOOL bHasRecorder = FALSE;
 
-			if (GetDriveType (path.c_str()) == DRIVE_CDROM)
-				return true;
+		if (SUCCEEDED( CoCreateInstance (CLSID_CDBurn, NULL,CLSCTX_INPROC_SERVER,IID_ICDBurn,(LPVOID*)&pICDBurn)))
+		{
+			if (pICDBurn->HasRecordableDrive (&bHasRecorder) != S_OK)
+			{
+				bHasRecorder = FALSE;
+			}
+			pICDBurn->Release();
 		}
-
-		return false;
+		return bHasRecorder? true : false;
 	}
 
 
@@ -1766,20 +1768,26 @@ namespace VeraCrypt
 		{
 			try
 			{
-				string path = "X:";
-				path[0] = drive;
+				char rootPath[4] = { drive, ':', '\\', 0};
+				UINT driveType = GetDriveTypeA (rootPath);
+				// check that it is a CD/DVD drive or a removable media in case a bootable
+				// USB key was created from the rescue disk ISO file
+				if ((DRIVE_CDROM == driveType) || (DRIVE_REMOVABLE == driveType)) 
+				{
+					rootPath[2] = 0; // remove trailing backslash
 
-				Device driveDevice (path, true);
-				driveDevice.CheckOpened (SRC_POS);
-				size_t verifiedSectorCount = (TC_CD_BOOTSECTOR_OFFSET + TC_ORIG_BOOT_LOADER_BACKUP_SECTOR_OFFSET + TC_BOOT_LOADER_AREA_SIZE) / 2048;
-				Buffer buffer ((verifiedSectorCount + 1) * 2048);
+					Device driveDevice (rootPath, true);
+					driveDevice.CheckOpened (SRC_POS);
+					size_t verifiedSectorCount = (TC_CD_BOOTSECTOR_OFFSET + TC_ORIG_BOOT_LOADER_BACKUP_SECTOR_OFFSET + TC_BOOT_LOADER_AREA_SIZE) / 2048;
+					Buffer buffer ((verifiedSectorCount + 1) * 2048);
 
-				DWORD bytesRead = driveDevice.Read (buffer.Ptr(), (DWORD) buffer.Size());
-				if (bytesRead != buffer.Size())
-					continue;
+					DWORD bytesRead = driveDevice.Read (buffer.Ptr(), (DWORD) buffer.Size());
+					if (bytesRead != buffer.Size())
+						continue;
 
-				if (memcmp (buffer.Ptr(), RescueIsoImage, buffer.Size()) == 0)
-					return true;
+					if (memcmp (buffer.Ptr(), RescueIsoImage, buffer.Size()) == 0)
+						return true;
+				}
 			}
 			catch (...) { }
 		}
@@ -1787,6 +1795,31 @@ namespace VeraCrypt
 		return false;
 	}
 
+	bool BootEncryption::VerifyRescueDiskIsoImage (const char* imageFile)
+	{
+		if (!RescueIsoImage)
+			throw ParameterIncorrect (SRC_POS);
+
+		try
+		{
+			File isoFile (imageFile, true);
+			isoFile.CheckOpened (SRC_POS);
+			size_t verifiedSectorCount = (TC_CD_BOOTSECTOR_OFFSET + TC_ORIG_BOOT_LOADER_BACKUP_SECTOR_OFFSET + TC_BOOT_LOADER_AREA_SIZE) / 2048;
+			Buffer buffer ((verifiedSectorCount + 1) * 2048);
+
+			DWORD bytesRead = isoFile.Read (buffer.Ptr(), (DWORD) buffer.Size());
+			if (	(bytesRead == buffer.Size()) 
+				&& (memcmp (buffer.Ptr(), RescueIsoImage, buffer.Size()) == 0)
+				)
+			{
+				return true;
+			}
+		}
+		catch (...) { }
+
+		return false;
+	}
+
 
 #ifndef SETUP
 
@@ -2017,6 +2050,7 @@ namespace VeraCrypt
 	{
 		SC_HANDLE scm = OpenSCManager (NULL, NULL, SC_MANAGER_ALL_ACCESS);
 		throw_sys_if (!scm);
+		finally_do_arg (SC_HANDLE, scm, { CloseServiceHandle (finally_arg); });
 
 		string servicePath = GetServiceConfigPath (TC_APP_NAME ".exe", false);
 		string serviceLegacyPath = GetServiceConfigPath (TC_APP_NAME ".exe", true);
@@ -2099,6 +2133,39 @@ namespace VeraCrypt
 		}
 	}
 
+	void BootEncryption::UpdateSystemFavoritesService ()
+	{
+		SC_HANDLE scm = OpenSCManager (NULL, NULL, SC_MANAGER_ALL_ACCESS);
+		throw_sys_if (!scm);
+
+		finally_do_arg (SC_HANDLE, scm, { CloseServiceHandle (finally_arg); });
+
+		string servicePath = GetServiceConfigPath (TC_APP_NAME ".exe", false);
+
+		// check if service exists
+		SC_HANDLE service = OpenService (scm, TC_SYSTEM_FAVORITES_SERVICE_NAME, SERVICE_ALL_ACCESS);
+		if (service)
+		{
+			// ensure that its parameters are correct
+			throw_sys_if (!ChangeServiceConfig (service,
+				SERVICE_WIN32_OWN_PROCESS,
+				SERVICE_AUTO_START,
+				SERVICE_ERROR_NORMAL,
+				(string ("\"") + servicePath + "\" " TC_SYSTEM_FAVORITES_SERVICE_CMDLINE_OPTION).c_str(),
+				TC_SYSTEM_FAVORITES_SERVICE_LOAD_ORDER_GROUP,
+				NULL,
+				NULL,
+				NULL,
+				NULL,
+				TC_APP_NAME " System Favorites"));
+
+		}
+		else
+		{
+			RegisterSystemFavoritesService (TRUE, TRUE);
+		}
+	}
+
 	void BootEncryption::SetDriverConfigurationFlag (uint32 flag, bool state)
 	{
 		DWORD configMap = ReadDriverConfigurationFlags();
diff --git a/src/Common/BootEncryption.h b/src/Common/BootEncryption.h
index cceaa11..1dbba90 100644
--- a/src/Common/BootEncryption.h
+++ b/src/Common/BootEncryption.h
@@ -174,7 +174,7 @@ namespace VeraCrypt
 		void InstallBootLoader (bool preserveUserConfig = false, bool hiddenOSCreation = false);
 		bool CheckBootloaderFingerprint (bool bSilent = false);
 		void InvalidateCachedSysDriveProperties ();
-		bool IsCDDrivePresent ();
+		bool IsCDRecorderPresent ();
 		bool IsHiddenSystemRunning ();
 		bool IsPagingFileActive (BOOL checkNonWindowsPartitionsOnly);
 		void PrepareHiddenOSCreation (int ea, int mode, int pkcs5);
@@ -186,6 +186,7 @@ namespace VeraCrypt
 		void RegisterFilterDriver (bool registerDriver, FilterType filterType);
 		void RegisterSystemFavoritesService (BOOL registerService);
 		void RegisterSystemFavoritesService (BOOL registerService, BOOL noFileHandling);
+		void UpdateSystemFavoritesService ();
 		void RenameDeprecatedSystemLoaderBackup ();
 		bool RestartComputer (void);
 		void InitialSecurityChecksForHiddenOS ();
@@ -202,6 +203,7 @@ namespace VeraCrypt
 		bool SystemPartitionCoversWholeDrive ();
 		bool SystemDriveIsDynamic ();
 		bool VerifyRescueDisk ();
+		bool VerifyRescueDiskIsoImage (const char* imageFile);
 		void WipeHiddenOSCreationConfig ();
 		void WriteBootDriveSector (uint64 offset, byte *data);
 		void WriteBootSectorConfig (const byte newConfig[]);
diff --git a/src/Common/Common.h b/src/Common/Common.h
index 1d01ee9..c792e1d 100644
--- a/src/Common/Common.h
+++ b/src/Common/Common.h
@@ -81,6 +81,7 @@ typedef struct
 	BOOL RecoveryMode;
 	int ProtectedHidVolPkcs5Prf;
 	int ProtectedHidVolPim;
+	wchar_t Label[33]; /* maximum label length is 32 for NTFS and 11 for FAT32 */
 } MountOptions;
 
 #endif
diff --git a/src/Common/Common.rc b/src/Common/Common.rc
index 652b407..3f80805 100644
--- a/src/Common/Common.rc
+++ b/src/Common/Common.rc
@@ -65,7 +65,7 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,248,190,50,14
 END
 
-IDD_MOUNT_OPTIONS DIALOGEX 0, 0, 277, 224
+IDD_MOUNT_OPTIONS DIALOGEX 0, 0, 277, 231
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "VeraCrypt - Mount Options"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
@@ -78,22 +78,24 @@ BEGIN
     CONTROL         "Mount partition &using system encryption without pre-boot authentication",IDC_MOUNT_SYSENC_PART_WITHOUT_PBA,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,53,259,11
     CONTROL         "&Protect hidden volume against damage caused by writing to outer volume",IDC_PROTECT_HIDDEN_VOL,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,86,252,10
-    EDITTEXT        IDC_PASSWORD_PROT_HIDVOL,112,104,151,14,ES_PASSWORD | ES_AUTOHSCROLL
-    COMBOBOX        IDC_PKCS5_PRF_ID,112,125,91,90,CBS_DROPDOWNLIST | WS_TABSTOP
-    EDITTEXT        IDC_PIM,112,145,42,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER | NOT WS_VISIBLE
-    LTEXT           "(Empty or 0 for default iterations)",IDC_PIM_HELP,158,148,112,8,NOT WS_VISIBLE
-    CONTROL         "&Display password",IDC_SHOW_PASSWORD_MO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,165,90,10
-    CONTROL         "U&se keyfiles",IDC_KEYFILES_ENABLE_HIDVOL_PROT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,178,90,10
-    PUSHBUTTON      "&Keyfiles...",IDC_KEYFILES_HIDVOL_PROT,204,174,60,14
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,97,252,10
+    EDITTEXT        IDC_PASSWORD_PROT_HIDVOL,112,115,151,14,ES_PASSWORD | ES_AUTOHSCROLL
+    COMBOBOX        IDC_PKCS5_PRF_ID,112,136,91,90,CBS_DROPDOWNLIST | WS_TABSTOP
+    EDITTEXT        IDC_PIM,112,156,42,14,ES_RIGHT | ES_PASSWORD | ES_AUTOHSCROLL | ES_NUMBER | NOT WS_VISIBLE
+    LTEXT           "(Empty or 0 for default iterations)",IDC_PIM_HELP,158,159,112,8,NOT WS_VISIBLE
+    CONTROL         "&Display password",IDC_SHOW_PASSWORD_MO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,174,90,10
+    CONTROL         "U&se keyfiles",IDC_KEYFILES_ENABLE_HIDVOL_PROT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,187,90,10
+    PUSHBUTTON      "&Keyfiles...",IDC_KEYFILES_HIDVOL_PROT,204,183,60,14
     DEFPUSHBUTTON   "OK",IDOK,211,7,60,14
     PUSHBUTTON      "Cancel",IDCANCEL,211,24,60,14
-    LTEXT           "What is hidden volume protection?",IDC_LINK_HIDVOL_PROTECTION_INFO,16,193,247,10,SS_NOTIFY
-    RTEXT           "P&assword to hidden volume:\n(if empty, cache is used)",IDT_HIDDEN_PROT_PASSWD,15,103,91,17,0,WS_EX_RIGHT
-    GROUPBOX        "Hidden Volume Protection",IDT_HIDDEN_VOL_PROTECTION,6,72,265,139
-    RTEXT           "PKCS-5 PRF:",IDT_PKCS5_PRF,15,126,91,17
-    RTEXT           "Volume PIM:",IDT_PIM,15,148,91,17,NOT WS_VISIBLE
-    CONTROL         "Use PIM",IDC_PIM_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,152,97,10
+    LTEXT           "What is hidden volume protection?",IDC_LINK_HIDVOL_PROTECTION_INFO,16,202,247,10,SS_NOTIFY
+    RTEXT           "P&assword to hidden volume:\n(if empty, cache is used)",IDT_HIDDEN_PROT_PASSWD,15,114,91,17,0,WS_EX_RIGHT
+    GROUPBOX        "Hidden Volume Protection",IDT_HIDDEN_VOL_PROTECTION,6,83,265,136
+    RTEXT           "PKCS-5 PRF:",IDT_PKCS5_PRF,15,137,91,17
+    RTEXT           "Volume PIM:",IDT_PIM,15,159,91,17,NOT WS_VISIBLE
+    CONTROL         "Use PIM",IDC_PIM_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,161,97,10
+    LTEXT           "Volume Label in Windows:",IDT_VOLUME_LABEL,12,70,95,8
+    EDITTEXT        IDC_VOLUME_LABEL,112,67,150,14,ES_AUTOHSCROLL
 END
 
 IDD_KEYFILES DIALOGEX 0, 0, 345, 237
@@ -180,7 +182,7 @@ BEGIN
     RTEXT           "",IDC_TESTS_MESSAGE,50,213,178,10
     CONTROL         "",IDC_REDTICK,"VCREDTICK",0x0,234,214,10,8
     RTEXT           "Key size:",IDT_KEY,8,57,56,8
-    RTEXT           "Plaintext size:",IDT_PLAINTEXT,190,153,63,8
+    RTEXT           "Plaintext size:",IDT_PLAINTEXT,174,153,79,8
     LTEXT           "bits",IDT_KEY_UNIT,114,57,45,8
     RTEXT           "Cipher:",IDT_CIPHER,38,13,68,8
     LTEXT           "bits",IDT_PLAINTEXT_SIZE_UNIT,298,153,22,8
@@ -352,7 +354,7 @@ BEGIN
     BEGIN
         LEFTMARGIN, 7
         TOPMARGIN, 7
-        BOTTOMMARGIN, 218
+        BOTTOMMARGIN, 225
     END
 
     IDD_KEYFILES, DIALOG
diff --git a/src/Common/Crypto.c b/src/Common/Crypto.c
index 357f7b8..4008e57 100644
--- a/src/Common/Crypto.c
+++ b/src/Common/Crypto.c
@@ -450,8 +450,8 @@ int EAGetByName (char *name)
 
 	do
 	{
-		EAGetName (n, ea, 0);
-		if (strcmp (n, name) == 0)
+		EAGetName (n, ea, 1);
+		if (_stricmp (n, name) == 0)
 			return ea;
 	}
 	while (ea = EAGetNext (ea));
diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c
index 23fbcd6..d72d914 100644
--- a/src/Common/Dlgcode.c
+++ b/src/Common/Dlgcode.c
@@ -88,6 +88,8 @@ HFONT hUserUnderlineBoldFont = NULL;
 
 HFONT WindowTitleBarFont;
 
+WCHAR EditPasswordChar = 0;
+
 int ScreenDPI = USER_DEFAULT_SCREEN_DPI;
 double DPIScaleFactorX = 1;
 double DPIScaleFactorY = 1;
@@ -132,6 +134,8 @@ BOOL MountVolumesAsSystemFavorite = FALSE;
 BOOL FavoriteMountOnArrivalInProgress = FALSE;
 BOOL MultipleMountOperationInProgress = FALSE;
 
+BOOL WaitDialogDisplaying = FALSE;
+
 /* Handle to the device driver */
 HANDLE hDriver = INVALID_HANDLE_VALUE;
 
@@ -873,7 +877,7 @@ static LRESULT CALLBACK BootPwdFieldProc (HWND hwnd, UINT message, WPARAM wParam
 		return 1;
 	}
 
-	return CallWindowProc (wp, hwnd, message, wParam, lParam);
+	return CallWindowProcW (wp, hwnd, message, wParam, lParam);
 }
 
 
@@ -884,8 +888,8 @@ void ToBootPwdField (HWND hwndDlg, UINT ctrlId)
 {
 	HWND hwndCtrl = GetDlgItem (hwndDlg, ctrlId);
 
-	SetWindowLongPtr (hwndCtrl, GWLP_USERDATA, (LONG_PTR) GetWindowLongPtr (hwndCtrl, GWLP_WNDPROC));
-	SetWindowLongPtr (hwndCtrl, GWLP_WNDPROC, (LONG_PTR) BootPwdFieldProc);
+	SetWindowLongPtrW (hwndCtrl, GWLP_USERDATA, (LONG_PTR) GetWindowLongPtrW (hwndCtrl, GWLP_WNDPROC));
+	SetWindowLongPtrW (hwndCtrl, GWLP_WNDPROC, (LONG_PTR) BootPwdFieldProc);
 }
 
 
@@ -2419,8 +2423,21 @@ void InitApp (HINSTANCE hInstance, char *lpszCommandLine)
 	SetPreferredLangId (ConfigReadString ("Language", "", langId, sizeof (langId)));
 	
 	if (langId[0] == 0)
-		DialogBoxParamW (hInst, MAKEINTRESOURCEW (IDD_LANGUAGE), NULL,
-			(DLGPROC) LanguageDlgProc, (LPARAM) 1);
+	{
+		if (IsNonInstallMode ())
+		{
+			// only support automatic use of a language file in portable mode
+			// this is achieved by placing a unique language XML file in the same
+			// place as portable VeraCrypt binaries.
+			DialogBoxParamW (hInst, MAKEINTRESOURCEW (IDD_LANGUAGE), NULL,
+				(DLGPROC) LanguageDlgProc, (LPARAM) 1);
+		}
+		else
+		{
+			// when installed, force using English as default language
+			SetPreferredLangId ("en");
+		}
+	}
 
 	LoadLanguageFile ();
 
@@ -3214,7 +3231,8 @@ BOOL CALLBACK RawDevicesDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 #ifdef TCMOUNT
 				else
 				{
-					wstring favoriteLabel = GetFavoriteVolumeLabel (device.Path);
+					bool useInExplorer = false;
+					wstring favoriteLabel = GetFavoriteVolumeLabel (device.Path, useInExplorer);
 					if (!favoriteLabel.empty())
 						ListSubItemSetW (hList, item.iItem, 3, (wchar_t *) favoriteLabel.c_str());
 				}
@@ -3223,6 +3241,11 @@ BOOL CALLBACK RawDevicesDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 				item.iItem = line++;   
 			}
 
+			SendMessageW(hList, LVM_SETCOLUMNWIDTH, 0, MAKELPARAM(LVSCW_AUTOSIZE_USEHEADER, 0));
+			SendMessageW(hList, LVM_SETCOLUMNWIDTH, 1, MAKELPARAM(LVSCW_AUTOSIZE_USEHEADER, 0));
+			SendMessageW(hList, LVM_SETCOLUMNWIDTH, 2, MAKELPARAM(LVSCW_AUTOSIZE_USEHEADER, 0));
+			SendMessageW(hList, LVM_SETCOLUMNWIDTH, 3, MAKELPARAM(LVSCW_AUTOSIZE_USEHEADER, 0));
+
 			lpszFileName = pDlgParam->pszFileName;
 
 #ifdef VOLFORMAT
@@ -4342,6 +4365,58 @@ BOOL CloseVolumeExplorerWindows (HWND hwnd, int driveNo)
 	return explorerCloseSent;
 }
 
+BOOL UpdateDriveCustomLabel (int driveNo, wchar_t* effectiveLabel, BOOL bSetValue)
+{
+	wchar_t wszRegPath[MAX_PATH];
+	wchar_t driveStr[] = {L'A' + (wchar_t) driveNo, 0};
+	HKEY hKey;
+	LSTATUS lStatus;
+	DWORD cbLabelLen = (DWORD) ((wcslen (effectiveLabel) + 1) * sizeof (wchar_t));
+	BOOL bToBeDeleted = FALSE;
+
+	StringCbPrintfW (wszRegPath, sizeof (wszRegPath), L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\DriveIcons\\%s\\DefaultLabel", driveStr);	
+	
+	if (bSetValue)
+		lStatus = RegCreateKeyExW (HKEY_CURRENT_USER, wszRegPath, NULL, NULL, 0, 
+			KEY_READ | KEY_WRITE | KEY_SET_VALUE, NULL, &hKey, NULL);
+	else
+		lStatus = RegOpenKeyExW (HKEY_CURRENT_USER, wszRegPath, 0, KEY_READ | KEY_WRITE | KEY_SET_VALUE, &hKey);
+	if (ERROR_SUCCESS == lStatus)
+	{
+		if (bSetValue)
+			lStatus = RegSetValueExW (hKey, NULL, NULL, REG_SZ, (LPCBYTE) effectiveLabel, cbLabelLen);
+		else
+		{
+			wchar_t storedLabel[34] = {0};
+			DWORD cbStoredLen = sizeof (storedLabel) - 1, dwType;
+			lStatus = RegQueryValueExW (hKey, NULL, NULL, &dwType, (LPBYTE) storedLabel, &cbStoredLen);
+			if ((ERROR_SUCCESS == lStatus) && (REG_SZ == dwType) && (0 == wcscmp(storedLabel, effectiveLabel)))
+			{
+				// same label stored. mark key for deletion
+				bToBeDeleted = TRUE;
+			}
+		}
+		RegCloseKey (hKey);
+	}
+
+	if (bToBeDeleted)
+	{
+		StringCbPrintfW (wszRegPath, sizeof (wszRegPath), L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\DriveIcons\\%s", driveStr);	
+		lStatus = RegOpenKeyExW (HKEY_CURRENT_USER, wszRegPath, 0, KEY_READ | KEY_WRITE | KEY_SET_VALUE, &hKey);
+		if (ERROR_SUCCESS == lStatus)
+		{
+			lStatus = RegDeleteKeyW (hKey, L"DefaultLabel");
+			RegCloseKey (hKey);
+		}
+
+		// delete drive letter of nothing else is present under it
+		RegDeleteKeyW (HKEY_CURRENT_USER, wszRegPath);
+
+	}
+
+	return (ERROR_SUCCESS == lStatus)? TRUE : FALSE;
+}
+
 string GetUserFriendlyVersionString (int version)
 {
 	char szTmp [64];
@@ -4547,6 +4622,9 @@ static void DisplayBenchmarkResults (HWND hwndDlg)
 	}
 
 	SendMessageW(hList, LVM_SETCOLUMNWIDTH, 0, MAKELPARAM(LVSCW_AUTOSIZE_USEHEADER, 0));
+	SendMessageW(hList, LVM_SETCOLUMNWIDTH, 1, MAKELPARAM(LVSCW_AUTOSIZE_USEHEADER, 0));
+	SendMessageW(hList, LVM_SETCOLUMNWIDTH, 2, MAKELPARAM(LVSCW_AUTOSIZE_USEHEADER, 0));
+	SendMessageW(hList, LVM_SETCOLUMNWIDTH, 3, MAKELPARAM(LVSCW_AUTOSIZE_USEHEADER, 0));
 }
 
 // specific implementation for support of benchmark operation in wait dialog mechanism
@@ -6184,6 +6262,16 @@ BOOL CheckFileExtension (char *fileName)
 	return FALSE;
 }
 
+void CorrectFileName (char* fileName)
+{
+	/* replace '/' by '\' */
+	size_t i, len = strlen (fileName);
+	for (i = 0; i < len; i++)
+	{
+		if (fileName [i] == '/')
+			fileName [i] = '\\';
+	}
+}
 
 void IncreaseWrongPwdRetryCount (int count)
 {
@@ -6264,26 +6352,42 @@ int DriverUnmountVolume (HWND hwndDlg, int nDosDriveNo, BOOL forced)
 {
 	UNMOUNT_STRUCT unmount;
 	DWORD dwResult;
-
+	VOLUME_PROPERTIES_STRUCT prop;
 	BOOL bResult;
+	WCHAR wszLabel[33] = {0};
+	BOOL bDriverSetLabel = FALSE;
+
+	memset (&prop, 0, sizeof(prop));
+	prop.driveNo = nDosDriveNo;
+
+	if (	DeviceIoControl (hDriver, TC_IOCTL_GET_VOLUME_PROPERTIES, &prop, sizeof (prop), &prop, sizeof (prop), &dwResult, NULL)
+		&&	prop.driveNo == nDosDriveNo
+		)
+	{
+		memcpy (wszLabel, prop.wszLabel, sizeof (wszLabel));
+		bDriverSetLabel = prop.bDriverSetLabel;
+	}
 	
 	unmount.nDosDriveNo = nDosDriveNo;
 	unmount.ignoreOpenFiles = forced;
 
 	bResult = DeviceIoControl (hDriver, TC_IOCTL_DISMOUNT_VOLUME, &unmount,
-		sizeof (unmount), &unmount, sizeof (unmount), &dwResult, NULL);
+			sizeof (unmount), &unmount, sizeof (unmount), &dwResult, NULL);
 
 	if (bResult == FALSE)
 	{
 		handleWin32Error (hwndDlg, SRC_POS);
 		return 1;
 	}
+	else if ((unmount.nReturnCode == ERR_SUCCESS) && bDriverSetLabel && wszLabel[0])
+		UpdateDriveCustomLabel (nDosDriveNo, wszLabel, FALSE);
 
 #ifdef TCMOUNT
 
 	if (unmount.nReturnCode == ERR_SUCCESS
 		&& unmount.HiddenVolumeProtectionTriggered
-		&& !VolumeNotificationsList.bHidVolDamagePrevReported [nDosDriveNo])
+		&& !VolumeNotificationsList.bHidVolDamagePrevReported [nDosDriveNo]
+		&& !Silent)
 	{
 		wchar_t msg[4096];
 
@@ -6494,15 +6598,31 @@ void ShowWaitDialog(HWND hwnd, BOOL bUseHwndAsParent, WaitThreadProc callback, v
 	WaitThreadParam threadParam;
 	threadParam.callback = callback;
 	threadParam.pArg = pArg;
-	
-	DialogBoxParamW (hInst,
-				MAKEINTRESOURCEW (IDD_STATIC_MODAL_WAIT_DLG), hParent,
-				(DLGPROC) WaitDlgProc, (LPARAM) &threadParam);
 
-	if (hwnd && IsWindowVisible(hwnd) && !bUseHwndAsParent)
+	if (WaitDialogDisplaying)
 	{
-		SetForegroundWindow(hwnd);
-		BringWindowToTop(hwnd);
+		callback (pArg, hwnd);
+	}
+	else
+	{
+		WaitDialogDisplaying = TRUE;
+		if (hwnd)
+			EnableWindow (hwnd, FALSE);
+		else
+			EnableWindow (MainDlg, FALSE);
+		finally_do_arg (HWND, hwnd, { if (finally_arg) EnableWindow(finally_arg, TRUE); else EnableWindow (MainDlg, TRUE);});
+
+		DialogBoxParamW (hInst,
+					MAKEINTRESOURCEW (IDD_STATIC_MODAL_WAIT_DLG), hParent,
+					(DLGPROC) WaitDlgProc, (LPARAM) &threadParam);
+
+		WaitDialogDisplaying = FALSE;
+
+		if (hwnd && IsWindowVisible(hwnd) && !bUseHwndAsParent)
+		{
+			SetForegroundWindow(hwnd);
+			BringWindowToTop(hwnd);
+		}
 	}
 }
 
@@ -6593,6 +6713,7 @@ int MountVolume (HWND hwndDlg,
 	mount.SystemFavorite = MountVolumesAsSystemFavorite;
 	mount.UseBackupHeader =  mountOptions->UseBackupHeader;
 	mount.RecoveryMode = mountOptions->RecoveryMode;
+	StringCbCopyW (mount.wszLabel, sizeof (mount.wszLabel), mountOptions->Label);
 
 retry:
 	mount.nDosDriveNo = driveNo;
@@ -6899,6 +7020,12 @@ retry:
 		}
 	}
 
+	if (mount.wszLabel[0] && !mount.bDriverSetLabel)
+	{
+		// try setting the drive label on user-mode using registry
+		UpdateDriveCustomLabel (driveNo, mount.wszLabel, TRUE);
+	}
+
 	ResetWrongPwdRetryCount ();
 
 	BroadcastDeviceChange (DBT_DEVICEARRIVAL, driveNo, 0);
@@ -6909,26 +7036,63 @@ retry:
 	return 1;
 }
 
+typedef struct
+{
+	int nDosDriveNo;
+	BOOL forced;
+	int dismountMaxRetries;
+	DWORD retryDelay;
+	int* presult;
+	DWORD dwLastError;
+} UnmountThreadParam;
+
+void CALLBACK UnmountWaitThreadProc(void* pArg, HWND hwnd)
+{
+	UnmountThreadParam* pThreadParam = (UnmountThreadParam*) pArg;
+	int dismountMaxRetries = pThreadParam->dismountMaxRetries;
+	DWORD retryDelay = pThreadParam->retryDelay;
+
+	do
+	{
+		*pThreadParam->presult = DriverUnmountVolume (hwnd, pThreadParam->nDosDriveNo, pThreadParam->forced);
+
+		if (*pThreadParam->presult == ERR_FILES_OPEN)
+			Sleep (retryDelay);
+		else
+			break;
+
+	} while (--dismountMaxRetries > 0);
+
+	pThreadParam->dwLastError = GetLastError ();
+}
+
 static BOOL UnmountVolumeBase (HWND hwndDlg, int nDosDriveNo, BOOL forceUnmount, BOOL ntfsFormatCase)
 {
 	int result;
 	BOOL forced = forceUnmount;
 	int dismountMaxRetries = ntfsFormatCase? 5 : UNMOUNT_MAX_AUTO_RETRIES;
 	DWORD retryDelay = ntfsFormatCase? 2000: UNMOUNT_AUTO_RETRY_DELAY;
+	UnmountThreadParam param;
 
 retry:
 	BroadcastDeviceChange (DBT_DEVICEREMOVEPENDING, nDosDriveNo, 0);
 
-	do
-	{
-		result = DriverUnmountVolume (hwndDlg, nDosDriveNo, forced);
+	param.nDosDriveNo = nDosDriveNo;
+	param.forced = forced;
+	param.dismountMaxRetries = dismountMaxRetries;
+	param.retryDelay = retryDelay;
+	param.presult = &result;
 
-		if (result == ERR_FILES_OPEN)
-			Sleep (retryDelay);
-		else
-			break;
+	if (Silent)
+	{
+		UnmountWaitThreadProc (&param, hwndDlg);
+	}
+	else
+	{
+		ShowWaitDialog (hwndDlg, FALSE, UnmountWaitThreadProc, &param);		
+	}
 
-	} while (--dismountMaxRetries > 0);
+	SetLastError (param.dwLastError);
 
 	if (result != 0)
 	{
@@ -7463,31 +7627,13 @@ fsif_end:
 
 // System CopyFile() copies source file attributes (like FILE_ATTRIBUTE_ENCRYPTED)
 // so we need to use our own copy function
-BOOL TCCopyFile (char *sourceFileName, char *destinationFile)
+BOOL TCCopyFileBase (HANDLE src, HANDLE dst)
 {
 	__int8 *buffer;
-	HANDLE src, dst;
 	FILETIME fileTime;
 	DWORD bytesRead, bytesWritten;
 	BOOL res;
 
-	src = CreateFile (sourceFileName,
-		GENERIC_READ,
-		FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
-
-	if (src == INVALID_HANDLE_VALUE)
-		return FALSE;
-
-	dst = CreateFile (destinationFile,
-		GENERIC_WRITE,
-		0, NULL, CREATE_ALWAYS, 0, NULL);
-
-	if (dst == INVALID_HANDLE_VALUE)
-	{
-		CloseHandle (src);
-		return FALSE;
-	}
-
 	buffer = (char *) malloc (64 * 1024);
 	if (!buffer)
 	{
@@ -7522,6 +7668,54 @@ BOOL TCCopyFile (char *sourceFileName, char *destinationFile)
 	return res != 0;
 }
 
+BOOL TCCopyFile (char *sourceFileName, char *destinationFile)
+{
+	HANDLE src, dst;
+
+	src = CreateFile (sourceFileName,
+		GENERIC_READ,
+		FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
+
+	if (src == INVALID_HANDLE_VALUE)
+		return FALSE;
+
+	dst = CreateFile (destinationFile,
+		GENERIC_WRITE,
+		0, NULL, CREATE_ALWAYS, 0, NULL);
+
+	if (dst == INVALID_HANDLE_VALUE)
+	{
+		CloseHandle (src);
+		return FALSE;
+	}
+
+	return TCCopyFileBase (src, dst);
+}
+
+BOOL TCCopyFileW (wchar_t *sourceFileName, wchar_t *destinationFile)
+{
+	HANDLE src, dst;
+
+	src = CreateFileW (sourceFileName,
+		GENERIC_READ,
+		FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
+
+	if (src == INVALID_HANDLE_VALUE)
+		return FALSE;
+
+	dst = CreateFileW (destinationFile,
+		GENERIC_WRITE,
+		0, NULL, CREATE_ALWAYS, 0, NULL);
+
+	if (dst == INVALID_HANDLE_VALUE)
+	{
+		CloseHandle (src);
+		return FALSE;
+	}
+
+	return TCCopyFileBase (src, dst);
+}
+
 // If bAppend is TRUE, the buffer is appended to an existing file. If bAppend is FALSE, any existing file 
 // is replaced. If an error occurs, the incomplete file is deleted (provided that bAppend is FALSE).
 BOOL SaveBufferToFile (const char *inputBuffer, const char *destinationFile, DWORD inputLength, BOOL bAppend, BOOL bRenameIfFailed)
@@ -8713,9 +8907,50 @@ char *ConfigReadString (char *configKey, char *defaultValue, char *str, int maxL
 	if (ConfigRead (configKey, str, maxLen))
 		return str;
 	else
+	{
+		StringCbCopyA (str, maxLen, defaultValue);
 		return defaultValue;
+	}
 }
 
+void ConfigReadCompareInt(char *configKey, int defaultValue, int* pOutputValue, BOOL bOnlyCheckModified, BOOL* pbModified)
+{
+	int intValue = ConfigReadInt (configKey, defaultValue);
+	if (pOutputValue)
+	{
+		if (pbModified && (*pOutputValue != intValue))
+			*pbModified = TRUE;
+		if (!bOnlyCheckModified)
+			*pOutputValue = intValue;
+	}
+}
+
+void ConfigReadCompareString (char *configKey, char *defaultValue, char *str, int maxLen, BOOL bOnlyCheckModified, BOOL *pbModified)
+{
+	char *strValue = (char*) malloc (maxLen);
+	if (strValue)
+	{
+		memcpy (strValue, str, maxLen);
+
+		ConfigReadString (configKey, defaultValue, strValue, maxLen);
+
+		if (pbModified && strcmp (str, strValue))
+			*pbModified = TRUE;
+		if (!bOnlyCheckModified)
+			memcpy(str, strValue, maxLen);
+
+		free (strValue);
+	}
+	else
+	{
+		/* allocation failed. Suppose that value changed */
+		if (pbModified)
+			*pbModified = TRUE;
+		if (!bOnlyCheckModified)
+			ConfigReadString (configKey, defaultValue, str, maxLen);
+		
+	}
+}
 
 void OpenPageHelp (HWND hwndDlg, int nPage)
 {
@@ -10800,3 +11035,25 @@ void SetPim (HWND hwndDlg, UINT ctrlId, int pim)
 		SetDlgItemText (hwndDlg, ctrlId, "");
 }
 
+void HandleShowPasswordFieldAction (HWND hwndDlg, UINT checkBoxId, UINT edit1Id, UINT edit2Id)
+{
+	if ((EditPasswordChar == 0) && GetCheckBox (hwndDlg, checkBoxId))
+	{
+		EditPasswordChar = (WCHAR) SendMessageW (GetDlgItem (hwndDlg, edit1Id), EM_GETPASSWORDCHAR, 0, 0);
+	}
+
+	SendMessageW (GetDlgItem (hwndDlg, edit1Id),
+		EM_SETPASSWORDCHAR,
+		GetCheckBox (hwndDlg, checkBoxId) ? 0 : EditPasswordChar,
+		0);
+	InvalidateRect (GetDlgItem (hwndDlg, edit1Id), NULL, TRUE);
+
+	if (edit2Id)
+	{
+		SendMessageW (GetDlgItem (hwndDlg, edit2Id),
+			EM_SETPASSWORDCHAR,
+			GetCheckBox (hwndDlg, checkBoxId) ? 0 : EditPasswordChar,
+			0);
+		InvalidateRect (GetDlgItem (hwndDlg, edit2Id), NULL, TRUE);
+	}
+}
\ No newline at end of file
diff --git a/src/Common/Dlgcode.h b/src/Common/Dlgcode.h
index e2589e8..45694c9 100644
--- a/src/Common/Dlgcode.h
+++ b/src/Common/Dlgcode.h
@@ -326,8 +326,10 @@ void LocalizeDialog ( HWND hwnd, char *stringId );
 void OpenVolumeExplorerWindow (int driveNo);
 static BOOL CALLBACK CloseVolumeExplorerWindowsEnum( HWND hwnd, LPARAM driveNo);
 BOOL CloseVolumeExplorerWindows (HWND hwnd, int driveNo);
+BOOL UpdateDriveCustomLabel (int driveNo, wchar_t* effectiveLabel, BOOL bSetValue);
 BOOL CheckCapsLock (HWND hwnd, BOOL quiet);
 BOOL CheckFileExtension (char *fileName);
+void CorrectFileName (char* fileName);
 void IncreaseWrongPwdRetryCount (int count);
 void ResetWrongPwdRetryCount (void);
 BOOL WrongPwdRetryCountOverLimit (void);
@@ -356,6 +358,7 @@ int64 FindString (const char *buf, const char *str, int64 bufLen, int64 strLen,
 BOOL FileExists (const char *filePathPtr);
 __int64 FindStringInFile (const char *filePath, const char *str, int strLen);
 BOOL TCCopyFile (char *sourceFileName, char *destinationFile);
+BOOL TCCopyFileW (wchar_t *sourceFileName, wchar_t *destinationFile);
 BOOL SaveBufferToFile (const char *inputBuffer, const char *destinationFile, DWORD inputLength, BOOL bAppend, BOOL bRenameIfFailed);
 BOOL TCFlushFile (FILE *f);
 BOOL PrintHardCopyTextUTF16 (wchar_t *text, char *title, size_t byteLen);
@@ -425,6 +428,8 @@ BOOL ConfigWriteString (char *configKey, char *configValue);
 BOOL ConfigWriteInt (char *configKey, int configValue);
 int ConfigReadInt (char *configKey, int defaultValue);
 char *ConfigReadString (char *configKey, char *defaultValue, char *str, int maxLen);
+void ConfigReadCompareInt(char *configKey, int defaultValue, int* pOutputValue, BOOL bOnlyCheckModified, BOOL* pbModified);
+void ConfigReadCompareString (char *configKey, char *defaultValue, char *str, int maxLen, BOOL bOnlyCheckModified, BOOL *pbModified);
 void RestoreDefaultKeyFilesParam (void);
 BOOL LoadDefaultKeyFilesParam (void);
 void Debug (char *format, ...);
@@ -488,6 +493,7 @@ BOOL LaunchWindowsIsoBurner (HWND hwnd, const char *isoPath);
 BOOL IsApplicationInstalled (const char *appName);
 int GetPim (HWND hwndDlg, UINT ctrlId);
 void SetPim (HWND hwndDlg, UINT ctrlId, int pim);
+void HandleShowPasswordFieldAction (HWND hwndDlg, UINT checkBoxId, UINT edit1Id, UINT edit2Id);
 
 #ifdef __cplusplus
 }
diff --git a/src/Common/Format.c b/src/Common/Format.c
index 7feeaab..326faed 100644
--- a/src/Common/Format.c
+++ b/src/Common/Format.c
@@ -284,7 +284,7 @@ begin_format:
 				dev = CreateFile (devName, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
 				if (dev != INVALID_HANDLE_VALUE)
 				{
-					if (IDNO == MessageBoxW (volParams->hwndDlg, GetString ("DEVICE_IN_USE_FORMAT"), lpszTitle, MB_YESNO|MB_ICONWARNING|MB_DEFBUTTON2))
+					if (!volParams->bForceOperation && (Silent || (IDNO == MessageBoxW (volParams->hwndDlg, GetString ("DEVICE_IN_USE_FORMAT"), lpszTitle, MB_YESNO|MB_ICONWARNING|MB_DEFBUTTON2))))
 					{
 						nStatus = ERR_DONT_REPORT; 
 						goto error;
@@ -381,7 +381,7 @@ begin_format:
 			bTimeStampValid = TRUE;
 	}
 
-	KillTimer (volParams->hwndDlg, TIMER_ID_RANDVIEW);
+	if (volParams->hwndDlg && volParams->bGuiMode) KillTimer (volParams->hwndDlg, TIMER_ID_RANDVIEW);
 
 	/* Volume header */
 
@@ -618,8 +618,11 @@ error:
 
 		if (driveNo == -1)
 		{
-			MessageBoxW (volParams->hwndDlg, GetString ("NO_FREE_DRIVES"), lpszTitle, ICON_HAND);
-			MessageBoxW (volParams->hwndDlg, GetString ("FORMAT_NTFS_STOP"), lpszTitle, ICON_HAND);
+			if (!Silent)
+			{
+				MessageBoxW (volParams->hwndDlg, GetString ("NO_FREE_DRIVES"), lpszTitle, ICON_HAND);
+				MessageBoxW (volParams->hwndDlg, GetString ("FORMAT_NTFS_STOP"), lpszTitle, ICON_HAND);
+			}
 
 			nStatus = ERR_NO_FREE_DRIVES;
 			goto fv_end;
@@ -634,20 +637,23 @@ error:
 
 		if (MountVolume (volParams->hwndDlg, driveNo, volParams->volumePath, volParams->password, volParams->pkcs5, volParams->pim, FALSE, FALSE, TRUE, &mountOptions, FALSE, TRUE) < 1)
 		{
-			MessageBoxW (volParams->hwndDlg, GetString ("CANT_MOUNT_VOLUME"), lpszTitle, ICON_HAND);
-			MessageBoxW (volParams->hwndDlg, GetString ("FORMAT_NTFS_STOP"), lpszTitle, ICON_HAND);
+			if (!Silent)
+			{
+				MessageBoxW (volParams->hwndDlg, GetString ("CANT_MOUNT_VOLUME"), lpszTitle, ICON_HAND);
+				MessageBoxW (volParams->hwndDlg, GetString ("FORMAT_NTFS_STOP"), lpszTitle, ICON_HAND);
+			}
 			nStatus = ERR_VOL_MOUNT_FAILED;
 			goto fv_end;
 		}
 
-		if (!IsAdmin () && IsUacSupported ())
+		if (!Silent && !IsAdmin () && IsUacSupported ())
 			retCode = UacFormatNtfs (volParams->hwndDlg, driveNo, volParams->clusterSize);
 		else
 			retCode = FormatNtfs (driveNo, volParams->clusterSize);
 
 		if (retCode != TRUE)
 		{
-			if (!UnmountVolumeAfterFormatExCall (volParams->hwndDlg, driveNo))
+			if (!UnmountVolumeAfterFormatExCall (volParams->hwndDlg, driveNo) && !Silent)
 				MessageBoxW (volParams->hwndDlg, GetString ("CANT_DISMOUNT_VOLUME"), lpszTitle, ICON_HAND);
 
 			if (dataAreaSize <= TC_MAX_FAT_SECTOR_COUNT * FormatSectorSize)
@@ -669,7 +675,7 @@ error:
 			goto fv_end;
 		}
 
-		if (!UnmountVolumeAfterFormatExCall (volParams->hwndDlg, driveNo))
+		if (!UnmountVolumeAfterFormatExCall (volParams->hwndDlg, driveNo) && !Silent)
 			MessageBoxW (volParams->hwndDlg, GetString ("CANT_DISMOUNT_VOLUME"), lpszTitle, ICON_HAND);
 	}
 
diff --git a/src/Common/Format.h b/src/Common/Format.h
index 2aea323..a29a1e7 100644
--- a/src/Common/Format.h
+++ b/src/Common/Format.h
@@ -38,11 +38,13 @@ typedef struct
 	unsigned int clusterSize;
 	BOOL sparseFileSwitch;
 	BOOL quickFormat;
-	int sectorSize;
+	DWORD sectorSize;
 	int *realClusterSize;
 	Password *password;
 	int pim;
 	HWND hwndDlg;
+	BOOL bForceOperation;
+	BOOL bGuiMode;
 }
 FORMAT_VOL_PARAMETERS;
 
diff --git a/src/Common/Keyfiles.c b/src/Common/Keyfiles.c
index 5231e18..c444fef 100644
--- a/src/Common/Keyfiles.c
+++ b/src/Common/Keyfiles.c
@@ -222,7 +222,7 @@ close:
 }
 
 
-BOOL KeyFilesApply (HWND hwndDlg, Password *password, KeyFile *firstKeyFile)
+BOOL KeyFilesApply (HWND hwndDlg, Password *password, KeyFile *firstKeyFile, const char* volumeFileName)
 {
 	BOOL status = TRUE;
 	KeyFile kfSubStruct;
@@ -322,7 +322,7 @@ BOOL KeyFilesApply (HWND hwndDlg, Password *password, KeyFile *firstKeyFile)
 				StringCbPrintfA (kfSub->FileName, sizeof(kfSub->FileName), "%s%c%s", kf->FileName,
 					'\\',
 					fBuf.name
-					);
+					);				
 
 				// Determine whether it's a path or a file
 				if (stat (kfSub->FileName, &statStruct) != 0)
@@ -346,6 +346,13 @@ BOOL KeyFilesApply (HWND hwndDlg, Password *password, KeyFile *firstKeyFile)
 					continue;	 
 				}
 
+				CorrectFileName (kfSub->FileName);
+				if (volumeFileName && (_stricmp (volumeFileName, kfSub->FileName) == 0))
+				{
+					// skip if it is the current container file name
+					continue;
+				}
+
 				++keyfileCount;
 
 				// Apply keyfile to the pool
@@ -474,13 +481,25 @@ BOOL CALLBACK KeyFilesDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 			{
 				if (SelectMultipleFiles (hwndDlg, "SELECT_KEYFILE", kf->FileName, sizeof(kf->FileName),bHistory))
 				{
+					bool containerFileSkipped = false;
 					do
 					{
-						param->FirstKeyFile = KeyFileAdd (param->FirstKeyFile, kf);
-						LoadKeyList (hwndDlg, param->FirstKeyFile);
-
-						kf = (KeyFile *) malloc (sizeof (KeyFile));
+						CorrectFileName (kf->FileName);
+						if (_stricmp (param->VolumeFileName, kf->FileName) == 0)
+							containerFileSkipped = true;
+						else
+						{
+							param->FirstKeyFile = KeyFileAdd (param->FirstKeyFile, kf);
+							LoadKeyList (hwndDlg, param->FirstKeyFile);
+
+							kf = (KeyFile *) malloc (sizeof (KeyFile));
+						}
 					} while (SelectMultipleFilesNext (kf->FileName, sizeof(kf->FileName)));
+
+					if (containerFileSkipped)
+					{
+						Warning ("SELECTED_KEYFILE_IS_CONTAINER_FILE", hwndDlg);
+					}
 				}
 
 				free (kf);
diff --git a/src/Common/Keyfiles.h b/src/Common/Keyfiles.h
index ed8c5b5..ec7e686 100644
--- a/src/Common/Keyfiles.h
+++ b/src/Common/Keyfiles.h
@@ -30,6 +30,7 @@ typedef struct KeyFileStruct
 
 typedef struct
 {
+	char VolumeFileName[MAX_PATH + 1];
 	BOOL EnableKeyFiles;
 	KeyFile *FirstKeyFile;
 } KeyFilesDlgParam;
@@ -38,7 +39,7 @@ KeyFile *KeyFileAdd (KeyFile *firstKeyFile, KeyFile *keyFile);
 void KeyFileRemoveAll (KeyFile **firstKeyFile);
 KeyFile *KeyFileClone (KeyFile *keyFile);
 KeyFile *KeyFileCloneAll (KeyFile *firstKeyFile);
-BOOL KeyFilesApply (HWND hwndDlg, Password *password, KeyFile *firstKeyFile);
+BOOL KeyFilesApply (HWND hwndDlg, Password *password, KeyFile *firstKeyFilem, const char* volumeFileName);
 
 BOOL CALLBACK KeyFilesDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
 BOOL KeyfilesPopupMenu (HWND hwndDlg, POINT popupPosition, KeyFilesDlgParam *dialogParam);
diff --git a/src/Common/Language.c b/src/Common/Language.c
index c45088f..34815ef 100644
--- a/src/Common/Language.c
+++ b/src/Common/Language.c
@@ -35,10 +35,10 @@
 BOOL LocalizationActive;
 int LocalizationSerialNo;
 
-wchar_t UnknownString[1024];
+wchar_t UnknownString[1024]  = {0};
 static char *LanguageFileBuffer = NULL;
 static HANDLE LanguageFileFindHandle = INVALID_HANDLE_VALUE;
-static char PreferredLangId[6];
+static char PreferredLangId[6] = {0};
 static char *LanguageResource = NULL;
 static DWORD LanguageResourceSize = 0;
 static char *HeaderResource[2] = {NULL, NULL};
diff --git a/src/Common/Language.xml b/src/Common/Language.xml
index 04f71b5..5126b21 100644
--- a/src/Common/Language.xml
+++ b/src/Common/Language.xml
@@ -53,7 +53,7 @@
     <control lang="en" key="IDC_MORE_INFO_ON_CONTAINERS">More information</control>
     <control lang="en" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">More information about system encryption</control>
     <control lang="en" key="IDC_MORE_INFO_SYS_ENCRYPTION">More information</control>
-    <control lang="en" key="IDC_MULTI_BOOT">Multi-boot</control>
+    <control lang="en" key="IDC_MULTI_BOOT">Multi-Boot</control>
     <control lang="en" key="IDC_NONSYS_DEVICE">Encrypt a non-system partition/drive</control>
     <control lang="en" key="IDC_NO_HISTORY">&Never save history</control>
     <control lang="en" key="IDC_OPEN_OUTER_VOLUME">Open Outer Volume</control>
@@ -62,6 +62,7 @@
     <control lang="en" key="IDC_QUICKFORMAT">Quick Format</control>
     <control lang="en" key="IDC_SHOW_PASSWORD">&Display password</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&Display password</control>
+    <control lang="en" key="IDC_SHOW_PIM">&Display PIM</control>
     <control lang="en" key="IDC_SINGLE_BOOT">Single-boot</control>
     <control lang="en" key="IDC_STD_VOL">Standard VeraCrypt volume</control>
     <control lang="en" key="IDC_SYSENC_HIDDEN">Hi&dden</control>
@@ -98,6 +99,7 @@
     <control lang="en" key="IDT_SYSENC_KEYS_GEN_INFO">The keys, salt, and other data have been successfully generated. If you want to generate new keys, click Back and then Next. Otherwise, click Next to continue.</control>
     <control lang="en" key="IDT_SYS_DEVICE">Encrypts the partition/drive where Windows is installed. Anyone who wants to gain access and use the system, read and write files, etc., will need to enter the correct password each time before Windows boots. Optionally, creates a hidden system.</control>
     <control lang="en" key="IDT_SYS_PARTITION">Select this option to encrypt the partition where the currently running Windows operating system is installed.</control>
+    <control lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</control>
     <control lang="en" key="IDT_WIPE_MODE">Wipe mode:</control>
     <control lang="en" key="IDCLOSE">Close</control>
     <control lang="en" key="IDC_ALLOW_ESC_PBA_BYPASS">Allow pre-boot &authentication to be bypassed by pressing the Esc key (enables boot manager)</control>
@@ -111,6 +113,7 @@
     <control lang="en" key="IDC_CACHE">Cache passwords and keyfil&es in memory</control>
     <control lang="en" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Exit when there are no mounted volumes</control>
     <control lang="en" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&Close token session (log out) after a volume is successfully mounted</control>
+    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
     <control lang="en" key="IDC_COPY_WIZARD">Include VeraCrypt Volume Creation Wizard</control>
     <control lang="en" key="IDC_CREATE">Create</control>
     <control lang="en" key="IDC_CREATE_VOLUME">&Create Volume</control>
@@ -253,6 +256,7 @@
     <control lang="en" key="IDM_UNMOUNTALL">Dismount All Mounted Volumes</control>
     <control lang="en" key="IDM_UNMOUNT_VOLUME">Dismount Volume</control>
     <control lang="en" key="IDM_VERIFY_RESCUE_DISK">Verify Rescue Disk</control>
+    <control lang="en" key="IDM_VERIFY_RESCUE_DISK_ISO">Verify Rescue Disk ISO Image</control>
     <control lang="en" key="IDM_VERSION_HISTORY">Version History</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="en" key="IDM_VOLUME_PROPERTIES">Volume Properties</control>
@@ -271,6 +275,8 @@
     <control lang="en" key="IDT_CUSTOM_BOOT_LOADER_MESSAGE">Display this custom message in the pre-boot authentication screen (24 characters maximum):</control>
     <control lang="en" key="IDT_DEFAULT_MOUNT_OPTIONS">Default Mount Options</control>
     <control lang="en" key="IDT_DISMOUNT_ACTION">Hot Key Options</control>
+    <control lang="en" key="IDT_DRIVER_OPTIONS">Driver Configuration</control>
+    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
     <control lang="en" key="IDT_FAVORITE_LABEL">Label of selected favorite volume:</control>
     <control lang="en" key="IDT_FILE_SETTINGS">File Settings</control>
     <control lang="en" key="IDT_HOTKEY_KEY">Key to assign:</control>
@@ -537,7 +543,16 @@
     <string lang="en" key="DECOY_TO_HIDDEN_OS_DATA_TRANSFER_HOWTO">Note: If you need to securely transfer files from the decoy system to the hidden system, follow these steps:\n1) Start the decoy system.\n2) Save the files to an unencrypted volume or to an outer/normal VeraCrypt volume.\n3) Start the hidden system.\n4) If you saved the files to a VeraCrypt volume, mount it (it will be automatically mounted as read-only).\n5) Copy the files to the hidden system partition or to another hid [...]
     <string lang="en" key="CONFIRM_RESTART">Your computer must be restarted.\n\nDo you want to restart it now?</string>
     <string lang="en" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">An error occurred when obtaining the system encryption status.</string>
-    <string lang="en" key="INIT_SYS_ENC">Cannot initialize application components for system encryption.</string>
+    <string lang="en" key="ERR_PASSWORD_MISSING">No password specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_SIZE_MISSING">No volume size specified in the command line. The volume can't be created.</string>
+    <string lang="en" key="ERR_NTFS_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected NTFS filesystem.</string>
+    <string lang="en" key="ERR_FAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected FAT32 filesystem.</string>
+    <string lang="en" key="ERR_DYNAMIC_NOT_SUPPORTED">The filesystem on the target drive doesn't support creating sparse files which is required for dynamic volumes.</string>
+    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+	 <string lang="en" key="ERR_CONTAINER_SIZE_TOO_BIG">The container file size specified in the command line is greater than the available disk free space. Volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_SMALL">The volume size specified in the command line is too small. The volume can't be created.</string>
+    <string lang="en" key="ERR_VOLUME_SIZE_TOO_BIG">The volume size specified in the command line is too big. The volume can't be created.</string>
+	 <string lang="en" key="INIT_SYS_ENC">Cannot initialize application components for system encryption.</string>
     <string lang="en" key="INIT_RAND">Failed to initialize the random number generator!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="en" key="INIT_REGISTER">Unable to initialize the application. Failed to register the Dialog class.</string>
@@ -647,6 +662,7 @@
     <string lang="en" key="SELECT_KEYFILE">Select Keyfile</string>
     <string lang="en" key="SELECT_KEYFILE_PATH">Select a keyfile search path. WARNING: Note that only the path will be remembered, not the filenames!</string>
     <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="en" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">The current container file was selected as a keyfile. It will be skipped.</string>
     <string lang="en" key="SERPENT_HELP">Designed by Ross Anderson, Eli Biham, and Lars Knudsen. Published in 1998. 256-bit key, 128-bit block. Mode of operation is XTS. Serpent was one of the AES finalists.</string>
     <string lang="en" key="SIZE_HELP">Please specify the size of the container you want to create.\n\nIf you create a dynamic (sparse-file) container, this parameter will specify its maximum possible size.\n\nNote that the minimum possible size of a FAT volume is 292 KB. The minimum possible size of an NTFS volume is 3792 KB.</string>
     <string lang="en" key="SIZE_HELP_HIDDEN_HOST_VOL">Please specify the size of the outer volume to be created (you will first create the outer volume and then a hidden volume within it). The minimum possible size of a volume within which a hidden volume is intended to be created is 340 KB.</string>
@@ -765,7 +781,7 @@
     <string lang="en" key="DRIVE">Drive</string>
     <string lang="en" key="SIZE">Size</string>
     <string lang="en" key="ENCRYPTION_ALGORITHM">Encryption Algorithm</string>
-    <string lang="en" key="ENCRYPTION_ALGORITHM_LV">Encryption algorithm</string>
+    <string lang="en" key="ENCRYPTION_ALGORITHM_LV">Encryption Algorithm</string>
     <string lang="en" key="TYPE">Type</string>
     <string lang="en" key="VALUE">Value</string>
     <string lang="en" key="PROPERTY">Property</string>
@@ -946,6 +962,8 @@
     <string lang="en" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Please insert your VeraCrypt Rescue Disk into your CD/DVD drive and click OK to verify it.</string>
     <string lang="en" key="RESCUE_DISK_NON_WIZARD_CHECK_PASSED">The VeraCrypt Rescue Disk has been successfully verified.</string>
     <string lang="en" key="RESCUE_DISK_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly burned.\n\nIf you have burned the Rescue Disk, please eject and reinsert the CD/DVD; then try again. If this does not help, please try other CD/DVD recording software and/or medium.\n\nIf you attempted to verify a VeraCrypt Rescue Disk created for a different master key, password, salt, etc., please note that such Rescue Disk will always fail this verification. To create  [...]
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk ISO image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk ISO image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk ISO image created for a different master key, password, salt, etc., please note that such Rescue Disk ISO image will always fail this verification. To create a new Rescue Disk ISO image fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
     <string lang="en" key="ERROR_CREATING_RESCUE_DISK">Error creating VeraCrypt Rescue Disk.</string>
     <string lang="en" key="CANNOT_CREATE_RESCUE_DISK_ON_HIDDEN_OS">VeraCrypt Rescue Disk cannot be created when a hidden operating system is running.\n\nTo create a VeraCrypt Rescue Disk, boot the decoy operating system and then select 'System' > 'Create Rescue Disk'.</string>
     <string lang="en" key="RESCUE_DISK_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly burned.\n\nIf you have burned the Rescue Disk, please eject and reinsert the CD/DVD; then click Next to try again. If this does not help, please try another medium%s.\n\nIf you have not burned the Rescue Disk yet, please do so, and then click Next.\n\nIf you attempted to verify a VeraCrypt Rescue Disk created before you started this wizard, please note that such Rescue Disk cannot b [...]
@@ -1091,7 +1109,7 @@
     <string lang="en" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">As VeraCrypt temporarily changed the keyboard layout to the standard US keyboard layout, it is not possible to type characters by pressing keys while the right Alt key is held down. However, you can type most of such characters by pressing appropriate keys while the Shift key is held down.</string>
     <string lang="en" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCrypt prevented change of keyboard layout.</string>
     <string lang="en" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Note: The password will need to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout. However, it is important to note that you do NOT need a real US keyboard. VeraCrypt automatically ensures that you can safely type the password (right now and in the pre-boot environment) even if yo [...]
-    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (TRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the TRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the TRD allows you to permanently decrypt the partition/drive before Windows  [...]
+    <string lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (VRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the VRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the VRD allows you to permanently decrypt the partition/drive before Windows  [...]
     <string lang="en" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">After you click OK, Microsoft Windows Disc Image Burner will be launched. Please use it to burn the VeraCrypt Rescue Disk ISO image to a CD or DVD.\n\nAfter you do so, return to the VeraCrypt Volume Creation Wizard and follow its instructions.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn it to a CD or DVD.\n\n%lsAfter you burn the Rescue Disk, click Next to verify that it has been correctly burned.</string>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you should either burn the image to a CD/DVD or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
diff --git a/src/Common/Password.c b/src/Common/Password.c
index d3c0ac4..8953da1 100644
--- a/src/Common/Password.c
+++ b/src/Common/Password.c
@@ -113,7 +113,7 @@ BOOL CheckPasswordCharEncoding (HWND hPassword, Password *ptrPw)
 }
 
 
-BOOL CheckPasswordLength (HWND hwndDlg, unsigned __int32 passwordLength, int pim, BOOL bForBoot, BOOL bSkipPasswordWarning)
+BOOL CheckPasswordLength (HWND hwndDlg, unsigned __int32 passwordLength, int pim, BOOL bForBoot, BOOL bSkipPasswordWarning, BOOL bSkipPimWarning)
 {
 	BOOL bCustomPimSmall = ((pim != 0) && (pim < (bForBoot? 98 : 485)))? TRUE : FALSE;
 	if (passwordLength < PASSWORD_LEN_WARNING)
@@ -132,7 +132,7 @@ BOOL CheckPasswordLength (HWND hwndDlg, unsigned __int32 passwordLength, int pim
 #ifndef _DEBUG
 	else if (bCustomPimSmall)
 	{
-		if (MessageBoxW (hwndDlg, GetString ("PIM_SMALL_WARNING"), lpszTitle, MB_YESNO|MB_ICONWARNING|MB_DEFBUTTON2) != IDYES)
+		if (!bSkipPimWarning && AskWarnNoYes ("PIM_SMALL_WARNING", hwndDlg) != IDYES)
 			return FALSE;
 	}
 #endif
@@ -140,7 +140,7 @@ BOOL CheckPasswordLength (HWND hwndDlg, unsigned __int32 passwordLength, int pim
 	if ((pim != 0) && (pim > (bForBoot? 98 : 485)))
 	{
 		// warn that mount/boot will take more time
-		MessageBoxW (hwndDlg, GetString ("PIM_LARGE_WARNING"), lpszTitle, MB_OK|MB_ICONWARNING);
+		Warning ("PIM_LARGE_WARNING", hwndDlg);
 
 	}
 	return TRUE;
diff --git a/src/Common/Password.h b/src/Common/Password.h
index 50e4652..8354054 100644
--- a/src/Common/Password.h
+++ b/src/Common/Password.h
@@ -38,7 +38,7 @@ typedef struct
 #if defined(_WIN32) && !defined(TC_WINDOWS_DRIVER)
 
 void VerifyPasswordAndUpdate ( HWND hwndDlg , HWND hButton , HWND hPassword , HWND hVerify , unsigned char *szPassword , char *szVerify, BOOL keyFilesEnabled );
-BOOL CheckPasswordLength (HWND hwndDlg, unsigned __int32 passwordLength, int pim, BOOL bForBoot, BOOL bSkipPasswordWarning);		
+BOOL CheckPasswordLength (HWND hwndDlg, unsigned __int32 passwordLength, int pim, BOOL bForBoot, BOOL bSkipPasswordWarning, BOOL bSkipPimWarning);		
 BOOL CheckPasswordCharEncoding (HWND hPassword, Password *ptrPw);			
 int ChangePwd (const char *lpszVolume, Password *oldPassword, int old_pkcs5, int old_pim, BOOL truecryptMode, Password *newPassword, int pkcs5, int pim, int wipePassCount, HWND hwndDlg);
 
diff --git a/src/Common/Resource.h b/src/Common/Resource.h
index 5a4c291..43bac11 100644
--- a/src/Common/Resource.h
+++ b/src/Common/Resource.h
@@ -192,6 +192,8 @@
 #define IDC_PIM                         5130
 #define IDC_PIM_HELP                    5131
 #define IDC_PIM_ENABLE                  5132
+#define IDC_VOLUME_LABEL                5133
+#define IDT_VOLUME_LABEL                5134
 
 // Next default values for new objects
 // 
@@ -200,7 +202,7 @@
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        542
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         5133
+#define _APS_NEXT_CONTROL_VALUE         5135
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif
diff --git a/src/Common/Tcdefs.h b/src/Common/Tcdefs.h
index d59867b..7f10af3 100644
--- a/src/Common/Tcdefs.h
+++ b/src/Common/Tcdefs.h
@@ -17,15 +17,15 @@
 #define TC_APP_NAME						"VeraCrypt"
 
 // Version displayed to user 
-#define VERSION_STRING					"1.12"
+#define VERSION_STRING					"1.14"
 
 // Version number to compare against driver
-#define VERSION_NUM						0x0112
+#define VERSION_NUM						0x0114
 
 // Release date
-#define TC_STR_RELEASE_DATE				"August 5, 2015"
+#define TC_STR_RELEASE_DATE				"Septembre 16th, 2015"
 #define TC_RELEASE_DATE_YEAR			2015
-#define TC_RELEASE_DATE_MONTH			08
+#define TC_RELEASE_DATE_MONTH			09
 
 #define BYTES_PER_KB                    1024LL
 #define BYTES_PER_MB                    1048576LL
diff --git a/src/Driver/Driver.rc b/src/Driver/Driver.rc
index 1437b88..25e4847 100644
--- a/src/Driver/Driver.rc
+++ b/src/Driver/Driver.rc
@@ -27,8 +27,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,12,22,0
- PRODUCTVERSION 1,12,22,0
+ FILEVERSION 1,14,15,0
+ PRODUCTVERSION 1,14,15,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -45,11 +45,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "IDRIX"
             VALUE "FileDescription", "VeraCrypt Driver"
-            VALUE "FileVersion", "1.12"
+            VALUE "FileVersion", "1.14"
             VALUE "LegalTrademarks", "VeraCrypt"
             VALUE "OriginalFilename", "veracrypt.sys"
             VALUE "ProductName", "VeraCrypt"
-            VALUE "ProductVersion", "1.12"
+            VALUE "ProductVersion", "1.14"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/Driver/Ntdriver.c b/src/Driver/Ntdriver.c
index a909a36..a655b88 100644
--- a/src/Driver/Ntdriver.c
+++ b/src/Driver/Ntdriver.c
@@ -58,6 +58,7 @@ BOOL NonAdminSystemFavoritesAccessDisabled = FALSE;
 static size_t EncryptionThreadPoolFreeCpuCountLimit = 0;
 static BOOL SystemFavoriteVolumeDirty = FALSE;
 static BOOL PagingFileCreationPrevented = FALSE;
+static BOOL EnableExtendedIoctlSupport = FALSE;
 
 PDEVICE_OBJECT VirtualVolumeDeviceObjects[MAX_MOUNTED_VOLUME_DRIVE_NUMBER + 1];
 
@@ -631,38 +632,68 @@ NTSTATUS ProcessVolumeDeviceControlIrp (PDEVICE_OBJECT DeviceObject, PEXTENSION
 		break;
 
 	case IOCTL_STORAGE_QUERY_PROPERTY:
-		if (ValidateIOBufferSize (Irp, sizeof (STORAGE_PROPERTY_QUERY), ValidateInput))
-		{			
-			PSTORAGE_PROPERTY_QUERY pStoragePropQuery = (PSTORAGE_PROPERTY_QUERY) Irp->AssociatedIrp.SystemBuffer;
-			STORAGE_QUERY_TYPE type = pStoragePropQuery->QueryType;
+		if (EnableExtendedIoctlSupport)
+		{
+			if (ValidateIOBufferSize (Irp, sizeof (STORAGE_PROPERTY_QUERY), ValidateInput))
+			{			
+				PSTORAGE_PROPERTY_QUERY pStoragePropQuery = (PSTORAGE_PROPERTY_QUERY) Irp->AssociatedIrp.SystemBuffer;
+				STORAGE_QUERY_TYPE type = pStoragePropQuery->QueryType;
 
-			if (type == PropertyExistsQuery)
-			{
-				if (pStoragePropQuery->PropertyId == StorageAccessAlignmentProperty)
-				{
-					Irp->IoStatus.Status = STATUS_SUCCESS;
-					Irp->IoStatus.Information = 0;
-				}
-			}
-			else if (type == PropertyStandardQuery)
-			{
-				if (pStoragePropQuery->PropertyId == StorageAccessAlignmentProperty)
+				/* return error if an unsupported type is encountered */
+				Irp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST;
+				Irp->IoStatus.Information = 0;
+
+				if (	(pStoragePropQuery->PropertyId == StorageAccessAlignmentProperty)
+					||	(pStoragePropQuery->PropertyId == StorageDeviceProperty)
+					)
 				{
-					if (ValidateIOBufferSize (Irp, sizeof (STORAGE_ACCESS_ALIGNMENT_DESCRIPTOR), ValidateOutput))
+					if (type == PropertyExistsQuery)
 					{
-						PSTORAGE_ACCESS_ALIGNMENT_DESCRIPTOR outputBuffer = (PSTORAGE_ACCESS_ALIGNMENT_DESCRIPTOR) Irp->AssociatedIrp.SystemBuffer;
-
-						outputBuffer->Version = sizeof(STORAGE_ACCESS_ALIGNMENT_DESCRIPTOR);
-						outputBuffer->Size = sizeof(STORAGE_ACCESS_ALIGNMENT_DESCRIPTOR);
-						outputBuffer->BytesPerLogicalSector = Extension->BytesPerSector;
-						outputBuffer->BytesPerPhysicalSector = Extension->HostBytesPerPhysicalSector;
-						outputBuffer->BytesOffsetForSectorAlignment = Extension->BytesOffsetForSectorAlignment;
 						Irp->IoStatus.Status = STATUS_SUCCESS;
-						Irp->IoStatus.Information = sizeof (STORAGE_ACCESS_ALIGNMENT_DESCRIPTOR);
+						Irp->IoStatus.Information = 0;
+					}
+					else if (type == PropertyStandardQuery)
+					{
+						switch (pStoragePropQuery->PropertyId)
+						{
+							case StorageDeviceProperty:
+								{
+									if (ValidateIOBufferSize (Irp, sizeof (STORAGE_DEVICE_DESCRIPTOR), ValidateOutput))
+									{
+										PSTORAGE_DEVICE_DESCRIPTOR outputBuffer = (PSTORAGE_DEVICE_DESCRIPTOR) Irp->AssociatedIrp.SystemBuffer;
+
+										outputBuffer->Version = sizeof(STORAGE_DEVICE_DESCRIPTOR);
+										outputBuffer->Size = sizeof(STORAGE_DEVICE_DESCRIPTOR);
+										outputBuffer->DeviceType = FILE_DEVICE_DISK;
+										outputBuffer->RemovableMedia = Extension->bRemovable? TRUE : FALSE;
+										Irp->IoStatus.Status = STATUS_SUCCESS;
+										Irp->IoStatus.Information = sizeof (STORAGE_DEVICE_DESCRIPTOR);
+									}
+								}
+								break;
+							case StorageAccessAlignmentProperty:
+								{
+									if (ValidateIOBufferSize (Irp, sizeof (STORAGE_ACCESS_ALIGNMENT_DESCRIPTOR), ValidateOutput))
+									{
+										PSTORAGE_ACCESS_ALIGNMENT_DESCRIPTOR outputBuffer = (PSTORAGE_ACCESS_ALIGNMENT_DESCRIPTOR) Irp->AssociatedIrp.SystemBuffer;
+
+										outputBuffer->Version = sizeof(STORAGE_ACCESS_ALIGNMENT_DESCRIPTOR);
+										outputBuffer->Size = sizeof(STORAGE_ACCESS_ALIGNMENT_DESCRIPTOR);
+										outputBuffer->BytesPerLogicalSector = Extension->BytesPerSector;
+										outputBuffer->BytesPerPhysicalSector = Extension->HostBytesPerPhysicalSector;
+										outputBuffer->BytesOffsetForSectorAlignment = Extension->BytesOffsetForSectorAlignment;
+										Irp->IoStatus.Status = STATUS_SUCCESS;
+										Irp->IoStatus.Information = sizeof (STORAGE_ACCESS_ALIGNMENT_DESCRIPTOR);
+									}
+								}
+								break;
+						}
 					}
 				}
 			}
 		}
+		else
+			return TCCompleteIrp (Irp, STATUS_INVALID_DEVICE_REQUEST, 0);
 		
 		break;
 
@@ -1174,6 +1205,7 @@ NTSTATUS ProcessMainDeviceControlIrp (PDEVICE_OBJECT DeviceObject, PEXTENSION Ex
 				{
 					list->ulMountedDrives |= (1 << ListExtension->nDosDriveNo);
 					RtlStringCbCopyW (list->wszVolume[ListExtension->nDosDriveNo], sizeof(list->wszVolume[ListExtension->nDosDriveNo]),ListExtension->wszVolume);
+					RtlStringCbCopyW (list->wszLabel[ListExtension->nDosDriveNo], sizeof(list->wszLabel[ListExtension->nDosDriveNo]),ListExtension->wszLabel);
 					list->diskLength[ListExtension->nDosDriveNo] = ListExtension->DiskLength;
 					list->ea[ListExtension->nDosDriveNo] = ListExtension->cryptoInfo->ea;
 					if (ListExtension->cryptoInfo->hiddenVolume)
@@ -1224,6 +1256,8 @@ NTSTATUS ProcessMainDeviceControlIrp (PDEVICE_OBJECT DeviceObject, PEXTENSION Ex
 				{
 					prop->uniqueId = ListExtension->UniqueVolumeId;
 					RtlStringCbCopyW (prop->wszVolume, sizeof(prop->wszVolume),ListExtension->wszVolume);
+					RtlStringCbCopyW (prop->wszLabel, sizeof(prop->wszLabel),ListExtension->wszLabel);
+					prop->bDriverSetLabel = ListExtension->bDriverSetLabel;
 					prop->diskLength = ListExtension->DiskLength;
 					prop->ea = ListExtension->cryptoInfo->ea;
 					prop->mode = ListExtension->cryptoInfo->mode;
@@ -1417,6 +1451,7 @@ NTSTATUS ProcessMainDeviceControlIrp (PDEVICE_OBJECT DeviceObject, PEXTENSION Ex
 			}
 
 			EnsureNullTerminatedString (mount->wszVolume, sizeof (mount->wszVolume));
+			EnsureNullTerminatedString (mount->wszLabel, sizeof (mount->wszLabel));
 
 			Irp->IoStatus.Information = sizeof (MOUNT_STRUCT);
 			Irp->IoStatus.Status = MountDevice (DeviceObject, mount);
@@ -2628,6 +2663,7 @@ NTSTATUS MountDevice (PDEVICE_OBJECT DeviceObject, MOUNT_STRUCT *mount)
 		PACCESS_TOKEN accessToken;
 
 		SeCaptureSubjectContext (&subContext);
+		SeLockSubjectContext(&subContext);
 		accessToken = SeQuerySubjectContextToken (&subContext);
 
 		if (!accessToken)
@@ -2653,6 +2689,7 @@ NTSTATUS MountDevice (PDEVICE_OBJECT DeviceObject, MOUNT_STRUCT *mount)
 			}
 		}
 
+		SeUnlockSubjectContext(&subContext);
 		SeReleaseSubjectContext (&subContext);
 
 		if (NT_SUCCESS (ntStatus))
@@ -2670,6 +2707,9 @@ NTSTATUS MountDevice (PDEVICE_OBJECT DeviceObject, MOUNT_STRUCT *mount)
 			{
 				HANDLE volumeHandle;
 				PFILE_OBJECT volumeFileObject;
+				ULONG labelLen = (ULONG) wcslen (mount->wszLabel);
+				BOOL bIsNTFS = FALSE;
+				ULONG labelMaxLen, labelEffectiveLen;
 
 				Dump ("Mount SUCCESS TC code = 0x%08x READ-ONLY = %d\n", mount->nReturnCode, NewExtension->bReadOnly);
 
@@ -2708,6 +2748,59 @@ NTSTATUS MountDevice (PDEVICE_OBJECT DeviceObject, MOUNT_STRUCT *mount)
 						mount->FilesystemDirty = TRUE;
 					}
 
+					// detect if the filesystem is NTFS or FAT
+					__try
+					{
+						NTFS_VOLUME_DATA_BUFFER ntfsData;
+						if (NT_SUCCESS (TCFsctlCall (volumeFileObject, FSCTL_GET_NTFS_VOLUME_DATA, NULL, 0, &ntfsData, sizeof (ntfsData))))
+						{
+							bIsNTFS = TRUE;
+						}
+					}
+					__except (EXCEPTION_EXECUTE_HANDLER)
+					{
+						bIsNTFS = FALSE;
+					}
+
+					NewExtension->bIsNTFS = bIsNTFS;
+					mount->bIsNTFS = bIsNTFS;
+
+					if (labelLen > 0)
+					{
+						if (bIsNTFS)
+							labelMaxLen = 32; // NTFS maximum label length
+						else
+							labelMaxLen = 11; // FAT maximum label length
+
+						// calculate label effective length
+						labelEffectiveLen = labelLen > labelMaxLen? labelMaxLen : labelLen;
+
+						// correct the label in the device
+						memset (&NewExtension->wszLabel[labelEffectiveLen], 0, 33 - labelEffectiveLen);
+						memcpy (mount->wszLabel, NewExtension->wszLabel, 33);
+
+						// set the volume label
+						__try
+						{
+							IO_STATUS_BLOCK ioblock;
+							ULONG labelInfoSize = sizeof(FILE_FS_LABEL_INFORMATION) + (labelEffectiveLen * sizeof(WCHAR));
+							FILE_FS_LABEL_INFORMATION* labelInfo = (FILE_FS_LABEL_INFORMATION*) TCalloc (labelInfoSize);
+							labelInfo->VolumeLabelLength = labelEffectiveLen * sizeof(WCHAR);
+							memcpy (labelInfo->VolumeLabel, mount->wszLabel, labelInfo->VolumeLabelLength);
+									
+							if (STATUS_SUCCESS == ZwSetVolumeInformationFile (volumeHandle, &ioblock, labelInfo, labelInfoSize, FileFsLabelInformation))
+							{
+								mount->bDriverSetLabel = TRUE;
+								NewExtension->bDriverSetLabel = TRUE;
+							}
+
+							TCfree(labelInfo);
+						}
+						__except (EXCEPTION_EXECUTE_HANDLER)
+						{
+
+						}
+					}
 
 					TCCloseFsVolume (volumeHandle, volumeFileObject);
 				}
@@ -3179,6 +3272,8 @@ NTSTATUS ReadRegistryConfigFlags (BOOL driverEntry)
 			}
 
 			EnableHwEncryption ((flags & TC_DRIVER_CONFIG_DISABLE_HARDWARE_ENCRYPTION) ? FALSE : TRUE);
+			
+			EnableExtendedIoctlSupport = (flags & TC_DRIVER_CONFIG_ENABLE_EXTENDED_IOCTL)? TRUE : FALSE;
 		}
 		else
 			status = STATUS_INVALID_PARAMETER;
diff --git a/src/Driver/Ntdriver.h b/src/Driver/Ntdriver.h
index 5c6f22e..f845823 100644
--- a/src/Driver/Ntdriver.h
+++ b/src/Driver/Ntdriver.h
@@ -77,6 +77,9 @@ typedef struct EXTENSION
 	BOOL SystemFavorite;
 
 	WCHAR wszVolume[TC_MAX_PATH];	/*  DONT change this size without also changing MOUNT_LIST_STRUCT! */
+	WCHAR wszLabel[33];
+	BOOL bIsNTFS;
+	BOOL bDriverSetLabel;
 
 	LARGE_INTEGER fileCreationTime;
 	LARGE_INTEGER fileLastAccessTime;
diff --git a/src/Driver/Ntvol.c b/src/Driver/Ntvol.c
index 2f8ac95..de0cee0 100644
--- a/src/Driver/Ntvol.c
+++ b/src/Driver/Ntvol.c
@@ -669,6 +669,9 @@ NTSTATUS TCOpenVolume (PDEVICE_OBJECT DeviceObject,
 				{
 					RtlStringCbCopyW (Extension->wszVolume, sizeof(Extension->wszVolume),pwszMountVolume);
 				}
+
+				memset (Extension->wszLabel, 0, sizeof (Extension->wszLabel));
+				RtlStringCbCopyW (Extension->wszLabel, sizeof(Extension->wszLabel), mount->wszLabel);
 			}
 
 			// If we are to protect a hidden volume we cannot exit yet, for we must also
diff --git a/src/ExpandVolume/DlgExpandVolume.cpp b/src/ExpandVolume/DlgExpandVolume.cpp
index 1e0552c..410b101 100644
--- a/src/ExpandVolume/DlgExpandVolume.cpp
+++ b/src/ExpandVolume/DlgExpandVolume.cpp
@@ -59,7 +59,7 @@ BOOL CALLBACK ExpandVolProgressDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, L
 namespace VeraCryptExpander
 {
 /* defined in WinMain.c, referenced by ExpandVolumeWizard() */
-int ExtcvAskVolumePassword (HWND hwndDlg, Password *password, int *pkcs5, int *pim, BOOL* truecryptMode, char *titleStringId, BOOL enableMountOptions);
+int ExtcvAskVolumePassword (HWND hwndDlg, const char* fileName, Password *password, int *pkcs5, int *pim, BOOL* truecryptMode, char *titleStringId, BOOL enableMountOptions);
 }
 
 
@@ -500,7 +500,7 @@ void ExpandVolumeWizard (HWND hwndDlg, char *lpszVolume)
 		OpenVolumeContext expandVol;
 		BOOL truecryptMode = FALSE;
 
-		if (!VeraCryptExpander::ExtcvAskVolumePassword (hwndDlg, &VolumePassword, &VolumePkcs5, &VolumePim, &truecryptMode, "ENTER_NORMAL_VOL_PASSWORD", FALSE))
+		if (!VeraCryptExpander::ExtcvAskVolumePassword (hwndDlg, lpszVolume, &VolumePassword, &VolumePkcs5, &VolumePim, &truecryptMode, "ENTER_NORMAL_VOL_PASSWORD", FALSE))
 		{
 			goto ret;
 		}
@@ -509,7 +509,7 @@ void ExpandVolumeWizard (HWND hwndDlg, char *lpszVolume)
 		WaitCursor();
 
 		if (KeyFilesEnable && FirstKeyFile)
-			KeyFilesApply (hwndDlg, &VolumePassword, FirstKeyFile);
+			KeyFilesApply (hwndDlg, &VolumePassword, FirstKeyFile, lpszVolume);
 
 		WaitCursor ();
 
diff --git a/src/ExpandVolume/ExpandVolume.rc b/src/ExpandVolume/ExpandVolume.rc
index ad0c97c..ba97697 100644
--- a/src/ExpandVolume/ExpandVolume.rc
+++ b/src/ExpandVolume/ExpandVolume.rc
@@ -218,8 +218,8 @@ IDR_MOUNT_RSRC_HEADER   HEADER                  "resource.h"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,12,22,0
- PRODUCTVERSION 1,12,22,0
+ FILEVERSION 1,14,15,0
+ PRODUCTVERSION 1,14,15,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -236,11 +236,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "IDRIX"
             VALUE "FileDescription", "VeraCrypt Expander"
-            VALUE "FileVersion", "1.12"
+            VALUE "FileVersion", "1.14"
             VALUE "LegalTrademarks", "VeraCrypt"
             VALUE "OriginalFilename", "VeraCryptExpander.exe"
             VALUE "ProductName", "VeraCrypt"
-            VALUE "ProductVersion", "1.12"
+            VALUE "ProductVersion", "1.14"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/ExpandVolume/WinMain.cpp b/src/ExpandVolume/WinMain.cpp
index 117ad90..5ef60d8 100644
--- a/src/ExpandVolume/WinMain.cpp
+++ b/src/ExpandVolume/WinMain.cpp
@@ -367,7 +367,7 @@ GetItemLong (HWND hTree, int itemNo)
 		return item.lParam;
 }
 
-static char PasswordDlgVolume[MAX_PATH + 1];
+static char PasswordDlgVolume[MAX_PATH + 1] = {0};
 static BOOL PasswordDialogDisableMountOptions;
 static char *PasswordDialogTitleStringId;
 
@@ -534,10 +534,13 @@ BOOL CALLBACK ExtcvPasswordDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 				return 1;
 			}
 
-			SetCheckBox (hwndDlg, IDC_SHOW_PASSWORD, FALSE);
+			if (GetCheckBox (hwndDlg, IDC_SHOW_PASSWORD))
+			{
+				// simulate hiding password
+				SetCheckBox (hwndDlg, IDC_SHOW_PASSWORD, FALSE);
 
-			SendMessage (GetDlgItem (hwndDlg, IDC_PASSWORD), EM_SETPASSWORDCHAR, '*', 0);
-			InvalidateRect (GetDlgItem (hwndDlg, IDC_PASSWORD), NULL, TRUE);
+				HandleShowPasswordFieldAction (hwndDlg, IDC_SHOW_PASSWORD, IDC_PASSWORD, IDC_PIM);
+			}
 
 			SetCheckBox (hwndDlg, IDC_KEYFILES_ENABLE, FALSE);
 			EnableWindow (GetDlgItem (hwndDlg, IDC_KEYFILES_ENABLE), FALSE);
@@ -614,11 +617,7 @@ BOOL CALLBACK ExtcvPasswordDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 
 		if (lw == IDC_SHOW_PASSWORD)
 		{
-			SendMessage (GetDlgItem (hwndDlg, IDC_PASSWORD),
-						EM_SETPASSWORDCHAR,
-						GetCheckBox (hwndDlg, IDC_SHOW_PASSWORD) ? 0 : '*',
-						0);
-			InvalidateRect (GetDlgItem (hwndDlg, IDC_PASSWORD), NULL, TRUE);
+			HandleShowPasswordFieldAction (hwndDlg, IDC_SHOW_PASSWORD, IDC_PASSWORD, IDC_PIM);
 			return 1;
 		}
 
@@ -655,7 +654,7 @@ BOOL CALLBACK ExtcvPasswordDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			if (lw == IDOK)
 			{
 				if (mountOptions.ProtectHiddenVolume && hidVolProtKeyFilesParam.EnableKeyFiles)
-					KeyFilesApply (hwndDlg, &mountOptions.ProtectedHidVolPassword, hidVolProtKeyFilesParam.FirstKeyFile);
+					KeyFilesApply (hwndDlg, &mountOptions.ProtectedHidVolPassword, hidVolProtKeyFilesParam.FirstKeyFile, PasswordDlgVolume);
 
 				GetWindowText (GetDlgItem (hwndDlg, IDC_PASSWORD), (LPSTR) szXPwd->Text, MAX_PASSWORD + 1);
 				szXPwd->Length = strlen ((char *) szXPwd->Text);
@@ -780,7 +779,7 @@ int RestoreVolumeHeader (HWND hwndDlg, char *lpszVolume)
 	return 0;
 }
 
-int ExtcvAskVolumePassword (HWND hwndDlg, Password *password, int *pkcs5, int *pim, BOOL* truecryptMode, char *titleStringId, BOOL enableMountOptions)
+int ExtcvAskVolumePassword (HWND hwndDlg, const char* fileName, Password *password, int *pkcs5, int *pim, BOOL* truecryptMode, char *titleStringId, BOOL enableMountOptions)
 {
 	int result;
 	PasswordDlgParam dlgParam;
@@ -793,6 +792,8 @@ int ExtcvAskVolumePassword (HWND hwndDlg, Password *password, int *pkcs5, int *p
 	dlgParam.pim = pim;
 	dlgParam.truecryptMode = truecryptMode;
 
+	StringCbCopyA (PasswordDlgVolume, sizeof(PasswordDlgVolume), fileName);
+
 	result = DialogBoxParamW (hInst, 
 		MAKEINTRESOURCEW (IDD_PASSWORD_DLG), hwndDlg,
 		(DLGPROC) ExtcvPasswordDlgProc, (LPARAM) &dlgParam);
diff --git a/src/Format/Format.rc b/src/Format/Format.rc
index 52c876e..0cb989a 100644
--- a/src/Format/Format.rc
+++ b/src/Format/Format.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,12,22,0
- PRODUCTVERSION 1,12,22,0
+ FILEVERSION 1,14,15,0
+ PRODUCTVERSION 1,14,15,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -46,11 +46,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "IDRIX"
             VALUE "FileDescription", "VeraCrypt Format"
-            VALUE "FileVersion", "1.12"
+            VALUE "FileVersion", "1.14"
             VALUE "LegalTrademarks", "VeraCrypt"
             VALUE "OriginalFilename", "VeraCrypt Format.exe"
             VALUE "ProductName", "VeraCrypt"
-            VALUE "ProductVersion", "1.12"
+            VALUE "ProductVersion", "1.14"
         END
     END
     BLOCK "VarFileInfo"
@@ -225,7 +225,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     EDITTEXT        IDC_PASSWORD_DIRECT,50,2,149,14,ES_PASSWORD | ES_AUTOHSCROLL
     COMBOBOX        IDC_PKCS5_PRF_ID,50,17,91,90,CBS_DROPDOWNLIST | WS_TABSTOP
-    EDITTEXT        IDC_PIM,50,32,42,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER | NOT WS_VISIBLE
+    EDITTEXT        IDC_PIM,50,32,42,14,ES_RIGHT | ES_PASSWORD | ES_AUTOHSCROLL | ES_NUMBER | NOT WS_VISIBLE
     LTEXT           "(Empty or 0 for default iterations)",IDC_PIM_HELP,96,34,127,8,NOT WS_VISIBLE
     CONTROL         "&Display password",IDC_SHOW_PASSWORD_SINGLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,46,84,11,WS_EX_TRANSPARENT
     CONTROL         "U&se keyfiles",IDC_KEYFILES_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,82,11
@@ -437,11 +437,12 @@ IDD_PIM_PAGE_DLG DIALOGEX 0, 0, 226, 172
 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    EDITTEXT        IDC_PIM,53,8,42,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "",IDC_BOX_HELP,0,28,225,130
-    RTEXT           "Volume PIM:",IDT_PIM,1,11,50,8
-    LTEXT           "(Empty or 0 for default iterations)",IDC_PIM_HELP,97,11,126,8
+    EDITTEXT        IDC_PIM,53,0,42,14,ES_RIGHT | ES_PASSWORD | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "",IDC_BOX_HELP,0,32,225,126
+    RTEXT           "Volume PIM:",IDT_PIM,1,3,50,8
+    LTEXT           "(Empty or 0 for default iterations)",IDC_PIM_HELP,97,3,126,8
     LTEXT           "Information on PIM",IDC_LINK_PIM_INFO,0,161,213,8,SS_NOTIFY
+    CONTROL         "Display PIM",IDC_SHOW_PIM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,53,17,150,10
 END
 
 
diff --git a/src/Format/Resource.h b/src/Format/Resource.h
index f0d19c4..bb4a90c 100644
--- a/src/Format/Resource.h
+++ b/src/Format/Resource.h
@@ -142,6 +142,7 @@
 #define IDC_DRIVE_LETTER_LIST           1103
 #define IDT_DRIVE_LETTER                1104
 #define IDC_LINK_PIM_INFO               1105
+#define IDC_SHOW_PIM                    1106
 
 // Next default values for new objects
 // 
@@ -150,7 +151,7 @@
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        134
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1106
+#define _APS_NEXT_CONTROL_VALUE         1107
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif
diff --git a/src/Format/Tcformat.c b/src/Format/Tcformat.c
index f2881d4..ad29e0f 100644
--- a/src/Format/Tcformat.c
+++ b/src/Format/Tcformat.c
@@ -156,6 +156,8 @@ BOOL DirectNonSysInplaceDecStartMode = FALSE;
 BOOL DirectNonSysInplaceEncResumeMode = FALSE;
 BOOL DirectNonSysInplaceDecResumeMode = FALSE;
 BOOL DirectPromptNonSysInplaceEncResumeMode = FALSE;
+BOOL DirectCreationMode = FALSE;
+
 volatile BOOL bInPlaceEncNonSys = FALSE;		/* If TRUE, existing data on a non-system partition/volume are to be encrypted (or decrypted if bInPlaceDecNonSys is TRUE) in place (for system encryption, this flag is ignored) */
 volatile BOOL bInPlaceDecNonSys = FALSE;		/* If TRUE, existing data on a non-system partition/volume are to be decrypted in place (for system encryption, this flag is ignored) */
 volatile BOOL bInPlaceEncNonSysResumed = FALSE;	/* If TRUE, the wizard is supposed to resume (or has resumed) process of non-system in-place encryption/decryption. */
@@ -236,6 +238,21 @@ int volumePim = 0;
 BOOL bHistoryCmdLine = FALSE; /* History control is always disabled */
 BOOL ComServerMode = FALSE;
 
+
+Password CmdVolumePassword = {0}; /* Password passed from command line */
+int CmdVolumeEA = 0;
+int CmdVolumePkcs5 = 0;
+int CmdVolumePim = 0;
+int CmdVolumeFilesystem = FILESYS_NONE;
+unsigned __int64 CmdVolumeFileSize = 0;
+BOOL CmdSparseFileSwitch = FALSE;
+
+BOOL bForceOperation = FALSE;
+
+BOOL bOperationSuccess = FALSE;
+
+BOOL bGuiMode = TRUE;
+
 int nPbar = 0;			/* Control ID of progress bar:- for format code */
 
 char HeaderKeyGUIView [KEY_GUI_VIEW_SIZE];
@@ -385,6 +402,8 @@ static void WipePasswordsAndKeyfiles (void)
 	burn (&volumePassword, sizeof (volumePassword));
 	burn (&szRawPassword[0], sizeof (szRawPassword));
 	burn (&volumePim, sizeof (volumePim));
+	burn (&CmdVolumePassword, sizeof (CmdVolumePassword));
+	burn (&CmdVolumePim, sizeof (CmdVolumePim));
 
 	SetWindowText (hPasswordInputField, "");
 	SetWindowText (hVerifyPasswordInputField, "");
@@ -714,33 +733,6 @@ static BOOL CreatingHiddenSysVol (void)
 		&& bHiddenVol && !bHiddenVolHost);
 }
 
-static void ConfigReadCompareInt(char *configKey, int defaultValue, int* pOutputValue, BOOL bOnlyCheckModified, BOOL* pbModified)
-{
-	int intValue = ConfigReadInt (configKey, defaultValue);
-	if (pOutputValue)
-	{
-		if (pbModified && (*pOutputValue != intValue))
-			*pbModified = TRUE;
-		if (!bOnlyCheckModified)
-			*pOutputValue = intValue;
-	}
-}
-
-static void ConfigReadCompareString (char *configKey, char *defaultValue, char *str, int maxLen, BOOL bOnlyCheckModified, BOOL *pbModified)
-{
-	char *strValue = (char*) malloc (maxLen);
-	memcpy (strValue, str, maxLen);
-
-	ConfigReadString (configKey, defaultValue, strValue, maxLen);
-
-	if (pbModified && strcmp (str, strValue))
-		*pbModified = TRUE;
-	if (!bOnlyCheckModified)
-		memcpy(str, strValue, maxLen);
-
-	free (strValue);
-}
-
 static void LoadSettingsAndCheckModified (HWND hwndDlg, BOOL bOnlyCheckModified, BOOL* pbSettingsModified, BOOL* pbHistoryModified)
 {
 	if (!bOnlyCheckModified)
@@ -770,8 +762,21 @@ static void LoadSettingsAndCheckModified (HWND hwndDlg, BOOL bOnlyCheckModified,
 	if (bOnlyCheckModified)
 	{
 		char langid[6] = {0};
-		StringCbCopyA (langid, sizeof(langid), GetPreferredLangId ());
-		ConfigReadCompareString ("Language", "", langid, sizeof (langid), TRUE, pbSettingsModified);
+		if (!IsNonInstallMode ())
+		{
+			ConfigReadString ("Language", "", langid, sizeof (langid));
+			// when installed, if no preferred language set by user, English is selected default
+			if (langid [0] == 0)
+				StringCbCopyA (langid, sizeof(langid), "en");
+
+			if (pbSettingsModified && strcmp (langid, GetPreferredLangId ()))
+				*pbSettingsModified = TRUE;	
+		}
+		else
+		{
+			StringCbCopyA (langid, sizeof(langid), GetPreferredLangId ());
+			ConfigReadCompareString ("Language", "", langid, sizeof (langid), TRUE, pbSettingsModified);
+		}
 	}
 
 	if (hwndDlg != NULL)
@@ -812,8 +817,7 @@ static void SaveSettings (HWND hwndDlg)
 		ConfigWriteInt ("SaveVolumeHistory", bHistory);
 		ConfigWriteString ("SecurityTokenLibrary", SecurityTokenLibraryPath[0] ? SecurityTokenLibraryPath : "");
 
-		if (GetPreferredLangId () != NULL)
-			ConfigWriteString ("Language", GetPreferredLangId ());
+		ConfigWriteString ("Language", GetPreferredLangId ());
 
 		ConfigWriteEnd (hwndDlg);
 	}
@@ -1473,7 +1477,7 @@ static void VerifySizeAndUpdate (HWND hwndDlg, BOOL bUpdate)
 		i = nMultiplier;
 		lTmp = _atoi64 (szTmp);
 
-		int sectorSize = GetFormatSectorSize();
+		DWORD sectorSize = GetFormatSectorSize();
 		uint32 sectorSizeRem = (lTmp * nMultiplier) % sectorSize;
 
 		if (sectorSizeRem != 0)
@@ -2467,7 +2471,7 @@ static void __cdecl volTransformThreadFunction (void *hwndDlgArg)
 	int nStatus;
 	DWORD dwWin32FormatError;
 	BOOL bHidden;
-	HWND hwndDlg = (HWND) hwndDlgArg;
+	HWND hwndDlg = (HWND) hwndDlgArg;	
 	volatile FORMAT_VOL_PARAMETERS *volParams = (FORMAT_VOL_PARAMETERS *) malloc (sizeof(FORMAT_VOL_PARAMETERS));
 
 	if (volParams == NULL)
@@ -2475,20 +2479,25 @@ static void __cdecl volTransformThreadFunction (void *hwndDlgArg)
 
 	VirtualLock ((LPVOID) volParams, sizeof(FORMAT_VOL_PARAMETERS));
 
-	bVolTransformThreadRunning = TRUE;
-	bVolTransformThreadToRun = FALSE;
+	bOperationSuccess = FALSE;
+
+	if (bGuiMode)
+	{
+		bVolTransformThreadRunning = TRUE;
+		bVolTransformThreadToRun = FALSE;
+	}
 
 	// Check administrator privileges
 	if (!IsAdmin () && !IsUacSupported ())
 	{
 		if (fileSystem == FILESYS_NTFS)
 		{
-			if (MessageBoxW (hwndDlg, GetString ("ADMIN_PRIVILEGES_WARN_NTFS"), lpszTitle, MB_OKCANCEL|MB_ICONWARNING|MB_DEFBUTTON2) == IDCANCEL)
+			if (Silent || (MessageBoxW (hwndDlg, GetString ("ADMIN_PRIVILEGES_WARN_NTFS"), lpszTitle, MB_OKCANCEL|MB_ICONWARNING|MB_DEFBUTTON2) == IDCANCEL))
 				goto cancel;
 		}
 		if (bDevice)
 		{
-			if (MessageBoxW (hwndDlg, GetString ("ADMIN_PRIVILEGES_WARN_DEVICES"), lpszTitle, MB_OKCANCEL|MB_ICONWARNING|MB_DEFBUTTON2) == IDCANCEL)
+			if (Silent || (MessageBoxW (hwndDlg, GetString ("ADMIN_PRIVILEGES_WARN_DEVICES"), lpszTitle, MB_OKCANCEL|MB_ICONWARNING|MB_DEFBUTTON2) == IDCANCEL))
 				goto cancel;
 		}
 	}
@@ -2502,13 +2511,13 @@ static void __cdecl volTransformThreadFunction (void *hwndDlgArg)
 			{
 				wchar_t szTmp[512];
 
-				if (! ((bHiddenVol && !bHiddenVolHost) && errno != EACCES))	// Only ask ask for permission to overwrite an existing volume if we're not creating a hidden volume
+				if (!bForceOperation && !((bHiddenVol && !bHiddenVolHost) && errno != EACCES))	// Only ask ask for permission to overwrite an existing volume if we're not creating a hidden volume
 				{
 					StringCbPrintfW (szTmp, sizeof szTmp,
 						GetString (errno == EACCES ? "READONLYPROMPT" : "OVERWRITEPROMPT"),
 						szDiskFile);
 
-					x = MessageBoxW (hwndDlg, szTmp, lpszTitle, YES_NO|MB_ICONWARNING|MB_DEFBUTTON2);
+					x = Silent? IDNO : MessageBoxW (hwndDlg, szTmp, lpszTitle, YES_NO|MB_ICONWARNING|MB_DEFBUTTON2);
 
 					if (x != IDYES)
 						goto cancel;
@@ -2521,7 +2530,7 @@ static void __cdecl volTransformThreadFunction (void *hwndDlgArg)
 				{
 					if (_chmod (szDiskFile, _S_IREAD | _S_IWRITE) != 0)
 					{
-						MessageBoxW (hwndDlg, GetString ("ACCESSMODEFAIL"), lpszTitle, ICON_HAND);
+						if (!Silent) MessageBoxW (hwndDlg, GetString ("ACCESSMODEFAIL"), lpszTitle, ICON_HAND);
 						goto cancel;
 					}
 				}
@@ -2559,6 +2568,8 @@ static void __cdecl volTransformThreadFunction (void *hwndDlgArg)
 	volParams->password = &volumePassword;
 	volParams->pim = volumePim;
 	volParams->hwndDlg = hwndDlg;
+	volParams->bForceOperation = bForceOperation;
+	volParams->bGuiMode = bGuiMode;
 
 	if (bInPlaceDecNonSys)
 	{
@@ -2602,7 +2613,7 @@ static void __cdecl volTransformThreadFunction (void *hwndDlgArg)
 	{
 		// Format-encryption
 
-		InitProgressBar (GetVolumeDataAreaSize (bHidden, nVolumeSize), 0, FALSE, FALSE, FALSE, TRUE);
+		if (hwndDlg && bGuiMode) InitProgressBar (GetVolumeDataAreaSize (bHidden, nVolumeSize), 0, FALSE, FALSE, FALSE, TRUE);
 
 		nStatus = TCFormatVolume (volParams);
 	}
@@ -2626,19 +2637,19 @@ static void __cdecl volTransformThreadFunction (void *hwndDlgArg)
 
 	dwWin32FormatError = GetLastError ();
 
-	if (bHiddenVolHost && !bVolTransformThreadCancel && nStatus == 0)
+	if (bHiddenVolHost && (!bGuiMode || !bVolTransformThreadCancel) && nStatus == 0)
 	{
 		/* Auto mount the newly created hidden volume host */
 		switch (MountHiddenVolHost (hwndDlg, szDiskFile, &hiddenVolHostDriveNo, &volumePassword, hash_algo, volumePim, FALSE))
 		{
 		case ERR_NO_FREE_DRIVES:
-			MessageBoxW (hwndDlg, GetString ("NO_FREE_DRIVE_FOR_OUTER_VOL"), lpszTitle, ICON_HAND);
-			bVolTransformThreadCancel = TRUE;
+			if (!Silent) MessageBoxW (hwndDlg, GetString ("NO_FREE_DRIVE_FOR_OUTER_VOL"), lpszTitle, ICON_HAND);
+			if (bGuiMode) bVolTransformThreadCancel = TRUE;
 			break;
 		case ERR_VOL_MOUNT_FAILED:
 		case ERR_PASSWORD_WRONG:
-			MessageBoxW (hwndDlg, GetString ("CANT_MOUNT_OUTER_VOL"), lpszTitle, ICON_HAND);
-			bVolTransformThreadCancel = TRUE;
+			if (!Silent) MessageBoxW (hwndDlg, GetString ("CANT_MOUNT_OUTER_VOL"), lpszTitle, ICON_HAND);
+			if (bGuiMode) bVolTransformThreadCancel = TRUE;
 			break;
 		}
 	}
@@ -2683,7 +2694,7 @@ static void __cdecl volTransformThreadFunction (void *hwndDlgArg)
 						ShowInPlaceEncErrMsgWAltSteps (hwndDlg, "INPLACE_ENC_GENERIC_ERR_ALT_STEPS", TRUE);
 				}
 			}
-			else if (!(bHiddenVolHost && hiddenVolHostDriveNo < 0))  // If the error was not that the hidden volume host could not be mounted (this error has already been reported to the user)
+			else if (!Silent && !(bHiddenVolHost && hiddenVolHostDriveNo < 0))  // If the error was not that the hidden volume host could not be mounted (this error has already been reported to the user)
 			{
 				StringCbPrintfW (szMsg, sizeof(szMsg), GetString ("CREATE_FAILED"), szDiskFile);
 				MessageBoxW (hwndDlg, szMsg, lpszTitle, ICON_HAND);
@@ -2704,6 +2715,8 @@ static void __cdecl volTransformThreadFunction (void *hwndDlgArg)
 
 			PimEnable = FALSE;
 
+			bOperationSuccess = TRUE;
+
 			if (bDevice && !bInPlaceEncNonSys)
 			{
 				// Handle assigned drive letter (if any)
@@ -2753,10 +2766,10 @@ static void __cdecl volTransformThreadFunction (void *hwndDlgArg)
 				burn(&szVerify[0], sizeof (szVerify));
 				burn(&szRawPassword[0], sizeof (szRawPassword));
 
-				MessageBeep (MB_OK);
+				if (!Silent) MessageBeep (MB_OK);
 			}
 
-			if (!bInPlaceEncNonSys)
+			if (!bInPlaceEncNonSys && hwndDlg && bGuiMode)
 				SetTimer (hwndDlg, TIMER_ID_RANDVIEW, TIMER_INTERVAL_RANDVIEW, NULL);
 
 
@@ -2766,13 +2779,16 @@ static void __cdecl volTransformThreadFunction (void *hwndDlgArg)
 			free ((LPVOID) volParams);
 			volParams = NULL;
 
-			bVolTransformThreadRunning = FALSE;
-			bVolTransformThreadCancel = FALSE;
+			if (bGuiMode)
+			{
+				bVolTransformThreadRunning = FALSE;
+				bVolTransformThreadCancel = FALSE;
+			}
 
-			PostMessage (hwndDlg, bInPlaceEncNonSys ? TC_APPMSG_NONSYS_INPLACE_ENC_FINISHED : TC_APPMSG_FORMAT_FINISHED, 0, 0);
+			if (hwndDlg && bGuiMode) PostMessage (hwndDlg, bInPlaceEncNonSys ? TC_APPMSG_NONSYS_INPLACE_ENC_FINISHED : TC_APPMSG_FORMAT_FINISHED, 0, 0);
 
 			LastDialogId = "FORMAT_FINISHED";
-			_endthread ();
+			if (bGuiMode) _endthread ();
 		}
 	}
 
@@ -2780,7 +2796,7 @@ cancel:
 
 	LastDialogId = (bInPlaceEncNonSys ? "NONSYS_INPLACE_ENC_CANCELED" : "FORMAT_CANCELED");
 
-	if (!bInPlaceEncNonSys)
+	if (!bInPlaceEncNonSys && hwndDlg && bGuiMode)
 		SetTimer (hwndDlg, TIMER_ID_RANDVIEW, TIMER_INTERVAL_RANDVIEW, NULL);
 
 	if (volParams != NULL)
@@ -2791,18 +2807,21 @@ cancel:
 		volParams = NULL;
 	}
 
-	bVolTransformThreadRunning = FALSE;
-	bVolTransformThreadCancel = FALSE;
+	if (bGuiMode)
+	{
+		bVolTransformThreadRunning = FALSE;
+		bVolTransformThreadCancel = FALSE;
+	}
 
 	// Allow the OS to enter Sleep mode when idle
 	SetThreadExecutionState (ES_CONTINUOUS);
 
-	PostMessage (hwndDlg, TC_APPMSG_VOL_TRANSFORM_THREAD_ENDED, 0, 0);
+	if (hwndDlg) PostMessage (hwndDlg, TC_APPMSG_VOL_TRANSFORM_THREAD_ENDED, 0, 0);
 
 	if (bHiddenVolHost && hiddenVolHostDriveNo < -1 && !bVolTransformThreadCancel)	// If hidden volume host could not be mounted
 		AbortProcessSilent ();
 
-	_endthread ();
+	if (bGuiMode) _endthread ();
 }
 
 static void LoadPage (HWND hwndDlg, int nPageNo)
@@ -3336,7 +3355,7 @@ BOOL QueryFreeSpace (HWND hwndDlg, HWND hwndTextBox, BOOL display)
 			return FALSE;
 		}
 
-		int sectorSize = GetFormatSectorSize();
+		DWORD sectorSize = GetFormatSectorSize();
 
 		if (sectorSize < TC_MIN_VOLUME_SECTOR_SIZE
 			|| sectorSize > TC_MAX_VOLUME_SECTOR_SIZE
@@ -3396,7 +3415,7 @@ static BOOL FinalPreTransformPrompts (void)
 
 	driveNo = GetDiskDeviceDriveLetter (deviceName);
 
-	if (!(bHiddenVol && !bHiddenVolHost))	// Do not ask for permission to overwrite an existing volume if we're creating a hidden volume within it
+	if (!bForceOperation && !(bHiddenVol && !bHiddenVolHost))	// Do not ask for permission to overwrite an existing volume if we're creating a hidden volume within it
 	{
 		wchar_t drive[128];
 		wchar_t volumeLabel[128];
@@ -3423,8 +3442,11 @@ static BOOL FinalPreTransformPrompts (void)
 		else
 			StringCbPrintfW (szTmp, sizeof(szTmp), GetString (bInPlaceEncNonSys ? (bInPlaceDecNonSys ? "NONSYS_INPLACE_DEC_CONFIRM" : "NONSYS_INPLACE_ENC_CONFIRM") : "OVERWRITEPROMPT_DEVICE"), type, szFileName, drive);
 
+		if (bInPlaceEncNonSys)
+			x = AskWarnYesNoString (szTmp, MainDlg);
+		else
+			x = AskWarnNoYesString (szTmp, MainDlg);
 
-		x = MessageBoxW (MainDlg, szTmp, lpszTitle, YES_NO | MB_ICONWARNING | (bInPlaceEncNonSys ? MB_DEFBUTTON1 : MB_DEFBUTTON2));
 		if (x != IDYES)
 			return FALSE;
 
@@ -3510,7 +3532,7 @@ void HandleOldAssignedDriveLetter (void)
 		ToUNICODE ((char *)deviceName, sizeof(deviceName));
 		driveLetter = GetDiskDeviceDriveLetter (deviceName);
 
-		if (!bHiddenVolHost
+		if (!Silent && !bHiddenVolHost
 			&& !bHiddenOS
 			&& driveLetter > 1)		// If a drive letter is assigned to the device, but not A: or B:
 		{
@@ -4763,7 +4785,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 				for (int i = 1; i <= 128; i *= 2)
 				{
 					wstringstream s;
-					int size = GetFormatSectorSize() * i;
+					DWORD size = GetFormatSectorSize() * i;
 
 					if (size > TC_MAX_FAT_CLUSTER_SIZE)
 						break;
@@ -5436,16 +5458,13 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 
 		if (lw == IDC_SHOW_PASSWORD && nCurPageNo == PASSWORD_PAGE)
 		{
-			SendMessage (GetDlgItem (hwndDlg, IDC_PASSWORD),
-						EM_SETPASSWORDCHAR,
-						GetCheckBox (hwndDlg, IDC_SHOW_PASSWORD) ? 0 : '*',
-						0);
-			SendMessage (GetDlgItem (hwndDlg, IDC_VERIFY),
-						EM_SETPASSWORDCHAR,
-						GetCheckBox (hwndDlg, IDC_SHOW_PASSWORD) ? 0 : '*',
-						0);
-			InvalidateRect (GetDlgItem (hwndDlg, IDC_PASSWORD), NULL, TRUE);
-			InvalidateRect (GetDlgItem (hwndDlg, IDC_VERIFY), NULL, TRUE);
+			HandleShowPasswordFieldAction (hwndDlg, IDC_SHOW_PASSWORD, IDC_PASSWORD, IDC_VERIFY);
+			return 1;
+		}
+
+		if (lw == IDC_SHOW_PIM && nCurPageNo == PIM_PAGE)
+		{
+			HandleShowPasswordFieldAction (hwndDlg, IDC_SHOW_PIM, IDC_PIM, 0);
 			return 1;
 		}
 
@@ -5536,11 +5555,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 
 			if (lw == IDC_SHOW_PASSWORD_SINGLE)
 			{
-				SendMessage (GetDlgItem (hwndDlg, IDC_PASSWORD_DIRECT),
-					EM_SETPASSWORDCHAR,
-					GetCheckBox (hwndDlg, IDC_SHOW_PASSWORD_SINGLE) ? 0 : '*',
-					0);
-				InvalidateRect (GetDlgItem (hwndDlg, IDC_PASSWORD_DIRECT), NULL, TRUE);
+				HandleShowPasswordFieldAction (hwndDlg, IDC_SHOW_PASSWORD_SINGLE, IDC_PASSWORD_DIRECT, IDC_PIM);
 				return 1;
 			}
 		}
@@ -5873,6 +5888,167 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 				exit (0);
 			}
 
+			if (DirectCreationMode)
+			{
+				char root[TC_MAX_PATH];
+				DWORD fileSystemFlags = 0;
+				uint64 dataAreaSize;
+				char szFileSystemNameBuffer[256];
+				ULARGE_INTEGER free;
+
+				showKeys = FALSE;
+				bGuiMode = FALSE;
+
+				if (CmdVolumePassword.Length == 0)
+					AbortProcess ("ERR_PASSWORD_MISSING");
+				
+				if (CmdVolumeFileSize == 0)
+					AbortProcess ("ERR_SIZE_MISSING");
+
+				CreateFullVolumePath (szDiskFile, sizeof(szDiskFile), szFileName, &bDevice);
+
+				if (bDevice)
+					AbortProcess ("ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED");
+
+				volumePassword = CmdVolumePassword;
+				volumePim = CmdVolumePim;
+
+				if (CmdVolumeEA > 0)
+					nVolumeEA = CmdVolumeEA;
+
+				if (CmdVolumePkcs5 > 0)
+					hash_algo = CmdVolumePkcs5;
+
+				if (CmdVolumeFilesystem > 0)
+					fileSystem = CmdVolumeFilesystem;
+				else
+					fileSystem = FILESYS_NTFS;
+
+				nVolumeSize = CmdVolumeFileSize;
+
+				// correct volume size to be multiple of sector size
+				if (bDevice && !(bHiddenVol && !bHiddenVolHost))	// If raw device but not a hidden volume
+				{
+					// do nothing. no correction is needed
+				}
+				else
+				{
+					unsigned __int64 sectorSize = (unsigned __int64) GetFormatSectorSize();
+					unsigned __int64 sectorSizeRem = nVolumeSize % sectorSize;
+
+					if (sectorSizeRem != 0)
+						nVolumeSize = nVolumeSize + (sectorSize - sectorSizeRem);
+				}
+
+				if (nVolumeSize < (bHiddenVolHost ? TC_MIN_HIDDEN_VOLUME_HOST_SIZE : (bHiddenVol ? TC_MIN_HIDDEN_VOLUME_SIZE : TC_MIN_VOLUME_SIZE)))
+					AbortProcess ("ERR_VOLUME_SIZE_TOO_SMALL");
+
+				if (	((!bHiddenVolHost && bHiddenVol) && (nVolumeSize > nMaximumHiddenVolSize))
+					||	(nVolumeSize > (bHiddenVolHost ? TC_MAX_HIDDEN_VOLUME_HOST_SIZE : TC_MAX_VOLUME_SIZE))
+					)
+				{
+					AbortProcess ("ERR_VOLUME_SIZE_TOO_BIG");
+				}
+
+				if (!GetVolumePathName (szFileName, root, sizeof (root)))
+				{
+					handleWin32Error (hwndDlg, SRC_POS);
+					exit (1);
+				}
+		
+				if (CmdSparseFileSwitch)
+				{
+					/* Check if the host file system supports sparse files */
+					GetVolumeInformation (root, NULL, 0, NULL, NULL, &fileSystemFlags, NULL, 0);
+					bSparseFileSwitch = fileSystemFlags & FILE_SUPPORTS_SPARSE_FILES;
+
+					if (!bSparseFileSwitch)
+					{
+						AbortProcess ("ERR_DYNAMIC_NOT_SUPPORTED");
+					}
+				}
+
+				quickFormat = TRUE;
+
+				if (!GetDiskFreeSpaceEx (root, &free, 0, 0))
+				{
+					wchar_t szTmp[1024];
+
+					if (translateWin32Error (szTmp, sizeof (szTmp) / sizeof(szTmp[0])))
+					{
+						wchar_t szTmp2[1024];
+						StringCbPrintfW (szTmp2, sizeof(szTmp2), L"%s\n%s", GetString ("CANNOT_CALC_SPACE"), szTmp);
+						AbortProcessDirect (szTmp2);
+					}
+					else
+					{
+						handleWin32Error (hwndDlg, SRC_POS);
+					}
+
+					exit (1);
+				}
+				else
+				{
+					if (!bSparseFileSwitch && (nVolumeSize > free.QuadPart))
+					{
+						AbortProcess ("ERR_CONTAINER_SIZE_TOO_BIG");
+					}
+				}
+
+				dataAreaSize = GetVolumeDataAreaSize (bHiddenVol && !bHiddenVolHost, nVolumeSize);
+
+				if (	(fileSystem == FILESYS_NTFS) && 
+						(dataAreaSize < TC_MIN_NTFS_FS_SIZE || dataAreaSize > TC_MAX_NTFS_FS_SIZE)
+					)
+				{
+					AbortProcess ("ERR_NTFS_INVALID_VOLUME_SIZE");
+				}
+
+				if (	(fileSystem == FILESYS_FAT) && 
+						(dataAreaSize < TC_MIN_FAT_FS_SIZE || dataAreaSize > (TC_MAX_FAT_SECTOR_COUNT * GetFormatSectorSize()))
+					)
+				{
+					AbortProcess ("ERR_FAT_INVALID_VOLUME_SIZE");
+				}
+
+				/* Verify that the volume would not be too large for the host file system */
+				if (GetVolumePathName (szDiskFile, root, sizeof (root))
+					&& GetVolumeInformation (root, NULL, 0, NULL, NULL, NULL, szFileSystemNameBuffer, sizeof(szFileSystemNameBuffer))
+					&& !strncmp (szFileSystemNameBuffer, "FAT32", 5))
+				{
+					// The host file system is FAT32
+					if (nVolumeSize >= 4 * BYTES_PER_GB)
+					{
+						AbortProcess ("VOLUME_TOO_LARGE_FOR_FAT32");
+					}
+				}
+
+				/* Verify that the volume would not be too large for the operating system */
+				if (!IsOSAtLeast (WIN_VISTA)
+					&& nVolumeSize > 2 * BYTES_PER_TB)
+				{
+					AbortProcess ("VOLUME_TOO_LARGE_FOR_WINXP");
+				}
+
+				if (volumePassword.Length > 0)
+				{	
+					// Password character encoding
+					if (!CheckPasswordCharEncoding (NULL, &volumePassword))
+					{
+						AbortProcess ("UNSUPPORTED_CHARS_IN_PWD");
+					}
+					// Check password length (check also done for outer volume which is not the case in TrueCrypt).
+					else if (!CheckPasswordLength (NULL, volumePassword.Length, volumePim, FALSE, Silent, Silent))
+					{
+						exit (1);
+					}
+				}
+
+				volTransformThreadFunction (hwndDlg);
+
+				exit (bOperationSuccess? 0 : 1);
+			}
+
 			SHGetFolderPath (NULL, CSIDL_MYDOCUMENTS, NULL, 0, szRescueDiskISO);
 			StringCbCatA (szRescueDiskISO, sizeof(szRescueDiskISO), "\\VeraCrypt Rescue Disk.iso");
 
@@ -7124,7 +7300,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 						return 1;
 					}
 					// Check password length (check also done for outer volume which is not the case in TrueCrypt).
-					else if (!CheckPasswordLength (hwndDlg, volumePassword.Length, 0, SysEncInEffect(), FALSE))
+					else if (!CheckPasswordLength (hwndDlg, volumePassword.Length, 0, SysEncInEffect(), FALSE, FALSE))
 					{
 						return 1;
 					}
@@ -7139,7 +7315,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 					{
 						WaitCursor ();
 
-						if (!KeyFilesApply (hwndDlg, &volumePassword, FirstKeyFile))
+						if (!KeyFilesApply (hwndDlg, &volumePassword, FirstKeyFile, NULL))
 						{
 							NormalCursor ();
 							return 1;
@@ -7203,7 +7379,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 						return 1;
 					}
 					// Check password length (check also done for outer volume which is not the case in TrueCrypt).
-					else if (!CheckPasswordLength (hwndDlg, volumePassword.Length, volumePim, SysEncInEffect(), TRUE))
+					else if (!CheckPasswordLength (hwndDlg, volumePassword.Length, volumePim, SysEncInEffect(), TRUE, FALSE))
 					{
 						return 1;
 					}
@@ -7244,7 +7420,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 
 				if (KeyFilesEnable)
 				{
-					KeyFilesApply (hwndDlg, &volumePassword, FirstKeyFile);
+					KeyFilesApply (hwndDlg, &volumePassword, FirstKeyFile, NULL);
 				}
 			
 				if (!bInPlaceEncNonSys)
@@ -7603,7 +7779,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 				}
 
 retryCDDriveCheck:
-				if (!bDontVerifyRescueDisk && !BootEncObj->IsCDDrivePresent())
+				if (!bDontVerifyRescueDisk && !BootEncObj->IsCDRecorderPresent())
 				{
 					char *multiChoiceStr[] = { 0, "CD_BURNER_NOT_PRESENT",
 						"CD_BURNER_NOT_PRESENT_WILL_STORE_ISO",
@@ -8480,6 +8656,16 @@ void ExtractCommandLine (HWND hwndDlg, char *lpszCommandLine)
 				CommandInplaceDec,
 				CommandResumeInplaceDec,
 				CommandResumeInplace,
+				OptionEncryption,
+				OptionFilesystem,
+				OptionPkcs5,
+				OptionPassword,
+				OptionPim,
+				OptionSize,
+				OptionCreate,
+				OptionSilent,
+				OptionDynamic,
+				OptionForce,
 			};
 
 			argument args[]=
@@ -8489,6 +8675,16 @@ void ExtractCommandLine (HWND hwndDlg, char *lpszCommandLine)
 				{ OptionNoIsoCheck,				"/noisocheck",		"/n", FALSE },
 				{ OptionTokenLib,				"/tokenlib",		NULL, FALSE },
 				{ OptionQuit,					"/quit",			"/q", FALSE },
+				{ OptionEncryption,			"/encryption",			NULL , FALSE },
+				{ OptionFilesystem,			"/filesystem",			NULL , FALSE },
+				{ OptionPkcs5,					"/hash",			NULL , FALSE },
+				{ OptionPassword,				"/password",		NULL, FALSE },
+				{ OptionPim,					"/pim",				NULL, FALSE },
+				{ OptionSize,					"/size",				NULL, FALSE },
+				{ OptionCreate,				"/create",			NULL, FALSE },
+				{ OptionSilent,				"/silent",			NULL, FALSE },
+				{ OptionDynamic,				"/dynamic",			NULL, FALSE },
+				{ OptionForce,					"/force",			NULL, FALSE },
 
 				// Internal 
 				{ CommandResumeSysEncLogOn,		"/acsysenc",		"/a", TRUE },
@@ -8518,6 +8714,160 @@ void ExtractCommandLine (HWND hwndDlg, char *lpszCommandLine)
 
 			switch (x)
 			{
+			case OptionCreate:
+				{
+					DirectCreationMode = TRUE;
+
+					if (HAS_ARGUMENT == GetArgumentValue (lpszCommandLineArgs, &i, nNoCommandLineArgs,
+						     szFileName, sizeof (szFileName)))
+					{
+						RelativePath2Absolute (szFileName);
+					}
+					else
+						AbortProcess ("COMMAND_LINE_ERROR");
+				}
+				break;
+			case OptionEncryption:
+				{
+					char szTmp[64] = {0};
+					if (HAS_ARGUMENT == GetArgumentValue (lpszCommandLineArgs,
+						&i, nNoCommandLineArgs, szTmp, sizeof (szTmp)))
+					{
+						CmdVolumeEA = EAGetByName (szTmp);
+						if (CmdVolumeEA == 0)
+							AbortProcess ("COMMAND_LINE_ERROR");
+					}
+					else
+						AbortProcess ("COMMAND_LINE_ERROR");
+					}
+				break;
+			case OptionFilesystem:
+				{
+					char szTmp[8] = {0};
+					if (HAS_ARGUMENT == GetArgumentValue (lpszCommandLineArgs,
+						&i, nNoCommandLineArgs, szTmp, sizeof (szTmp)))
+					{
+						if (_stricmp(szTmp, "NONE") == 0)
+							CmdVolumeFilesystem = FILESYS_NONE;
+						else if (_stricmp(szTmp, "FAT32") == 0 || _stricmp(szTmp, "FAT") == 0)
+							CmdVolumeFilesystem = FILESYS_FAT;
+						else if (_stricmp(szTmp, "NTFS") == 0)
+							CmdVolumeFilesystem = FILESYS_NTFS;
+						else
+						{
+							AbortProcess ("COMMAND_LINE_ERROR");
+						}
+					}
+					else
+						AbortProcess ("COMMAND_LINE_ERROR");
+					}
+				break;
+			case OptionPassword:
+				if (HAS_ARGUMENT == GetArgumentValue (lpszCommandLineArgs, &i, nNoCommandLineArgs,
+						     (char *) CmdVolumePassword.Text, sizeof (CmdVolumePassword.Text)))
+				{
+					CmdVolumePassword.Length = (unsigned __int32) strlen ((char *) CmdVolumePassword.Text);
+				}
+				else
+					AbortProcess ("COMMAND_LINE_ERROR");
+				break;
+			case OptionPkcs5:
+				{
+					char szTmp[32] = {0};
+					if (HAS_ARGUMENT == GetArgumentValue (lpszCommandLineArgs,
+						&i, nNoCommandLineArgs, szTmp, sizeof (szTmp)))
+					{
+						if (_stricmp(szTmp, "sha512") == 0 || _stricmp(szTmp, "sha-512") == 0)
+							CmdVolumePkcs5 = SHA512;
+						else if (_stricmp(szTmp, "whirlpool") == 0)
+							CmdVolumePkcs5 = WHIRLPOOL;
+						else if (_stricmp(szTmp, "sha256") == 0 || _stricmp(szTmp, "sha-256") == 0)
+							CmdVolumePkcs5 = SHA256;
+						else if (_stricmp(szTmp, "ripemd160") == 0 || _stricmp(szTmp, "ripemd-160") == 0)
+							CmdVolumePkcs5 = RIPEMD160;
+						else
+						{
+							CmdVolumePkcs5 = 0;
+							AbortProcess ("COMMAND_LINE_ERROR");
+						}
+
+					}
+					else
+						AbortProcess ("COMMAND_LINE_ERROR");
+				}
+				break;
+
+			case OptionPim:
+				{
+					char szTmp[32] = {0};
+					if (HAS_ARGUMENT == GetArgumentValue (lpszCommandLineArgs,
+						&i, nNoCommandLineArgs, szTmp, sizeof (szTmp)))
+					{
+						char* endPtr = NULL;
+						CmdVolumePim = (int) strtol(szTmp, &endPtr, 0);
+						if (CmdVolumePim < 0 || endPtr == szTmp || *endPtr != '\0')
+						{
+							CmdVolumePim = 0;
+							AbortProcess ("COMMAND_LINE_ERROR");
+						}
+
+					}
+					else
+						AbortProcess ("COMMAND_LINE_ERROR");
+				}
+				break;
+			case OptionSilent:
+				Silent = TRUE;
+				break;
+			case OptionDynamic:
+				CmdSparseFileSwitch = TRUE;
+				break;
+			case OptionForce:
+				bForceOperation = TRUE;
+				break;
+			case OptionSize:
+				{
+					char szTmp[32] = {0};
+					if (HAS_ARGUMENT == GetArgumentValue (lpszCommandLineArgs,
+									&i, nNoCommandLineArgs, szTmp, sizeof (szTmp)) 
+						 && (strlen (szTmp) >= 2)
+						)
+					{
+						/* size can be expressed in bytes or with suffixes K, M,G or T
+						 * to indicate the unit to use
+						 */
+						unsigned __int64 multiplier;
+						char* endPtr = NULL;
+						char lastChar = szTmp [strlen (szTmp) - 1];
+						if (lastChar >= '0' && lastChar <= '9')
+							multiplier = 1;
+						else if (lastChar == 'K' || lastChar == 'k')
+							multiplier = BYTES_PER_KB;
+						else if (lastChar == 'M' || lastChar == 'm')
+							multiplier = BYTES_PER_MB;
+						else if (lastChar == 'G' || lastChar == 'g')
+							multiplier = BYTES_PER_GB;
+						else if (lastChar == 'T' || lastChar == 't')
+							multiplier = BYTES_PER_TB;
+						else
+							AbortProcess ("COMMAND_LINE_ERROR");
+
+						if (multiplier != 1)
+							szTmp [strlen (szTmp) - 1] = 0;
+
+						CmdVolumeFileSize = _strtoui64(szTmp, &endPtr, 0);
+						if (CmdVolumeFileSize == 0 || CmdVolumeFileSize == _UI64_MAX 
+							|| endPtr == szTmp || *endPtr != '\0')
+						{
+							AbortProcess ("COMMAND_LINE_ERROR");
+						}
+
+						CmdVolumeFileSize *= multiplier;
+					}
+					else
+						AbortProcess ("COMMAND_LINE_ERROR");
+				}
+				break;
 			case CommandSysEnc:
 				// Encrypt system partition/drive (passed by Mount if system encryption hasn't started or to reverse decryption)
 
@@ -9715,7 +10065,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, char *lpszComm
 }
 
 
-static int GetFormatSectorSize ()
+static DWORD GetFormatSectorSize ()
 {
 	if (!bDevice)
 		return TC_SECTOR_SIZE_FILE_HOSTED_VOLUME;
diff --git a/src/Format/Tcformat.h b/src/Format/Tcformat.h
index 0366bfe..f49746a 100644
--- a/src/Format/Tcformat.h
+++ b/src/Format/Tcformat.h
@@ -78,7 +78,7 @@ static void WipeAbort (void);
 static void UpdateWipeProgressBar (void);
 static void InitWipeProgressBar (void);
 static void UpdateWipeControls (void);
-static int GetFormatSectorSize ();
+static DWORD GetFormatSectorSize ();
 
 extern BOOL showKeys;
 extern volatile HWND hMasterKey;
diff --git a/src/Main/CommandLineInterface.cpp b/src/Main/CommandLineInterface.cpp
index 4b1584c..3563f0b 100644
--- a/src/Main/CommandLineInterface.cpp
+++ b/src/Main/CommandLineInterface.cpp
@@ -71,6 +71,7 @@ namespace VeraCrypt
 		parser.AddOption (L"",	L"new-password",		_("New password"));
 		parser.AddOption (L"",	L"new-pim",				_("New PIM"));
 		parser.AddSwitch (L"",	L"non-interactive",		_("Do not interact with user"));
+		parser.AddSwitch (L"",  L"stdin",				_("Read password from standard input"));
 		parser.AddOption (L"p", L"password",			_("Password"));
 		parser.AddOption (L"",  L"pim",					_("PIM"));
 		parser.AddOption (L"",	L"protect-hidden",		_("Protect hidden volume"));
@@ -402,9 +403,21 @@ namespace VeraCrypt
 			Preferences.NonInteractive = true;
 		}
 
+		if (parser.Found (L"stdin"))
+		{
+			if (!Preferences.NonInteractive)
+				throw_err (L"--stdin is supported only in non-interactive mode");
+
+			Preferences.UseStandardInput = true;
+		}
+
 		if (parser.Found (L"password", &str))
+		{
+			if (Preferences.UseStandardInput)
+				throw_err (L"--password cannot be used with --stdin");
 			ArgPassword.reset (new VolumePassword (wstring (str)));
-		
+		}
+
 		if (parser.Found (L"pim", &str))
 		{
 			try
diff --git a/src/Main/Forms/Forms.cpp b/src/Main/Forms/Forms.cpp
index 3b4e055..5917562 100644
--- a/src/Main/Forms/Forms.cpp
+++ b/src/Main/Forms/Forms.cpp
@@ -3209,7 +3209,7 @@ VolumePasswordPanelBase::VolumePasswordPanelBase( wxWindow* parent, wxWindowID i
 	VolumePimStaticText->Wrap( -1 );
 	GridBagSizer->Add( VolumePimStaticText, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM|wxRIGHT, 5 );
 	
-	VolumePimTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	VolumePimTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
 	VolumePimTextCtrl->SetMaxLength( 10 ); 
 	GridBagSizer->Add( VolumePimTextCtrl, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND, 5 );
 	
@@ -3350,7 +3350,7 @@ VolumePimWizardPageBase::VolumePimWizardPageBase( wxWindow* parent, wxWindowID i
 	VolumePimStaticText->Wrap( -1 );
 	PimSizer->Add( VolumePimStaticText, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
-	VolumePimTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	VolumePimTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
 	VolumePimTextCtrl->SetMaxLength( 10 ); 
 	PimSizer->Add( VolumePimTextCtrl, 0, wxALL, 5 );
 	
@@ -3361,6 +3361,15 @@ VolumePimWizardPageBase::VolumePimWizardPageBase( wxWindow* parent, wxWindowID i
 	
 	PimPanelSizer->Add( PimSizer, 1, wxEXPAND, 5 );
 	
+	wxBoxSizer* bSizer166;
+	bSizer166 = new wxBoxSizer( wxHORIZONTAL );
+	
+	DisplayPimCheckBox = new wxCheckBox( this, wxID_ANY, _("&Display PIM"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer166->Add( DisplayPimCheckBox, 1, wxALL|wxEXPAND, 5 );
+	
+	
+	PimPanelSizer->Add( bSizer166, 1, wxEXPAND, 5 );
+	
 	
 	bSizer102->Add( PimPanelSizer, 0, wxEXPAND, 5 );
 	
@@ -3378,12 +3387,14 @@ VolumePimWizardPageBase::VolumePimWizardPageBase( wxWindow* parent, wxWindowID i
 	
 	// Connect Events
 	VolumePimTextCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( VolumePimWizardPageBase::OnPimChanged ), NULL, this );
+	DisplayPimCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( VolumePimWizardPageBase::OnDisplayPimCheckBoxClick ), NULL, this );
 }
 
 VolumePimWizardPageBase::~VolumePimWizardPageBase()
 {
 	// Disconnect Events
 	VolumePimTextCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( VolumePimWizardPageBase::OnPimChanged ), NULL, this );
+	DisplayPimCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( VolumePimWizardPageBase::OnDisplayPimCheckBoxClick ), NULL, this );
 	
 }
 
diff --git a/src/Main/Forms/Forms.h b/src/Main/Forms/Forms.h
index a8eccf6..3edc6a7 100644
--- a/src/Main/Forms/Forms.h
+++ b/src/Main/Forms/Forms.h
@@ -1026,10 +1026,12 @@ namespace VeraCrypt
 			wxStaticText* VolumePimStaticText;
 			wxTextCtrl* VolumePimTextCtrl;
 			wxStaticText* VolumePimHelpStaticText;
+			wxCheckBox* DisplayPimCheckBox;
 			wxStaticText* InfoStaticText;
 			
 			// Virtual event handlers, overide them in your derived class
 			virtual void OnPimChanged( wxCommandEvent& event ) { event.Skip(); }
+			virtual void OnDisplayPimCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
 			
 		
 		public:
diff --git a/src/Main/Forms/TrueCrypt.fbp b/src/Main/Forms/TrueCrypt.fbp
index 903bd83..ca816a5 100644
--- a/src/Main/Forms/TrueCrypt.fbp
+++ b/src/Main/Forms/TrueCrypt.fbp
@@ -25972,7 +25972,7 @@
                                 <property name="resize">Resizable</property>
                                 <property name="show">1</property>
                                 <property name="size"></property>
-                                <property name="style"></property>
+                                <property name="style">wxTE_PASSWORD</property>
                                 <property name="subclass"></property>
                                 <property name="toolbar_pane">0</property>
                                 <property name="tooltip"></property>
@@ -27412,7 +27412,7 @@
                                                 <property name="resize">Resizable</property>
                                                 <property name="show">1</property>
                                                 <property name="size"></property>
-                                                <property name="style"></property>
+                                                <property name="style">wxTE_PASSWORD</property>
                                                 <property name="subclass"></property>
                                                 <property name="toolbar_pane">0</property>
                                                 <property name="tooltip"></property>
@@ -27538,6 +27538,105 @@
                                         </object>
                                     </object>
                                 </object>
+                                <object class="sizeritem" expanded="0">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxEXPAND</property>
+                                    <property name="proportion">1</property>
+                                    <object class="wxBoxSizer" expanded="0">
+                                        <property name="minimum_size"></property>
+                                        <property name="name">bSizer166</property>
+                                        <property name="orient">wxHORIZONTAL</property>
+                                        <property name="permission">none</property>
+                                        <object class="sizeritem" expanded="0">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALL|wxEXPAND</property>
+                                            <property name="proportion">1</property>
+                                            <object class="wxCheckBox" expanded="0">
+                                                <property name="BottomDockable">1</property>
+                                                <property name="LeftDockable">1</property>
+                                                <property name="RightDockable">1</property>
+                                                <property name="TopDockable">1</property>
+                                                <property name="aui_layer"></property>
+                                                <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</property>
+                                                <property name="center_pane">0</property>
+                                                <property name="checked">0</property>
+                                                <property name="close_button">1</property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="default_pane">0</property>
+                                                <property name="dock">Dock</property>
+                                                <property name="dock_fixed">0</property>
+                                                <property name="docking">Left</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="floatable">1</property>
+                                                <property name="font"></property>
+                                                <property name="gripper">0</property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="label">&Display PIM</property>
+                                                <property name="max_size"></property>
+                                                <property name="maximize_button">0</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="min_size"></property>
+                                                <property name="minimize_button">0</property>
+                                                <property name="minimum_size"></property>
+                                                <property name="moveable">1</property>
+                                                <property name="name">DisplayPimCheckBox</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <property name="subclass"></property>
+                                                <property name="toolbar_pane">0</property>
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnCheckBox">OnDisplayPimCheckBoxClick</event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                    </object>
+                                </object>
                             </object>
                         </object>
                         <object class="sizeritem" expanded="0">
diff --git a/src/Main/Forms/VolumePasswordPanel.cpp b/src/Main/Forms/VolumePasswordPanel.cpp
index 8d4639b..0313453 100644
--- a/src/Main/Forms/VolumePasswordPanel.cpp
+++ b/src/Main/Forms/VolumePasswordPanel.cpp
@@ -66,10 +66,7 @@ namespace VeraCrypt
 		VolumePimTextCtrl->Show (false);
 		VolumePimHelpStaticText->Show (false);
 
-		wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST);  // wxFILTER_NUMERIC does not exclude - . , etc.
-		const wxChar *valArr[] = { L"0", L"1", L"2", L"3", L"4", L"5", L"6", L"7", L"8", L"9" };
-		validator.SetIncludes (wxArrayString (array_capacity (valArr), (const wxChar **) &valArr));
-		VolumePimTextCtrl->SetValidator (validator);
+		SetPimValidator ();
 
 		ConfirmPasswordStaticText->Show (enableConfirmation);
 		ConfirmPasswordTextCtrl->Show (enableConfirmation);
@@ -186,17 +183,27 @@ namespace VeraCrypt
 		UseKeyfilesCheckBox->SetValue (true);
 	}
 
+	void VolumePasswordPanel::SetPimValidator ()
+	{
+		wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST);  // wxFILTER_NUMERIC does not exclude - . , etc.
+		const wxChar *valArr[] = { L"0", L"1", L"2", L"3", L"4", L"5", L"6", L"7", L"8", L"9" };
+		validator.SetIncludes (wxArrayString (array_capacity (valArr), (const wxChar **) &valArr));
+		VolumePimTextCtrl->SetValidator (validator);
+	}
+
 	void VolumePasswordPanel::DisplayPassword (bool display, wxTextCtrl **textCtrl, int row)
 	{
 		FreezeScope freeze (this);
+		bool isPim = (*textCtrl == VolumePimTextCtrl);
+		int colspan = isPim? 1 : 2;
 
 		wxTextCtrl *newTextCtrl = new wxTextCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, display ? 0 : wxTE_PASSWORD);
-		newTextCtrl->SetMaxLength (VolumePassword::MaxSize); 
+		newTextCtrl->SetMaxLength (isPim? 10 : VolumePassword::MaxSize); 
 		newTextCtrl->SetValue ((*textCtrl)->GetValue());
 		newTextCtrl->SetMinSize ((*textCtrl)->GetSize());
 
 		GridBagSizer->Detach ((*textCtrl));
-		GridBagSizer->Add (newTextCtrl, wxGBPosition (row, 1), wxGBSpan (1, 2), wxEXPAND|wxBOTTOM|wxALIGN_CENTER_VERTICAL, 5);
+		GridBagSizer->Add (newTextCtrl, wxGBPosition (row, 1), wxGBSpan (1, colspan), wxEXPAND|wxBOTTOM|wxALIGN_CENTER_VERTICAL, 5);
 		(*textCtrl)->Show (false);
 		WipeTextCtrl (*textCtrl);
 
@@ -204,8 +211,11 @@ namespace VeraCrypt
 		Layout();
 		newTextCtrl->SetMinSize ((*textCtrl)->GetMinSize());
 
-		newTextCtrl->Connect (wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (VolumePasswordPanel::OnTextChanged), nullptr, this);
+		newTextCtrl->Connect (wxEVT_COMMAND_TEXT_UPDATED, isPim? wxCommandEventHandler (VolumePasswordPanel::OnPimChanged): wxCommandEventHandler (VolumePasswordPanel::OnTextChanged), nullptr, this);
+		delete *textCtrl;
 		*textCtrl = newTextCtrl;
+		if (isPim)
+			SetPimValidator ();
 	}
 
 	shared_ptr <VolumePassword> VolumePasswordPanel::GetPassword () const
@@ -369,6 +379,9 @@ namespace VeraCrypt
 		
 		if (ConfirmPasswordTextCtrl->IsShown())
 			DisplayPassword (event.IsChecked(), &ConfirmPasswordTextCtrl, 2);
+		
+		if (VolumePimTextCtrl->IsShown())
+			DisplayPassword (event.IsChecked(), &VolumePimTextCtrl, 3);
 
 		OnUpdate();
 	}
@@ -449,9 +462,15 @@ namespace VeraCrypt
 			VolumePimStaticText->Show (true);
 			VolumePimTextCtrl->Show (true);
 			VolumePimHelpStaticText->Show (true);	
-		
-			Layout();
-			Fit();
+			
+			if (DisplayPasswordCheckBox->IsChecked ())
+				DisplayPassword (true, &VolumePimTextCtrl, 3);
+			else
+			{
+				Layout();
+				Fit();
+			}
+			
 			GetParent()->Layout();
 			GetParent()->Fit();
 		}
diff --git a/src/Main/Forms/VolumePasswordPanel.h b/src/Main/Forms/VolumePasswordPanel.h
index 520c36f..de2475e 100644
--- a/src/Main/Forms/VolumePasswordPanel.h
+++ b/src/Main/Forms/VolumePasswordPanel.h
@@ -45,6 +45,7 @@ namespace VeraCrypt
 		Event UpdateEvent;
 
 	protected:
+		void SetPimValidator ();
 		void DisplayPassword (bool display, wxTextCtrl **textCtrl, int row);
 		shared_ptr <VolumePassword> GetPassword (wxTextCtrl *textCtrl) const;
 		void OnAddKeyfileDirMenuItemSelected (wxCommandEvent& event);
diff --git a/src/Main/Forms/VolumePimWizardPage.cpp b/src/Main/Forms/VolumePimWizardPage.cpp
index 36dc4c7..e335305 100644
--- a/src/Main/Forms/VolumePimWizardPage.cpp
+++ b/src/Main/Forms/VolumePimWizardPage.cpp
@@ -23,10 +23,7 @@ namespace VeraCrypt
 	VolumePimWizardPage::VolumePimWizardPage (wxPanel* parent)
 		: VolumePimWizardPageBase (parent)
 	{
-		wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST);  // wxFILTER_NUMERIC does not exclude - . , etc.
-		const wxChar *valArr[] = { L"0", L"1", L"2", L"3", L"4", L"5", L"6", L"7", L"8", L"9" };
-		validator.SetIncludes (wxArrayString (array_capacity (valArr), (const wxChar **) &valArr));
-		VolumePimTextCtrl->SetValidator (validator);
+		SetPimValidator ();
 	}
 
 	VolumePimWizardPage::~VolumePimWizardPage ()
@@ -61,7 +58,7 @@ namespace VeraCrypt
 			VolumePimTextCtrl->SetValue (wxT(""));
 		}
 
-		OnPimChanged (pim);
+		OnPimValueChanged (pim);
 	}
 
 	bool VolumePimWizardPage::IsValid ()
@@ -71,10 +68,10 @@ namespace VeraCrypt
 	
 	void VolumePimWizardPage::OnPimChanged  (wxCommandEvent& event)
 	{
-		OnPimChanged (GetVolumePim ());
+		OnPimValueChanged (GetVolumePim ());
 	}
 
-	void VolumePimWizardPage::OnPimChanged  (int pim)
+	void VolumePimWizardPage::OnPimValueChanged  (int pim)
 	{
 		if (pim > 0)
 		{
@@ -85,6 +82,43 @@ namespace VeraCrypt
 		{
 			VolumePimHelpStaticText->SetForegroundColour(*wxBLACK);
 			VolumePimHelpStaticText->SetLabel(LangString["IDC_PIM_HELP"]);
-		}			
+		}	
+		Fit();
+		Layout();
+	}
+
+	void VolumePimWizardPage::SetPimValidator ()
+	{
+		wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST);  // wxFILTER_NUMERIC does not exclude - . , etc.
+		const wxChar *valArr[] = { L"0", L"1", L"2", L"3", L"4", L"5", L"6", L"7", L"8", L"9" };
+		validator.SetIncludes (wxArrayString (array_capacity (valArr), (const wxChar **) &valArr));
+		VolumePimTextCtrl->SetValidator (validator);
+	}
+
+	void VolumePimWizardPage::OnDisplayPimCheckBoxClick( wxCommandEvent& event )
+	{
+		FreezeScope freeze (this);
+		
+		bool display = event.IsChecked ();
+
+		wxTextCtrl *newTextCtrl = new wxTextCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, display ? 0 : wxTE_PASSWORD);
+		newTextCtrl->SetMaxLength (10); 
+		newTextCtrl->SetValue (VolumePimTextCtrl->GetValue());
+		newTextCtrl->SetMinSize (VolumePimTextCtrl->GetSize());
+
+		PimSizer->Replace (VolumePimTextCtrl, newTextCtrl);		
+		VolumePimTextCtrl->Show (false);
+		VolumePimTextCtrl->SetValue (wxString (L'X', VolumePimTextCtrl->GetLineLength(0)));
+		GetVolumePim ();
+
+		Fit();
+		Layout();
+		newTextCtrl->SetMinSize (VolumePimTextCtrl->GetMinSize());
+
+		newTextCtrl->Connect (wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (VolumePimWizardPage::OnPimChanged), nullptr, this);
+		delete VolumePimTextCtrl;
+		VolumePimTextCtrl = newTextCtrl;
+		SetPimValidator ();
+		OnPimValueChanged (GetVolumePim ());
 	}
 }
diff --git a/src/Main/Forms/VolumePimWizardPage.h b/src/Main/Forms/VolumePimWizardPage.h
index ae09700..d7586c9 100644
--- a/src/Main/Forms/VolumePimWizardPage.h
+++ b/src/Main/Forms/VolumePimWizardPage.h
@@ -32,10 +32,12 @@ namespace VeraCrypt
 		bool IsValid ();
 		void SetMaxStaticTextWidth (int width) { InfoStaticText->Wrap (width); }
 		void SetPageText (const wxString &text) { InfoStaticText->SetLabel (text); }
+		void OnDisplayPimCheckBoxClick( wxCommandEvent& event );
 		
 	protected:
+		void SetPimValidator ();
 		void OnPimChanged  (wxCommandEvent& event);
-		void OnPimChanged  (int pim);
+		void OnPimValueChanged  (int pim);
 	};
 }
 
diff --git a/src/Main/UserInterface.cpp b/src/Main/UserInterface.cpp
index 6804866..070a49c 100644
--- a/src/Main/UserInterface.cpp
+++ b/src/Main/UserInterface.cpp
@@ -889,11 +889,19 @@ namespace VeraCrypt
 	{
 		CommandLineInterface &cmdLine = *CmdLine;
 
-		switch (cmdLine.ArgCommand)
-		{
-		case CommandId::None:
+		if (cmdLine.ArgCommand == CommandId::None)
 			return false;
 
+		if (Preferences.UseStandardInput)
+		{
+			wstring pwdInput;
+			wcin >> pwdInput;
+
+			cmdLine.ArgPassword = make_shared<VolumePassword> (pwdInput);
+		}
+
+		switch (cmdLine.ArgCommand)
+		{
 		case CommandId::AutoMountDevices:
 		case CommandId::AutoMountFavorites:
 		case CommandId::AutoMountDevicesFavorites:
diff --git a/src/Main/UserPreferences.h b/src/Main/UserPreferences.h
index 2c7d16f..efc02d5 100644
--- a/src/Main/UserPreferences.h
+++ b/src/Main/UserPreferences.h
@@ -43,6 +43,7 @@ namespace VeraCrypt
 			MountDevicesOnLogon (false),
 			MountFavoritesOnLogon (false),
 			NonInteractive (false),
+			UseStandardInput (false),
 			OpenExplorerWindowAfterMount (false),
 			SaveHistory (false),
 			StartOnLogon (false),
@@ -83,6 +84,7 @@ namespace VeraCrypt
 		bool MountDevicesOnLogon;
 		bool MountFavoritesOnLogon;
 		bool NonInteractive;
+		bool UseStandardInput;
 		bool OpenExplorerWindowAfterMount;
 		bool SaveHistory;
 		FilePath SecurityTokenModule;
diff --git a/src/Mount/Favorites.cpp b/src/Mount/Favorites.cpp
index 731fbdf..9a35f1d 100644
--- a/src/Mount/Favorites.cpp
+++ b/src/Mount/Favorites.cpp
@@ -55,6 +55,12 @@ namespace VeraCrypt
 		if (favorite.Path.find ("\\??\\") == 0)
 			favorite.Path = favorite.Path.substr (4);
 
+		if (wcslen (prop.wszLabel))
+		{
+			favorite.Label = prop.wszLabel;
+			favorite.UseLabelInExplorer = true;
+		}
+
 		if (IsVolumeDeviceHosted (favorite.Path.c_str()))
 		{
 			// Get GUID path
@@ -373,6 +379,9 @@ namespace VeraCrypt
 			case IDC_FAVORITES_HELP_LINK:
 				Applink (SystemFavoritesMode ? "sysfavorites" : "favorites", TRUE, "");
 				return 1;
+			case IDC_SHOW_PIM:
+				HandleShowPasswordFieldAction (hwndDlg, IDC_SHOW_PIM, IDC_PIM, 0);
+				return 1;
 			}
 
 			return 0;
@@ -472,20 +481,27 @@ namespace VeraCrypt
 	}
 
 
-	wstring GetFavoriteVolumeLabel (const string &volumePath)
+	wstring GetFavoriteVolumeLabel (const string &volumePath, bool& useInExplorer)
 	{
 		foreach (const FavoriteVolume &favorite, FavoriteVolumes)
 		{
 			if (favorite.Path == volumePath)
+			{
+				useInExplorer = favorite.UseLabelInExplorer;
 				return favorite.Label;
+			}
 		}
 
 		foreach (const FavoriteVolume &favorite, SystemFavoriteVolumes)
 		{
 			if (favorite.Path == volumePath)
+			{
+				useInExplorer = favorite.UseLabelInExplorer;
 				return favorite.Label;
+			}
 		}
 
+		useInExplorer = false;
 		return wstring();
 	}
 
@@ -592,6 +608,10 @@ namespace VeraCrypt
 			if (boolVal[0])
 				favorite.MountOnLogOn = (boolVal[0] == '1');
 
+			XmlGetAttributeText (xml, "useLabelInExplorer", boolVal, sizeof (boolVal));
+			if (boolVal[0])
+				favorite.UseLabelInExplorer = (boolVal[0] == '1') && !favorite.ReadOnly;
+
 			if (favorite.Path.find ("\\\\?\\Volume{") == 0 && favorite.Path.rfind ("}\\") == favorite.Path.size() - 2)
 			{
 				string resolvedPath = VolumeGuidPathToDevicePath (favorite.Path);
@@ -716,6 +736,9 @@ namespace VeraCrypt
 			if (favorite.OpenExplorerWindow)
 				s += L" openExplorerWindow=\"1\"";
 
+			if (favorite.UseLabelInExplorer && !favorite.ReadOnly)
+				s += L" useLabelInExplorer=\"1\"";
+
 			s += L">" + SingleStringToWide (tq) + L"</volume>";
 
 			fwprintf (f, L"%ws", s.c_str());
@@ -791,6 +814,7 @@ namespace VeraCrypt
 		else
 			SetDlgItemText (hwndDlg, IDC_PIM, "");
 		SetDlgItemTextW (hwndDlg, IDC_FAVORITE_LABEL, favorite.Label.c_str());
+		SetCheckBox (hwndDlg, IDC_FAVORITE_USE_LABEL_IN_EXPLORER, favorite.UseLabelInExplorer);
 		SetCheckBox (hwndDlg, IDC_FAVORITE_MOUNT_ON_LOGON, favorite.MountOnLogOn);
 		SetCheckBox (hwndDlg, IDC_FAVORITE_MOUNT_ON_ARRIVAL, favorite.MountOnArrival);
 		SetCheckBox (hwndDlg, IDC_FAVORITE_MOUNT_READONLY, favorite.ReadOnly);
@@ -820,6 +844,7 @@ namespace VeraCrypt
 		EnableWindow (GetDlgItem (hwndDlg, IDC_PIM_HELP), enable);
 		EnableWindow (GetDlgItem (hwndDlg, IDT_FAVORITE_LABEL), enable);
 		EnableWindow (GetDlgItem (hwndDlg, IDC_FAVORITE_LABEL), enable);
+		EnableWindow (GetDlgItem (hwndDlg, IDC_FAVORITE_USE_LABEL_IN_EXPLORER), enable);
 		EnableWindow (GetDlgItem (hwndDlg, IDC_FAVORITE_MOUNT_ON_LOGON), enable && !systemFavoritesMode);
 		EnableWindow (GetDlgItem (hwndDlg, IDC_FAVORITE_MOUNT_ON_ARRIVAL), enable && !systemFavoritesMode);
 		EnableWindow (GetDlgItem (hwndDlg, IDC_FAVORITE_MOUNT_READONLY), enable);
@@ -846,6 +871,7 @@ namespace VeraCrypt
 			favorite.Label.clear();
 
 		favorite.Pim = GetPim (hwndDlg, IDC_PIM);
+		favorite.UseLabelInExplorer = (IsDlgButtonChecked (hwndDlg, IDC_FAVORITE_USE_LABEL_IN_EXPLORER) != 0);
 
 		favorite.ReadOnly = (IsDlgButtonChecked (hwndDlg, IDC_FAVORITE_MOUNT_READONLY) != 0);
 		favorite.Removable = (IsDlgButtonChecked (hwndDlg, IDC_FAVORITE_MOUNT_REMOVABLE) != 0);
diff --git a/src/Mount/Favorites.h b/src/Mount/Favorites.h
index f7a52ae..8eeb3e6 100644
--- a/src/Mount/Favorites.h
+++ b/src/Mount/Favorites.h
@@ -29,7 +29,8 @@ namespace VeraCrypt
 			OpenExplorerWindow (false),
 			ReadOnly (false),
 			Removable (false),
-			SystemEncryption (false)
+			SystemEncryption (false),
+			UseLabelInExplorer (false)
 		{
 		}
 
@@ -47,6 +48,7 @@ namespace VeraCrypt
 		bool ReadOnly;
 		bool Removable;
 		bool SystemEncryption;
+		bool UseLabelInExplorer;
 	};
 
 	struct FavoriteVolumesDlgProcArguments
@@ -67,7 +69,7 @@ namespace VeraCrypt
 	static void FillFavoriteVolumesMenu ();
 	static void FillListControl (HWND favoriteListControl, vector <FavoriteVolume> &favorites);
 	static void FillListControlSubItems (HWND favoriteListControl, int line, const FavoriteVolume &favorite);
-	wstring GetFavoriteVolumeLabel (const string &volumePath);
+	wstring GetFavoriteVolumeLabel (const string &volumePath, bool& useInExplorer);
 	void LoadFavoriteVolumes ();
 	void LoadFavoriteVolumes (vector <FavoriteVolume> &favorites, bool systemFavorites, bool noUacElevation = false);
 	static void OnFavoriteVolumesUpdated ();
diff --git a/src/Mount/Hotkeys.c b/src/Mount/Hotkeys.c
index 0bffb49..8214d87 100644
--- a/src/Mount/Hotkeys.c
+++ b/src/Mount/Hotkeys.c
@@ -30,6 +30,7 @@ static TCHOTKEY	tmpHotkeys [NBR_HOTKEYS];
 
 static int nSelectedHotkeyId;
 static UINT currentVKeyCode;
+static BYTE vkeysDown[256];
 
 
 static void ScanAndProcessKey (UINT *vKeyCode, wchar_t *keyName)
@@ -41,9 +42,15 @@ static void ScanAndProcessKey (UINT *vKeyCode, wchar_t *keyName)
 	{
 		if (GetAsyncKeyState (vKey) < 0)
 		{
-			if (GetKeyName (vKey, keyName))	// If the key is allowed and its name has been resolved
-				*vKeyCode = vKey;
+			if (!vkeysDown [vKey])
+			{
+				vkeysDown [vKey] = 1;
+				if (GetKeyName (vKey, keyName))	// If the key is allowed and its name has been resolved
+					*vKeyCode = vKey;
+			}
 		}
+		else
+			vkeysDown [vKey] = 0;
 	}
 }
 
@@ -62,6 +69,56 @@ BOOL GetKeyName (UINT vKey, wchar_t *keyName)
 	{
 		// OEM-specific
 		StringCbPrintfW (keyName, MAX_KEY_COMB_NAME_LEN, L"OEM-%d", vKey);
+
+		// mapping taken from:
+		//	http://www.hotkeynet.com/ref/keynames.html
+		//	https://mojoware.googlecode.com/svn-history/r3/trunk/mojo_engine/cKeyboard.cpp
+		//	http://www.screenio.com/gui_screenio/gs_htmlhelp_subweb/download/SIMKEYS.cob
+		//
+		// These values seem to come from Nokia/Ericsson mobile device keys
+
+		switch (vKey)
+		{
+		case 0xE9: // OEMReset = 0xE9
+			StringCbCatW (keyName, MAX_KEY_COMB_NAME_LEN, L" (OEMReset)");
+			break;
+		case 0xEA: // OEMJump = 0xEA
+			StringCbCatW (keyName, MAX_KEY_COMB_NAME_LEN, L" (OEMJump)");
+			break;
+		case 0xEB: // OEMPA1 = 0xEB
+			StringCbCatW (keyName, MAX_KEY_COMB_NAME_LEN, L" (OEMPA1)");
+			break;
+		case 0xEC: // OEMPA2 = 0xEC
+			StringCbCatW (keyName, MAX_KEY_COMB_NAME_LEN, L" (OEMPA2)");
+			break;
+		case 0xED: // OEMPA3 = 0xED
+			StringCbCatW (keyName, MAX_KEY_COMB_NAME_LEN, L" (OEMPA3)");
+			break;
+		case 0xEE: // OEMWSCtrl = 0xEE
+			StringCbCatW (keyName, MAX_KEY_COMB_NAME_LEN, L" (OEMWSCtrl)");
+			break;
+		case 0xEF: // OEMCUSel = 0xEF
+			StringCbCatW (keyName, MAX_KEY_COMB_NAME_LEN, L" (OEMCUSel)");
+			break;
+		case 0xF0: // OEMATTN = 0xF0
+			StringCbCatW (keyName, MAX_KEY_COMB_NAME_LEN, L" (OEMATTN)");
+			break;
+		case 0xF1: // OEMFinish = 0xF1
+			StringCbCatW (keyName, MAX_KEY_COMB_NAME_LEN, L" (OEMFinish)");
+			break;
+		case 0xF2: // OEMCopy = 0xF2
+			StringCbCatW (keyName, MAX_KEY_COMB_NAME_LEN, L" (OEMCopy)");
+			break;
+		case 0xF3: // OEMAuto = 0xF3
+			StringCbCatW (keyName, MAX_KEY_COMB_NAME_LEN, L" (OEMAuto)");
+			break;
+		case 0xF4: // OEMENLW = 0xF4
+			StringCbCatW (keyName, MAX_KEY_COMB_NAME_LEN, L" (OEMENLW)");
+			break;
+		case 0xF5: // OEMBackTab = 0xF5
+			StringCbCatW (keyName, MAX_KEY_COMB_NAME_LEN, L" (OEMBackTab)");
+			break;
+		}
 	}
 	else if (vKey >= VK_F1 && vKey <= VK_F24)
 	{
@@ -296,6 +353,7 @@ BOOL CALLBACK HotkeysDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 			nSelectedHotkeyId = -1;
 			currentVKeyCode = 0;
 			memcpy (tmpHotkeys, Hotkeys, sizeof(tmpHotkeys));
+			memset (vkeysDown, 0, sizeof(vkeysDown));
 
 			SendMessageW (hList,LVM_SETEXTENDEDLISTVIEWSTYLE,0,
 				LVS_EX_FULLROWSELECT|LVS_EX_HEADERDRAGDROP|LVS_EX_LABELTIP 
@@ -337,7 +395,7 @@ BOOL CALLBACK HotkeysDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 
 	case WM_TIMER:
 		{
-			if (nSelectedHotkeyId > -1)
+			if ((nSelectedHotkeyId > -1) && (GetFocus () == GetDlgItem (hwndDlg, IDC_HOTKEY_KEY)))
 			{
 				wchar_t keyName [MAX_KEY_COMB_NAME_LEN];
 				UINT tmpVKeyCode;
@@ -352,6 +410,10 @@ BOOL CALLBACK HotkeysDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 					SetWindowTextW (GetDlgItem (hwndDlg, IDC_HOTKEY_KEY), keyName);
 					EnableWindow (GetDlgItem (hwndDlg, IDC_HOTKEY_ASSIGN), TRUE);
 				}
+				else if ((currentVKeyCode != 0) && GetKeyName (currentVKeyCode, keyName))
+				{
+					SetWindowTextW (GetDlgItem (hwndDlg, IDC_HOTKEY_KEY), keyName);
+				}
 			}
 			return 1;
 		}
@@ -365,6 +427,8 @@ BOOL CALLBACK HotkeysDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 				LVITEM item;
 				memset(&item,0,sizeof(item));
 				nSelectedHotkeyId = ((LPNMLISTVIEW) lParam)->iItem;
+				currentVKeyCode = 0;
+				memset (vkeysDown, 0, sizeof(vkeysDown));
 				SetWindowTextW (GetDlgItem (hwndDlg, IDC_HOTKEY_KEY), GetString ("PRESS_A_KEY_TO_ASSIGN"));
 
 				EnableWindow (GetDlgItem (hwndDlg, IDC_HOTKEY_REMOVE), (tmpHotkeys[nSelectedHotkeyId].vKeyCode > 0));
@@ -446,6 +510,8 @@ BOOL CALLBACK HotkeysDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 					EnableWindow (GetDlgItem (hwndDlg, IDC_HOTKEY_REMOVE), FALSE);
 					nSelectedHotkeyId = -1;
 					bKeyScanOn = FALSE;
+					currentVKeyCode = 0;
+					memset (vkeysDown, 0, sizeof(vkeysDown));
 				}
 			}
 			DisplayHotkeyList(hwndDlg);
@@ -463,6 +529,8 @@ BOOL CALLBACK HotkeysDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 				EnableWindow (GetDlgItem (hwndDlg, IDC_HOTKEY_REMOVE), FALSE);
 				nSelectedHotkeyId = -1;
 				bKeyScanOn = FALSE;
+				currentVKeyCode = 0;
+				memset (vkeysDown, 0, sizeof(vkeysDown));
 				DisplayHotkeyList(hwndDlg);
 			}
 			return 1;
@@ -482,6 +550,8 @@ BOOL CALLBACK HotkeysDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 			EnableWindow (GetDlgItem (hwndDlg, IDC_HOTKEY_REMOVE), FALSE);
 			nSelectedHotkeyId = -1;
 			bKeyScanOn = FALSE;
+			currentVKeyCode = 0;
+			memset (vkeysDown, 0, sizeof(vkeysDown));
 			DisplayHotkeyList(hwndDlg);
 			return 1;
 		}
diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c
index 9dc1916..b98de66 100644
--- a/src/Mount/Mount.c
+++ b/src/Mount/Mount.c
@@ -429,6 +429,12 @@ BOOL VolumeSelected (HWND hwndDlg)
 	return (GetWindowTextLength (GetDlgItem (hwndDlg, IDC_VOLUME)) > 0);
 }
 
+void GetVolumePath (HWND hwndDlg, LPSTR szPath, int nMaxCount)
+{
+	GetWindowText (GetDlgItem (hwndDlg, IDC_VOLUME), szPath, nMaxCount);
+	CorrectFileName (szPath);
+}
+
 /* Returns TRUE if the last partition/drive selected via the Select Device dialog box was the system 
 partition/drive and if it is encrypted. 
          WARNING: This function is very fast but not always reliable (for example, if the user manually types
@@ -447,7 +453,7 @@ BOOL ActiveSysEncDeviceSelected (void)
 		{
 			int retCode = 0;
 
-			GetWindowText (GetDlgItem (MainDlg, IDC_VOLUME), szFileName, sizeof (szFileName));
+			GetVolumePath (MainDlg, szFileName, sizeof (szFileName));
 
 			retCode = IsSystemDevicePath (szFileName, MainDlg, FALSE);
 
@@ -496,7 +502,7 @@ static string ResolveAmbiguousSelection (HWND hwndDlg, int *driveNoPtr)
 	if (VolumeSelected (MainDlg))
 	{
 		// volPathInputField will contain the volume path (if any) from the input field below the drive list 
-		GetWindowText (GetDlgItem (MainDlg, IDC_VOLUME), volPathInputField, sizeof (volPathInputField));
+		GetVolumePath (MainDlg, volPathInputField, sizeof (volPathInputField));
 
 		if (!ambig)
 			retPath = (string) volPathInputField;
@@ -639,45 +645,6 @@ static string ResolveAmbiguousSelection (HWND hwndDlg, int *driveNoPtr)
 	return retPath;
 }
 
-static void ConfigReadCompareInt(char *configKey, int defaultValue, int* pOutputValue, BOOL bOnlyCheckModified, BOOL* pbModified)
-{
-	int intValue = ConfigReadInt (configKey, defaultValue);
-	if (pOutputValue)
-	{
-		if (pbModified && (*pOutputValue != intValue))
-			*pbModified = TRUE;
-		if (!bOnlyCheckModified)
-			*pOutputValue = intValue;
-	}
-}
-
-static void ConfigReadCompareString (char *configKey, char *defaultValue, char *str, int maxLen, BOOL bOnlyCheckModified, BOOL *pbModified)
-{
-	char *strValue = (char*) malloc (maxLen);
-	if (strValue)
-	{
-		memcpy (strValue, str, maxLen);
-
-		ConfigReadString (configKey, defaultValue, strValue, maxLen);
-
-		if (pbModified && strcmp (str, strValue))
-			*pbModified = TRUE;
-		if (!bOnlyCheckModified)
-			memcpy(str, strValue, maxLen);
-
-		free (strValue);
-	}
-	else
-	{
-		/* allocation failed. Suppose that value changed */
-		if (pbModified)
-			*pbModified = TRUE;
-		if (!bOnlyCheckModified)
-			ConfigReadString (configKey, defaultValue, str, maxLen);
-		
-	}
-}
-
 void LoadSettingsAndCheckModified (HWND hwndDlg, BOOL bOnlyCheckModified, BOOL* pbSettingsModified, BOOL* pbHistoryModified)
 {
 	char langid[6] = {0};
@@ -706,6 +673,9 @@ void LoadSettingsAndCheckModified (HWND hwndDlg, BOOL bOnlyCheckModified, BOOL*
 	ConfigReadCompareInt ("SaveVolumeHistory", FALSE, &bHistory, bOnlyCheckModified, pbSettingsModified);
 
 	ConfigReadCompareInt ("CachePasswords", FALSE, &bCacheInDriverDefault, bOnlyCheckModified, pbSettingsModified);
+	if (!bOnlyCheckModified)
+		bCacheInDriver = bCacheInDriverDefault;
+
 	ConfigReadCompareInt ("CachePasswordDuringMultipleMount", FALSE, &bCacheDuringMultipleMount, bOnlyCheckModified, pbSettingsModified);
 	ConfigReadCompareInt ("WipePasswordCacheOnExit", FALSE, &bWipeCacheOnExit, bOnlyCheckModified, pbSettingsModified);
 	ConfigReadCompareInt ("WipeCacheOnAutoDismount", TRUE, &bWipeCacheOnAutoDismount, bOnlyCheckModified, pbSettingsModified);
@@ -753,7 +723,7 @@ void LoadSettingsAndCheckModified (HWND hwndDlg, BOOL bOnlyCheckModified, BOOL*
 		ConfigReadCompareInt ("HiddenSystemLeakProtNotifStatus", TC_HIDDEN_OS_READ_ONLY_NOTIF_MODE_NONE, &HiddenSysLeakProtectionNotificationStatus, bOnlyCheckModified, pbSettingsModified);
 
 	// Drive letter - command line arg overrides registry
-	if (!bOnlyCheckModified && szDriveLetter[0] == 0)
+	if (!bOnlyCheckModified && bHistory && szDriveLetter[0] == 0)
 		ConfigReadString ("LastSelectedDrive", "", szDriveLetter, sizeof (szDriveLetter));
 	if (bHistory && pbSettingsModified)
 	{
@@ -764,7 +734,7 @@ void LoadSettingsAndCheckModified (HWND hwndDlg, BOOL bOnlyCheckModified, BOOL*
 		if (LOWORD (lLetter) != 0xffff)
 			StringCbPrintfA (szTmp, sizeof(szTmp), "%c:", (char) HIWORD (lLetter));
 
-		ConfigReadCompareString ("LastSelectedDrive", "", szDriveLetter, sizeof (szDriveLetter), bOnlyCheckModified, pbSettingsModified);
+		ConfigReadCompareString ("LastSelectedDrive", "", szTmp, sizeof (szTmp), bOnlyCheckModified, pbSettingsModified);
 	}
 
 	ConfigReadCompareString ("SecurityTokenLibrary", "", SecurityTokenLibraryPath, sizeof (SecurityTokenLibraryPath) - 1, bOnlyCheckModified, pbSettingsModified);
@@ -806,9 +776,23 @@ void LoadSettingsAndCheckModified (HWND hwndDlg, BOOL bOnlyCheckModified, BOOL*
 	ConfigReadCompareInt ("DefaultTrueCryptMode", FALSE, &DefaultVolumeTrueCryptMode, bOnlyCheckModified, pbSettingsModified);
 
 	if (bOnlyCheckModified)
-	{
-		StringCbCopyA (langid, sizeof(langid), GetPreferredLangId ());
-		ConfigReadCompareString ("Language", "", langid, sizeof (langid), TRUE, pbSettingsModified);
+	{		
+		if (!IsNonInstallMode ())
+		{
+			ConfigReadString ("Language", "", langid, sizeof (langid));
+			// when installed, if no preferred language set by user, English is set default
+			// 
+			if (langid [0] == 0)
+				StringCbCopyA (langid, sizeof(langid), "en");
+
+			if (pbSettingsModified && strcmp (langid, GetPreferredLangId ()))
+				*pbSettingsModified = TRUE;
+		}
+		else
+		{
+			StringCbCopyA (langid, sizeof(langid), GetPreferredLangId ());
+			ConfigReadCompareString ("Language", "", langid, sizeof (langid), TRUE, pbSettingsModified);
+		}
 	}
 
 	if (DefaultVolumePkcs5 < 0 || DefaultVolumePkcs5 > LAST_PRF_ID)
@@ -876,11 +860,15 @@ void SaveSettings (HWND hwndDlg)
 		if (IsHiddenOSRunning())
 			ConfigWriteInt ("HiddenSystemLeakProtNotifStatus", HiddenSysLeakProtectionNotificationStatus);
 
-		// Drive Letter
-		lLetter = GetSelectedLong (GetDlgItem (hwndDlg, IDC_DRIVELIST));
-		if (LOWORD (lLetter) != 0xffff)
-			StringCbPrintfA (szTmp, sizeof(szTmp), "%c:", (char) HIWORD (lLetter));
-		ConfigWriteString ("LastSelectedDrive", szTmp);
+		// save last selected drive only when history enabled
+		if (bHistory)
+		{
+			// Drive Letter
+			lLetter = GetSelectedLong (GetDlgItem (hwndDlg, IDC_DRIVELIST));
+			if (LOWORD (lLetter) != 0xffff)
+				StringCbPrintfA (szTmp, sizeof(szTmp), "%c:", (char) HIWORD (lLetter));
+			ConfigWriteString ("LastSelectedDrive", szTmp);
+		}
 
 		ConfigWriteInt ("CloseSecurityTokenSessionsAfterMount",	CloseSecurityTokenSessionsAfterMount);
 
@@ -907,8 +895,7 @@ void SaveSettings (HWND hwndDlg)
 		ConfigWriteInt ("DisplayMsgBoxOnHotkeyDismount",			bDisplayBalloonOnSuccessfulHkDismount);
 
 		// Language
-		if (GetPreferredLangId () != NULL)
-			ConfigWriteString ("Language", GetPreferredLangId ());
+		ConfigWriteString ("Language", GetPreferredLangId ());
 
 		// PKCS#11 Library Path
 		ConfigWriteString ("SecurityTokenLibrary", SecurityTokenLibraryPath[0] ? SecurityTokenLibraryPath : "");
@@ -1105,6 +1092,7 @@ static void PopulateSysEncContextMenu (HMENU popup, BOOL bToolsOnly)
 		AppendMenu (popup, MF_SEPARATOR, 0, "");
 		AppendMenuW (popup, MF_STRING, IDM_CREATE_RESCUE_DISK, GetString ("IDM_CREATE_RESCUE_DISK"));
 		AppendMenuW (popup, MF_STRING, IDM_VERIFY_RESCUE_DISK, GetString ("IDM_VERIFY_RESCUE_DISK"));
+		AppendMenuW (popup, MF_STRING, IDM_VERIFY_RESCUE_DISK_ISO, GetString ("IDM_VERIFY_RESCUE_DISK_ISO"));
 	}
 
 	if (!bToolsOnly)
@@ -1132,7 +1120,7 @@ BOOL CheckSysEncMountWithoutPBA (HWND hwndDlg, const char *devicePath, BOOL quie
 
 	if (strlen (devicePath) < 2)
 	{
-		GetWindowText (GetDlgItem (MainDlg, IDC_VOLUME), szDevicePath, sizeof (szDevicePath));
+		GetVolumePath (MainDlg, szDevicePath, sizeof (szDevicePath));
 		CreateFullVolumePath (szDiskFile, sizeof(szDiskFile), szDevicePath, &tmpbDevice);
 
 		if (!tmpbDevice)
@@ -1314,10 +1302,25 @@ static void LaunchVolCreationWizard (HWND hwndDlg, const char *arg)
 	{
 		STARTUPINFO si;
 		PROCESS_INFORMATION pi;
+		char formatExeName[64];
+		char* suffix = NULL;
 		ZeroMemory (&si, sizeof (si));
 
+		StringCbCopyA (formatExeName, sizeof (formatExeName), "\\VeraCrypt Format");
+
+		// check if there is a suffix in VeraCrypt file name
+		// in order to use the same for "VeraCrypt Format"
+		suffix = strrchr (tmp + 1, '-');
+		if (suffix)
+		{
+			StringCbCatA (formatExeName, sizeof (formatExeName), suffix);
+			StringCbCatA (formatExeName, sizeof (formatExeName), "\"");
+		}
+		else
+			StringCbCatA (formatExeName, sizeof (formatExeName), ".exe\"");
+
 		*tmp = 0;
-		StringCbCatA (t, sizeof(t), "\\VeraCrypt Format.exe\"");
+		StringCbCatA (t, sizeof(t), formatExeName);
 
 		if (!FileExists(t))
 			Error ("VOL_CREATION_WIZARD_NOT_FOUND", hwndDlg);	// Display a user-friendly error message and advise what to do
@@ -1342,7 +1345,7 @@ static void LaunchVolCreationWizard (HWND hwndDlg, const char *arg)
 
 static void LaunchVolExpander (HWND hwndDlg)
 {
-	char t[TC_MAX_PATH] = {'"',0};
+	char t[TC_MAX_PATH + TC_MAX_PATH] = {'"',0};
 	char *tmp;
 
 	GetModuleFileName (NULL, t+1, sizeof(t)-1);
@@ -1350,8 +1353,24 @@ static void LaunchVolExpander (HWND hwndDlg)
 	tmp = strrchr (t, '\\');
 	if (tmp)
 	{
+		char expanderExeName[64];
+		char* suffix = NULL;
+
+		StringCbCopyA (expanderExeName, sizeof (expanderExeName), "\\VeraCryptExpander");
+
+		// check if there is a suffix in VeraCrypt file name
+		// in order to use the same for "VeraCrypt Format"
+		suffix = strrchr (tmp + 1, '-');
+		if (suffix)
+		{
+			StringCbCatA (expanderExeName, sizeof (expanderExeName), suffix);
+			StringCbCatA (expanderExeName, sizeof (expanderExeName), "\"");
+		}
+		else
+			StringCbCatA (expanderExeName, sizeof (expanderExeName), ".exe\"");
+
 		*tmp = 0;
-		StringCbCatA (t, sizeof(t), "\\VeraCryptExpander.exe\"");
+		StringCbCatA (t, sizeof(t), expanderExeName);
 
 		if (!FileExists(t))
 			Error ("VOL_EXPANDER_NOT_FOUND", hwndDlg);	// Display a user-friendly error message and advise what to do
@@ -1619,7 +1638,11 @@ void LoadDriveLetters (HWND hwndDlg, HWND hTree, int drive)
 
 				listItem.iSubItem = 1;
 
-				wstring label = GetFavoriteVolumeLabel (path);
+				// first check label used for mounting. If empty, look for it in favorites.
+				bool useInExplorer = false;
+				wstring label = (wchar_t *) driver.wszLabel[i];
+				if (label.empty())
+					label = GetFavoriteVolumeLabel (path, useInExplorer);
 				if (!label.empty())
 					ListSubItemSetW (hTree, listItem.iItem, 1, (wchar_t *) label.c_str());
 				else
@@ -1885,16 +1908,34 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 	{
 	case WM_INITDIALOG:
 		{
-			LPARAM nIndex;
+			LPARAM nIndex, nSelectedIndex = 0;
 			HWND hComboBox = GetDlgItem (hwndDlg, IDC_PKCS5_OLD_PRF_ID);
 			int i;
 			WipeAlgorithmId headerWipeMode = TC_WIPE_3_DOD_5220;
+			int EffectiveVolumePkcs5 = CmdVolumePkcs5;
+			BOOL EffectiveVolumeTrueCryptMode = CmdVolumeTrueCryptMode;
+			int EffectiveVolumePim = CmdVolumePim;
+
+			/* Priority is given to command line parameters 
+			 * Default values used only when nothing specified in command line
+			 */
+			if (EffectiveVolumePkcs5 == 0)
+				EffectiveVolumePkcs5 = DefaultVolumePkcs5;
+			if (!EffectiveVolumeTrueCryptMode)
+				EffectiveVolumeTrueCryptMode = DefaultVolumeTrueCryptMode;
 
 			NewPimValuePtr = (int*) lParam;
 
 			PimValueChangedWarning = FALSE;
 
 			ZeroMemory (&newKeyFilesParam, sizeof (newKeyFilesParam));
+			if (NewPimValuePtr)
+			{
+				/* we are in the case of a volume. Store its name to use it in the key file dialog
+				 * this will help avoid using the current container file as a key file
+				 */
+				StringCbCopyA (newKeyFilesParam.VolumeFileName, sizeof (newKeyFilesParam.VolumeFileName), szFileName);
+			}
 
 			SetWindowTextW (hwndDlg, GetString ("IDD_PASSWORDCHANGE_DLG"));
 			LocalizeDialog (hwndDlg, "IDD_PASSWORDCHANGE_DLG");
@@ -1920,9 +1961,27 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 			{
 				nIndex = SendMessage (hComboBox, CB_ADDSTRING, 0, (LPARAM) get_pkcs5_prf_name(i));
 				SendMessage (hComboBox, CB_SETITEMDATA, nIndex, (LPARAM) i);
+				if (i == EffectiveVolumePkcs5)
+				{
+					nSelectedIndex = nIndex;
+				}
 			}
 
-			SendMessage (hComboBox, CB_SETCURSEL, 0, 0);
+			SendMessage (hComboBox, CB_SETCURSEL, nSelectedIndex, 0);
+
+			/* check TrueCrypt Mode if it was set as default*/
+			SetCheckBox (hwndDlg, IDC_TRUECRYPT_MODE, EffectiveVolumeTrueCryptMode);
+
+			/* set default PIM if set in the command line*/
+			if (EffectiveVolumePim > 0)
+			{
+				SetCheckBox (hwndDlg, IDC_PIM_ENABLE, TRUE);
+				ShowWindow (GetDlgItem (hwndDlg, IDC_PIM_ENABLE), SW_HIDE);
+				ShowWindow (GetDlgItem( hwndDlg, IDT_OLD_PIM), SW_SHOW);
+				ShowWindow (GetDlgItem( hwndDlg, IDC_OLD_PIM), SW_SHOW);
+				ShowWindow (GetDlgItem( hwndDlg, IDC_OLD_PIM_HELP), SW_SHOW);
+				SetPim (hwndDlg, IDC_OLD_PIM, EffectiveVolumePim);
+			}
 
 			/* Add PRF algorithm list for new password */
 			hComboBox = GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID);
@@ -1976,7 +2035,7 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 				EnableWindow (GetDlgItem (hwndDlg, IDC_SHOW_PASSWORD_CHPWD_NEW), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDT_NEW_PASSWORD), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDT_CONFIRM_PASSWORD), FALSE);
-				EnableWindow (GetDlgItem (hwndDlg, IDT_PKCS5_PRF), FALSE);
+				EnableWindow (GetDlgItem (hwndDlg, IDT_NEW_PKCS5_PRF), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), FALSE);
 				break;
 
@@ -1999,7 +2058,7 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 				EnableWindow (GetDlgItem (hwndDlg, IDC_NEW_KEYFILES), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDT_NEW_PASSWORD), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDT_CONFIRM_PASSWORD), FALSE);
-				EnableWindow (GetDlgItem (hwndDlg, IDT_PKCS5_PRF), FALSE);
+				EnableWindow (GetDlgItem (hwndDlg, IDT_NEW_PKCS5_PRF), FALSE);
 				EnableWindow (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), FALSE);
 				break;
 
@@ -2337,26 +2396,14 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 
 		if (lw == IDC_SHOW_PASSWORD_CHPWD_ORI)
 		{
-			SendMessage (GetDlgItem (hwndDlg, IDC_OLD_PASSWORD),
-						EM_SETPASSWORDCHAR,
-						GetCheckBox (hwndDlg, IDC_SHOW_PASSWORD_CHPWD_ORI) ? 0 : '*',
-						0);
-			InvalidateRect (GetDlgItem (hwndDlg, IDC_OLD_PASSWORD), NULL, TRUE);
+			HandleShowPasswordFieldAction (hwndDlg, IDC_SHOW_PASSWORD_CHPWD_ORI, IDC_OLD_PASSWORD, IDC_OLD_PIM);
 			return 1;
 		}
 
 		if (lw == IDC_SHOW_PASSWORD_CHPWD_NEW)
 		{
-			SendMessage (GetDlgItem (hwndDlg, IDC_PASSWORD),
-						EM_SETPASSWORDCHAR,
-						GetCheckBox (hwndDlg, IDC_SHOW_PASSWORD_CHPWD_NEW) ? 0 : '*',
-						0);
-			SendMessage (GetDlgItem (hwndDlg, IDC_VERIFY),
-						EM_SETPASSWORDCHAR,
-						GetCheckBox (hwndDlg, IDC_SHOW_PASSWORD_CHPWD_NEW) ? 0 : '*',
-						0);
-			InvalidateRect (GetDlgItem (hwndDlg, IDC_PASSWORD), NULL, TRUE);
-			InvalidateRect (GetDlgItem (hwndDlg, IDC_VERIFY), NULL, TRUE);
+			HandleShowPasswordFieldAction (hwndDlg, IDC_SHOW_PASSWORD_CHPWD_NEW, IDC_PASSWORD, IDC_VERIFY);
+			HandleShowPasswordFieldAction (hwndDlg, IDC_SHOW_PASSWORD_CHPWD_NEW, IDC_PIM, 0);
 			return 1;
 		}
 
@@ -2411,11 +2458,11 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 			else if (!(newKeyFilesParam.EnableKeyFiles && newKeyFilesParam.FirstKeyFile != NULL)
 				&& pwdChangeDlgMode == PCDM_CHANGE_PASSWORD)
 			{
-				if (!CheckPasswordLength (hwndDlg, GetWindowTextLength(GetDlgItem (hwndDlg, IDC_PASSWORD)), pim, bSysEncPwdChangeDlgMode, FALSE))
+				if (!CheckPasswordLength (hwndDlg, GetWindowTextLength(GetDlgItem (hwndDlg, IDC_PASSWORD)), pim, bSysEncPwdChangeDlgMode, FALSE, FALSE))
 					return 1;
 			}
 
-			GetWindowText (GetDlgItem (hParent, IDC_VOLUME), szFileName, sizeof (szFileName));
+			GetVolumePath (hParent, szFileName, sizeof (szFileName));
 
 			GetWindowText (GetDlgItem (hwndDlg, IDC_OLD_PASSWORD), (LPSTR) oldPassword.Text, sizeof (oldPassword.Text));
 			oldPassword.Length = (unsigned __int32) strlen ((char *) oldPassword.Text);
@@ -2438,11 +2485,11 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 			WaitCursor ();
 
 			if (KeyFilesEnable)
-				KeyFilesApply (hwndDlg, &oldPassword, FirstKeyFile);
+				KeyFilesApply (hwndDlg, &oldPassword, FirstKeyFile, szFileName);
 
 			if (newKeyFilesParam.EnableKeyFiles)
 			{
-				if (!KeyFilesApply (hwndDlg, &newPassword, pwdChangeDlgMode == PCDM_CHANGE_PKCS5_PRF ? FirstKeyFile : newKeyFilesParam.FirstKeyFile))
+				if (!KeyFilesApply (hwndDlg, &newPassword, pwdChangeDlgMode == PCDM_CHANGE_PKCS5_PRF ? FirstKeyFile : newKeyFilesParam.FirstKeyFile, szFileName))
 				{
 					nStatus = ERR_DONT_REPORT;
 					goto err;
@@ -2544,10 +2591,13 @@ BOOL CALLBACK PasswordDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 				RECT rect;
 				GetWindowRect (hwndDlg, &rect);
 
-				wstring label = GetFavoriteVolumeLabel (PasswordDlgVolume);
+				bool useInExplorer = false;
+				wstring label = GetFavoriteVolumeLabel (PasswordDlgVolume, useInExplorer);
 				if (!label.empty())
 				{
 					StringCbPrintfW (s, sizeof(s), GetString ("ENTER_PASSWORD_FOR_LABEL"), label.c_str());
+					if (useInExplorer)
+						StringCbCopyW (mountOptions.Label, sizeof (mountOptions.Label), label.c_str());
 				}
 				else
 				{
@@ -2683,10 +2733,13 @@ BOOL CALLBACK PasswordDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 				return 1;
 			}
 
-			SetCheckBox (hwndDlg, IDC_SHOW_PASSWORD, FALSE);
+			if (GetCheckBox (hwndDlg, IDC_SHOW_PASSWORD))
+			{
+				// simulate hiding password
+				SetCheckBox (hwndDlg, IDC_SHOW_PASSWORD, FALSE);
 
-			SendMessage (GetDlgItem (hwndDlg, IDC_PASSWORD), EM_SETPASSWORDCHAR, '*', 0);
-			InvalidateRect (GetDlgItem (hwndDlg, IDC_PASSWORD), NULL, TRUE);
+				HandleShowPasswordFieldAction (hwndDlg, IDC_SHOW_PASSWORD, IDC_PASSWORD, IDC_PIM);
+			}
 
 			SetCheckBox (hwndDlg, IDC_KEYFILES_ENABLE, FALSE);
 			EnableWindow (GetDlgItem (hwndDlg, IDC_KEYFILES_ENABLE), FALSE);
@@ -2768,11 +2821,7 @@ BOOL CALLBACK PasswordDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 
 		if (lw == IDC_SHOW_PASSWORD)
 		{
-			SendMessage (GetDlgItem (hwndDlg, IDC_PASSWORD),
-						EM_SETPASSWORDCHAR,
-						GetCheckBox (hwndDlg, IDC_SHOW_PASSWORD) ? 0 : '*',
-						0);
-			InvalidateRect (GetDlgItem (hwndDlg, IDC_PASSWORD), NULL, TRUE);
+			HandleShowPasswordFieldAction (hwndDlg, IDC_SHOW_PASSWORD, IDC_PASSWORD, IDC_PIM);
 			return 1;
 		}
 
@@ -2817,7 +2866,7 @@ BOOL CALLBACK PasswordDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 			if (lw == IDOK)
 			{
 				if (mountOptions.ProtectHiddenVolume && hidVolProtKeyFilesParam.EnableKeyFiles)
-					KeyFilesApply (hwndDlg, &mountOptions.ProtectedHidVolPassword, hidVolProtKeyFilesParam.FirstKeyFile);
+					KeyFilesApply (hwndDlg, &mountOptions.ProtectedHidVolPassword, hidVolProtKeyFilesParam.FirstKeyFile, strlen (PasswordDlgVolume) > 0 ? PasswordDlgVolume : NULL);
 
 				GetWindowText (GetDlgItem (hwndDlg, IDC_PASSWORD), (LPSTR) szXPwd->Text, MAX_PASSWORD + 1);
 				szXPwd->Length = (unsigned __int32) strlen ((char *) szXPwd->Text);
@@ -3196,6 +3245,9 @@ BOOL CALLBACK MountOptionsDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 			
 			EnableWindow (GetDlgItem (hwndDlg, IDC_MOUNT_SYSENC_PART_WITHOUT_PBA), !bPrebootPasswordDlgMode);
 
+			SetDlgItemTextW (hwndDlg, IDC_VOLUME_LABEL, mountOptions->Label);
+			SendDlgItemMessage (hwndDlg, IDC_VOLUME_LABEL, EM_LIMITTEXT, 32, 0); // 32 is the maximum possible length for a drive label in Windows
+
 			/* Add PRF algorithm list for hidden volume password */
 			HWND hComboBox = GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID);
 			SendMessage (hComboBox, CB_RESETCONTENT, 0, 0);
@@ -3297,11 +3349,7 @@ BOOL CALLBACK MountOptionsDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 
 		if (lw == IDC_SHOW_PASSWORD_MO)
 		{
-			SendMessage (GetDlgItem (hwndDlg, IDC_PASSWORD_PROT_HIDVOL),
-						EM_SETPASSWORDCHAR,
-						GetCheckBox (hwndDlg, IDC_SHOW_PASSWORD_MO) ? 0 : '*',
-						0);
-			InvalidateRect (GetDlgItem (hwndDlg, IDC_PASSWORD_PROT_HIDVOL), NULL, TRUE);
+			HandleShowPasswordFieldAction (hwndDlg, IDC_SHOW_PASSWORD_MO, IDC_PASSWORD_PROT_HIDVOL, IDC_PIM);
 			return 1;
 		}
 
@@ -3341,6 +3389,8 @@ BOOL CALLBACK MountOptionsDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 			mountOptions->ProtectHiddenVolume = IsButtonChecked (GetDlgItem (hwndDlg, IDC_PROTECT_HIDDEN_VOL));
 			mountOptions->PartitionInInactiveSysEncScope = IsButtonChecked (GetDlgItem (hwndDlg, IDC_MOUNT_SYSENC_PART_WITHOUT_PBA));
 			mountOptions->UseBackupHeader = IsButtonChecked (GetDlgItem (hwndDlg, IDC_USE_EMBEDDED_HEADER_BAK));
+
+			GetDlgItemTextW (hwndDlg, IDC_VOLUME_LABEL, mountOptions->Label, sizeof (mountOptions->Label) /sizeof (wchar_t));
 			
 			if (mountOptions->ProtectHiddenVolume)
 			{
@@ -3808,15 +3858,18 @@ BOOL CALLBACK TravelerDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 	{
 	case WM_INITDIALOG:
 		{
-			char i;
+			WCHAR i;
 			int index;
-			char drive[] = { 0, ':', 0 };
+			WCHAR drive[] = { 0, L':', 0 };
 
 			LocalizeDialog (hwndDlg, "IDD_TRAVELER_DLG");
 
 			SendDlgItemMessage (hwndDlg, IDC_COPY_WIZARD, BM_SETCHECK, 
 						BST_CHECKED, 0);
 
+			SendDlgItemMessage (hwndDlg, IDC_COPY_EXPANDER, BM_SETCHECK, 
+						BST_CHECKED, 0);
+
 			SendDlgItemMessage (hwndDlg, IDC_TRAVEL_OPEN_EXPLORER, BM_SETCHECK, 
 						BST_CHECKED, 0);
 
@@ -3828,18 +3881,33 @@ BOOL CALLBACK TravelerDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 			index = (int) SendDlgItemMessageW (hwndDlg, IDC_DRIVELIST, CB_ADDSTRING, 0, (LPARAM) GetString ("FIRST_AVAILABLE"));
 			SendDlgItemMessage (hwndDlg, IDC_DRIVELIST, CB_SETITEMDATA, index, (LPARAM) 0);
 
-			for (i = 'D'; i <= 'Z'; i++)
+			for (i = L'A'; i <= L'Z'; i++)
 			{
+				if (i == L'C')
+					continue;
 				drive[0] = i;
-				index = (int) SendDlgItemMessage (hwndDlg, IDC_DRIVELIST, CB_ADDSTRING, 0, (LPARAM) drive);
-				SendDlgItemMessage (hwndDlg, IDC_DRIVELIST, CB_SETITEMDATA, index, (LPARAM) i);
+				index = (int) SendDlgItemMessageW (hwndDlg, IDC_DRIVELIST, CB_ADDSTRING, 0, (LPARAM) drive);
+				SendDlgItemMessageW (hwndDlg, IDC_DRIVELIST, CB_SETITEMDATA, index, (LPARAM) i);
 			}
 		
-			SendDlgItemMessage (hwndDlg, IDC_DRIVELIST, CB_SETCURSEL, 0, 0);
+			SendDlgItemMessageW (hwndDlg, IDC_DRIVELIST, CB_SETCURSEL, 0, 0);
 
 			return 0;
 		}
 
+	case WM_CTLCOLORSTATIC:
+		{
+			HDC hdc = (HDC)	wParam;
+			HWND hw = (HWND) lParam;
+			if (hw == GetDlgItem(hwndDlg, IDC_DIRECTORY))
+			{
+				// This the directory field. Make its background like normal edit
+				HBRUSH hbr = GetSysColorBrush (COLOR_WINDOW);
+				::SelectObject(hdc, hbr);
+				return (BOOL) hbr;
+			}
+		}
+		return 0;
 
 	case WM_COMMAND:
 
@@ -3901,24 +3969,24 @@ BOOL CALLBACK TravelerDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 		if (lw == IDC_CREATE)
 		{
 
-			BOOL copyWizard, bExplore, bCacheInDriver, bAutoRun, bAutoMount, bMountReadOnly;
-			char dstDir[MAX_PATH];
-			char srcPath[MAX_PATH * 2];
-			char dstPath[MAX_PATH * 2];
-			char appDir[MAX_PATH];
-			char sysDir[MAX_PATH];
-			char volName[MAX_PATH];
+			BOOL copyWizard, copyExpander, bExplore, bCacheInDriver, bAutoRun, bAutoMount, bMountReadOnly;
+			WCHAR dstDir[MAX_PATH + 1];
+			WCHAR srcPath[1024 + MAX_PATH + 1];
+			WCHAR dstPath[2*MAX_PATH + 1];
+			WCHAR appDir[1024];
+			WCHAR volName[MAX_PATH + 2];
 			int drive;
-			char* ptr;
+			WCHAR* ptr;
 
-			GetDlgItemText (hwndDlg, IDC_DIRECTORY, dstDir, sizeof dstDir);
+			GetDlgItemTextW (hwndDlg, IDC_DIRECTORY, dstDir, array_capacity (dstDir));
 			volName[0] = 0;
-			GetDlgItemText (hwndDlg, IDC_VOLUME_NAME, volName + 1, (sizeof volName) - 1);
+			GetDlgItemTextW (hwndDlg, IDC_VOLUME_NAME, volName + 1, (array_capacity (volName)) - 1);
 			
 			drive = (int) SendDlgItemMessage (hwndDlg, IDC_DRIVELIST, CB_GETCURSEL, 0, 0);
 			drive = (int) SendDlgItemMessage (hwndDlg, IDC_DRIVELIST, CB_GETITEMDATA, drive, 0);
 
 			copyWizard = IsButtonChecked (GetDlgItem (hwndDlg, IDC_COPY_WIZARD));
+			copyExpander = IsButtonChecked (GetDlgItem (hwndDlg, IDC_COPY_EXPANDER));
 			bExplore = IsButtonChecked (GetDlgItem (hwndDlg, IDC_TRAVEL_OPEN_EXPLORER));
 			bCacheInDriver = IsButtonChecked (GetDlgItem (hwndDlg, IDC_TRAV_CACHE_PASSWORDS));
 			bMountReadOnly = IsButtonChecked (GetDlgItem (hwndDlg, IDC_MOUNT_READONLY));
@@ -3942,24 +4010,42 @@ BOOL CALLBACK TravelerDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 
 			if (volName[1] != 0)
 			{
-				volName[0] = '"';
-				StringCbCatA (volName, sizeof(volName), "\"");
+				volName[0] = L'"';
+				StringCbCatW (volName, sizeof(volName), L"\"");
 			}
 
-			GetModuleFileName (NULL, appDir, sizeof (appDir));
-			if (ptr = strrchr (appDir, '\\'))
+			GetModuleFileNameW (NULL, appDir, array_capacity (appDir));
+			if (ptr = wcsrchr (appDir, L'\\'))
 				ptr[0] = 0;
 
 			WaitCursor ();
-			GetSystemDirectory (sysDir, sizeof (sysDir));
 
-			StringCbPrintfA (dstPath, sizeof(dstPath), "%s\\VeraCrypt", dstDir);
-			CreateDirectory (dstPath, NULL);
+			StringCbPrintfW (dstPath, sizeof(dstPath), L"%s\\VeraCrypt", dstDir);
+			if (!CreateDirectoryW (dstPath, NULL))
+			{
+				handleWin32Error (hwndDlg, SRC_POS);
+				goto stop;
+			}
+
+			// Main app 32-bit
+			if (Is64BitOs ())
+				StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\VeraCrypt-x86.exe", appDir);
+			else
+				StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\VeraCrypt.exe", appDir);
+			StringCbPrintfW (dstPath, sizeof(dstPath), L"%s\\VeraCrypt\\VeraCrypt.exe", dstDir);
+			if (!TCCopyFileW (srcPath, dstPath))
+			{
+				handleWin32Error (hwndDlg, SRC_POS);
+				goto stop;
+			}
 
-			// Main app
-			StringCbPrintfA (srcPath, sizeof(srcPath), "%s\\VeraCrypt.exe", appDir);
-			StringCbPrintfA (dstPath, sizeof(dstPath), "%s\\VeraCrypt\\VeraCrypt.exe", dstDir);
-			if (!TCCopyFile (srcPath, dstPath))
+			// Main app 64-bit
+			if (Is64BitOs ())
+				StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\VeraCrypt.exe", appDir);
+			else
+				StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\VeraCrypt-x64.exe", appDir);
+			StringCbPrintfW (dstPath, sizeof(dstPath), L"%s\\VeraCrypt\\VeraCrypt-x64.exe", dstDir);
+			if (!TCCopyFileW (srcPath, dstPath))
 			{
 				handleWin32Error (hwndDlg, SRC_POS);
 				goto stop;
@@ -3968,9 +4054,53 @@ BOOL CALLBACK TravelerDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 			// Wizard
 			if (copyWizard)
 			{
-				StringCbPrintfA (srcPath, sizeof(srcPath), "%s\\VeraCrypt Format.exe", appDir);
-				StringCbPrintfA (dstPath, sizeof(dstPath), "%s\\VeraCrypt\\VeraCrypt Format.exe", dstDir);
-				if (!TCCopyFile (srcPath, dstPath))
+				// Wizard 32-bit
+				if (Is64BitOs ())
+					StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\VeraCrypt Format-x86.exe", appDir);
+				else
+					StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\VeraCrypt Format.exe", appDir);
+				StringCbPrintfW (dstPath, sizeof(dstPath), L"%s\\VeraCrypt\\VeraCrypt Format.exe", dstDir);
+				if (!TCCopyFileW (srcPath, dstPath))
+				{
+					handleWin32Error (hwndDlg, SRC_POS);
+					goto stop;
+				}
+
+				// Wizard 64-bit
+				if (Is64BitOs ())
+					StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\VeraCrypt Format.exe", appDir);
+				else
+					StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\VeraCrypt Format-x64.exe", appDir);
+				StringCbPrintfW (dstPath, sizeof(dstPath), L"%s\\VeraCrypt\\VeraCrypt Format-x64.exe", dstDir);
+				if (!TCCopyFileW (srcPath, dstPath))
+				{
+					handleWin32Error (hwndDlg, SRC_POS);
+					goto stop;
+				}
+			}
+
+			// Expander
+			if (copyExpander)
+			{
+				// Expander 32-bit
+				if (Is64BitOs ())
+					StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\VeraCryptExpander-x86.exe", appDir);
+				else
+					StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\VeraCryptExpander.exe", appDir);
+				StringCbPrintfW (dstPath, sizeof(dstPath), L"%s\\VeraCrypt\\VeraCryptExpander.exe", dstDir);
+				if (!TCCopyFileW (srcPath, dstPath))
+				{
+					handleWin32Error (hwndDlg, SRC_POS);
+					goto stop;
+				}
+
+				// Expander 64-bit
+				if (Is64BitOs ())
+					StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\VeraCryptExpander.exe", appDir);
+				else
+					StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\VeraCryptExpander-x64.exe", appDir);
+				StringCbPrintfW (dstPath, sizeof(dstPath), L"%s\\VeraCrypt\\VeraCryptExpander-x64.exe", dstDir);
+				if (!TCCopyFileW (srcPath, dstPath))
 				{
 					handleWin32Error (hwndDlg, SRC_POS);
 					goto stop;
@@ -3978,41 +4108,41 @@ BOOL CALLBACK TravelerDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 			}
 
 			// Driver
-			StringCbPrintfA (srcPath, sizeof(srcPath), "%s\\veracrypt.sys", appDir);
-			StringCbPrintfA (dstPath, sizeof(dstPath), "%s\\VeraCrypt\\veracrypt.sys", dstDir);
-			if (!TCCopyFile (srcPath, dstPath))
+			StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\veracrypt.sys", appDir);
+			StringCbPrintfW (dstPath, sizeof(dstPath), L"%s\\VeraCrypt\\veracrypt.sys", dstDir);
+			if (!TCCopyFileW (srcPath, dstPath))
 			{
 				handleWin32Error (hwndDlg, SRC_POS);
 				goto stop;
 			}
 
 			// Driver x64
-			StringCbPrintfA (srcPath, sizeof(srcPath), "%s\\veracrypt-x64.sys", appDir);
-			StringCbPrintfA (dstPath, sizeof(dstPath), "%s\\VeraCrypt\\veracrypt-x64.sys", dstDir);
-			if (!TCCopyFile (srcPath, dstPath))
+			StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\veracrypt-x64.sys", appDir);
+			StringCbPrintfW (dstPath, sizeof(dstPath), L"%s\\VeraCrypt\\veracrypt-x64.sys", dstDir);
+			if (!TCCopyFileW (srcPath, dstPath))
 			{
 				handleWin32Error (hwndDlg, SRC_POS);
 				goto stop;
 			}
 
-			if (GetPreferredLangId () && strcmp (GetPreferredLangId (), "en") != 0)
+			if (strcmp (GetPreferredLangId (), "en") != 0)
 			{
 				// Language pack
-				StringCbPrintfA (srcPath, sizeof(srcPath), "%s\\Language.%s.xml", appDir, GetPreferredLangId ());
-				StringCbPrintfA (dstPath, sizeof(dstPath), "%s\\VeraCrypt\\Language.%s.xml", dstDir, GetPreferredLangId ());
-				TCCopyFile (srcPath, dstPath);
+				StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\Language.%hs.xml", appDir, GetPreferredLangId ());
+				StringCbPrintfW (dstPath, sizeof(dstPath), L"%s\\VeraCrypt\\Language.%hs.xml", dstDir, GetPreferredLangId ());
+				TCCopyFileW (srcPath, dstPath);
 			}
 
 			// AutoRun
-			StringCbPrintfA (dstPath, sizeof(dstPath), "%s\\autorun.inf", dstDir);
-			DeleteFile (dstPath);
+			StringCbPrintfW (dstPath, sizeof(dstPath), L"%s\\autorun.inf", dstDir);
+			DeleteFileW (dstPath);
 			if (bAutoRun)
 			{
 				FILE *af;
-				char autoMount[100];
-				char driveLetter[] = { ' ', '/', 'l', (char) drive, 0 };
+				wchar_t autoMount[2*MAX_PATH + 2];
+				wchar_t driveLetter[] = { L' ', L'/', L'l', L' ', (wchar_t) drive, 0 };
 
-				af = fopen (dstPath, "w,ccs=UNICODE");
+				af = _wfopen (dstPath, L"w,ccs=UNICODE");
 
 				if (af == NULL)
 				{
@@ -4020,20 +4150,21 @@ BOOL CALLBACK TravelerDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 					goto stop;
 				}
 
-				StringCbPrintfA (autoMount, sizeof(autoMount), "VeraCrypt\\VeraCrypt.exe /q background%s%s%s%s /m rm /v %s",
-					drive > 0 ? driveLetter : "",
-					bExplore ? " /e" : "",
-					bCacheInDriver ? " /c y" : "",
-					bMountReadOnly ? " /m ro" : "",
+				StringCbPrintfW (autoMount, sizeof(autoMount), L"VeraCrypt\\VeraCrypt.exe /q background%s%s%s%s /m rm /v %s",
+					drive > 0 ? driveLetter : L"",
+					bExplore ? L" /e" : L"",
+					bCacheInDriver ? L" /c y" : L"",
+					bMountReadOnly ? L" /m ro" : L"",
 					volName);
 
 				fwprintf (af, L"[autorun]\nlabel=%s\nicon=VeraCrypt\\VeraCrypt.exe\n", GetString ("TC_TRAVELER_DISK"));
 				fwprintf (af, L"action=%s\n", bAutoMount ? GetString ("MOUNT_TC_VOLUME") : GetString ("IDC_PREF_LOGON_START"));
-				fwprintf (af, L"open=%hs\n", bAutoMount ? autoMount : "VeraCrypt\\VeraCrypt.exe");
+				fwprintf (af, L"open=%s\n", bAutoMount ? autoMount : L"VeraCrypt\\VeraCrypt.exe");
 				fwprintf (af, L"shell\\start=%s\nshell\\start\\command=VeraCrypt\\VeraCrypt.exe\n", GetString ("IDC_PREF_LOGON_START"));
 				fwprintf (af, L"shell\\dismount=%s\nshell\\dismount\\command=VeraCrypt\\VeraCrypt.exe /q /d\n", GetString ("DISMOUNT_ALL_TC_VOLUMES"));
 
-				CheckFileStreamWriteErrors (hwndDlg, af, dstPath);
+				ToSBCS (dstPath, sizeof (dstPath));
+				CheckFileStreamWriteErrors (hwndDlg, af, (char*) dstPath);
 				fclose (af);
 			}
 			MessageBoxW (hwndDlg, GetString ("TRAVELER_DISK_CREATED"), lpszTitle, MB_ICONINFORMATION);
@@ -4226,7 +4357,7 @@ static BOOL Mount (HWND hwndDlg, int nDosDriveNo, char *szFileName, int pim)
 	bPrebootPasswordDlgMode = mountOptions.PartitionInInactiveSysEncScope;
 
 	if (nDosDriveNo == 0)
-		nDosDriveNo = HIWORD (GetSelectedLong (GetDlgItem (hwndDlg, IDC_DRIVELIST))) - 'A';
+		nDosDriveNo = HIWORD (GetSelectedLong (GetDlgItem (MainDlg, IDC_DRIVELIST))) - 'A';
 
 	if (!MultipleMountOperationInProgress)
 	{
@@ -4238,7 +4369,7 @@ static BOOL Mount (HWND hwndDlg, int nDosDriveNo, char *szFileName, int pim)
 
 	if (szFileName == NULL)
 	{
-		GetWindowText (GetDlgItem (hwndDlg, IDC_VOLUME), fileName, sizeof (fileName));
+		GetVolumePath (hwndDlg, fileName, sizeof (fileName));
 		szFileName = fileName;
 	}
 
@@ -4281,7 +4412,7 @@ static BOOL Mount (HWND hwndDlg, int nDosDriveNo, char *szFileName, int pim)
 		Password emptyPassword;
 		emptyPassword.Length = 0;
 
-		KeyFilesApply (hwndDlg, &emptyPassword, FirstKeyFile);
+		KeyFilesApply (hwndDlg, &emptyPassword, FirstKeyFile, szFileName);
 		// try TrueCrypt mode first since it is quick, only if pim = 0
 		if (EffectiveVolumePim == 0)
 			mounted = MountVolume (hwndDlg, nDosDriveNo, szFileName, &emptyPassword, 0, 0, TRUE, bCacheInDriver, bForceMount, &mountOptions, Silent, FALSE);
@@ -4343,7 +4474,7 @@ static BOOL Mount (HWND hwndDlg, int nDosDriveNo, char *szFileName, int pim)
 		WaitCursor ();
 
 		if (KeyFilesEnable)
-			KeyFilesApply (hwndDlg, &VolumePassword, FirstKeyFile);
+			KeyFilesApply (hwndDlg, &VolumePassword, FirstKeyFile, szFileName);
 
 		mounted = MountVolume (hwndDlg, nDosDriveNo, szFileName, &VolumePassword, VolumePkcs5, VolumePim, VolumeTrueCryptMode, bCacheInDriver, bForceMount, &mountOptions, Silent, !Silent);
 		NormalCursor ();
@@ -4378,7 +4509,7 @@ static BOOL Mount (HWND hwndDlg, int nDosDriveNo, char *szFileName, int pim)
 		if (bBeep)
 			MessageBeep (0xFFFFFFFF);
 
-		RefreshMainDlg(hwndDlg);
+		RefreshMainDlg(MainDlg);
 
 		if (bExplore)
 		{	
@@ -4454,6 +4585,81 @@ void __cdecl mountThreadFunction (void *hwndDlgArg)
 	Mount (hwndDlg, 0, 0, -1);	
 }
 
+typedef struct
+{
+	UNMOUNT_STRUCT* punmount;
+	BOOL interact;
+	int dismountMaxRetries;
+	int dismountAutoRetryDelay;
+	BOOL* pbResult;
+	DWORD* pdwResult;
+	DWORD dwLastError;
+	BOOL bReturn;
+} DismountAllThreadParam;
+
+void CALLBACK DismountAllThreadProc(void* pArg, HWND hwndDlg)
+{
+	DismountAllThreadParam* pThreadParam = (DismountAllThreadParam*) pArg;
+	UNMOUNT_STRUCT* punmount = pThreadParam->punmount;
+	BOOL* pbResult = pThreadParam->pbResult;
+	DWORD* pdwResult = pThreadParam->pdwResult;
+	int dismountMaxRetries = pThreadParam->dismountMaxRetries;
+	int dismountAutoRetryDelay = pThreadParam->dismountAutoRetryDelay;
+
+	do
+	{
+		*pbResult = DeviceIoControl (hDriver, TC_IOCTL_DISMOUNT_ALL_VOLUMES, punmount,
+			sizeof (UNMOUNT_STRUCT), punmount, sizeof (UNMOUNT_STRUCT), pdwResult, NULL);
+
+		if (	punmount->nDosDriveNo < 0 || punmount->nDosDriveNo > 25 
+				|| (punmount->ignoreOpenFiles != TRUE && punmount->ignoreOpenFiles != FALSE)
+				||	(punmount->HiddenVolumeProtectionTriggered != TRUE && punmount->HiddenVolumeProtectionTriggered != FALSE)
+				||	(punmount->nReturnCode < 0)
+			)
+		{
+			if (*pbResult)
+				SetLastError (ERROR_INTERNAL_ERROR);
+			*pbResult = FALSE;
+		}
+
+		if (*pbResult == FALSE)
+		{
+			NormalCursor();
+			handleWin32Error (hwndDlg, SRC_POS);
+			pThreadParam->dwLastError = GetLastError ();
+			pThreadParam->bReturn = FALSE;
+			return;
+		}
+
+		if (punmount->nReturnCode == ERR_SUCCESS
+			&& punmount->HiddenVolumeProtectionTriggered
+			&& !VolumeNotificationsList.bHidVolDamagePrevReported [punmount->nDosDriveNo]
+			&& pThreadParam->interact
+			&& !Silent)
+		{
+			wchar_t msg[4096];
+
+			VolumeNotificationsList.bHidVolDamagePrevReported [punmount->nDosDriveNo] = TRUE;
+				
+			StringCbPrintfW (msg, sizeof(msg), GetString ("DAMAGE_TO_HIDDEN_VOLUME_PREVENTED"), punmount->nDosDriveNo + 'A');
+			SetForegroundWindow (hwndDlg);
+			MessageBoxW (hwndDlg, msg, lpszTitle, MB_ICONWARNING | MB_SETFOREGROUND | MB_TOPMOST);
+
+			punmount->HiddenVolumeProtectionTriggered = FALSE;
+			continue;
+		}
+
+		if (punmount->nReturnCode == ERR_FILES_OPEN)
+			Sleep (dismountAutoRetryDelay);
+		else
+			break;
+
+	} while (--dismountMaxRetries > 0);
+
+	pThreadParam->dwLastError = GetLastError ();
+	pThreadParam->bReturn = TRUE;
+}
+
 static BOOL DismountAll (HWND hwndDlg, BOOL forceUnmount, BOOL interact, int dismountMaxRetries, int dismountAutoRetryDelay)
 {
 	BOOL status = TRUE;
@@ -4461,8 +4667,9 @@ static BOOL DismountAll (HWND hwndDlg, BOOL forceUnmount, BOOL interact, int dis
 	DWORD dwResult;
 	UNMOUNT_STRUCT unmount = {0};
 	BOOL bResult;
-	unsigned __int32 prevMountedDrives = 0;
+	MOUNT_LIST_STRUCT prevMountList = {0};
 	int i;
+	DismountAllThreadParam dismountAllThreadParam;
 
 retry:
 	WaitCursor();
@@ -4477,7 +4684,7 @@ retry:
 
 	BroadcastDeviceChange (DBT_DEVICEREMOVEPENDING, 0, mountList.ulMountedDrives);
 
-	prevMountedDrives = mountList.ulMountedDrives;
+	memcpy (&prevMountList, &mountList, sizeof (mountList));
 
 	for (i = 0; i < 26; i++)
 	{
@@ -4490,55 +4697,42 @@ retry:
 
 	unmount.nDosDriveNo = 0;
 	unmount.ignoreOpenFiles = forceUnmount;
+	
+	dismountAllThreadParam.punmount = &unmount;
+	dismountAllThreadParam.interact = interact;
+	dismountAllThreadParam.dismountMaxRetries = dismountMaxRetries;
+	dismountAllThreadParam.dismountAutoRetryDelay = dismountAutoRetryDelay;
+	dismountAllThreadParam.pbResult = &bResult;
+	dismountAllThreadParam.pdwResult = &dwResult;
+	dismountAllThreadParam.dwLastError = ERROR_SUCCESS;
+	dismountAllThreadParam.bReturn = TRUE;
 
-	do
+	if (interact && !Silent)
 	{
-		bResult = DeviceIoControl (hDriver, TC_IOCTL_DISMOUNT_ALL_VOLUMES, &unmount,
-			sizeof (unmount), &unmount, sizeof (unmount), &dwResult, NULL);
 
-		if (	unmount.nDosDriveNo < 0 || unmount.nDosDriveNo > 25 
-				|| (unmount.ignoreOpenFiles != TRUE && unmount.ignoreOpenFiles != FALSE)
-				||	(unmount.HiddenVolumeProtectionTriggered != TRUE && unmount.HiddenVolumeProtectionTriggered != FALSE)
-				||	(unmount.nReturnCode < 0)
-			)
-		{
-			if (bResult)
-				SetLastError (ERROR_INTERNAL_ERROR);
-			bResult = FALSE;			
-		}
+		ShowWaitDialog (hwndDlg, FALSE, DismountAllThreadProc, &dismountAllThreadParam);			
+	}
+	else
+		DismountAllThreadProc (&dismountAllThreadParam, hwndDlg);
 
-		if (bResult == FALSE)
-		{
-			NormalCursor();
-			handleWin32Error (hwndDlg, SRC_POS);
-			return FALSE;
-		}
+	SetLastError (dismountAllThreadParam.dwLastError);
 
-		if (unmount.nReturnCode == ERR_SUCCESS
-			&& unmount.HiddenVolumeProtectionTriggered
-			&& !VolumeNotificationsList.bHidVolDamagePrevReported [unmount.nDosDriveNo])
-		{
-			wchar_t msg[4096];
+	if (!dismountAllThreadParam.bReturn)
+		return FALSE;
 
-			VolumeNotificationsList.bHidVolDamagePrevReported [unmount.nDosDriveNo] = TRUE;
-			StringCbPrintfW (msg, sizeof(msg), GetString ("DAMAGE_TO_HIDDEN_VOLUME_PREVENTED"), unmount.nDosDriveNo + 'A');
-			SetForegroundWindow (hwndDlg);
-			MessageBoxW (hwndDlg, msg, lpszTitle, MB_ICONWARNING | MB_SETFOREGROUND | MB_TOPMOST);
+	memset (&mountList, 0, sizeof (mountList));
+	DeviceIoControl (hDriver, TC_IOCTL_GET_MOUNTED_VOLUMES, &mountList, sizeof (mountList), &mountList, sizeof (mountList), &dwResult, NULL);
 
-			unmount.HiddenVolumeProtectionTriggered = FALSE;
-			continue;
+	// remove any custom label from registry
+	for (i = 0; i < 26; i++)
+	{
+		if ((prevMountList.ulMountedDrives & (1 << i)) && (!(mountList.ulMountedDrives & (1 << i))) && wcslen (prevMountList.wszLabel[i]))
+		{
+			UpdateDriveCustomLabel (i, prevMountList.wszLabel[i], FALSE);
 		}
+	}
 
-		if (unmount.nReturnCode == ERR_FILES_OPEN)
-			Sleep (dismountAutoRetryDelay);
-		else
-			break;
-
-	} while (--dismountMaxRetries > 0);
-
-	memset (&mountList, 0, sizeof (mountList));
-	DeviceIoControl (hDriver, TC_IOCTL_GET_MOUNTED_VOLUMES, &mountList, sizeof (mountList), &mountList, sizeof (mountList), &dwResult, NULL);
-	BroadcastDeviceChange (DBT_DEVICEREMOVECOMPLETE, 0, prevMountedDrives & ~mountList.ulMountedDrives);
+	BroadcastDeviceChange (DBT_DEVICEREMOVECOMPLETE, 0, prevMountList.ulMountedDrives & ~mountList.ulMountedDrives);
 
 	RefreshMainDlg (hwndDlg);
 
@@ -4653,9 +4847,9 @@ static BOOL MountAllDevicesThreadCode (HWND hwndDlg, BOOL bPasswordPrompt)
 			WaitCursor();
 
 			if (FirstCmdKeyFile)
-				KeyFilesApply (hwndDlg, &VolumePassword, FirstCmdKeyFile);
+				KeyFilesApply (hwndDlg, &VolumePassword, FirstCmdKeyFile, NULL);
 			else if (KeyFilesEnable)
-				KeyFilesApply (hwndDlg, &VolumePassword, FirstKeyFile);
+				KeyFilesApply (hwndDlg, &VolumePassword, FirstKeyFile, NULL);
 
 		}
 
@@ -4858,7 +5052,7 @@ static BOOL MountAllDevices (HWND hwndDlg, BOOL bPasswordPrompt)
 	param.bPasswordPrompt = bPasswordPrompt;
 	param.bRet = FALSE;
 
-	ShowWaitDialog (hwndDlg, TRUE, mountAllDevicesThreadProc, &param);
+	ShowWaitDialog (hwndDlg, FALSE, mountAllDevicesThreadProc, &param);
 
 	return param.bRet;
 }
@@ -4868,7 +5062,7 @@ static void ChangePassword (HWND hwndDlg)
 	INT_PTR result;
 	int newPimValue = -1;
 	
-	GetWindowText (GetDlgItem (hwndDlg, IDC_VOLUME), szFileName, sizeof (szFileName));
+	GetVolumePath (hwndDlg, szFileName, sizeof (szFileName));
 	if (IsMountedVolume (szFileName))
 	{
 		Warning (pwdChangeDlgMode == PCDM_CHANGE_PKCS5_PRF ? "MOUNTED_NO_PKCS5_PRF_CHANGE" : "MOUNTED_NOPWCHANGE", hwndDlg);
@@ -5213,7 +5407,7 @@ static void DecryptNonSysDevice (HWND hwndDlg, BOOL bResolveAmbiguousSelection,
 
 		char volPath [TC_MAX_PATH];
 
-		GetWindowText (GetDlgItem (MainDlg, IDC_VOLUME), volPath, sizeof (volPath));
+		GetVolumePath (MainDlg, volPath, sizeof (volPath));
 
 		scPath = volPath;
 	}
@@ -5374,7 +5568,7 @@ void CreateRescueDisk (HWND hwndDlg)
 		Warning ("SYSTEM_ENCRYPTION_IN_PROGRESS_ELSEWHERE", hwndDlg);
 }
 
-static void VerifyRescueDisk (HWND hwndDlg)
+static void VerifyRescueDisk (HWND hwndDlg, bool checkIsoFile)
 {
 	try
 	{
@@ -5405,7 +5599,7 @@ static void VerifyRescueDisk (HWND hwndDlg)
 	{
 		try
 		{
-			if (AskOkCancel ("RESCUE_DISK_NON_WIZARD_CHECK_INSERT", hwndDlg) != IDOK)
+			if (!checkIsoFile && (AskOkCancel ("RESCUE_DISK_NON_WIZARD_CHECK_INSERT", hwndDlg) != IDOK))
 			{		
 				CloseSysEncMutex ();
 				return;
@@ -5414,11 +5608,33 @@ static void VerifyRescueDisk (HWND hwndDlg)
 			// Create a temporary up-to-date rescue disk image in RAM (with it the CD/DVD content will be compared)
 			BootEncObj->CreateRescueIsoImage (false, "");
 
-			WaitCursor();
-			if (!BootEncObj->VerifyRescueDisk ())
-				Error ("RESCUE_DISK_NON_WIZARD_CHECK_FAILED", hwndDlg);
+			
+			if (checkIsoFile)
+			{
+				char szRescueDiskISO [TC_MAX_PATH+1];
+				char initialDir[MAX_PATH];
+				SHGetFolderPath (NULL, CSIDL_MYDOCUMENTS, NULL, 0, initialDir);
+
+				if (!BrowseFilesInDir (hwndDlg, "OPEN_TITLE", initialDir, szRescueDiskISO, FALSE, FALSE, NULL, L"VeraCrypt Rescue Disk.iso", L"iso"))
+				{		
+					CloseSysEncMutex ();
+					return;
+				}
+
+				WaitCursor();
+				if (!BootEncObj->VerifyRescueDiskIsoImage (szRescueDiskISO))
+					Error ("RESCUE_DISK_ISO_IMAGE_CHECK_FAILED", hwndDlg);
+				else
+					Info ("RESCUE_DISK_ISO_IMAGE_CHECK_PASSED", hwndDlg);	
+			}
 			else
-				Info ("RESCUE_DISK_NON_WIZARD_CHECK_PASSED", hwndDlg);
+			{
+				WaitCursor();
+				if (!BootEncObj->VerifyRescueDisk ())
+					Error ("RESCUE_DISK_NON_WIZARD_CHECK_FAILED", hwndDlg);
+				else
+					Info ("RESCUE_DISK_NON_WIZARD_CHECK_PASSED", hwndDlg);
+			}
 		}
 		catch (Exception &e)
 		{
@@ -5892,7 +6108,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 							BOOL reportBadPasswd = CmdVolumePassword.Length > 0;
 
 							if (FirstCmdKeyFile)
-								KeyFilesApply (hwndDlg, &CmdVolumePassword, FirstCmdKeyFile);
+								KeyFilesApply (hwndDlg, &CmdVolumePassword, FirstCmdKeyFile, szFileName);
 
 							mounted = MountVolume (hwndDlg, szDriveLetter[0] - 'A',
 								szFileName, &CmdVolumePassword, EffectiveVolumePkcs5, CmdVolumePim, EffectiveVolumeTrueCryptMode, bCacheInDriver, bForceMount,
@@ -5931,7 +6147,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 							WaitCursor ();
 
 							if (KeyFilesEnable && FirstKeyFile)
-								KeyFilesApply (hwndDlg, &VolumePassword, FirstKeyFile);
+								KeyFilesApply (hwndDlg, &VolumePassword, FirstKeyFile, szFileName);
 
 							mounted = MountVolume (hwndDlg, szDriveLetter[0] - 'A', szFileName, &VolumePassword, VolumePkcs5, VolumePim, VolumeTrueCryptMode, bCacheInDriver, bForceMount, &mountOptions, FALSE, TRUE);
 
@@ -6333,7 +6549,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 						if (!mountedAndNotDisconnected)
 						{
 							FavoriteMountOnArrivalInProgress = TRUE;
-							MountFavoriteVolumes (FALSE, FALSE, FALSE, favorite);
+							MountFavoriteVolumes (hwndDlg, FALSE, FALSE, FALSE, favorite);
 							FavoriteMountOnArrivalInProgress = FALSE;
 
 							FavoritesMountedOnArrivalStillConnected.push_back (favorite);
@@ -6435,7 +6651,11 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 
 								if (wcsstr (vol, L"\\??\\")) vol += 4;
 
-								wstring label = GetFavoriteVolumeLabel (WideToSingleString (vol));
+								// first check label used for mounting. If empty, look for it in favorites.
+								bool useInExplorer = false;
+								wstring label = (wchar_t *) LastKnownMountList.wszLabel[i];
+								if (label.empty())
+									label = GetFavoriteVolumeLabel (WideToSingleString (vol), useInExplorer);
 
 								StringCbPrintfW (s, sizeof(s), L"%s %c: (%s)",
 									GetString (n==0 ? "OPEN" : "DISMOUNT"),
@@ -6665,7 +6885,11 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 							return 1;
 
 						if (mountOptions.ProtectHiddenVolume && hidVolProtKeyFilesParam.EnableKeyFiles)
-							KeyFilesApply (hwndDlg, &mountOptions.ProtectedHidVolPassword, hidVolProtKeyFilesParam.FirstKeyFile);
+						{
+							char selectedVolume [TC_MAX_PATH + 1];
+							GetVolumePath (hwndDlg, selectedVolume, sizeof (selectedVolume));
+							KeyFilesApply (hwndDlg, &mountOptions.ProtectedHidVolPassword, hidVolProtKeyFilesParam.FirstKeyFile, selectedVolume);
+						}
 					}
 
 					if (CheckMountList (hwndDlg, FALSE))
@@ -6935,7 +7159,10 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 			CreateRescueDisk (hwndDlg);
 			break;
 		case IDM_VERIFY_RESCUE_DISK:
-			VerifyRescueDisk (hwndDlg);
+			VerifyRescueDisk (hwndDlg, false);
+			break;
+		case IDM_VERIFY_RESCUE_DISK_ISO:
+			VerifyRescueDisk (hwndDlg, true);
 			break;
 		case IDM_MOUNT_SYSENC_PART_WITHOUT_PBA:
 
@@ -7060,7 +7287,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 				}
 				else
 				{
-					GetWindowText (GetDlgItem (hwndDlg, IDC_VOLUME), volPath, sizeof (volPath));
+					GetVolumePath (hwndDlg, volPath, sizeof (volPath));
 
 					WaitCursor ();
 
@@ -7083,7 +7310,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 				}
 				else
 				{
-					GetWindowText (GetDlgItem (hwndDlg, IDC_VOLUME), volPath, sizeof (volPath));
+					GetVolumePath (hwndDlg, volPath, sizeof (volPath));
 
 					WaitCursor ();
 
@@ -7359,7 +7586,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 			wchar_t volPathLowerW[TC_MAX_PATH];
 
 			// volPathLower will contain the volume path (if any) from the input field below the drive list 
-			GetWindowText (GetDlgItem (hwndDlg, IDC_VOLUME), volPathLower, sizeof (volPathLower));
+			GetVolumePath (hwndDlg, volPathLower, sizeof (volPathLower));
 
 			if (LOWORD (selectedDrive) != TC_MLIST_ITEM_NONSYS_VOL
 				&& !(VolumeSelected (hwndDlg) && IsMountedVolume (volPathLower)))
@@ -7505,7 +7732,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 			{
 				char volPath[TC_MAX_PATH];		/* Volume to mount */
 
-				GetWindowText (GetDlgItem (hwndDlg, IDC_VOLUME), volPath, sizeof (volPath));
+				GetVolumePath (hwndDlg, volPath, sizeof (volPath));
 
 				WaitCursor ();
 
@@ -7532,7 +7759,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 			{
 				char volPath[TC_MAX_PATH];		/* Volume to mount */
 
-				GetWindowText (GetDlgItem (hwndDlg, IDC_VOLUME), volPath, sizeof (volPath));
+				GetVolumePath (hwndDlg, volPath, sizeof (volPath));
 
 				WaitCursor ();
 
@@ -7976,7 +8203,7 @@ void ExtractCommandLine (HWND hwndDlg, char *lpszCommandLine)
 
 			case OptionMountOption:
 				{
-					char szTmp[16] = {0};
+					char szTmp[64] = {0};
 					if (HAS_ARGUMENT == GetArgumentValue (lpszCommandLineArgs,
 						&i, nNoCommandLineArgs, szTmp, sizeof (szTmp)))
 					{
@@ -7997,7 +8224,12 @@ void ExtractCommandLine (HWND hwndDlg, char *lpszCommandLine)
 
 						else if (!_stricmp (szTmp, "recovery"))
 							mountOptions.RecoveryMode = TRUE;
-
+						else if ((strlen(szTmp) > 6) && (strlen(szTmp) <= 38) && !_strnicmp (szTmp, "label=", 6))
+						{
+							// get the label
+							memmove (szTmp, &szTmp[6], (strlen(szTmp) - 6) + 1);
+							MultiByteToWideChar (CP_ACP, 0, szTmp, -1, mountOptions.Label, sizeof (mountOptions.Label) / sizeof(wchar_t));
+						}
 						else
 							AbortProcess ("COMMAND_LINE_ERROR");
 
@@ -8229,7 +8461,7 @@ static VOID WINAPI SystemFavoritesServiceMain (DWORD argc, LPTSTR *argv)
 
 	try
 	{
-		status = MountFavoriteVolumes (TRUE);
+		status = MountFavoriteVolumes (NULL, TRUE);
 	}
 	catch (...) { }
 
@@ -8497,7 +8729,7 @@ void DismountIdleVolumes ()
 	}
 }
 
-static BOOL MountFavoriteVolumeBase (const FavoriteVolume &favorite, BOOL& lastbExplore, BOOL& userForcedReadOnly, BOOL systemFavorites, BOOL logOnMount, BOOL hotKeyMount, const FavoriteVolume &favoriteVolumeToMount)
+static BOOL MountFavoriteVolumeBase (HWND hwnd, const FavoriteVolume &favorite, BOOL& lastbExplore, BOOL& userForcedReadOnly, BOOL systemFavorites, BOOL logOnMount, BOOL hotKeyMount, const FavoriteVolume &favoriteVolumeToMount)
 {
 	BOOL status = TRUE;
 	int drive;
@@ -8505,6 +8737,10 @@ static BOOL MountFavoriteVolumeBase (const FavoriteVolume &favorite, BOOL& lastb
 	
 	mountOptions.ReadOnly = favorite.ReadOnly || userForcedReadOnly;
 	mountOptions.Removable = favorite.Removable;
+	if (favorite.UseLabelInExplorer && !favorite.Label.empty())
+		StringCbCopyW (mountOptions.Label, sizeof (mountOptions.Label), favorite.Label.c_str());
+	else
+		ZeroMemory (mountOptions.Label, sizeof (mountOptions.Label));
 
 	if (favorite.SystemEncryption)
 	{
@@ -8553,7 +8789,7 @@ static BOOL MountFavoriteVolumeBase (const FavoriteVolume &favorite, BOOL& lastb
 			else
 				mountOptions.ProtectedHidVolPkcs5Prf = CmdVolumePkcs5;
 			mountOptions.ProtectedHidVolPim = CmdVolumePim;
-			if (DialogBoxParamW (hInst, MAKEINTRESOURCEW (IDD_MOUNT_OPTIONS), MainDlg, (DLGPROC) MountOptionsDlgProc, (LPARAM) &mountOptions) == IDCANCEL)
+			if (DialogBoxParamW (hInst, MAKEINTRESOURCEW (IDD_MOUNT_OPTIONS), hwnd, (DLGPROC) MountOptionsDlgProc, (LPARAM) &mountOptions) == IDCANCEL)
 			{
 				status = FALSE;
 				goto skipMount;
@@ -8565,7 +8801,7 @@ static BOOL MountFavoriteVolumeBase (const FavoriteVolume &favorite, BOOL& lastb
 		if (ServiceMode)
 			SystemFavoritesServiceLogInfo (string ("Mounting system favorite \"") + favorite.Path + "\"");
 
-		status = Mount (MainDlg, drive, (char *) favorite.Path.c_str(), favorite.Pim);
+		status = Mount (hwnd, drive, (char *) favorite.Path.c_str(), favorite.Pim);
 
 		if (ServiceMode)
 		{
@@ -8627,7 +8863,7 @@ skipMount:
 }
 
 
-BOOL MountFavoriteVolumes (BOOL systemFavorites, BOOL logOnMount, BOOL hotKeyMount, const FavoriteVolume &favoriteVolumeToMount)
+BOOL MountFavoriteVolumes (HWND hwnd, BOOL systemFavorites, BOOL logOnMount, BOOL hotKeyMount, const FavoriteVolume &favoriteVolumeToMount)
 {
 	BOOL bRet = TRUE, status = TRUE;
 	BOOL lastbExplore;
@@ -8689,7 +8925,7 @@ BOOL MountFavoriteVolumes (BOOL systemFavorites, BOOL logOnMount, BOOL hotKeyMou
 			continue;
 		}
 
-		status = MountFavoriteVolumeBase (favorite, lastbExplore, userForcedReadOnly, systemFavorites, logOnMount, hotKeyMount, favoriteVolumeToMount);
+		status = MountFavoriteVolumeBase (hwnd, favorite, lastbExplore, userForcedReadOnly, systemFavorites, logOnMount, hotKeyMount, favoriteVolumeToMount);
 		if (!status)
 			bRet = FALSE;
 	}
@@ -8728,7 +8964,7 @@ BOOL MountFavoriteVolumes (BOOL systemFavorites, BOOL logOnMount, BOOL hotKeyMou
 						// favorite OK. 
 						SystemFavoritesServiceLogInfo (string ("Favorite \"") + favorite->VolumePathId + "\" is connected. Performing mount.");
 
-						status = MountFavoriteVolumeBase (*favorite, lastbExplore, userForcedReadOnly, systemFavorites, logOnMount, hotKeyMount, favoriteVolumeToMount);
+						status = MountFavoriteVolumeBase (hwnd, *favorite, lastbExplore, userForcedReadOnly, systemFavorites, logOnMount, hotKeyMount, favoriteVolumeToMount);
 						if (!status)
 							bRet = FALSE;
 					}
@@ -8758,26 +8994,27 @@ BOOL MountFavoriteVolumes (BOOL systemFavorites, BOOL logOnMount, BOOL hotKeyMou
 	return bRet;
 }
 
-void __cdecl mountFavoriteVolumeThreadFunction (void *pArg)
+void CALLBACK mountFavoriteVolumeCallbackFunction (void *pArg, HWND hwnd)
 {
 	mountFavoriteVolumeThreadParam* pParam = (mountFavoriteVolumeThreadParam*) pArg;
-	// Disable main dialog during processing to avoid user interaction
-	EnableWindow(MainDlg, FALSE);
-	finally_do ({ EnableWindow(MainDlg, TRUE); });
 
 	if (pParam)
 	{
 		if (pParam->favoriteVolumeToMount)
-			MountFavoriteVolumes (pParam->systemFavorites, pParam->logOnMount, pParam->hotKeyMount, *(pParam->favoriteVolumeToMount));
+			MountFavoriteVolumes (hwnd, pParam->systemFavorites, pParam->logOnMount, pParam->hotKeyMount, *(pParam->favoriteVolumeToMount));
 		else
-			MountFavoriteVolumes (pParam->systemFavorites, pParam->logOnMount, pParam->hotKeyMount);
+			MountFavoriteVolumes (hwnd, pParam->systemFavorites, pParam->logOnMount, pParam->hotKeyMount);
 
-		free(pParam);
+		free (pParam);
 	}
 	else
-		MountFavoriteVolumes ();
+		MountFavoriteVolumes (hwnd);
 }
 
+void __cdecl mountFavoriteVolumeThreadFunction (void *pArg)
+{
+	ShowWaitDialog (NULL, FALSE, mountFavoriteVolumeCallbackFunction, pArg);
+}
 
 static void SaveDefaultKeyFilesParam (HWND hwnd)
 {
@@ -8915,6 +9152,7 @@ static void HandleHotKey (HWND hwndDlg, WPARAM wParam)
 			pParam->systemFavorites = FALSE;
 			pParam->logOnMount = FALSE;
 			pParam->hotKeyMount = TRUE;
+			pParam->favoriteVolumeToMount = NULL;
 
 			_beginthread(mountFavoriteVolumeThreadFunction, 0, pParam);
 		}
@@ -8959,6 +9197,14 @@ int BackupVolumeHeader (HWND hwndDlg, BOOL bRequireConfirmation, const char *lps
 	int hiddenVolPkcs5 = 0, hiddenVolPim = 0;
 	byte temporaryKey[MASTER_KEYDATA_SIZE];
 	byte originalK2[MASTER_KEYDATA_SIZE];
+	int EffectiveVolumePkcs5 = CmdVolumePkcs5;
+	int EffectiveVolumePim = CmdVolumePim;
+
+	/* Priority is given to command line parameters 
+	 * Default values used only when nothing specified in command line
+	 */
+	if (EffectiveVolumePkcs5 == 0)
+		EffectiveVolumePkcs5 = DefaultVolumePkcs5;
 
    if (!lpszVolume)
    {
@@ -9007,16 +9253,25 @@ int BackupVolumeHeader (HWND hwndDlg, BOOL bRequireConfirmation, const char *lps
 
 		while (TRUE)
 		{
-			if (!AskVolumePassword (hwndDlg, askPassword, askPkcs5, askPim, &VolumeTrueCryptMode, type == TC_VOLUME_TYPE_HIDDEN ? "ENTER_HIDDEN_VOL_PASSWORD" : "ENTER_NORMAL_VOL_PASSWORD", FALSE))
+			int GuiPkcs5 = ((EffectiveVolumePkcs5 > 0) && (*askPkcs5 == 0))? EffectiveVolumePkcs5 : *askPkcs5;
+			int GuiPim = ((EffectiveVolumePim > 0) && (*askPim <= 0))? EffectiveVolumePim : *askPim;
+			if (!AskVolumePassword (hwndDlg, askPassword, &GuiPkcs5, &GuiPim, &VolumeTrueCryptMode, type == TC_VOLUME_TYPE_HIDDEN ? "ENTER_HIDDEN_VOL_PASSWORD" : "ENTER_NORMAL_VOL_PASSWORD", FALSE))
 			{
 				nStatus = ERR_SUCCESS;
 				goto ret;
 			}
+			else
+			{
+				*askPkcs5 = GuiPkcs5;
+				*askPim = GuiPim;
+				burn (&GuiPkcs5, sizeof (GuiPkcs5));
+				burn (&GuiPim, sizeof (GuiPim));
+			}
 
 			WaitCursor();
 
 			if (KeyFilesEnable && FirstKeyFile)
-				KeyFilesApply (hwndDlg, askPassword, FirstKeyFile);
+				KeyFilesApply (hwndDlg, askPassword, FirstKeyFile, lpszVolume);
 
 			nStatus = OpenVolume (askVol, lpszVolume, askPassword, *askPkcs5, *askPim, VolumeTrueCryptMode, FALSE, bPreserveTimestamp, FALSE);
 
@@ -9207,6 +9462,14 @@ int RestoreVolumeHeader (HWND hwndDlg, const char *lpszVolume)
 	HANDLE fBackup = INVALID_HANDLE_VALUE;
 	LARGE_INTEGER headerOffset;
 	CRYPTO_INFO *restoredCryptoInfo = NULL;
+	int EffectiveVolumePkcs5 = CmdVolumePkcs5;
+	int EffectiveVolumePim = CmdVolumePim;
+
+	/* Priority is given to command line parameters 
+	 * Default values used only when nothing specified in command line
+	 */
+	if (EffectiveVolumePkcs5 == 0)
+		EffectiveVolumePkcs5 = DefaultVolumePkcs5;
 
    if (!lpszVolume)
    {
@@ -9277,17 +9540,26 @@ int RestoreVolumeHeader (HWND hwndDlg, const char *lpszVolume)
 		// Open the volume using backup header
 		while (TRUE)
 		{
+			int GuiPkcs5 = ((EffectiveVolumePkcs5 > 0) && (VolumePkcs5 == 0))? EffectiveVolumePkcs5 : VolumePkcs5;
+			int GuiPim = ((EffectiveVolumePim > 0) && (VolumePim <= 0))? EffectiveVolumePim : VolumePim;
 			StringCbCopyA (PasswordDlgVolume, sizeof(PasswordDlgVolume), lpszVolume);
-			if (!AskVolumePassword (hwndDlg, &VolumePassword, &VolumePkcs5, &VolumePim, &VolumeTrueCryptMode, NULL, FALSE))
+			if (!AskVolumePassword (hwndDlg, &VolumePassword, &GuiPkcs5, &GuiPim, &VolumeTrueCryptMode, NULL, FALSE))
 			{
 				nStatus = ERR_SUCCESS;
 				goto ret;
 			}
+			else
+			{
+				VolumePkcs5 = GuiPkcs5;
+				VolumePim = GuiPim;
+				burn (&GuiPkcs5, sizeof (GuiPkcs5));
+				burn (&GuiPim, sizeof (GuiPim));
+			}
 
 			WaitCursor();
 
 			if (KeyFilesEnable && FirstKeyFile)
-				KeyFilesApply (hwndDlg, &VolumePassword, FirstKeyFile);
+				KeyFilesApply (hwndDlg, &VolumePassword, FirstKeyFile, lpszVolume);
 
 			nStatus = OpenVolume (&volume, lpszVolume, &VolumePassword, VolumePkcs5, VolumePim, VolumeTrueCryptMode,TRUE, bPreserveTimestamp, TRUE);
 
@@ -9480,14 +9752,23 @@ int RestoreVolumeHeader (HWND hwndDlg, const char *lpszVolume)
 		// Open the header
 		while (TRUE)
 		{
+			int GuiPkcs5 = ((EffectiveVolumePkcs5 > 0) && (VolumePkcs5 == 0))? EffectiveVolumePkcs5 : VolumePkcs5;
+			int GuiPim = ((EffectiveVolumePim > 0) && (VolumePim <= 0))? EffectiveVolumePim : VolumePim;
 			if (!AskVolumePassword (hwndDlg, &VolumePassword, &VolumePkcs5, &VolumePim, &VolumeTrueCryptMode, "ENTER_HEADER_BACKUP_PASSWORD", FALSE))
 			{
 				nStatus = ERR_SUCCESS;
 				goto ret;
 			}
+			else
+			{
+				VolumePkcs5 = GuiPkcs5;
+				VolumePim = GuiPim;
+				burn (&GuiPkcs5, sizeof (GuiPkcs5));
+				burn (&GuiPim, sizeof (GuiPim));
+			}
 
 			if (KeyFilesEnable && FirstKeyFile)
-				KeyFilesApply (hwndDlg, &VolumePassword, FirstKeyFile);
+				KeyFilesApply (hwndDlg, &VolumePassword, FirstKeyFile, bDevice? NULL : lpszVolume);
 
 			// Decrypt volume header
 			headerOffsetBackupFile = 0;
@@ -9629,6 +9910,7 @@ static BOOL CALLBACK PerformanceSettingsDlgProc (HWND hwndDlg, UINT msg, WPARAM
 
 			uint32 driverConfig = ReadDriverConfigurationFlags();
 			CheckDlgButton (hwndDlg, IDC_ENABLE_HARDWARE_ENCRYPTION, (driverConfig & TC_DRIVER_CONFIG_DISABLE_HARDWARE_ENCRYPTION) ? BST_UNCHECKED : BST_CHECKED);
+			CheckDlgButton (hwndDlg, IDC_ENABLE_EXTENDED_IOCTL_SUPPORT, (driverConfig & TC_DRIVER_CONFIG_ENABLE_EXTENDED_IOCTL) ? BST_CHECKED : BST_UNCHECKED);
 
 			SYSTEM_INFO sysInfo;
 			GetSystemInfo (&sysInfo);
@@ -9685,6 +9967,7 @@ static BOOL CALLBACK PerformanceSettingsDlgProc (HWND hwndDlg, UINT msg, WPARAM
 				}
 
 				BOOL disableHW = !IsDlgButtonChecked (hwndDlg, IDC_ENABLE_HARDWARE_ENCRYPTION);
+				BOOL enableExtendedIOCTL = IsDlgButtonChecked (hwndDlg, IDC_ENABLE_EXTENDED_IOCTL_SUPPORT);
 
 				try
 				{
@@ -9717,6 +10000,7 @@ static BOOL CALLBACK PerformanceSettingsDlgProc (HWND hwndDlg, UINT msg, WPARAM
 					}
 
 					SetDriverConfigurationFlag (TC_DRIVER_CONFIG_DISABLE_HARDWARE_ENCRYPTION, disableHW);
+					SetDriverConfigurationFlag (TC_DRIVER_CONFIG_ENABLE_EXTENDED_IOCTL, enableExtendedIOCTL);
 
 					DWORD bytesReturned;
 					if (!DeviceIoControl (hDriver, TC_IOCTL_REREAD_DRIVER_CONFIG, NULL, 0, NULL, 0, &bytesReturned, NULL))
@@ -10169,7 +10453,11 @@ void MountSelectedVolume (HWND hwndDlg, BOOL mountWithOptions)
 				return;
 
 			if (mountOptions.ProtectHiddenVolume && hidVolProtKeyFilesParam.EnableKeyFiles)
-				KeyFilesApply (hwndDlg, &mountOptions.ProtectedHidVolPassword, hidVolProtKeyFilesParam.FirstKeyFile);
+			{
+				char selectedVolume [TC_MAX_PATH + 1];
+				GetVolumePath (hwndDlg, selectedVolume, sizeof (selectedVolume));
+				KeyFilesApply (hwndDlg, &mountOptions.ProtectedHidVolPassword, hidVolProtKeyFilesParam.FirstKeyFile, selectedVolume);
+			}
 		}
 
 		if (CheckMountList (hwndDlg, FALSE))
diff --git a/src/Mount/Mount.h b/src/Mount/Mount.h
index 746add7..d9a1682 100644
--- a/src/Mount/Mount.h
+++ b/src/Mount/Mount.h
@@ -126,7 +126,7 @@ typedef struct
 } mountFavoriteVolumeThreadParam;
 
 void SetDriverConfigurationFlag (uint32 flag, BOOL state);
-BOOL MountFavoriteVolumes (BOOL systemFavorites = FALSE, BOOL logOnMount = FALSE, BOOL hotKeyMount = FALSE, const VeraCrypt::FavoriteVolume &favoriteVolumeToMount = VeraCrypt::FavoriteVolume());
+BOOL MountFavoriteVolumes (HWND hwnd, BOOL systemFavorites = FALSE, BOOL logOnMount = FALSE, BOOL hotKeyMount = FALSE, const VeraCrypt::FavoriteVolume &favoriteVolumeToMount = VeraCrypt::FavoriteVolume());
 void __cdecl mountFavoriteVolumeThreadFunction (void *pArg);
 
 #endif
diff --git a/src/Mount/Mount.rc b/src/Mount/Mount.rc
index f65caba..d3f2386 100644
--- a/src/Mount/Mount.rc
+++ b/src/Mount/Mount.rc
@@ -114,14 +114,14 @@ BEGIN
     EDITTEXT        IDC_OLD_PASSWORD,89,14,162,13,ES_PASSWORD | ES_AUTOHSCROLL
     COMBOBOX        IDC_PKCS5_OLD_PRF_ID,89,33,85,90,CBS_DROPDOWNLIST | WS_TABSTOP
     CONTROL         "TrueCrypt Mode",IDC_TRUECRYPT_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,179,35,78,10
-    EDITTEXT        IDC_OLD_PIM,89,51,42,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER | NOT WS_VISIBLE
+    EDITTEXT        IDC_OLD_PIM,89,51,42,14,ES_RIGHT | ES_PASSWORD | ES_AUTOHSCROLL | ES_NUMBER | NOT WS_VISIBLE
     CONTROL         "Use PIM",IDC_PIM_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,59,97,10
     CONTROL         "Use keyfiles",IDC_ENABLE_KEYFILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,72,98,10
     PUSHBUTTON      "Keyfiles...",IDC_KEYFILES,192,70,59,14
     CONTROL         "Display password",IDC_SHOW_PASSWORD_CHPWD_ORI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,85,138,10,WS_EX_TRANSPARENT
     EDITTEXT        IDC_PASSWORD,89,121,162,13,ES_PASSWORD | ES_AUTOHSCROLL
     EDITTEXT        IDC_VERIFY,89,137,162,13,ES_PASSWORD | ES_AUTOHSCROLL
-    EDITTEXT        IDC_PIM,89,154,42,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER | NOT WS_VISIBLE
+    EDITTEXT        IDC_PIM,89,154,42,14,ES_RIGHT | ES_PASSWORD | ES_AUTOHSCROLL | ES_NUMBER | NOT WS_VISIBLE
     CONTROL         "Use PIM",IDC_NEW_PIM_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,161,97,10
     CONTROL         "Use keyfiles",IDC_ENABLE_NEW_KEYFILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,172,99,11
     PUSHBUTTON      "Keyfiles...",IDC_NEW_KEYFILES,192,170,59,14
@@ -182,7 +182,7 @@ BEGIN
     EDITTEXT        IDC_PASSWORD,69,8,166,14,ES_PASSWORD | ES_AUTOHSCROLL
     COMBOBOX        IDC_PKCS5_PRF_ID,69,26,86,90,CBS_DROPDOWNLIST | WS_TABSTOP
     CONTROL         "TrueCrypt Mode",IDC_TRUECRYPT_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,28,76,10
-    EDITTEXT        IDC_PIM,69,43,42,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER | NOT WS_VISIBLE
+    EDITTEXT        IDC_PIM,69,43,42,14,ES_RIGHT | ES_PASSWORD | ES_AUTOHSCROLL | ES_NUMBER | NOT WS_VISIBLE
     CONTROL         "Use PIM",IDC_PIM_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,70,48,97,10
     CONTROL         "Cache passwords and keyfil&es in memory",IDC_CACHE,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,70,61,153,10
@@ -198,36 +198,38 @@ BEGIN
     RTEXT           "Volume PIM:",IDT_PIM,0,46,65,8,NOT WS_VISIBLE
 END
 
-IDD_TRAVELER_DLG DIALOGEX 0, 0, 300, 269
+IDD_TRAVELER_DLG DIALOGEX 0, 0, 300, 287
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "VeraCrypt Traveler Disk Setup"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    EDITTEXT        IDC_DIRECTORY,17,29,205,13,ES_AUTOHSCROLL
+    EDITTEXT        IDC_DIRECTORY,17,29,205,13,ES_AUTOHSCROLL | ES_READONLY
     PUSHBUTTON      "Browse...",IDC_BROWSE_DIRS,228,28,57,14
     CONTROL         "Include VeraCrypt Volume Creation Wizard",IDC_COPY_WIZARD,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,48,258,10
-    CONTROL         "Do nothing",IDC_AUTORUN_DISABLE,"Button",BS_AUTORADIOBUTTON,15,97,262,10
-    CONTROL         "&Start VeraCrypt",IDC_AUTORUN_START,"Button",BS_AUTORADIOBUTTON,15,108,262,11
+    CONTROL         "Do nothing",IDC_AUTORUN_DISABLE,"Button",BS_AUTORADIOBUTTON,15,115,262,10
+    CONTROL         "&Start VeraCrypt",IDC_AUTORUN_START,"Button",BS_AUTORADIOBUTTON,15,126,262,11
     CONTROL         "&Auto-mount VeraCrypt volume (specified below)",IDC_AUTORUN_MOUNT,
-                    "Button",BS_AUTORADIOBUTTON,15,120,262,11
-    EDITTEXT        IDC_VOLUME_NAME,21,157,194,13,ES_AUTOHSCROLL | WS_DISABLED
-    PUSHBUTTON      "Browse...",IDC_BROWSE_FILES,221,156,57,14,WS_DISABLED
-    COMBOBOX        IDC_DRIVELIST,120,175,96,69,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
+                    "Button",BS_AUTORADIOBUTTON,15,138,262,11
+    EDITTEXT        IDC_VOLUME_NAME,21,175,194,13,ES_AUTOHSCROLL | WS_DISABLED
+    PUSHBUTTON      "Browse...",IDC_BROWSE_FILES,221,174,57,14,WS_DISABLED
+    COMBOBOX        IDC_DRIVELIST,120,193,96,69,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Open &Explorer window for mounted volume",IDC_TRAVEL_OPEN_EXPLORER,
-                    "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,22,193,256,10
-    CONTROL         "Mount volume as read-&only",IDC_MOUNT_READONLY,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,22,206,256,10
+                    "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,22,211,256,10
+    CONTROL         "Mount volume as read-&only",IDC_MOUNT_READONLY,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,22,224,256,10
     CONTROL         "&Cache password in driver memory",IDC_TRAV_CACHE_PASSWORDS,
-                    "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,22,219,256,10
-    DEFPUSHBUTTON   "Create",IDC_CREATE,173,249,57,14
-    PUSHBUTTON      "Close",IDCLOSE,236,249,57,14
-    GROUPBOX        "File Settings",IDT_FILE_SETTINGS,6,7,287,59
-    GROUPBOX        "AutoRun Configuration (autorun.inf)",IDT_AUTORUN,5,70,288,172
-    LTEXT           "VeraCrypt volume to mount (relative to traveler disk root):",IDT_TRAVELER_MOUNT,21,147,248,8,WS_DISABLED
-    RTEXT           "Mount volume as drive letter:",IDT_MOUNT_LETTER,18,177,99,8,WS_DISABLED
+                    "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,22,237,256,10
+    DEFPUSHBUTTON   "Create",IDC_CREATE,173,267,57,14
+    PUSHBUTTON      "Close",IDCLOSE,236,267,57,14
+    GROUPBOX        "File Settings",IDT_FILE_SETTINGS,6,7,287,71
+    GROUPBOX        "AutoRun Configuration (autorun.inf)",IDT_AUTORUN,5,88,288,172
+    LTEXT           "VeraCrypt volume to mount (relative to traveler disk root):",IDT_TRAVELER_MOUNT,21,165,248,8,WS_DISABLED
+    RTEXT           "Mount volume as drive letter:",IDT_MOUNT_LETTER,18,195,99,8,WS_DISABLED
     LTEXT           "Create traveler disk files at (traveler disk root directory):",IDT_TRAVEL_ROOT,18,19,259,8
-    GROUPBOX        "Mount Settings",IDT_MOUNT_SETTINGS,13,134,272,100,WS_DISABLED
-    LTEXT           "Upon insertion of traveler disk: ",IDT_TRAVEL_INSERTION,13,84,263,8
+    GROUPBOX        "Mount Settings",IDT_MOUNT_SETTINGS,13,152,272,100,WS_DISABLED
+    LTEXT           "Upon insertion of traveler disk: ",IDT_TRAVEL_INSERTION,13,102,263,8
+    CONTROL         "Include VeraCrypt Volume Expander",IDC_COPY_EXPANDER,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,62,258,10
 END
 
 IDD_HOTKEYS_DLG DIALOGEX 0, 0, 389, 257
@@ -293,7 +295,7 @@ BEGIN
     LTEXT           "",IDC_CUSTOM_BOOT_LOADER_MESSAGE_HELP,18,74,337,73
 END
 
-IDD_PERFORMANCE_SETTINGS DIALOGEX 0, 0, 370, 206
+IDD_PERFORMANCE_SETTINGS DIALOGEX 0, 0, 370, 248
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "VeraCrypt - Performance Options"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
@@ -306,16 +308,19 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | BS_TOP | WS_TABSTOP,18,103,283,11
     COMBOBOX        IDC_ENCRYPTION_FREE_CPU_COUNT,304,101,48,51,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "More information",IDC_MORE_INFO_ON_THREAD_BASED_PARALLELIZATION,18,159,165,10,SS_NOTIFY
-    PUSHBUTTON      "&Benchmark",IDC_BENCHMARK,7,185,59,14
-    DEFPUSHBUTTON   "OK",IDOK,257,185,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,313,185,50,14
+    PUSHBUTTON      "&Benchmark",IDC_BENCHMARK,7,227,59,14
+    DEFPUSHBUTTON   "OK",IDOK,257,227,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,313,227,50,14
     LTEXT           "Processor (CPU) in this computer supports hardware acceleration for AES:",IDT_HW_AES_SUPPORTED_BY_CPU,18,23,273,9
     GROUPBOX        "Hardware Acceleration",IDT_ACCELERATION_OPTIONS,7,6,355,74
     GROUPBOX        "Thread-Based Parallelization",IDT_PARALLELIZATION_OPTIONS,7,84,355,93
     LTEXT           "",IDT_LIMIT_ENC_THREAD_POOL_NOTE,18,126,334,33
+    GROUPBOX        "Driver Configuration",IDT_DRIVER_OPTIONS,7,183,356,36
+    CONTROL         "Enable extended disk control codes support",IDC_ENABLE_EXTENDED_IOCTL_SUPPORT,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,198,337,10
 END
 
-IDD_FAVORITE_VOLUMES DIALOGEX 0, 0, 380, 315
+IDD_FAVORITE_VOLUMES DIALOGEX 0, 0, 380, 339
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "VeraCrypt - Favorite Volumes"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
@@ -324,28 +329,31 @@ BEGIN
     PUSHBUTTON      "Move &Up",IDC_FAVORITE_MOVE_UP,7,104,63,14
     PUSHBUTTON      "Move &Down",IDC_FAVORITE_MOVE_DOWN,74,104,63,14
     PUSHBUTTON      "&Remove",IDC_FAVORITE_REMOVE,310,104,63,14
-    EDITTEXT        IDC_FAVORITE_LABEL,16,173,204,13,ES_AUTOHSCROLL
+    EDITTEXT        IDC_FAVORITE_LABEL,18,185,204,13,ES_AUTOHSCROLL
     CONTROL         "Mount selected volume as read-o&nly",IDC_FAVORITE_MOUNT_READONLY,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,193,349,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,215,349,10
     CONTROL         "Mount selected volume as remo&vable medium",IDC_FAVORITE_MOUNT_REMOVABLE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,207,349,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,229,349,10
     CONTROL         "Mount selected volume upon log&on",IDC_FAVORITE_MOUNT_ON_LOGON,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,221,349,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,243,349,10
     CONTROL         "Mount selected volume when its host device gets &connected",IDC_FAVORITE_MOUNT_ON_ARRIVAL,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,235,349,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,257,349,10
     CONTROL         "Open &Explorer window for selected volume when successfully mounted",IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,249,349,11
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,271,349,11
     CONTROL         "Do not mount selected volume when 'Mount Favorite Volumes' &hot key is pressed",IDC_FAVORITE_DISABLE_HOTKEY,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,264,349,11
-    LTEXT           "Help on favorite volumes",IDC_FAVORITES_HELP_LINK,17,298,237,10,SS_NOTIFY
-    DEFPUSHBUTTON   "OK",IDOK,269,296,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,323,296,50,14
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,286,349,11
+    LTEXT           "Help on favorite volumes",IDC_FAVORITES_HELP_LINK,17,322,237,10,SS_NOTIFY
+    DEFPUSHBUTTON   "OK",IDOK,269,318,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,323,318,50,14
     GROUPBOX        "",IDC_FAV_VOL_OPTIONS_GROUP_BOX,7,122,366,159
-    LTEXT           "Label of selected favorite volume:",IDT_FAVORITE_LABEL,18,163,202,8
-    GROUPBOX        "Global Settings",IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX,7,230,366,57
-    EDITTEXT        IDC_PIM,16,143,42,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "Label of selected favorite volume:",IDT_FAVORITE_LABEL,18,175,202,8
+    GROUPBOX        "Global Settings",IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX,7,252,366,57
+    EDITTEXT        IDC_PIM,18,143,42,13,ES_RIGHT | ES_PASSWORD | ES_AUTOHSCROLL | ES_NUMBER
     LTEXT           "(Empty or 0 for default iterations)",IDC_PIM_HELP,64,145,189,8
     LTEXT           "Volume PIM:",IDT_PIM,18,133,65,8
+    CONTROL         "Display PIM",IDC_SHOW_PIM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,159,150,10
+    CONTROL         "Use favorite label as Explorer drive label",IDC_FAVORITE_USE_LABEL_IN_EXPLORER,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,202,203,10
 END
 
 IDD_DEFAULT_MOUNT_PARAMETERS DIALOGEX 0, 0, 167, 65
@@ -410,7 +418,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 293
         TOPMARGIN, 7
-        BOTTOMMARGIN, 262
+        BOTTOMMARGIN, 280
     END
 
     IDD_HOTKEYS_DLG, DIALOG
@@ -441,7 +449,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 363
         TOPMARGIN, 7
-        BOTTOMMARGIN, 199
+        BOTTOMMARGIN, 241
     END
 
     IDD_FAVORITE_VOLUMES, DIALOG
@@ -449,7 +457,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 373
         TOPMARGIN, 7
-        BOTTOMMARGIN, 308
+        BOTTOMMARGIN, 332
     END
 
     IDD_DEFAULT_MOUNT_PARAMETERS, DIALOG
@@ -469,8 +477,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,12,22,0
- PRODUCTVERSION 1,12,22,0
+ FILEVERSION 1,14,15,0
+ PRODUCTVERSION 1,14,15,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -487,11 +495,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "IDRIX"
             VALUE "FileDescription", "VeraCrypt"
-            VALUE "FileVersion", "1.12"
+            VALUE "FileVersion", "1.14"
             VALUE "LegalTrademarks", "VeraCrypt"
             VALUE "OriginalFilename", "VeraCrypt.exe"
             VALUE "ProductName", "VeraCrypt"
-            VALUE "ProductVersion", "1.12"
+            VALUE "ProductVersion", "1.14"
         END
     END
     BLOCK "VarFileInfo"
@@ -580,6 +588,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Create Rescue Disk...",       IDM_CREATE_RESCUE_DISK
         MENUITEM "Verify Rescue Disk",          IDM_VERIFY_RESCUE_DISK
+        MENUITEM "Verify Rescue Disk ISO Image",IDM_VERIFY_RESCUE_DISK_ISO
         MENUITEM SEPARATOR
         MENUITEM "Mount Without Pre-Boot &Authentication...", IDM_MOUNT_SYSENC_PART_WITHOUT_PBA
         MENUITEM SEPARATOR
diff --git a/src/Mount/Resource.h b/src/Mount/Resource.h
index e589836..7ab074c 100644
--- a/src/Mount/Resource.h
+++ b/src/Mount/Resource.h
@@ -167,6 +167,11 @@
 #define IDC_OLD_PIM                     1143
 #define IDC_OLD_PIM_HELP                1144
 #define IDC_NEW_PIM_ENABLE              1145
+#define IDC_SHOW_PIM                    1146
+#define IDC_FAVORITE_USE_LABEL_IN_EXPLORER 1147
+#define IDC_COPY_EXPANDER               1148
+#define IDT_DRIVER_OPTIONS              1149
+#define IDC_ENABLE_EXTENDED_IOCTL_SUPPORT 1150
 #define IDM_HELP                        40001
 #define IDM_ABOUT                       40002
 #define IDM_UNMOUNT_VOLUME              40003
@@ -234,6 +239,7 @@
 #define IDM_VOLUME_EXPANDER             40065
 #define IDM_DEFAULT_MOUNT_PARAMETERS    40066
 #define IDM_DECRYPT_NONSYS_VOL          40067
+#define IDM_VERIFY_RESCUE_DISK_ISO      40068
 
 // Next default values for new objects
 // 
@@ -241,8 +247,8 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        119
-#define _APS_NEXT_COMMAND_VALUE         40068
-#define _APS_NEXT_CONTROL_VALUE         1146
+#define _APS_NEXT_COMMAND_VALUE         40069
+#define _APS_NEXT_CONTROL_VALUE         1151
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif
diff --git a/src/Readme.txt b/src/Readme.txt
index c9aa884..da00ea5 100644
--- a/src/Readme.txt
+++ b/src/Readme.txt
@@ -51,6 +51,7 @@ Requirements for Building VeraCrypt for Windows:
   header files (available at ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20)
 - NASM assembler 2.08 or compatible
 - gzip compressor
+- upx packer (available at http://upx.sourceforge.net/)
 
 IMPORTANT:
 
diff --git a/src/Release/Setup Files/VeraCrypt User Guide.pdf b/src/Release/Setup Files/VeraCrypt User Guide.pdf
index 8be6fce..b8b9f57 100644
Binary files a/src/Release/Setup Files/VeraCrypt User Guide.pdf and b/src/Release/Setup Files/VeraCrypt User Guide.pdf differ
diff --git a/src/Setup/MacOSX/veracrypt.pkgproj b/src/Setup/MacOSX/veracrypt.pkgproj
index 6c0c0ed..de4f181 100755
--- a/src/Setup/MacOSX/veracrypt.pkgproj
+++ b/src/Setup/MacOSX/veracrypt.pkgproj
@@ -495,7 +495,7 @@
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.12.22</string>
+				<string>1.14.15</string>
 			</dict>
 			<key>UUID</key>
 			<string>B14381D9-EC5F-43E4-B971-82AB3D132A64</string>
@@ -1051,7 +1051,7 @@ Merci de ré-installer OSXFUSE et de cocher l'option de compatibilité MacFUSE d
 				</dict>
 			</array>
 			<key>NAME</key>
-			<string>VeraCrypt 1.12</string>
+			<string>VeraCrypt 1.14</string>
 		</dict>
 	</dict>
 	<key>SHARED_GLOBAL_DATA</key>
diff --git a/src/Setup/Setup.c b/src/Setup/Setup.c
index d4b0556..f5c7a36 100644
--- a/src/Setup/Setup.c
+++ b/src/Setup/Setup.c
@@ -490,6 +490,39 @@ HRESULT CreateLink (char *lpszPathObj, char *lpszArguments,
 	return hres;
 }
 
+BOOL IsSystemRestoreEnabled ()
+{
+	BOOL bEnabled = FALSE;
+	HKEY hKey;
+	DWORD dwValue = 0, cbValue = sizeof (DWORD);
+	if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\SystemRestore", 0, KEY_READ | KEY_WOW64_64KEY, &hKey) == ERROR_SUCCESS)
+	{	
+		if (IsOSAtLeast (WIN_VISTA))
+		{
+			if (	(ERROR_SUCCESS == RegQueryValueEx (hKey, "RPSessionInterval", NULL, NULL, (LPBYTE) &dwValue, &cbValue))
+				&&	(dwValue == 1)
+				)
+			{
+				bEnabled = TRUE;
+			}
+		}
+		else
+		{
+			if (	(ERROR_SUCCESS == RegQueryValueEx (hKey, "DisableSR", NULL, NULL, (LPBYTE) &dwValue, &cbValue))
+				&&	(dwValue == 0)
+				)
+			{
+				bEnabled = TRUE;
+			}
+		}
+
+		
+		RegCloseKey (hKey);
+	}
+
+	return bEnabled;
+}
+
 void GetProgramPath (HWND hwndDlg, char *path)
 {
 	ITEMIDLIST *i;
@@ -641,6 +674,18 @@ BOOL DoFilesInstall (HWND hwndDlg, char *szDestDir)
 				continue;	// Destination = target
 		}
 
+		// skip files that don't apply to the current architecture
+		if (	(Is64BitOs () && (strcmp (szFiles[i], "AVeraCrypt-x64.exe") == 0))
+			|| (Is64BitOs () && (strcmp (szFiles[i], "AVeraCryptExpander-x64.exe") == 0))
+			|| (Is64BitOs () && (strcmp (szFiles[i], "AVeraCrypt Format-x64.exe") == 0))
+			||	(!Is64BitOs () && (strcmp (szFiles[i], "AVeraCrypt-x86.exe") == 0))
+			||	(!Is64BitOs () && (strcmp (szFiles[i], "AVeraCryptExpander-x86.exe") == 0))
+			||	(!Is64BitOs () && (strcmp (szFiles[i], "AVeraCrypt Format-x86.exe") == 0))
+			)
+		{
+			continue;
+		}
+
 		if (*szFiles[i] == 'A')
 			StringCbCopyA (szDir, sizeof(szDir), szDestDir);
 		else if (*szFiles[i] == 'D')
@@ -700,17 +745,35 @@ BOOL DoFilesInstall (HWND hwndDlg, char *szDestDir)
 				}
 
 				if (Is64BitOs ()
+					&& strcmp (szFiles[i], "AVeraCrypt-x86.exe") == 0)
+				{
+					StringCbCopyNA (curFileName, sizeof(curFileName), "VeraCrypt.exe", sizeof ("VeraCrypt.exe"));
+				}
+
+				if (Is64BitOs ()
 					&& strcmp (szFiles[i], "AVeraCryptExpander.exe") == 0)
 				{
 					StringCbCopyNA (curFileName, sizeof(curFileName), "VeraCryptExpander-x64.exe", sizeof ("VeraCryptExpander-x64.exe"));
 				}
 
 				if (Is64BitOs ()
+					&& strcmp (szFiles[i], "AVeraCryptExpander-x86.exe") == 0)
+				{
+					StringCbCopyNA (curFileName, sizeof(curFileName), "VeraCryptExpander.exe", sizeof ("VeraCryptExpander.exe"));
+				}
+
+				if (Is64BitOs ()
 					&& strcmp (szFiles[i], "AVeraCrypt Format.exe") == 0)
 				{
 					StringCbCopyNA (curFileName, sizeof(curFileName), "VeraCrypt Format-x64.exe", sizeof ("VeraCrypt Format-x64.exe"));
 				}
 
+				if (Is64BitOs ()
+					&& strcmp (szFiles[i], "AVeraCrypt Format-x86.exe") == 0)
+				{
+					StringCbCopyNA (curFileName, sizeof(curFileName), "VeraCrypt Format.exe", sizeof ("VeraCrypt Format.exe"));
+				}
+
 				if (!bDevm)
 				{
 					bResult = FALSE;
@@ -776,52 +839,103 @@ BOOL DoFilesInstall (HWND hwndDlg, char *szDestDir)
 
 					string servicePath = GetServiceConfigPath (TC_APP_NAME ".exe", false);
 					string serviceLegacyPath = GetServiceConfigPath (TC_APP_NAME ".exe", true);
+					string favoritesFile = GetServiceConfigPath (TC_APPD_FILENAME_SYSTEM_FAVORITE_VOLUMES, false);
+					string favoritesLegacyFile = GetServiceConfigPath (TC_APPD_FILENAME_SYSTEM_FAVORITE_VOLUMES, true);
 
-					if (FileExists (servicePath.c_str()))
+					if (	FileExists (servicePath.c_str())
+						||	(Is64BitOs () && FileExists (serviceLegacyPath.c_str()))
+						)
 					{
 						CopyMessage (hwndDlg, (char *) servicePath.c_str());
 						bResult = CopyFile (szTmp, servicePath.c_str(), FALSE);
 					}
-					else if (Is64BitOs () && FileExists (serviceLegacyPath.c_str()))
-					{
-						string favoritesFile = GetServiceConfigPath (TC_APPD_FILENAME_SYSTEM_FAVORITE_VOLUMES, false);
-						string favoritesLegacyFile = GetServiceConfigPath (TC_APPD_FILENAME_SYSTEM_FAVORITE_VOLUMES, true);
 
-						// delete files from legacy path
-						RemoveMessage (hwndDlg, (char *) serviceLegacyPath.c_str());
-						DeleteFile (serviceLegacyPath.c_str());
+					if (bResult && Is64BitOs () 
+						&& FileExists (favoritesLegacyFile.c_str()) 
+						&& !FileExists (favoritesFile.c_str()))
+					{
+						// copy the favorites XML file to the native system directory
+						bResult = CopyFile (favoritesLegacyFile.c_str(), favoritesFile.c_str(), FALSE);
+					}
 
-						CopyMessage (hwndDlg, (char *) servicePath.c_str());
-						bResult = CopyFile (szTmp, servicePath.c_str(), FALSE);	
+					if (bResult && Is64BitOs () && FileExists (favoritesFile.c_str()) && FileExists (servicePath.c_str()))
+					{
+						// Update the path of the service
+						BootEncryption BootEncObj (hwndDlg);
 
-						if (bResult && FileExists (favoritesLegacyFile.c_str()))
+						try
 						{
-							// copy the favorites XML file to the native system directory
-							bResult = CopyFile (favoritesLegacyFile.c_str(), favoritesFile.c_str(), FALSE);
-							if (bResult)
-								DeleteFile (favoritesLegacyFile.c_str());
-
-							BootEncryption BootEncObj (hwndDlg);
-
-							try
+							if (BootEncObj.GetStatus().DriveMounted)
 							{
-								if (BootEncObj.GetStatus().DriveMounted)
-								{
-									BootEncObj.RegisterSystemFavoritesService (TRUE, TRUE);
-								}
+								BootEncObj.UpdateSystemFavoritesService ();
 							}
-							catch (...) {}
 						}
+						catch (...) {}
 					}
 
 					if (Is64BitOs ())
+					{
+						// delete files from legacy path
+						if (FileExists (favoritesLegacyFile.c_str()))
+						{
+							RemoveMessage (hwndDlg, (char *) favoritesLegacyFile.c_str());
+							DeleteFile (favoritesLegacyFile.c_str());
+						}
+
+						if (FileExists (serviceLegacyPath.c_str()))
+						{
+							RemoveMessage (hwndDlg, (char *) serviceLegacyPath.c_str());
+							DeleteFile (serviceLegacyPath.c_str());
+						}
+
 						EnableWow64FsRedirection (TRUE);
+					}
 				}
 			}
 		}
 		else
 		{
 			bResult = StatDeleteFile (szTmp, TRUE);
+			if (bResult && strcmp (szFiles[i], "AVeraCrypt.exe") == 0)
+			{
+				if (Is64BitOs ())
+					EnableWow64FsRedirection (FALSE);
+
+				string servicePath = GetServiceConfigPath (TC_APP_NAME ".exe", false);
+				string serviceLegacyPath = GetServiceConfigPath (TC_APP_NAME ".exe", true);
+				string favoritesFile = GetServiceConfigPath (TC_APPD_FILENAME_SYSTEM_FAVORITE_VOLUMES, false);
+				string favoritesLegacyFile = GetServiceConfigPath (TC_APPD_FILENAME_SYSTEM_FAVORITE_VOLUMES, true);
+
+				// delete all files related to system favorites service
+				if (FileExists (favoritesFile.c_str()))
+				{
+					RemoveMessage (hwndDlg, (char *) favoritesFile.c_str());
+					DeleteFile (favoritesFile.c_str());
+				}
+
+				if (FileExists (servicePath.c_str()))
+				{
+					RemoveMessage (hwndDlg, (char *) servicePath.c_str());
+					DeleteFile (servicePath.c_str());
+				}
+
+				if (Is64BitOs ())
+				{
+					if (FileExists (favoritesLegacyFile.c_str()))
+					{
+						RemoveMessage (hwndDlg, (char *) favoritesLegacyFile.c_str());
+						DeleteFile (favoritesLegacyFile.c_str());
+					}
+
+					if (FileExists (serviceLegacyPath.c_str()))
+					{
+						RemoveMessage (hwndDlg, (char *) serviceLegacyPath.c_str());
+						DeleteFile (serviceLegacyPath.c_str());
+					}
+
+					EnableWow64FsRedirection (TRUE);
+				}
+			}
 		}
 
 err:
@@ -1105,6 +1219,22 @@ BOOL DoApplicationDataUninstall (HWND hwndDlg)
 		bOK = FALSE;
 	}
 
+	// remove VeraCrypt under common appdata
+	if (SUCCEEDED (SHGetFolderPath (NULL, CSIDL_COMMON_APPDATA | CSIDL_FLAG_CREATE, NULL, 0, path)))
+	{
+		StringCbCatA (path, sizeof(path), "\\VeraCrypt");
+
+		// Delete original bootloader
+		StringCbPrintfA (path2, sizeof(path2), "%s\\%s", path, TC_SYS_BOOT_LOADER_BACKUP_NAME);
+		RemoveMessage (hwndDlg, path2);
+		StatDeleteFile (path2, FALSE);
+
+		// remove VeraCrypt folder
+		RemoveMessage (hwndDlg, path);
+		StatRemoveDirectory (path);
+	}
+
+
 	return bOK;
 }
 
@@ -2457,14 +2587,19 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, char *lpszComm
 		}
 
 		// System Restore
-		char dllPath[MAX_PATH];
-		if (GetSystemDirectory (dllPath, MAX_PATH))
+		if (IsSystemRestoreEnabled ())
 		{
-			StringCbCatA(dllPath, sizeof(dllPath), "\\srclient.dll");
+			char dllPath[MAX_PATH];
+			if (GetSystemDirectory (dllPath, MAX_PATH))
+			{
+				StringCbCatA(dllPath, sizeof(dllPath), "\\srclient.dll");
+			}
+			else
+				StringCbCopyA(dllPath, sizeof(dllPath), "C:\\Windows\\System32\\srclient.dll");
+			SystemRestoreDll = LoadLibrary (dllPath);
 		}
 		else
-			StringCbCopyA(dllPath, sizeof(dllPath), "C:\\Windows\\System32\\srclient.dll");
-		SystemRestoreDll = LoadLibrary (dllPath);
+			SystemRestoreDll = 0;
 
 		if (!bUninstall)
 		{
diff --git a/src/Setup/Setup.h b/src/Setup/Setup.h
index 9275362..6fc180e 100644
--- a/src/Setup/Setup.h
+++ b/src/Setup/Setup.h
@@ -28,6 +28,12 @@ static char *szFiles[]=
 	"AVeraCrypt.exe",
 	"AVeraCryptExpander.exe",
 	"AVeraCrypt Format.exe",
+	"AVeraCrypt-x86.exe",
+	"AVeraCryptExpander-x86.exe",
+	"AVeraCrypt Format-x86.exe",
+	"AVeraCrypt-x64.exe",
+	"AVeraCryptExpander-x64.exe",
+	"AVeraCrypt Format-x64.exe",
 	"Averacrypt.sys",
 	"Averacrypt-x64.sys",
 	"Dveracrypt.sys",
diff --git a/src/Setup/Setup.rc b/src/Setup/Setup.rc
index ae18c50..841de32 100644
--- a/src/Setup/Setup.rc
+++ b/src/Setup/Setup.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,12,22,0
- PRODUCTVERSION 1,12,22,0
+ FILEVERSION 1,14,15,0
+ PRODUCTVERSION 1,14,15,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -46,11 +46,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "IDRIX"
             VALUE "FileDescription", "VeraCrypt Setup"
-            VALUE "FileVersion", "1.12"
+            VALUE "FileVersion", "1.14"
             VALUE "LegalTrademarks", "VeraCrypt"
             VALUE "OriginalFilename", "VeraCrypt Setup.exe"
             VALUE "ProductName", "VeraCrypt"
-            VALUE "ProductVersion", "1.12"
+            VALUE "ProductVersion", "1.14"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/Signing/sign.bat b/src/Signing/sign.bat
index f2e73b1..c5c47c6 100644
--- a/src/Signing/sign.bat
+++ b/src/Signing/sign.bat
@@ -21,6 +21,6 @@ del *.xml
 
 cd "..\..\Signing"
 
-signtool sign /v /a /n IDRIX /ac Thawt_CodeSigning_CA.crt /t http://timestamp.verisign.com/scripts/timestamp.dll "..\Release\Setup Files\VeraCrypt Setup 1.12.exe"
+signtool sign /v /a /n IDRIX /ac Thawt_CodeSigning_CA.crt /t http://timestamp.verisign.com/scripts/timestamp.dll "..\Release\Setup Files\VeraCrypt Setup 1.14.exe"
 
 pause
\ No newline at end of file
diff --git a/src/Signing/sign_test.bat b/src/Signing/sign_test.bat
index ec5872a..7494eff 100644
--- a/src/Signing/sign_test.bat
+++ b/src/Signing/sign_test.bat
@@ -24,6 +24,6 @@ del *.xml
 
 cd "..\..\Signing"
 
-signtool sign /v /a /f %PFXNAME% /p %PFXPASSWORD% /ac TestCertificate\idrix_TestRootCA.crt /t http://timestamp.verisign.com/scripts/timestamp.dll "..\Release\Setup Files\VeraCrypt Setup 1.12.exe"
+signtool sign /v /a /f %PFXNAME% /p %PFXPASSWORD% /ac TestCertificate\idrix_TestRootCA.crt /t http://timestamp.verisign.com/scripts/timestamp.dll "..\Release\Setup Files\VeraCrypt Setup 1.13.exe"
 
 pause
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/veracrypt.git



More information about the debian-edu-commits mailing list